Got rid of javascript-based random generator

This commit is contained in:
Raphael Michel
2016-08-29 23:46:17 +02:00
parent a86e706244
commit dc3e1e3d30
6 changed files with 50 additions and 27 deletions

View File

@@ -10,10 +10,14 @@ from .items import Item, ItemVariation, Quota
from .orders import CartPosition, Order, OrderPosition
def generate_code():
def _generate_random_code():
charset = list('ABCDEFGHKLMNPQRSTUVWXYZ23456789')
return get_random_string(length=settings.ENTROPY['voucher_code'], allowed_chars=charset)
def generate_code():
while True:
code = get_random_string(length=settings.ENTROPY['voucher_code'], allowed_chars=charset)
code = _generate_random_code()
if not Voucher.objects.filter(code=code).exists():
return code

View File

@@ -18,7 +18,7 @@
placeholder="{% trans "Number" %}">
<div class="input-group-btn">
<button class="btn btn-default" type="button" id="voucher-bulk-codes-generate"
data-length="{{ code_length }}">
data-rng-url="{% url 'control:event.vouchers.rng' organizer=request.event.organizer.slug event=request.event.slug %}">
{% trans "Generate random codes" %}
</button>
</div>

View File

@@ -63,6 +63,7 @@ urlpatterns = [
url(r'^quotas/add$', item.QuotaCreate.as_view(), name='event.items.quotas.add'),
url(r'^vouchers/$', vouchers.VoucherList.as_view(), name='event.vouchers'),
url(r'^vouchers/tags/$', vouchers.VoucherTags.as_view(), name='event.vouchers.tags'),
url(r'^vouchers/rng$', vouchers.VoucherRNG.as_view(), name='event.vouchers.rng'),
url(r'^vouchers/(?P<voucher>\d+)/$', vouchers.VoucherUpdate.as_view(), name='event.voucher'),
url(r'^vouchers/(?P<voucher>\d+)/delete$', vouchers.VoucherDelete.as_view(),
name='event.voucher.delete'),

View File

@@ -6,15 +6,18 @@ from django.contrib import messages
from django.core.urlresolvers import resolve, reverse
from django.db import transaction
from django.db.models import Count, Q, Sum
from django.http import Http404, HttpResponse, HttpResponseRedirect
from django.utils.formats import date_format
from django.http import (
Http404, HttpResponse, HttpResponseBadRequest, HttpResponseRedirect,
JsonResponse,
)
from django.utils.timezone import now
from django.utils.translation import ugettext_lazy as _
from django.views.generic import (
CreateView, DeleteView, ListView, TemplateView, UpdateView,
CreateView, DeleteView, ListView, TemplateView, UpdateView, View,
)
from pretix.base.models import Voucher
from pretix.base.models.vouchers import _generate_random_code
from pretix.control.forms.vouchers import VoucherBulkForm, VoucherForm
from pretix.control.permissions import EventPermissionRequiredMixin
from pretix.control.signals import voucher_form_class
@@ -261,3 +264,32 @@ class VoucherBulkCreate(EventPermissionRequiredMixin, CreateView):
# TODO: Transform this into an asynchronous call?
with request.event.lock():
return super().post(request, *args, **kwargs)
class VoucherRNG(EventPermissionRequiredMixin, View):
template_name = 'pretixcontrol/vouchers/bulk.html'
permission = 'can_change_vouchers'
def get(self, request, *args, **kwargs):
codes = set()
try:
num = int(request.GET.get('num', '5'))
except ValueError:
return HttpResponseBadRequest()
while len(codes) < num:
new_codes = set()
for i in range(min(num - len(codes), 500)): # Work around SQLite's SQLITE_MAX_VARIABLE_NUMBER
new_codes.add(_generate_random_code())
new_codes -= set([v['code'] for v in Voucher.objects.filter(code__in=new_codes).values('code')])
codes |= new_codes
return JsonResponse({
'codes': list(codes)
})
def get_success_url(self) -> str:
return reverse('control:event.vouchers', kwargs={
'organizer': self.request.event.organizer.slug,
'event': self.request.event.slug,
})

View File

@@ -56,26 +56,11 @@ $(function () {
// Vouchers
$("#voucher-bulk-codes-generate").click(function () {
var charset = "ABCDEFGHKLMNPQRSTUVWXYZ23456789",
i = 0, j = 0, len = parseInt($(this).attr("data-length")),
num = parseInt($("#voucher-bulk-codes-num").val()), text = "";
for (j = 0; j < num; j++) {
var key = [];
if (window.crypto && window.crypto.getRandomValues && Uint8Array) {
key = new Uint8Array(len);
window.crypto.getRandomValues(key);
} else {
for (i = 0; i < len; i++) {
key.push(Math.floor(Math.random() * charset.length));
}
}
if (i > 0) {
text += "\n";
}
for (i = 0; i < len; i++) {
text += charset.charAt(key[i] % charset.length);
}
}
$("#id_codes").html(text);
var url = $(this).attr("data-rng-url"),
num = $("#voucher-bulk-codes-num").val();
$("#id_codes").html("Generating...");
$.getJSON(url + '?num=' + num, function (data) {
$("#id_codes").text(data.codes.join("\n"));
});
});
});

View File

@@ -55,6 +55,7 @@ event_urls = [
"vouchers/2/",
"vouchers/add",
"vouchers/bulk_add",
"vouchers/rng",
"quotas/",
"quotas/2/delete",
"quotas/2/",