Merge branch 'next' of https://github.com/WebGoat/WebGoat into next

Conflicts:
	src/main/java/org/owasp/webgoat/lessons/DBSQLInjection/DBSQLInjection.java
	src/main/java/org/owasp/webgoat/lessons/FailOpenAuthentication.java
	src/main/java/org/owasp/webgoat/lessons/SQLInjection/SQLInjection.java
	src/main/java/org/owasp/webgoat/lessons/WsSqlInjection.java

src/main/java/org/owasp/webgoat/lessons/FailOpenAuthentication.java

@@ -41,6 +41,7 @@ import org.owasp.webgoat.session.WebSession;
  */
 public class FailOpenAuthentication extends WeakAuthenticationCookie
 {
+
     public final static A ASPECT_LOGO = new A().setHref("http://www.aspectsecurity.com")
             .addElement(
                         new IMG("images/logos/aspect.jpg").setAlt("Aspect Security").setBorder(0).setHspace(0)
@@ -143,7 +144,7 @@ public class FailOpenAuthentication extends WeakAuthenticationCookie
         hints.add("You can force errors during the authentication process.");
         hints.add("You can change length, existance, or values of authentication parameters.");
         hints
-				.add("Try removing a parameter ENTIRELY with <A href=\"https://www.owasp.org/index.php/OWASP_Zed_Attack_Proxy_Project \">OWASP ZAP</A>.");
+                .add("Try removing a parameter ENTIRELY with <A href=\"http://www.owasp.org/index.php/Category:OWASP_WebScarab_Project\">OWASP ZAP</A>.");
 
         return hints;
     }

src/main/java/org/owasp/webgoat/lessons/HttpSplitting.java

@@ -213,22 +213,16 @@ public class HttpSplitting extends SequentialLessonAdapter
 
     protected List<String> getHints(WebSession s)
     {
-
         List<String> hints = new ArrayList<String>();
         hints.add("Enter a language for the system to search by.");
         hints.add("Use CR (%0d) and LF (%0a) for a new line in Windows and only LF (%0a) in Linux.");
         hints.add("The Content-Length: 0 will tell the server that the first request is over.");
         hints.add("A 200 OK message looks like this: HTTP/1.1 200 OK");
-		hints
+        hints.add("NOTE: THIS HINT IS FOR WINDOWS AND HAS TO BE ALTERED FOR ANOTHER SYSTEM <br/> Try: foobar%0D%0AContent-Length%3A%200%0D%0A%0D%0AHTTP%2F1.1%20200%20OK%0D%0AContent-Type%3A%20text%2Fhtml%0D%0AContent-Length%3A%2047%0D%0A%0D%0A%3Chtml%3EHacked!%3C%2Fhtml%3E <br/>For insight into what this does, use the PHP charset encoder to decode it.");
-				.add("NOTE: THIS HINT IS FOR WINDOWS AND HAS TO BE ALTERED FOR ANOTHER SYSTEM <br/> Try: foobar%0D%0AContent-Length%3A%200%0D%0A%0D%0AHTTP%2F1.1%20200%20OK%0D%0AContent-Type%3A%20text%2Fhtml%0D%0AContent-Length%3A%2047%0D%0A%0D%0A%3Chtml%3EHacked!%3C%2Fhtml%3E <br/>For insight into what this does, use the PHP charset encoder to decode it.");
+        hints.add("Cache Poisoning starts with including 'Last-Modified' header in the hijacked page and setting it to a future date.");
-		hints
+        hints.add("NOTE: THIS HINT IS FOR WINDOWS AND HAS TO BE ALTERED FOR ANOTHER SYSTEM <br/>Try foobar%0D%0AContent-Length%3A%200%0D%0A%0D%0AHTTP%2F1.1%20200%20OK%0D%0AContent-Type%3A%20text%2Fhtml%0D%0ALast-Modified%3A%20Mon%2C%2027%20Oct%202080%2014%3A50%3A18%20GMT%0D%0AContent-Length%3A%2047%0D%0A%0D%0A%3Chtml%3EHacked%20J%3C%2Fhtml%3E");
-				.add("Cache Poisoning starts with including 'Last-Modified' header in the hijacked page and setting it to a future date.");
+        hints.add("'Last-Modified' header forces the browser to send a 'If-Modified-Since' header. Some cache servers will take the bait and keep serving the hijacked page");
-		hints
+        hints.add("NOTE: THIS HINT IS FOR WINDOWS AND HAS TO BE ALTERED FOR ANOTHER SYSTEM <br/>Try to intercept the reply and add HTTP/1.1 304 Not Modified0d%0aDate:%20Mon,%2027%20Oct%202030%2014:50:18%20GMT");
-				.add("NOTE: THIS HINT IS FOR WINDOWS AND HAS TO BE ALTERED FOR ANOTHER SYSTEM <br/>Try foobar%0D%0AContent-Length%3A%200%0D%0A%0D%0AHTTP%2F1.1%20200%20OK%0D%0AContent-Type%3A%20text%2Fhtml%0D%0ALast-Modified%3A%20Mon%2C%2027%20Oct%202080%2014%3A50%3A18%20GMT%0D%0AContent-Length%3A%2047%0D%0A%0D%0A%3Chtml%3EHacked%20J%3C%2Fhtml%3E");
-		hints
-				.add("'Last-Modified' header forces the browser to send a 'If-Modified-Since' header. Some cache servers will take the bait and keep serving the hijacked page");
-		hints
-				.add("NOTE: THIS HINT IS FOR WINDOWS AND HAS TO BE ALTERED FOR ANOTHER SYSTEM <br/>Try to intercept the reply and add HTTP/1.1 304 Not Modified0d%0aDate:%20Mon,%2027%20Oct%202030%2014:50:18%20GMT");
         return hints;
 
     }

src/main/webapp/WEB-INF/pages/main_new.jsp

@@ -62,7 +62,7 @@
     </head>
 
     <body class="animated fadeIn" ng-app="goatApp">
-        <section id="container" ng-controller="goatLesson">
+        <section id="container">
             <header id="header">
                 <!--logo start-->
                 <div class="brand">
@@ -75,7 +75,7 @@
                     </button>
                 </div><!--toggle navigation end-->
                 <div class="lessonTitle" >
-                    <h1 id="lessonTitle">Lesson Title in here</h1>
+                    <h1 id="lessonTitle"></h1>
                 </div><!--lesson title end-->
                 <div class="user-nav pull-right" style="margin-right: 75px;">
                     <div class="dropdown" style="display:inline">
@@ -108,11 +108,11 @@
 
             <!--sidebar left start-->
             <aside class="sidebar" >
-                <div id="leftside-navigation" class="nano">
+                <div id="leftside-navigation" ng-controller="goatMenu" class="nano">
                     <ul class="nano-content">
                         <li class="sub-menu" ng-repeat="item in menuTopics">
-                            <a ng-click="expanded = !expanded" href=""><i class="fa {{item.class}}"></i><span>{{item.name}}</span></a>
+                            <a ng-click="accordionMenu(item.id)" href=""><i class="fa {{item.class}}"></i><span>{{item.name}}</span></a><!-- expanded = !expanded-->
-                            <ul class="slideDown" ng-show="expanded">
+                            <ul class="slideDown lessonsAndStages" id="{{item.id}}" isOpen=0>
                                 <li ng-repeat="lesson in item.children">
                                     <a ng-click="renderLesson(lesson.link)" title="link to {{lesson.name}}" href="">{{lesson.name}}</a>
                                     <span ng-repeat="stage in lesson.children" >
@@ -122,15 +122,13 @@
                             </ul>
                         </li>
                     </ul> 
-
                 </div>
 
             </aside>
             <!--sidebar left end-->
             <!--main content start-->
             <section class="main-content-wrapper">
-
+                <section id="main-content" ng-controller="goatLesson">
-                <section id="main-content" > <!-- ng-controller="lessonController" -->
                     <div class="row">
                         <div class="col-md-8">
                             <div class="col-md-12" align="left">
@@ -149,7 +147,8 @@
                                             <span class="glyphicon-class glyphicon glyphicon-circle-arrow-left" id="showPrevHintBtn" ng-click="viewPrevHint()"></span>
                                             <span class="glyphicon-class glyphicon glyphicon-circle-arrow-right" id="showNextHintBtn" ng-click="viewNextHint()"></span>
                                             <br/>
-                                            {{curHint}}
+                                            
+                                            <span id="curHintContainer"></span><!--{{curHint}}-->
                                         </div>                                    
                                     </div>
                                 </div>
@@ -292,10 +291,10 @@
             var DEBUG_FORM_SUBMISSION = false;
 
             $(document).ready(function() {
+                //TODO merge appliction.js code into other js files
                 app.init();
-                //can be augmented later to 'resume' for a given user ... currently kluged to start at fixed lesson
+                
-                var url = 'attack?Screen=32&menu=5';
+                
-                angular.element($('#leftside-navigation')).scope().renderLesson(url);
             });
             // make all forms ajax forms
             var options = {

src/main/webapp/css/main.css

@@ -807,6 +807,12 @@ fieldset[disabled] .btn-warning.active {
   display: none;
   background-color: #eee;
 }
+
+#showPrevHintBtn, #showNextHintBtn {
+  cursor: pointer;
+}
+
+
 .info {
 	color:#e84c3d;
 	font-weight: bold; 

src/main/webapp/js/goatControllers.js

@@ -6,13 +6,22 @@
 /** Lesson Controller (includes menu stuff)
  *  prepares and updates menu topic items for the view
  */
-goat.controller('goatLesson', function($scope, $http, $modal, $log, $templateCache) {
+//<<<<<<< Updated upstream
+//goat.controller('goatLesson', function($scope, $http, $modal, $log, $sce) { //$templateCache
+//=======
+var goatMenu = function($scope, $http, $modal, $log, $templateCache) {
     $scope.cookies = [];
     $scope.params = [];
-    //TODO: implement via separate promise and use config for menu (goat.data.loadMenuData())
+    $scope.renderMenu = function() {
-    $http({method: 'GET', url: goatConstants.lessonService}).then(
+	goat.data.loadMenu($http).then( //$http({method: 'GET', url: goatConstants.lessonService})
 	    function(menuData) {
 		var menuItems = goat.utils.addMenuClasses(goatConstants.menuPrefix.concat(menuData.data));
+		for (var i=0;i<menuItems.length;i++) {
+		    if (menuItems[i].name) {
+			menuItems[i].id = menuItems[i].name.replace(/\s|\(|\)/g,'');
+		    }
+		}
+
 		$scope.menuTopics = menuItems;
 	    },
 	    function(error) {
@@ -20,26 +29,66 @@ goat.controller('goatLesson', function($scope, $http, $modal, $log, $templateCac
 		console.error("Error rendering menu: " + error);
 	    }	
 	);
+    };
 
     $scope.renderLesson = function(url) {
         //console.log(url + ' was passed in');
         // use jquery to render lesson content to div
         $scope.hintIndex = 0;
-
         var curScope = $scope;
       
         curScope.parameters = goat.utils.scrapeParams(url);
-        goat.data.loadLessonContent(url).then(
+        goat.data.loadLessonContent($http,url).then(
 	    function(reply) {
-                    $("#lesson_content").html(reply);
+		goat.data.loadLessonTitle($http).then(
-                    goat.data.loadLessonTitle().then(
 		    function(reply) {
-                    			$("#lessonTitle").text(reply);
+			    $("#lessonTitle").text(reply.data);
 		    }
 		);
+		$("#lesson_content").html(reply.data);
+		$('#leftside-navigation').height($('#main-content').height()+15)
+	    }
+    )};
+    $scope.accordionMenu = function(id) {
+	if ($('ul#'+id).attr('isOpen') == 0) {
+	    $scope.expandMe = true;    
+	} else {
+	    $('ul#'+id).slideUp(300).attr('isOpen',0);
+	    return;
+	}
+	$('.lessonsAndStages').not('ul#'+id).slideUp(300).attr('isOpen',0);
+	if ($scope.expandMe) {
+	    $('ul#'+id).slideDown(300).attr('isOpen',1);
+	}
+	console.log('accordion for ' + id);
+    }
+    $scope.renderMenu();
+    //can be augmented later to 'resume' for a given user ... currently kluged to start at fixed lesson
+    var url = 'attack?Screen=32&menu=5';
+    angular.element($('#leftside-navigation')).scope().renderLesson(url);
+}
 
+/*goatMenu.animation('.slideDown', function() {
+    var NgHideClassName = 'ng-hide';
+    return {
+        beforeAddClass: function(element, className, done) {
+            if (className === NgHideClassName) {
+                $(element).slideUp(done);
+            }
+        },
+        removeClass: function(element, className, done) {
+            if (className === NgHideClassName) {
+                $(element).hide().slideDown(done);
+            }
+        }
+    };
+
+
+});*/
+
+var goatLesson = function($scope,$http,$log) {
     //hook forms
-                    goat.utils.makeFormsAjax();
+
     $('#hintsView').hide();
 	// adjust menu to lessonContent size if necssary
 	//@TODO: this is still clunky ... needs some TLC
@@ -47,16 +96,17 @@ goat.controller('goatLesson', function($scope, $http, $modal, $log, $templateCac
 		    $('#leftside-navigation').height($(window).height());
 		}
 		//cookies
-                    goat.data.loadCookies().then(
+		goat.data.loadCookies($http).then(
 			function(resp) {
-                                curScope.cookies = resp;
+			    curScope.cookies = resp.data;
 			}
 		);
 		//hints
+		curScope = $scope; //TODO .. update below, this curScope is probably not needed
 		curScope.hintIndex = 0;
-                    goat.data.loadHints().then(
+		goat.data.loadHints($http).then(
 			function(resp) {
-                                curScope.hints = resp;
+			    curScope.hints = resp.data;
 			    if (curScope.hints.length > 0 && curScope.hints[0].hint.indexOf(goatConstants.noHints) === -1) {
 				goat.utils.displayButton('showHintsBtn', true);
 			    } else {
@@ -65,27 +115,25 @@ goat.controller('goatLesson', function($scope, $http, $modal, $log, $templateCac
 			}
 		);
 		//source
-                    goat.data.loadSource().then(
+		goat.data.loadSource($http).then(
 			function(resp) {
-                                curScope.source = resp;
+			    curScope.source = resp.data;
 			}
 		);
 		//plan
-                    goat.data.loadPlan().then(
+		goat.data.loadPlan($http).then(
 			function(resp) {
-                                curScope.plan = resp;
+			    curScope.plan = resp.data;
 			}
 		);
 		//solution
-                    goat.data.loadSolution().then(
+		goat.data.loadSolution($http).then(
 			function(resp) {
-                                curScope.solution = resp;
+			    curScope.solution = resp.data;
 			}
 		);
 		goat.utils.scrollToTop();
-                }
+
-        );
-    };
 
     $scope.showLessonSource = function() {
         $('.lessonHelp').hide();
@@ -128,23 +176,33 @@ goat.controller('goatLesson', function($scope, $http, $modal, $log, $templateCac
 
         $('.lessonHelp').hide();
         $('#lesson_hint_row').show();
-        goat.utils.scrollToHelp();
+        //goat.utils.scrollToHelp();
+	//TODO
         $scope.curHint = $scope.hints[$scope.hintIndex].hint;
+	//$scope.curHint = $sce.trustAsHtml($scope.hints[$scope.hintIndex].hint);
+	//TODO get html binding workin in the UI ... in the meantime ...
+	$scope.renderCurHint();
         $scope.manageHintButtons();
     };
 
     $scope.viewNextHint = function() {
         $scope.hintIndex++;
         $scope.curHint = $scope.hints[$scope.hintIndex].hint;
+	$scope.renderCurHint();
         $scope.manageHintButtons();
     };
 
     $scope.viewPrevHint = function() {
         $scope.hintIndex--;
         $scope.curHint = $scope.hints[$scope.hintIndex].hint;
+	$scope.renderCurHint();
         $scope.manageHintButtons();
     };
     
+    $scope.renderCurHint = function() {
+	$('#curHintContainer').html($scope.curHint);
+    }
+
     $scope.hideHints = function() {
 
     };
@@ -154,22 +212,6 @@ goat.controller('goatLesson', function($scope, $http, $modal, $log, $templateCac
             //remote: 'about.mvc'
         });
     };
-
-
-}).animation('.slideDown', function() {
-    var NgHideClassName = 'ng-hide';
-    return {
-        beforeAddClass: function(element, className, done) {
-            if (className === NgHideClassName) {
-                $(element).slideUp(done);
 }
-        },
-        removeClass: function(element, className, done) {
-            if (className === NgHideClassName) {
-                $(element).hide().slideDown(done);
-            }
-        }
-    };
 
 
-});

src/main/webapp/js/goatData.js

@@ -2,36 +2,39 @@
 
 goat.data = {
     /**** jQuery loads ... ****/
-    loadLessonContent: function (_url) {
+    loadLessonContent: function ($http,_url) {
     //TODO: switch to $http (angular) later
-    //return $http({method:'GET', url: _url});
+        return $http({method:'GET', url: _url});
-    
+    //return $.get(_url, {}, null, "html");
-    return $.get(_url, {}, null, "html");
     },
-    loadCookies: function() {
+    loadCookies: function($http) {
-        return $.get(goatConstants.cookieService, {});
+        return $http({method: 'GET', url: goatConstants.cookieService});
+        //return $.get(goatConstants.cookieService, {});
     },
-    loadHints: function () {
+    loadHints: function ($http) {
-        return $.get(goatConstants.hintService, {});
+        return $http({method: 'GET', url: goatConstants.hintService});
+        //return $.get(goatConstants.hintService, {});
     },
-    loadSource: function() {
+    loadSource: function($http) {
-        return $.get(goatConstants.sourceService, {});
+        return $http({method: 'GET', url: goatConstants.sourceService});
+        //return $.get(goatConstants.sourceService, {});
     },
-    loadSolution: function () {
+    loadSolution: function ($http) {
-        return $.get(goatConstants.solutionService, {});
+        return $http({method: 'GET', url: goatConstants.solutionService});
+        //return $.get(goatConstants.solutionService, {});
     },
-    loadPlan: function () {
+    loadPlan: function ($http) {
-        return $.get(goatConstants.lessonPlanService, {});
+        return $http({method: 'GET', url: goatConstants.lessonPlanService});
+        //return $.get(goatConstants.lessonPlanService, {});
     },
-    loadParams: function() {
+    loadParams: function($http) {
-        return $.get(goatConstants.paramsService,{});
+        return $http({method: 'GET', url: goatConstants.paramsService});
+        //return $.get(goatConstants.paramsService,{});
     },
-    /*** angular data grabs ***/
+    loadMenu: function($http) {
-    loadMenuData: function() {
+        return $http({method: 'GET', url: goatConstants.lessonService});
-        //TODO use goatConstants var for url
-        return $http({method: 'GET', url: goatConstants.menuService});
     },
-    loadLessonTitle: function () {
+    loadLessonTitle: function ($http) {
-        return $.get(goatConstants.lessonTitleService, {});
+        return $http({method: 'GET', url: goatConstants.lessonTitleService});
     }
 };

src/main/webapp/js/goatLesson.js

@@ -30,7 +30,7 @@ goat.lesson = {
                 var scope = this;
                 goat.data.loadHints().then(
                     function(resp) {
-                        scope.hints = resp;
+                        scope.hints = resp.data;
                         if (scope.hints.length > 0 && scope.hints[0].hint.indexOf(goatConstants.noHints) === -1) {
                             goat.utils.displayButton('showHintsBtn',true);
                         } else {
@@ -48,7 +48,7 @@ goat.lesson = {
                 var scope = this;
                 goat.data.loadSolution().then(
                     function(resp) {
-                        scope.solution = resp;
+                        scope.solution = resp.data;
                         goat.utils.displayButton('showSolutionBtn',true);
                         $('#showSolutionBtn').unbind().click(goat.utils.showLessonSolution);
                         return scope;
@@ -64,7 +64,7 @@ goat.lesson = {
                 var scope = this;
                 goat.data.loadPlan().then(
                     function(resp) {
-                        scope.plan = resp;
+                        scope.plan = resp.data;
                         goat.utils.displayButton('showPlanBtn',true);
                         $('#showPlanBtn').unbind().click(goat.utils.showLessonPlan);
                         return scope;
@@ -79,7 +79,7 @@ goat.lesson = {
                 var scope = this;
                 goat.data.loadSource().then(
                     function(resp) {
-                        scope.source = resp;
+                        scope.source = resp.data;
                         goat.utils.displayButton('showSourceBtn',true);
                         $('#showSourceBtn').unbind().click(goat.utils.showLessonSource);
                         return scope;
@@ -94,7 +94,7 @@ goat.lesson = {
                 var scope = this;
                 goat.data.loadCookies().then(
                     function(resp) {
-                        scope.cookies = resp;
+                        scope.cookies = resp.data;
                         return scope;
                     },
                     function(err){