Add endpoint fixes: port number was truncated, multiple endpoints wer…

…e not correctly added to related form.
DefectDojo · Jun 13, 2015 · d21db12 · d21db12
1 parent aefdd3b
commit d21db12
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 3 deletions.
diff --git a/dojo/forms.py b/dojo/forms.py
@@ -585,7 +585,7 @@ def __init__(self, *args, **kwargs):
     def clean(self):
         from django.core.validators import URLValidator, validate_ipv46_address
 
-        port_re = "(:[0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])"
+        port_re = "(:[0-9]{1,5}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])"
         cleaned_data = super(EditEndpointForm, self).clean()
 
         if 'host' in cleaned_data:
@@ -682,7 +682,7 @@ def save(self):
     def clean(self):
         from django.core.validators import URLValidator, validate_ipv46_address
 
-        port_re = "(:[0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])"
+        port_re = "(:[0-9]{1,5}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])"
         cleaned_data = super(AddEndpointForm, self).clean()
 
         if 'endpoint' in cleaned_data and 'product' in cleaned_data:

diff --git a/dojo/static/dojo/js/index.js b/dojo/static/dojo/js/index.js
@@ -38,6 +38,35 @@ $(function () {
 
 });
 
+function dismissAddAnotherPopupDojo(win, newId, newRepr) {
+    // newId and newRepr are expected to have previously been escaped by
+    // django.utils.html.escape.
+    newId = html_unescape(newId);
+    newRepr = html_unescape(newRepr);
+    var name = windowname_to_id(win.name);
+    var elem = document.getElementById(name);
+    var o;
+    if (elem) {
+        var elemName = elem.nodeName.toUpperCase();
+        if (elemName == 'SELECT') {
+            o = new Option(newRepr, newId);
+            elem.options[elem.options.length] = o;
+            o.selected = true;
+        } else if (elemName == 'INPUT') {
+            if (elem.className.indexOf('vManyToManyRawIdAdminField') != -1 && elem.value) {
+                elem.value += ',' + newId;
+            } else {
+                elem.value = newId;
+            }
+        }
+    } else {
+        var toId = name + "_to";
+        o = new Option(newRepr, newId);
+        SelectBox.add_to_cache(toId, o);
+        SelectBox.redisplay(toId);
+    }
+}
+
 function punchcard(element, data, ticks) {
     var d1 = data;
     var options = {

diff --git a/dojo/views.py b/dojo/views.py
@@ -4570,8 +4570,9 @@ def add_endpoint(request, pid):
             if '_popup' in request.GET:
                 resp = ''
                 for endpoint in endpoints:
-                    resp += '<script type="text/javascript">opener.dismissAddAnotherPopup(window, "%s", "%s");</script>' \
+                    resp += '<script type="text/javascript">opener.dismissAddAnotherPopupDojo(window, "%s", "%s");</script>' \
                             % (escape(endpoint._get_pk_val()), escape(endpoint))
+                resp += '<script type="text/javascript">window.close();</script>'
                 return HttpResponse(resp)
 
     return render(request, template, {