rule expiration: make max date configurable using settings.MAX_RULE_EXPIRE_DAYS

flowspec/views.py

@@ -277,8 +277,10 @@ def add_route(request):
         if not request.user.is_superuser:
             form.fields['then'] = forms.ModelMultipleChoiceField(queryset=ThenAction.objects.filter(action__in=settings.UI_USER_THEN_ACTIONS).order_by('action'), required=True)
             form.fields['protocol'] = forms.ModelMultipleChoiceField(queryset=MatchProtocol.objects.filter(protocol__in=settings.UI_USER_PROTOCOLS).order_by('protocol'), required=False)
-        return render_to_response('apply.html', {'form': form, 'applier': applier},
-                                  context_instance=RequestContext(request))
+        return render_to_response('apply.html', {'form': form,
+            'applier': applier,
+            'maxexpires': settings.MAX_RULE_EXPIRE_DAYS },
+            context_instance=RequestContext(request))
 
     else:
         request_data = request.POST.copy()
@@ -319,8 +321,8 @@ def add_route(request):
                 'apply.html',
                 {
                     'form': form,
-                    'applier': applier
-
+                    'applier': applier,
+                    'maxexpires': settings.MAX_RULE_EXPIRE_DAYS
                 }
             )
 
@@ -401,7 +403,8 @@ def edit_route(request, route_slug):
                 {
                     'form': form,
                     'edit': True,
-                    'applier': applier
+                    'applier': applier,
+                    'maxexpires': settings.MAX_RULE_EXPIRE_DAYS
                 },
                 context_instance=RequestContext(request)
             )
@@ -425,7 +428,8 @@ def edit_route(request, route_slug):
             {
                 'form': form,
                 'edit': True,
-                'applier': applier
+                'applier': applier,
+                'maxexpires': settings.MAX_RULE_EXPIRE_DAYS
             },
             context_instance=RequestContext(request)
         )

flowspy/settings.py.dist

@@ -273,6 +273,8 @@ CELERY_IMPORTS = ("flowspec.tasks", )
 SERVER_EMAIL = "Example FoD Service <noreply@example.com>"
 EMAIL_SUBJECT_PREFIX = "[FoD] "
 EXPIRATION_NOTIFY_DAYS = 4
+# max number of days into the future that is allowed to pick in rule expiration datepicker
+MAX_RULE_EXPIRE_DAYS = 30
 PREFIX_LENGTH = 29
 
 # Shibboleth

templates/apply.html

@@ -94,7 +94,7 @@
 
 		$('#id_expires').datepicker({
 			startDate: '+1d',
-			endDate: '+10d'
+			endDate: '+{{maxexpires}}d'
 		});
 		$('#setFromAll').click(function(){
 			$("#id_source").val('0.0.0.0/0');