render lesson content using jquery

nitinshirsat · Aug 18, 2014 · f3092a2 · f3092a2
1 parent 30f3c3a
commit f3092a2
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 24 deletions.
diff --git a/java/org/owasp/webgoat/session/Screen.java b/java/org/owasp/webgoat/session/Screen.java
@@ -205,6 +205,8 @@ public void output(PrintWriter out) {
     // TODO we could hook all forms here with javascript call to ajax forms plugin
     public String getContent() {
         String makeFormsAjax = "<script>  $(document).ready(function() { makeFormsAjax(); });</script>";
+        // handle this on the page with js
+        makeFormsAjax = "";
         return (content == null) ? "" : content.toString() + makeFormsAjax;
     }
 

diff --git a/java/org/owasp/webgoat/session/WebSession.java b/java/org/owasp/webgoat/session/WebSession.java
@@ -129,7 +129,7 @@ public class WebSession {
     /**
      * Description of the Field
      */
-    public final static String SESSION = "Session";
+    public final static String SESSION = "websession";
 
     public final static String SHOWSOURCE = "ShowSource";
 

diff --git a/webapp/WEB-INF/pages/main_new.jsp b/webapp/WEB-INF/pages/main_new.jsp
@@ -2,7 +2,7 @@
          errorPage=""%>
 <%@page import="org.owasp.webgoat.session.WebSession"%>
 <%
-    WebSession webSession = ((WebSession) session.getAttribute("websession"));
+    WebSession webSession = ((WebSession) session.getAttribute(WebSession.SESSION));
 %>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -84,9 +84,9 @@
             <section id="main-content">
                 <div class="row">
                		<div class="col-md-12">
-               			<div class="panel">
-                            <div class="panel-body" id="lesson_content">                            
-
+               			<div class="panel" >
+                                    <div class="panel-body" id="lesson_content" ng-controller="goatMenu">                            
+                                        <p  ng-model="lessonUrl">    {{lessonUrl}}</p>
                					<h1>About WebGoat</h1>
                					<hr />
                					<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque volutpat feugiat nunc, non vulputate urna dictum ut. Nam consectetur porttitor diam ut ultricies. Aenean dolor dolor, congue sed ornare non, elementum in mauris. Phasellus orci sem, rhoncus eu laoreet eu, aliquam nec ante. Suspendisse sit amet justo eget eros tempor tincidunt vel quis justo. Sed pulvinar enim id neque pellentesque, eu rhoncus lorem eleifend. Morbi congue tortor sit amet pulvinar posuere.</p>
@@ -184,8 +184,10 @@
                     alert('status: ' + statusText + '\n\nresponseText: \n' + responseText +
                             '\n\nThe output div should have already been updated with the responseText.');
                 }
+                makeFormsAjax();
             }
             function makeFormsAjax() {
+                //console.log("Hooking any lesson forms to make them ajax");
                 $("form").ajaxForm(options);
             }
         </script>

diff --git a/webapp/js/goat.js b/webapp/js/goat.js
diff --git a/webapp/lessons/GoatHillsFinancial/error.jsp b/webapp/lessons/GoatHillsFinancial/error.jsp
@@ -2,7 +2,7 @@
 	import="org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.GoatHillsFinancial.GoatHillsFinancial"
 	errorPage="" %>
 <%
-	WebSession webSession = ((WebSession)session.getAttribute("websession"));
+	WebSession webSession = ((WebSession)session.getAttribute(WebSession.SESSION));
 //	int myUserId = getIntSessionAttribute(webSession, "GoatHillsFinancial." + GoatHillsFinancial.USER_ID);
 %>
 <br><br><br>An error has occurred.