Changeset 440 in tmcsimulator for trunk/webapps

Timestamp:

07/11/2019 04:29:12 PM (7 years ago)

Author:

jdalbey

Message:

Move unified logger to python folder under src. Create a separate web app to display the log file in a formatted html page. Fix sanitize defect in cms and har layers.

Location:

trunk/webapps

Files:

• common/js/revision_number.dat (modified) (1 diff)
• cptms/js/cmsLayer.js (modified) (1 diff)
• cptms/js/harLayer.js (modified) (2 diffs)
• dynamicdata/cms_messages.json (modified) (1 diff)
• dynamicdata/highway_status.json (modified) (13 diffs)
• dynamicdata/unifiedlog.csv (added)
• dynamicdata/unifiedlog.html (deleted)
• unifiedlog.html (added)

trunk/webapps/common/js/revision_number.dat

@@ -1 +1 @@
 
-    var revisionNumber = "433";
+    var revisionNumber = "439";
     

trunk/webapps/cptms/js/cmsLayer.js

@@ -90 +90 @@
         // apply the padding
         var padding = kBlanks.substring(0, padLen);
-        // Fix defect #122.   Remove semicolons from input.
-        message = message.replace(/;/gi, ""); 
         return padding + message;
     }
-
+    // Remove harmful characters from the message
+    // Fix defect #122.   
+    function sanitize(text)
+    {
+        return text.replace(/[;:,"]/gi, ""); 
+    }
     function handleCMSsubmit()
     {
         // recover the user's response
-        var response1 = document.getElementById('msgcontent1').value.trim();
-        var response2 = document.getElementById('msgcontent2').value.trim();
-        var response3 = document.getElementById('msgcontent3').value.trim();
-        var response4 = document.getElementById('msgcontent4').value.trim();
-        var response5 = document.getElementById('msgcontent5').value.trim();
-        var response6 = document.getElementById('msgcontent6').value.trim();
+        var response1 = sanitize(document.getElementById('msgcontent1').value.trim());
+        var response2 = sanitize(document.getElementById('msgcontent2').value.trim());
+        var response3 = sanitize(document.getElementById('msgcontent3').value.trim());
+        var response4 = sanitize(document.getElementById('msgcontent4').value.trim());
+        var response5 = sanitize(document.getElementById('msgcontent5').value.trim());
+        var response6 = sanitize(document.getElementById('msgcontent6').value.trim());
         var newMsg = response1 + response2 + response3 + response4 + response5 + response6;
         if (newMsg.length == 0)

trunk/webapps/cptms/js/harLayer.js

@@ -77 +77 @@
         var response1 = document.getElementById('har-msgcontent1').value.trim();
 
-        var newMsg = response1.replace(/;/gi, "");  // remove semicolons from input
+        var newMsg = response1.replace(/[;:",]/gi, "");  // remove semicolons from input
 
         if (newMsg.length == 0)
@@ -85 +85 @@
         else
         {
-            document.getElementById('har-msgdisplay1').value = response1;
+            document.getElementById('har-msgdisplay1').value = newMsg;
 
-            saveHARMessage(response1);
+            saveHARMessage(newMsg);
         }
     }

trunk/webapps/dynamicdata/cms_messages.json

@@ -12 +12 @@
 {"cms":{"index":"20","message":{"displayTime":"","phase1":{"Line1":"","Line2":"","Line3":""},"phase2":{"Line1":"","Line2":"","Line3":""}}}},
 {"cms":{"index":"21","message":{"displayTime":"","phase1":{"Line1":"","Line2":"","Line3":""},"phase2":{"Line1":"","Line2":"","Line3":""}}}},
-{"cms":{"index":"23","message":{"displayTime":"","phase1":{"Line1":"AMAZINGLY FEW","Line2":"DISCOS","Line3":""},"phase2":{"Line1":"","Line2":"","Line3":""}}}},
+{"cms":{"index":"23","message":{"displayTime":"","phase1":{"Line1":"EAT MORE CHIKIN","Line2":"","Line3":""},"phase2":{"Line1":"","Line2":"","Line3":""}}}},
 {"cms":{"index":"24","message":{"displayTime":"","phase1":{"Line1":"","Line2":"","Line3":""},"phase2":{"Line1":"","Line2":"","Line3":""}}}},
 {"cms":{"index":"25","message":{"displayTime":"","phase1":{"Line1":"","Line2":"","Line3":""},"phase2":{"Line1":"","Line2":"","Line3":""}}}},

trunk/webapps/dynamicdata/highway_status.json

@@ -4304 +4304 @@
        },
    "properties": 
-       {"street": "PAULARINO 2", "color": "lime", "perpx": "0.725068", "perpy": "-0.688678"}
+       {"street": "PAULARINO 2", "color": "yellow", "perpx": "0.725068", "perpy": "-0.688678"}
 },  
 {
@@ -4315 +4315 @@
        },
    "properties": 
-       {"street": "PAULARINO 2", "color": "lime", "perpx": "0.719864", "perpy": "-0.694115"}
+       {"street": "PAULARINO 2", "color": "yellow", "perpx": "0.719864", "perpy": "-0.694115"}
 },  
 {
@@ -4766 +4766 @@
        },
    "properties": 
-       {"street": "MACARTHU2", "color": "yellow", "perpx": "-0.710326", "perpy": "0.703873"}
+       {"street": "MACARTHU2", "color": "red", "perpx": "-0.710326", "perpy": "0.703873"}
 },  
 {
@@ -4777 +4777 @@
        },
    "properties": 
-       {"street": "DYER 1", "color": "yellow", "perpx": "0", "perpy": "0"}
+       {"street": "DYER 1", "color": "red", "perpx": "0", "perpy": "0"}
 },  
 {
@@ -4788 +4788 @@
        },
    "properties": 
-       {"street": "DYER 2", "color": "lime", "perpx": "-0.708914", "perpy": "0.705295"}
+       {"street": "DYER 2", "color": "red", "perpx": "-0.708914", "perpy": "0.705295"}
 },  
 {
@@ -4799 +4799 @@
        },
    "properties": 
-       {"street": "WARNER", "color": "lime", "perpx": "-0.711107", "perpy": "0.703084"}
+       {"street": "WARNER", "color": "red", "perpx": "-0.711107", "perpy": "0.703084"}
 },  
 {
@@ -4810 +4810 @@
        },
    "properties": 
-       {"street": "EDINGER 1", "color": "lime", "perpx": "0", "perpy": "0"}
+       {"street": "EDINGER 1", "color": "yellow", "perpx": "0", "perpy": "0"}
 },  
 {
@@ -12013 +12013 @@
        },
    "properties": 
-       {"street": "JAMBOREE1", "color": "lime", "perpx": "0.400805", "perpy": "0.916164"}
+       {"street": "JAMBOREE1", "color": "yellow", "perpx": "0.400805", "perpy": "0.916164"}
 },  
 {
@@ -12024 +12024 @@
        },
    "properties": 
-       {"street": "JAMBOREE2", "color": "lime", "perpx": "0.400805", "perpy": "0.916164"}
+       {"street": "JAMBOREE2", "color": "red", "perpx": "0.400805", "perpy": "0.916164"}
 },  
 {
@@ -12035 +12035 @@
        },
    "properties": 
-       {"street": "MACARTHUR 1", "color": "lime", "perpx": "0.408917", "perpy": "0.912572"}
+       {"street": "MACARTHUR 1", "color": "red", "perpx": "0.408917", "perpy": "0.912572"}
 },  
 {
@@ -12046 +12046 @@
        },
    "properties": 
-       {"street": "AIRPORT", "color": "lime", "perpx": "0.321527", "perpy": "0.9469"}
+       {"street": "AIRPORT", "color": "red", "perpx": "0.321527", "perpy": "0.9469"}
 },  
 {
@@ -12057 +12057 @@
        },
    "properties": 
-       {"street": "HOV AT 55N FLYOVER**", "color": "lime", "perpx": "0.271933", "perpy": "0.962316"}
+       {"street": "HOV AT 55N FLYOVER**", "color": "red", "perpx": "0.271933", "perpy": "0.962316"}
 },  
 {
@@ -12068 +12068 @@
        },
    "properties": 
-       {"street": "RED HILL", "color": "lime", "perpx": "0.126754", "perpy": "0.991934"}
+       {"street": "RED HILL", "color": "red", "perpx": "0.126754", "perpy": "0.991934"}
 },  
 {