PatchWork AutoFix

WebContent/static/inside_about.htm

@@ -1,25 +1,17 @@
 <div class="fl" style="width: 67%;">
-
 <h1>About Altoro Mutual</h1>
 
 <p>Altoro Mutual offers a broad range of commercial, private, retail and mortgage banking services to small- and middle-market businesses and individuals.</p>
-
 <p>We pride ourselves on constantly surpassing the demands of our most loyal customers. And, we are determined to help you stay ahead of your expectations. That is our commitment to you.</p>
-
 <ul>
     <li><a href="index.jsp?content=inside_executives.htm">Executives & Management Team</a></li>
     <li><a href="index.jsp?content=inside_community.htm">Community Affairs</a></li>
-    <li><a href="http://www.newspapersyndications.tv">Analyst Reviews</a></li>
+    <li><a href="https://www.newspapersyndications.tv">Analyst Reviews</a></li>
     <li><a href="inside_points_of_interest.htm">Points of Interest</a></li>
 </ul>
 
-</div>
-
 <div class="flp" style="width: 150px;">
-
 <img src="images/inside5.jpg" alt="About Altoro Mutual"><br />
+<span class="credit">Altoro Mutual offers a broad range of commercial, private, retail and mortgage banking services to small- and middle-market businesses and individuals.</span>
 
-<span class="credit">
-Altoro Mutual offers a broad range of commercial, private, retail and mortgage banking services to small- and middle-market businesses and individuals.</span>
-
-</div>
+</div>

WebContent/swagger/lib/marked.js

@@ -308,7 +308,7 @@ Lexer.prototype.token = function(src, top, bq) {
         if (~item.indexOf('\n ')) {
           space -= item.length;
           item = !this.options.pedantic
-            ? item.replace(new RegExp('^ {1,' + space + '}', 'gm'), '')
+             ? item.replace(/^ {1,' + space + '}/gm, '')
             : item.replace(/^ {1,4}/gm, '');
         }
 
@@ -1098,11 +1098,10 @@ function unescape(html) {
 function replace(regex, opt) {
   regex = regex.source;
   opt = opt || '';
-  return function self(name, val) {
-    if (!name) return new RegExp(regex, opt);
-    val = val.source || val;
-    val = val.replace(/(^|[^\[])\^/g, '$1');
-    regex = regex.replace(name, val);
+  return function self(name) {
+    if (!name) return new RegExp(regex + opt);
+    let val = (name.source || name).replace(/(^|[^\[])\^/g, '$1');
+    regex = regex.replace(new RegExp(val, 'g'), val);
     return self;
   };
 }

src/com/ibm/security/appscan/altoromutual/servlet/SurveyServlet.java

@@ -95,10 +95,10 @@ else if (step.equals("done")){
 			content = "<h1>Request Out of Order</h1>"+
 			"<div width=\"99%\"><p>It appears that you attempted to skip or repeat some areas of this survey.  Please <a href=\"survey_questions.jsp\">return to the start page</a> to begin again.</p></div>";
 		} else {		
-			request.getSession().setAttribute("surveyStep", step);
+			request.getSession().setAttribute("surveyStep", sanitizeInput(step));
 		}
 		response.setContentType("text/html");
-		response.getWriter().write(content);
+		response.getWriter().write(URLEncoder.encode(content, "UTF-8").replace("%0A", "").replace("%0D", ""));
 		response.getWriter().flush();
 
 	}