[mapguide-commits] r9482 - in trunk/MgDev: . Web/src/mapviewerjava

[svn_mapguide at osgeo.org]

Author: jng
Date: 2019-03-21 05:33:32 -0700 (Thu, 21 Mar 2019)
New Revision: 9482

Modified:
   trunk/MgDev/
   trunk/MgDev/Web/src/mapviewerjava/quickplotpreviewinner.jsp
Log:
Merged revision(s) 9481 from branches/3.1/MgDev:
Plug potential XSS hole in Quick Plot (Java AJAX viewer). Unlike the suggested fix in the original ticket, we'll just run the request parameter through GetIntParameter() that would render any malicious content to 0.

Fixes #2790
........


Index: trunk/MgDev
===================================================================
--- trunk/MgDev	2019-03-21 12:31:31 UTC (rev 9481)
+++ trunk/MgDev	2019-03-21 12:33:32 UTC (rev 9482)

Property changes on: trunk/MgDev
___________________________________________________________________
Modified: svn:mergeinfo
## -1,7 +1,7 ##
 /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
 /branches/2.6/MgDev:8276-8286,8288-8292,8297,8299,8301,8303,8314-8315,8318,8335,8340,8354-8355,8365,8373
 /branches/3.0/MgDev:8658,8705,8710
-/branches/3.1/MgDev:9026,9058-9059,9067-9068,9322-9323,9329,9377-9378,9382,9387,9389,9393-9395
+/branches/3.1/MgDev:9026,9058-9059,9067-9068,9322-9323,9329,9377-9378,9382,9387,9389,9393-9395,9481
 /sandbox/VC140:8684-8759
 /sandbox/adsk/2.6l:8727
 /sandbox/adsk/3.0m:8563,8584,8607,8625,8694-8695
Modified: trunk/MgDev/Web/src/mapviewerjava/quickplotpreviewinner.jsp
===================================================================
--- trunk/MgDev/Web/src/mapviewerjava/quickplotpreviewinner.jsp	2019-03-21 12:31:31 UTC (rev 9481)
+++ trunk/MgDev/Web/src/mapviewerjava/quickplotpreviewinner.jsp	2019-03-21 12:33:32 UTC (rev 9482)
@@ -33,6 +33,7 @@
 String locale;
 int targetType;
 int us;
+int scaleDenominator;
 
 Hashtable<String, String> annotations = new Hashtable<String, String>();
 %>
@@ -41,7 +42,7 @@
     response.setContentType("text/html; charset=UTF-8");
     request.setCharacterEncoding("UTF-8");
     mapName = sessionId = locale = "";
-    targetType = us = 0;
+    targetType = us = scaleDenominator = 0;
 
     MgLocalizer.SetLocalizedFilesPath(getServletContext().getRealPath("/") + "localized/");
     GetRequestParameters(request);
@@ -79,6 +80,7 @@
     mapName = ValidateMapName(GetParameter(request, "MAPNAME"));
     targetType = GetIntParameter(request, "TARGETTYPE");
     us = GetIntParameter(request, "US");
+    scaleDenominator = GetIntParameter(request, "scale_denominator");
 
     // The parameters whose name matches this pattern will be treated as annotation
     String pattern = "^\\{field:.+\\}$";
@@ -93,6 +95,6 @@
         }
      }
 
-    annotations.put("{scale}", "1 : " + GetParameter(request, "scale_denominator"));
+    annotations.put("{scale}", "1 : " + scaleDenominator);
 }
 %>