Fix for Issue #136

cairis-platform · Nov 9, 2017 · d6028c9 · d6028c9
1 parent 12ebad2
commit d6028c9
Show file tree

Hide file tree

Showing 29 changed files with 154 additions and 164 deletions.
diff --git a/cairis/mio/GoalsContentHandler.py b/cairis/mio/GoalsContentHandler.py
@@ -111,7 +111,7 @@ def resetDomainPropertyAttributes(self):
     self.theName = ''
     self.theTags = []
     self.theType = ''
-    self.theDescription = ''
+    self.theDefinition = ''
     self.theOriginator = ''
 
   def resetGoalAttributes(self):
@@ -140,10 +140,10 @@ def resetGoalEnvironmentAttributes(self):
     self.theConcernAssociations = []
 
   def resetObstacleEnvironmentAttributes(self):
-    self.inDescription = 0
+    self.inDefinition = 0
     self.theEnvironmentName = ''
     self.theCategory = ''
-    self.theDescription = ''
+    self.theDefinition = ''
     self.theConcerns = []
     self.resetProbabilityElements()
 
@@ -357,15 +357,15 @@ def characters(self,data):
 
   def endElement(self,name):
     if name == 'domainproperty':
-      p = DomainPropertyParameters(self.theName,self.theDescription,self.theType,self.theOriginator,self.theTags)
+      p = DomainPropertyParameters(self.theName,self.theDefinition,self.theType,self.theOriginator,self.theTags)
       self.theDomainProperties.append(p)
       self.resetDomainPropertyAttributes()
     elif name == 'goal_environment':
       p = GoalEnvironmentProperties(self.theEnvironmentName,'',self.theDefinition,self.theCategory,self.thePriority,self.theFitCriterion,self.theIssue,[],[],self.theConcerns,self.theConcernAssociations)
       self.theEnvironmentProperties.append(p)
       self.resetGoalEnvironmentAttributes()
     elif name == 'obstacle_environment':
-      p = ObstacleEnvironmentProperties(self.theEnvironmentName,'',self.theDescription,self.theCategory,[],[],self.theConcerns)
+      p = ObstacleEnvironmentProperties(self.theEnvironmentName,'',self.theDefinition,self.theCategory,[],[],self.theConcerns)
       p.theProbability = self.theProbability
       p.theProbabilityRationale = self.theRationale
       self.theEnvironmentProperties.append(p)

diff --git a/cairis/tools/SVGGenerator.py b/cairis/tools/SVGGenerator.py
@@ -15,6 +15,11 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
+import sys
+if (sys.version_info > (3,)):
+  from urllib.parse import quote
+else:
+  from urllib import quote
 import os
 from re import sub as substitute
 import base64
@@ -129,21 +134,20 @@ def correctHref(line, model_type):
       type = parts[0]
       if type[-1] == 'y':
         type = type[:-1]+'ie'
-
-
-      object = parts[1]
       if (model_type == 'dataflow' and type == 'dataflow'):
         environment = ''.join(parts[2:])
       else:
         object = ''.join(parts[1:])
+      object = quote(parts[1])
+      new_link = '/api/{0}/name/{1}'.format(type,object)
 
       if type == 'domainproperty':
         new_link = '/api/domainproperties/shortcode/{0}'.format(object)
 
       if (model_type == 'goal' or model_type == 'risk') and type == 'requirement':
         new_link = '/api/{0}s/shortcode/{1}'.format(type, object)
       elif (model_type == 'dataflow' and type == 'dataflow'):
-        new_link = '/api/{0}s/name/{1}/environment/{2}'.format(type,object,environment)
+        new_link = '/api/{0}s/name/{1}/environment/{2}'.format(type,object,quote(environment))
       else:
         if type == 'grounds': 
           new_link = '/api/{0}/name/{1}'.format(type, object)

diff --git a/cairis/web/dist/js/cairis/Cairis.js b/cairis/web/dist/js/cairis/Cairis.js
@@ -481,7 +481,7 @@ function getGoalview(environment,goalName,ucName){
       session_id: String($.session.get('sessionID'))
     },
     crossDomain: true,
-    url: serverIP + "/api/goals/model/environment/" + environment.replace(" ","%20") + "/goal/" + goalName.replace(" ","%20") + "/usecase/" + ucName.replace(" ","%20"),
+    url: serverIP + "/api/goals/model/environment/" + encodeURIComponent(environment) + "/goal/" + encodeURIComponent(goalName) + "/usecase/" + encodeURIComponent(ucName),
     success: function(data){
       fillSvgViewer(data);
     },
@@ -578,9 +578,9 @@ function getRequirementScores(lbls) {
       url: serverIP + "/api/requirements/name/" + encodeURIComponent(reqLabel),
       success: function (req) {
         var reqDesc = req.theDescription;
-        var reqRat = req.attrs.rationale;
-        var reqFC = req.attrs.fitCriterion;
-        var reqOrig = req.attrs.originator;
+        var reqRat = req.theRationale;
+        var reqFC = req.theFitCriterion;
+        var reqOrig = req.theOriginator;
 
         var completeScore = 0;
         if (reqDesc == '') {
@@ -715,7 +715,7 @@ function getRiskview(environment,dimName,objtName,modelLayout){
       layout : modelLayout
     },
     crossDomain: true,
-    url: serverIP + "/api/risks/model/environment/" + environment.replace(" ","%20"),
+    url: serverIP + "/api/risks/model/environment/" + encodeURIComponent(environment),
     success: function(data){
       var lbls = getRequirementLabels(data);
       var reqDict = getRequirementScores(lbls);
@@ -1338,7 +1338,7 @@ function getAllAssetsInEnv(env,callback) {
       session_id: String($.session.get('sessionID'))
     },
     crossDomain: true,
-    url: serverIP + "/api/assets/environment/" + env.replace(" ", "%20") + "/names" ,
+    url: serverIP + "/api/assets/environment/" + encodeURIComponent(env) + "/names" ,
     success: function (data) {
       if (jQuery.isFunction(callback)) {
         callback(data);
@@ -1488,7 +1488,7 @@ function deleteObject(dimName,objtName,deleteFn) {
       session_id: String($.session.get('sessionID'))
     },
     crossDomain: true,
-    url: serverIP + "/api/object_dependency/dimension/" + dimName + "/object/" + objtName.replace(" ", "%20"),
+    url: serverIP + "/api/object_dependency/dimension/" + dimName + "/object/" + encodeURIComponent(objtName),
     success: function (data) {
       if (data['theDependencies'].length == 0) {
        $("#confirmObjectDelete").data("deleteFn",deleteFn);
@@ -1562,7 +1562,7 @@ $("#reportObjectDependencies").on('click', '#confirmODDelete',function(e) {
       session_id: String($.session.get('sessionID'))
     },
     crossDomain: true,
-    url: serverIP + "/api/object_dependency/dimension/" + dimName + "/object/" + objtName.replace(" ", "%20"),
+    url: serverIP + "/api/object_dependency/dimension/" + dimName + "/object/" + encodeURIComponent(objtName),
     success: function (data) {
       var deleteFn = $("#reportObjectDependencies").data("deleteFn");
       deleteFn(objtName);

diff --git a/cairis/web/dist/js/cairis/SVGhandler.js b/cairis/web/dist/js/cairis/SVGhandler.js
@@ -73,7 +73,7 @@ function handleNodeClick(event,objt) {
         session_id: String($.session.get('sessionID'))
       },
       crossDomain: true,
-      url: serverIP + link.replace(" ","%20"),
+      url: serverIP + link,
       success: function (data) {
         fillOptionMenu("fastTemplates/AssetOptions.html", "#optionsContent", data,false,true,function(){
           $("#optionsHeaderGear").text("Asset properties");
@@ -109,7 +109,7 @@ function handleNodeClick(event,objt) {
         session_id: String($.session.get('sessionID'))
       },
       crossDomain: true,
-      url: serverIP + link.replace(" ", "%20"),
+      url: serverIP + link,
       success: function (data) {
         fillOptionMenu("fastTemplates/DataflowOptions.html", "#optionsContent", data,false,true,function(){
           $.session.set("Dataflow", JSON.stringify(data));
@@ -139,7 +139,7 @@ function handleNodeClick(event,objt) {
         session_id: String($.session.get('sessionID'))
       },
       crossDomain: true,
-      url: serverIP + link.replace(" ", "%20"),
+      url: serverIP + link,
       success: function (data) {
         fillOptionMenu("fastTemplates/PersonaOptions.html", "#optionsContent", data,false,true,function(){
           $.session.set("Persona", JSON.stringify(data));
@@ -170,7 +170,7 @@ function handleNodeClick(event,objt) {
         session_id: String($.session.get('sessionID'))
       },
       crossDomain: true,
-      url: serverIP + link.replace(" ", "%20"),
+      url: serverIP + link,
       success: function (data) {
         fillOptionMenu("fastTemplates/VulnerabilityOptions.html", "#optionsContent", data,false,true,function(){
           $.session.set("Vulnerability", JSON.stringify(data));
@@ -206,7 +206,7 @@ function handleNodeClick(event,objt) {
         session_id: String($.session.get('sessionID'))
       },
       crossDomain: true,
-      url: serverIP + link.replace(" ", "%20"),
+      url: serverIP + link,
       success: function (data) {
         fillOptionMenu("fastTemplates/RoleOptions.html", "#optionsContent", data,false,true,function(){
           $.session.set("Role", JSON.stringify(data));
@@ -232,7 +232,7 @@ function handleNodeClick(event,objt) {
         session_id: String($.session.get('sessionID'))
       },
       crossDomain: true,
-      url: serverIP + link.replace(" ", "%20"),
+      url: serverIP + link,
       success: function (data) {
         fillOptionMenu("fastTemplates/ThreatOptions.html", "#optionsContent", data,false,true,function(){
           $.session.set("Threat", JSON.stringify(data));
@@ -280,7 +280,7 @@ function handleNodeClick(event,objt) {
         session_id: String($.session.get('sessionID'))
       },
       crossDomain: true,
-      url: serverIP + link.replace(" ", "%20"),
+      url: serverIP + link,
       success: function (data) {
         fillOptionMenu("fastTemplates/RequirementOptions.html", "#optionsContent", data,false,true,function(){
           $.session.set("Requirement", JSON.stringify(data));
@@ -338,7 +338,7 @@ function handleNodeClick(event,objt) {
         session_id: String($.session.get('sessionID'))
       },
       crossDomain: true,
-      url: serverIP + link.replace(" ", "%20"),
+      url: serverIP + link,
       success: function (data) {
         fillOptionMenu("fastTemplates/GoalOptions.html", "#optionsContent", data,false,true,function(){
           $.session.set("Goal", JSON.stringify(data));
@@ -374,7 +374,7 @@ function handleNodeClick(event,objt) {
         session_id: String($.session.get('sessionID'))
       },
       crossDomain: true,
-      url: serverIP + link.replace(" ", "%20"),
+      url: serverIP + link,
       success: function (data) {
         fillOptionMenu("fastTemplates/AttackerOptions.html", "#optionsContent", data,false,true,function(){
           $.session.set("Attacker", JSON.stringify(data));
@@ -419,7 +419,7 @@ function handleNodeClick(event,objt) {
         session_id: String($.session.get('sessionID'))
       },
       crossDomain: true,
-      url: serverIP + link.replace(" ", "%20"),
+      url: serverIP + link,
       success: function (data) {
         fillOptionMenu("fastTemplates/RiskOptions.html", "#optionsContent", data,false,true,function(){
           $.session.set("Risk", JSON.stringify(data));
@@ -478,7 +478,7 @@ function handleNodeClick(event,objt) {
         session_id: String($.session.get('sessionID'))
       },
       crossDomain: true,
-      url: serverIP + link.replace(" ", "%20"),
+      url: serverIP + link,
       success: function (data) {
         fillOptionMenu("fastTemplates/TaskOptions.html", "#optionsContent", data,false,true,function(){
           $.session.set("Task", JSON.stringify(data));
@@ -582,7 +582,7 @@ function handleNodeClick(event,objt) {
         session_id: String($.session.get('sessionID'))
       },
       crossDomain: true,
-      url: serverIP + link.replace(" ", "%20"),
+      url: serverIP + link,
       success: function (data) {
         if (data.theResponseType == 'Accept') {
           fillOptionMenu("fastTemplates/AcceptOptions.html", "#optionsContent", data,false,true,function(){
@@ -642,7 +642,7 @@ function handleNodeClick(event,objt) {
         session_id: String($.session.get('sessionID'))
       },
       crossDomain: true,
-      url: serverIP + link.replace(" ", "%20"),
+      url: serverIP + link,
       success: function (data) {
         fillOptionMenu("fastTemplates/MisuseCaseOptions.html", "#optionsContent", data,false,true,function(){
           $.session.set("MisuseCase", JSON.stringify(data));
@@ -673,7 +673,7 @@ function handleNodeClick(event,objt) {
         session_id: String($.session.get('sessionID'))
       },
       crossDomain: true,
-      url: serverIP + link.replace(" ", "%20"),
+      url: serverIP + link,
       success: function (data) {
         fillOptionMenu("fastTemplates/ObstacleOptions.html", "#optionsContent", data,false,true,function(){
           $.session.set("Obstacle", JSON.stringify(data));
@@ -708,7 +708,7 @@ function handleNodeClick(event,objt) {
         session_id: String($.session.get('sessionID'))
       },
       crossDomain: true,
-      url: serverIP + link.replace(" ", "%20"),
+      url: serverIP + link,
       success: function (data) {
         fillOptionMenu("fastTemplates/CountermeasureOptions.html", "#optionsContent", data,false,true,function(){
           $.session.set("Countermeasure", JSON.stringify(data));
@@ -766,7 +766,7 @@ function handleNodeClick(event,objt) {
         session_id: String($.session.get('sessionID'))
       },
       crossDomain: true,
-      url: serverIP + link.replace(" ", "%20"),
+      url: serverIP + link,
       success: function (data) {
         fillOptionMenu("fastTemplates/DomainPropertyOptions.html", "#optionsContent", data,false,true,function(){
           $.session.set("DomainProperty", JSON.stringify(data));
@@ -792,7 +792,7 @@ function handleNodeClick(event,objt) {
         session_id: String($.session.get('sessionID'))
       },
       crossDomain: true,
-      url: serverIP + link.replace(" ", "%20"),
+      url: serverIP + link,
       success: function (data) {
         fillOptionMenu("fastTemplates/UseCaseOptions.html", "#optionsContent", data,false,true,function(){
           $.session.set("UseCase", JSON.stringify(data));