spdx · tjasmith · Mar 16, 2019 · Mar 16, 2019 · Mar 16, 2019 · Mar 25, 2019
diff --git a/requirements.txt b/requirements.txt
@@ -2,6 +2,7 @@ Django>=1.11.18,<1.12
 jpype1==0.6.3
 numpy==1.15.2
 djangorestframework==3.6.4
+django-ratelimit==2.0.0
 bs4==0.0.1
 requests==2.20.1
 lxml==4.2.5

diff --git a/src/api/views.py b/src/api/views.py
@@ -277,12 +277,12 @@ def convert(request):
                 message = jpype.JavaException.message(ex)
                 returnstatus = status.HTTP_400_BAD_REQUEST
                 httpstatus = 400
-                jpype.detachThreadFromJVM() 
+                jpype.detachThreadFromJVM()
             except :
                 message = format_exc()
                 returnstatus = status.HTTP_400_BAD_REQUEST
                 httpstatus = 400
-                jpype.detachThreadFromJVM() 
+                jpype.detachThreadFromJVM()
             query.tagToRdfFormat=tagToRdfFormat
             query.message=message
             query.status = httpstatus
@@ -473,10 +473,10 @@ def check_license(request):
                     returnstatus = status.HTTP_400_BAD_REQUEST
                     httpstatus = 400
                     jpype.detachThreadFromJVM()
-            
+
             except jpype.JavaException as ex :
                 """ Java exception raised without exiting the application """
-                result = jpype.JavaException.message(ex) 
+                result = jpype.JavaException.message(ex)
                 returnstatus = status.HTTP_400_BAD_REQUEST
                 httpstatus = 400
                 jpype.detachThreadFromJVM()
@@ -496,4 +496,4 @@ def check_license(request):
         else:
             return Response(
                 serializer.errors, status=status.HTTP_400_BAD_REQUEST
-                )        
+                )
diff --git a/src/app/templates/app/check_license.html b/src/app/templates/app/check_license.html
@@ -13,7 +13,7 @@
 		<textarea id="licensetext" name="licensetext" rows="18" style="width: 100%"></textarea>
 		<button id="checklicensebutton" class=" btn btn-md btn-info" type="submit">Check License</button>
 </form>
-{% include "app/modal.html" %} 
+{% include "app/modal.html" %}
 </div>
 {% endblock %}
 {% block script_block %}
@@ -59,7 +59,7 @@
                   $("#modal-body").html("<h3>"+data.data+"</h3>");
                   $("#myModal").modal({
                           backdrop: 'static',
-                          keyboard: true, 
+                          keyboard: true,
                           show: true
                   });
                   $("#checklicensebutton").text("Check License");
@@ -70,9 +70,17 @@
                   $("#modal-header").removeClass("green-modal");
                   try {
                     var obj = JSON.parse(e.responseText);
-                    $("#modal-header").addClass("red-modal");
-                    $("#modal-title").html("Error!");
-                    $("#modal-body").text(obj.data);
+										if (obj.type=="warning" || obj.type=="rate_limit"){
+                      $("#modal-header").removeClass("red-modal");
+                      $("#modal-header").addClass("yellow-modal");
+                      $("#modal-title").html("Warning!");
+                    }
+	                  else if (obj.type=="error"){
+	                      $("#modal-header").removeClass("yellow-modal");
+	                      $("#modal-header").addClass("red-modal");
+	                      $("#modal-title").html("Error!");
+	                    }
+	                  $("#modal-body").text(obj.data);
                   }
                   catch (e){
                     $("#modal-header").addClass("red-modal");
@@ -81,7 +89,7 @@
                   }
                   $("#myModal").modal({
                           backdrop: 'static',
-                          keyboard: true, 
+                          keyboard: true,
                           show: true
                   });
                   $("#checklicensebutton").text("Check License");

diff --git a/src/app/templates/app/compare.html b/src/app/templates/app/compare.html
@@ -27,11 +27,11 @@ <h4 id="doclabel">Upload SPDX Documents using the button or by dragging and drop
 		<div class = "form-group">
 			<div class="col-sm-12">
 			<label class="control-label col-sm-3" >Result File Name</label>
-				<div class="col-sm-6"> 
+				<div class="col-sm-6">
 					<input type="text" id="rfilename" placeholder="" name = "rfilename">
 					<label class="control-label" id="convertdoclabel">.xlsx</label>
 				</div>
-			</div>	
+			</div>
 		</div>
 		<hr>
 		<button class=" btn btn-md btn-info" type="submit" id="comparebutton" name="compare">Compare</button>
@@ -50,7 +50,7 @@ <h4 id="doclabel">Upload SPDX Documents using the button or by dragging and drop
   ['dragenter', 'dragover', 'dragleave', 'drop'].forEach(eventName => {
     dropArea.addEventListener(eventName, preventDefaults, false)
   });
-  
+
   function preventDefaults (e) {
     e.preventDefault()
     e.stopPropagation()
@@ -59,19 +59,19 @@ <h4 id="doclabel">Upload SPDX Documents using the button or by dragging and drop
   ['dragenter', 'dragover'].forEach(eventName => {
     dropArea.addEventListener(eventName, highlight, false)
   });
-  
+
   ['dragleave', 'drop'].forEach(eventName => {
     dropArea.addEventListener(eventName, unhighlight, false)
   });
-  
+
   function highlight(e) {
     dropArea.classList.add('highlight')
   }
-  
+
   function unhighlight(e) {
     dropArea.classList.remove('highlight')
   }
-  
+
   dropArea.addEventListener('drop', handleDrop, false)
 
   function handleDrop(e) {
@@ -83,7 +83,7 @@ <h4 id="doclabel">Upload SPDX Documents using the button or by dragging and drop
   function handleFiles(files) {
     ([...files]).forEach(checkFile)
   }
-  
+
   function checkFile(file){
     if(file && selected_files.length<13){
       if ($(".file-name").text() == "No file selected"){
@@ -153,7 +153,7 @@ <h4 id="doclabel">Upload SPDX Documents using the button or by dragging and drop
 	                $("#modal-body").html('<h3><a href="'+data.medialink+'"><span class="glyphicon glyphicon-save-file"></span> Download file now</a></h3>');
 	                $("#myModal").modal({
 	                        backdrop: 'static',
-	                        keyboard: true, 
+	                        keyboard: true,
 	                        show: true
 	                });
 	                $("#comparebutton").text("Compare");
@@ -165,6 +165,12 @@ <h4 id="doclabel">Upload SPDX Documents using the button or by dragging and drop
 	                $("#modal-header").removeClass("green-modal");
 	                try{
 		                var obj = JSON.parse(e.responseText);
+                    if (obj.type=="rate_limit"){
+                      $("#modal-header").removeClass("red-modal");
+                      $("#modal-header").addClass("yellow-modal");
+                      $("#modal-title").html("Warning!");
+                      $("#modal-body").text(obj.data);
+                    }
 		                if (obj.type=="warning"){
 		                    $("#modal-header").removeClass("red-modal");
 		                    $("#modal-header").addClass("yellow-modal");
@@ -208,7 +214,7 @@ <h4 id="doclabel">Upload SPDX Documents using the button or by dragging and drop
 
 	                $("#myModal").modal({
                           backdrop: 'static',
-                          keyboard: true, 
+                          keyboard: true,
                           show: true
                   	});
 	                $("#comparebutton").text("Compare");
@@ -231,4 +237,4 @@ <h4 id="doclabel">Upload SPDX Documents using the button or by dragging and drop
 });
 </script>
 
-{% endblock %}
+{% endblock %}
diff --git a/src/app/templates/app/convert.html b/src/app/templates/app/convert.html
@@ -55,20 +55,20 @@ <h4 id="doclabel">Upload SPDX Document using the button or by dragging and dropp
     <div class = "form-group">
 			<div class="col-sm-12">
 			<label class="control-label col-sm-3" id="doclabel" >SPDX Document</label>
-				<div class="col-sm-3"> 
+				<div class="col-sm-3">
 				  <input type="file" id="file" placeholder="" name = "file"  >
 				</div>
-			</div>	
+			</div>
     </div>
     -->
 		<div class = "form-group">
 			<div class="col-sm-12">
 			<label class="control-label col-sm-3" >Converted File Name</label>
-				<div class="col-sm-3"> 
+				<div class="col-sm-3">
 				  <input type="text" id="cfilename" placeholder="" name = "cfilename"  >
 				  <label class="control-label" id="convertdoclabel" ></label>
 				</div>
-			</div>	
+			</div>
 		</div>
     <hr>
 		<input type="hidden" id="cfileformat" name="cfileformat" value="">
@@ -88,7 +88,7 @@ <h4 id="doclabel">Upload SPDX Document using the button or by dragging and dropp
   ['dragenter', 'dragover', 'dragleave', 'drop'].forEach(eventName => {
     dropArea.addEventListener(eventName, preventDefaults, false)
   });
-  
+
   function preventDefaults (e) {
     e.preventDefault()
     e.stopPropagation()
@@ -97,19 +97,19 @@ <h4 id="doclabel">Upload SPDX Document using the button or by dragging and dropp
   ['dragenter', 'dragover'].forEach(eventName => {
     dropArea.addEventListener(eventName, highlight, false)
   });
-  
+
   ['dragleave', 'drop'].forEach(eventName => {
     dropArea.addEventListener(eventName, unhighlight, false)
   });
-  
+
   function highlight(e) {
     dropArea.classList.add('highlight')
   }
-  
+
   function unhighlight(e) {
     dropArea.classList.remove('highlight')
   }
-  
+
   dropArea.addEventListener('drop', handleDrop, false)
 
   function handleDrop(e) {
@@ -121,7 +121,7 @@ <h4 id="doclabel">Upload SPDX Document using the button or by dragging and dropp
   function handleFiles(files) {
     ([...files]).forEach(checkFile)
   }
-  
+
   function checkFile(file){
     if(file){
       $(".file-name").html("<b>Selected File: </b>"+file.name);
@@ -264,7 +264,7 @@ <h4 id="doclabel">Upload SPDX Document using the button or by dragging and dropp
                   $("#modal-body").html('<h3><a href="'+data.medialink+'"><span class="glyphicon glyphicon-save-file"></span> Download file now</a></h3>');
                   $("#myModal").modal({
                           backdrop: 'static',
-                          keyboard: true, 
+                          keyboard: true,
                           show: true
                   });
                   $("#convertbutton").text("Convert");
@@ -276,6 +276,12 @@ <h4 id="doclabel">Upload SPDX Document using the button or by dragging and dropp
                   $("#modal-body").text("");
               	  try{
               	  	var obj = JSON.parse(e.responseText);
+                    if (obj.type=="rate_limit"){
+                      $("#modal-header").removeClass("red-modal");
+                      $("#modal-header").addClass("yellow-modal");
+                      $("#modal-title").html("Warning!");
+                      $("#modal-body").text(obj.data);
+                    }
               	  	if (obj.type=="warning"){
 	                    $("#modal-header").removeClass("red-modal");
 	                    $("#modal-header").addClass("yellow-modal");
@@ -297,10 +303,10 @@ <h4 id="doclabel">Upload SPDX Document using the button or by dragging and dropp
                     $("#modal-title").html("Error!");
                     $("#modal-body").text("The application could not be connected. Please try later.");
               	  }
-                  
+
                   $("#myModal").modal({
                           backdrop: 'static',
-                          keyboard: true, 
+                          keyboard: true,
                           show: true
                   });
                   $("#convertbutton").text("Convert");
@@ -319,4 +325,4 @@ <h4 id="doclabel">Upload SPDX Document using the button or by dragging and dropp
 
 </script>
 
-{% endblock %}
+{% endblock %}
diff --git a/src/app/templates/app/submit_new_license.html b/src/app/templates/app/submit_new_license.html
@@ -244,7 +244,7 @@
                   $("#modal-header").removeClass("green-modal");
                   try {
                     var obj = JSON.parse(e.responseText);
-                    if (obj.type=="warning"){
+                    if (obj.type=="warning" || obj.type=="rate_limit"){
                       $("#modal-header").removeClass("red-modal");
                       $("#modal-header").addClass("yellow-modal");
                       $("#modal-title").html("Warning!");

diff --git a/src/app/templates/app/validate.html b/src/app/templates/app/validate.html
@@ -23,7 +23,7 @@ <h4>Upload file using the button or by dragging and dropping onto the dashed reg
     </form>
   </div> <hr>
     <button id="validatebutton" name="validatebutton" class="btn btn-md btn-info" type="submit" disabled="true">Validate</button>
-  {% include "app/modal.html" %} 
+  {% include "app/modal.html" %}
   <!--
   <output id="list"></output>
   -->
@@ -40,7 +40,7 @@ <h4>Upload file using the button or by dragging and dropping onto the dashed reg
   ['dragenter', 'dragover', 'dragleave', 'drop'].forEach(eventName => {
     dropArea.addEventListener(eventName, preventDefaults, false)
   });
-  
+
   function preventDefaults (e) {
     e.preventDefault()
     e.stopPropagation()
@@ -49,19 +49,19 @@ <h4>Upload file using the button or by dragging and dropping onto the dashed reg
   ['dragenter', 'dragover'].forEach(eventName => {
     dropArea.addEventListener(eventName, highlight, false)
   });
-  
+
   ['dragleave', 'drop'].forEach(eventName => {
     dropArea.addEventListener(eventName, unhighlight, false)
   });
-  
+
   function highlight(e) {
     dropArea.classList.add('highlight')
   }
-  
+
   function unhighlight(e) {
     dropArea.classList.remove('highlight')
   }
-  
+
   dropArea.addEventListener('drop', handleDrop, false)
 
   function handleDrop(e) {
@@ -73,7 +73,7 @@ <h4>Upload file using the button or by dragging and dropping onto the dashed reg
   function handleFiles(files) {
     ([...files]).forEach(checkFile)
   }
-  
+
   function checkFile(file){
     if(file){
       $(".file-name").html("<b>Selected File: </b>"+file.name);
@@ -125,7 +125,7 @@ <h4>Upload file using the button or by dragging and dropping onto the dashed reg
                   $("#modal-body").html("<h3>"+data.data+"</h3>");
                   $("#myModal").modal({
                           backdrop: 'static',
-                          keyboard: true, 
+                          keyboard: true,
                           show: true
                   });
                   $("#validatebutton").text("Validate");
@@ -136,7 +136,7 @@ <h4>Upload file using the button or by dragging and dropping onto the dashed reg
                   $("#modal-header").removeClass("green-modal");
                   try {
                   	var obj = JSON.parse(e.responseText);
-                  	if (obj.type=="warning"){
+                  	if (obj.type=="warning" || obj.type=="rate_limit"){
 	                    $("#modal-header").removeClass("red-modal");
 	                    $("#modal-header").addClass("yellow-modal");
 	                    $("#modal-title").html("Warning!");
@@ -156,7 +156,7 @@ <h4>Upload file using the button or by dragging and dropping onto the dashed reg
                   }
                   $("#myModal").modal({
                           backdrop: 'static',
-                          keyboard: true, 
+                          keyboard: true,
                           show: true
                   });
                   $("#validatebutton").text("Validate");
@@ -236,4 +236,4 @@ <h4>Upload file using the button or by dragging and dropping onto the dashed reg
 </script>
 -->
 
-{% endblock %}
+{% endblock %}