diff --git a/java/org/owasp/webgoat/HammerHead.java b/java/org/owasp/webgoat/HammerHead.java index e92137bde..4b8301af1 100644 --- a/java/org/owasp/webgoat/HammerHead.java +++ b/java/org/owasp/webgoat/HammerHead.java @@ -181,13 +181,15 @@ public class HammerHead extends HttpServlet { String viewPage = getViewPage(mySession); logger.debug("Forwarding to view: " + viewPage); logger.debug("Screen: " + screen); - request.getRequestDispatcher(viewPage).forward(request, response); + request.getRequestDispatcher(viewPage).forward(request, response); } catch (Throwable t) { logger.error("Error handling request", t); screen = new ErrorScreen(mySession, t); } finally { try { - this.writeScreen(mySession, screen, response); + if (screen instanceof ErrorScreen) { + this.writeScreen(mySession, screen, response); + } } catch (Throwable thr) { logger.error("Could not write error screen", thr); } @@ -426,6 +428,7 @@ public class HammerHead extends HttpServlet { response.setHeader("Content-Length", screen.getContentLength() + ""); screen.output(out); + out.flush(); out.close(); } } diff --git a/java/org/owasp/webgoat/controller/Logout.java b/java/org/owasp/webgoat/controller/Logout.java new file mode 100644 index 000000000..de9b6c3d1 --- /dev/null +++ b/java/org/owasp/webgoat/controller/Logout.java @@ -0,0 +1,45 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.owasp.webgoat.controller; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.servlet.ModelAndView; + +/** + * + * @author rlawson + */ +@Controller +public class Logout { + + final Logger logger = LoggerFactory.getLogger(Logout.class); + + @RequestMapping(value = "logout.do", method = RequestMethod.GET) + public ModelAndView logout( + @RequestParam(value = "error", required = false) String error, + @RequestParam(value = "logout", required = false) String logout) { + + logger.info("Logging user out"); + + ModelAndView model = new ModelAndView(); + if (error != null) { + model.addObject("error", "Invalid username and password!"); + } + + if (logout != null) { + model.addObject("msg", "You've been logged out successfully."); + } + model.setViewName("logout"); + + return model; + + } +} diff --git a/java/org/owasp/webgoat/session/Screen.java b/java/org/owasp/webgoat/session/Screen.java index c9bffe506..66aeb227a 100644 --- a/java/org/owasp/webgoat/session/Screen.java +++ b/java/org/owasp/webgoat/session/Screen.java @@ -1,319 +1,280 @@ - -package org.owasp.webgoat.session; - -import java.io.PrintWriter; -import java.util.Properties; -import org.apache.ecs.Element; -import org.apache.ecs.HtmlColor; -import org.apache.ecs.StringElement; -import org.apache.ecs.html.A; -import org.apache.ecs.html.Font; -import org.apache.ecs.html.IMG; -import org.owasp.webgoat.lessons.AbstractLesson; - - -/*************************************************************************************************** - * - * - * This file is part of WebGoat, an Open Web Application Security Project utility. For details, - * please see http://www.owasp.org/ - * - * Copyright (c) 2002 - 2007 Bruce Mayhew - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU General Public License as published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without - * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program; if - * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. - * - * Getting Source ============== - * - * Source for this application is maintained at code.google.com, a repository for free software - * projects. - * - * For details, please see http://code.google.com/p/webgoat/ - * - * @author Jeff Williams Aspect Security - * @created October 28, 2003 - */ -public abstract class Screen -{ - - /** - * Description of the Field - */ - public static int MAIN_SIZE = 375; - - // private Head head; - private Element content; - - final static IMG logo = new IMG("images/aspectlogo-horizontal-small.jpg").setAlt("Aspect Security").setBorder(0) - .setHspace(0).setVspace(0); - - /** - * Constructor for the Screen object - */ - - public Screen() - { - } - - // FIXME: Each lesson should have a role assigned to it. Each user/student - // should also have a role(s) assigned. The user would only be allowed - // to see lessons that correspond to their role. Eventually these roles - // will be stored in the internal database. The user will be able to hack - // into the database and change their role. This will allow the user to - // see the admin screens, once they figure out how to turn the admin switch on. - public abstract String getRole(); - - /** - * Description of the Method - * - * @param s - * Description of the Parameter - * @return Description of the Return Value - */ - - protected abstract Element createContent(WebSession s); - - /** - * Gets the credits attribute of the Screen object - * - * @return The credits value - */ - public abstract Element getCredits(); - - /** - * Creates a new lessonTracker object. - * - * @param props - * The properties file that was used to persist the user data. - * @return Description of the Return Value - */ - - public LessonTracker createLessonTracker(Properties props) - { - - // If the lesson had any specialized properties in the user persisted properties, - // now would be the time to pull them out. - - return createLessonTracker(); - } - - /** - * This allows the screens to provide a custom LessonTracker object if needed. - * - * @return Description of the Return Value - */ - public LessonTracker createLessonTracker() - { - return new LessonTracker(); - } - - /** - * Gets the lessonTracker attribute of the AbstractLesson object - * - * @param userName - * Description of the Parameter - * @return The lessonTracker value - */ - - public LessonTracker getLessonTracker(WebSession s) - { - UserTracker userTracker = UserTracker.instance(); - return userTracker.getLessonTracker(s, this); - } - - public LessonTracker getLessonTracker(WebSession s, String userNameOverride) - { - UserTracker userTracker = UserTracker.instance(); - return userTracker.getLessonTracker(s, userNameOverride, this); - } - - public LessonTracker getLessonTracker(WebSession s, AbstractLesson lesson) - { - UserTracker userTracker = UserTracker.instance(); - return userTracker.getLessonTracker(s, lesson); - } - - /** - * Fill in a descriptive title for this lesson - * - * @return The title value - */ - public abstract String getTitle(); - - protected void setContent(Element content) - { - this.content = content; - } - - /** - * Description of the Method - * - * @return Description of the Return Value - */ - - protected Element makeLogo() - { - - return new A("http://www.aspectsecurity.com/webgoat.html", logo); - } - - public String getSponsor() - { - return "Aspect Security"; - } - - public String getSponsorLogoResource() - { - return "images/aspectlogo-horizontal-small.jpg"; - } - - /** - * Description of the Method - * - * @param s - * Description of the Parameter - * @return Description of the Return Value - */ - - protected Element makeMessages(WebSession s) - { - - if (s == null) { - - return (new StringElement("")); } - - Font f = new Font().setColor(HtmlColor.RED); - - String message = s.getMessage(); - - f.addElement(message); - - return (f); - } - - /** - * Returns the content length of the the html. - * - */ - - public int getContentLength() - { - return getContent().length(); - } - - /** - * Description of the Method - * - * @param out - * Description of the Parameter - */ - - public void output(PrintWriter out) - { - - // format output -- then send to printwriter - - // otherwise we're doing way too much SSL encryption work - - out.print(getContent()); - - } - - public String getContent() - { - return (content == null) ? "" : content.toString(); - } - - /** - * Description of the Method - * - * @param x - * Description of the Parameter - * @return Description of the Return Value - */ - - protected static String pad(int x) - { - - StringBuffer sb = new StringBuffer(); - - if (x < 10) - { - - sb.append(" "); - - } - - if (x < 100) - { - - sb.append(" "); - - } - - sb.append(x); - - return (sb.toString()); - } - - /** - * Description of the Method - * - * @param token - * Description of the Parameter - * @return Description of the Return Value - */ - protected static String convertMetachars(String token) - { - - int mci = 0; - - /* - * meta char array FIXME: Removed the conversion of whitespace " " to " " in order for - * the html to be automatically wrapped in client browser. It is better to add line length - * checking and only do " " conversion in lines that won't exceed screen size, say less - * than 80 characters. - */ - String[] metaChar = { "&", "<", ">", "\"", "\t", System.getProperty("line.separator") }; - - String[] htmlCode = { "&", "<", ">", """, " ", "
" }; - - String replacedString = token; - for (; mci < metaChar.length; mci += 1) - { - replacedString = replacedString.replaceAll(metaChar[mci], htmlCode[mci]); - } - return (replacedString); - } - - /** - * Description of the Method - * - * @param token - * Description of the Parameter - * @return Description of the Return Value - */ - protected static String convertMetacharsJavaCode(String token) - { - return (convertMetachars(token).replaceAll(" ", " ")); - } - - /** - * Description of the Method - * - * @param s - * Description of the Parameter - * @return Description of the Return Value - */ - - // protected abstract Element wrapForm( WebSession s ); -} +package org.owasp.webgoat.session; + +import java.io.PrintWriter; +import java.util.Properties; +import org.apache.ecs.Element; +import org.apache.ecs.HtmlColor; +import org.apache.ecs.StringElement; +import org.apache.ecs.html.A; +import org.apache.ecs.html.Font; +import org.apache.ecs.html.IMG; +import org.owasp.webgoat.lessons.AbstractLesson; + +/** + * ************************************************************************************************* + * + * + * This file is part of WebGoat, an Open Web Application Security Project + * utility. For details, please see http://www.owasp.org/ + * + * Copyright (c) 2002 - 2007 Bruce Mayhew + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., 59 Temple + * Place - Suite 330, Boston, MA 02111-1307, USA. + * + * Getting Source ============== + * + * Source for this application is maintained at code.google.com, a repository + * for free software projects. + * + * For details, please see http://code.google.com/p/webgoat/ + * + * @author Jeff Williams Aspect + * Security + * @created October 28, 2003 + */ +public abstract class Screen { + + /** + * Description of the Field + */ + public static int MAIN_SIZE = 375; + + // private Head head; + private Element content; + + final static IMG logo = new IMG("images/aspectlogo-horizontal-small.jpg").setAlt("Aspect Security").setBorder(0) + .setHspace(0).setVspace(0); + + /** + * Constructor for the Screen object + */ + public Screen() { + } + + // FIXME: Each lesson should have a role assigned to it. Each user/student + // should also have a role(s) assigned. The user would only be allowed + // to see lessons that correspond to their role. Eventually these roles + // will be stored in the internal database. The user will be able to hack + // into the database and change their role. This will allow the user to + // see the admin screens, once they figure out how to turn the admin switch on. + public abstract String getRole(); + + /** + * Description of the Method + * + * @param s Description of the Parameter + * @return Description of the Return Value + */ + protected abstract Element createContent(WebSession s); + + /** + * Gets the credits attribute of the Screen object + * + * @return The credits value + */ + public abstract Element getCredits(); + + /** + * Creates a new lessonTracker object. + * + * @param props The properties file that was used to persist the user data. + * @return Description of the Return Value + */ + public LessonTracker createLessonTracker(Properties props) { + + // If the lesson had any specialized properties in the user persisted properties, + // now would be the time to pull them out. + return createLessonTracker(); + } + + /** + * This allows the screens to provide a custom LessonTracker object if + * needed. + * + * @return Description of the Return Value + */ + public LessonTracker createLessonTracker() { + return new LessonTracker(); + } + + /** + * Gets the lessonTracker attribute of the AbstractLesson object + * + * @param userName Description of the Parameter + * @return The lessonTracker value + */ + public LessonTracker getLessonTracker(WebSession s) { + UserTracker userTracker = UserTracker.instance(); + return userTracker.getLessonTracker(s, this); + } + + public LessonTracker getLessonTracker(WebSession s, String userNameOverride) { + UserTracker userTracker = UserTracker.instance(); + return userTracker.getLessonTracker(s, userNameOverride, this); + } + + public LessonTracker getLessonTracker(WebSession s, AbstractLesson lesson) { + UserTracker userTracker = UserTracker.instance(); + return userTracker.getLessonTracker(s, lesson); + } + + /** + * Fill in a descriptive title for this lesson + * + * @return The title value + */ + public abstract String getTitle(); + + protected void setContent(Element content) { + this.content = content; + } + + /** + * Description of the Method + * + * @return Description of the Return Value + */ + protected Element makeLogo() { + + return new A("http://www.aspectsecurity.com/webgoat.html", logo); + } + + public String getSponsor() { + return "Aspect Security"; + } + + public String getSponsorLogoResource() { + return "images/aspectlogo-horizontal-small.jpg"; + } + + /** + * Description of the Method + * + * @param s Description of the Parameter + * @return Description of the Return Value + */ + protected Element makeMessages(WebSession s) { + + if (s == null) { + + return (new StringElement("")); + } + + Font f = new Font().setColor(HtmlColor.RED); + + String message = s.getMessage(); + + f.addElement(message); + + return (f); + } + + /** + * Returns the content length of the the html. + * + */ + public int getContentLength() { + return getContent().length(); + } + + /** + * Description of the Method + * + * @param out Description of the Parameter + */ + public void output(PrintWriter out) { + + // format output -- then send to printwriter + // otherwise we're doing way too much SSL encryption work + out.print(getContent()); + + } + + public String getContent() { + return (content == null) ? "" : content.toString(); + } + + /** + * Description of the Method + * + * @param x Description of the Parameter + * @return Description of the Return Value + */ + protected static String pad(int x) { + + StringBuilder sb = new StringBuilder(); + + if (x < 10) { + + sb.append(" "); + + } + + if (x < 100) { + + sb.append(" "); + + } + + sb.append(x); + + return (sb.toString()); + } + + /** + * Description of the Method + * + * @param token Description of the Parameter + * @return Description of the Return Value + */ + protected static String convertMetachars(String token) { + + int mci = 0; + + /* + * meta char array FIXME: Removed the conversion of whitespace " " to " " in order for + * the html to be automatically wrapped in client browser. It is better to add line length + * checking and only do " " conversion in lines that won't exceed screen size, say less + * than 80 characters. + */ + String[] metaChar = {"&", "<", ">", "\"", "\t", System.getProperty("line.separator")}; + + String[] htmlCode = {"&", "<", ">", """, " ", "
"}; + + String replacedString = token; + for (; mci < metaChar.length; mci += 1) { + replacedString = replacedString.replaceAll(metaChar[mci], htmlCode[mci]); + } + return (replacedString); + } + + /** + * Description of the Method + * + * @param token Description of the Parameter + * @return Description of the Return Value + */ + protected static String convertMetacharsJavaCode(String token) { + return (convertMetachars(token).replaceAll(" ", " ")); + } + + /** + * Description of the Method + * + * @param s Description of the Parameter + * @return Description of the Return Value + */ + // protected abstract Element wrapForm( WebSession s ); +} diff --git a/webapp/WEB-INF/pages/logout.jsp b/webapp/WEB-INF/pages/logout.jsp new file mode 100644 index 000000000..e33a9a400 --- /dev/null +++ b/webapp/WEB-INF/pages/logout.jsp @@ -0,0 +1,59 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> + + + Login Page + + + + + + +
+ +
${error}
+ + +
${msg}
+ + You have logged out successfully +
+ Click here to " > Login + +
+ + + + + \ No newline at end of file diff --git a/webapp/WEB-INF/spring-security.xml b/webapp/WEB-INF/spring-security.xml index 009b8f2d3..7c899607a 100644 --- a/webapp/WEB-INF/spring-security.xml +++ b/webapp/WEB-INF/spring-security.xml @@ -15,7 +15,7 @@ - + @@ -27,9 +27,9 @@ authentication-failure-url="/login.do?error" username-parameter="username" password-parameter="password" /> - + - + diff --git a/webapp/main.jsp b/webapp/main.jsp index adb56330d..25cfbb4e6 100644 --- a/webapp/main.jsp +++ b/webapp/main.jsp @@ -1,300 +1,294 @@ -<%@ page contentType="text/html; charset=ISO-8859-1" language="java" - import="org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.Category, org.owasp.webgoat.lessons.AbstractLesson, org.owasp.webgoat.util.*, java.util.*" - errorPage="" %> -<% -Course course = ((Course)session.getAttribute("course")); -WebSession webSession = ((WebSession)session.getAttribute("websession")); -AbstractLesson currentLesson = webSession.getCurrentLesson(); -%> - - -<%@page import="org.owasp.webgoat.lessons.RandomLessonAdapter"%> - - - -<%=currentLesson.getTitle()%> - - - - - - - - - - -<% -final String menuPrefix = WebSession.MENU; -final String submenuPrefix = "submenu"; -final String mbutPrefix = "mbut"; -String printHint = ""; -String printParameters = ""; -String printCookies = ""; -String lessonComplete = ""; - -List categories = course.getCategories(); - -StringBuffer buildList = new StringBuffer(); - - Iterator iter1 = categories.iterator(); - while(iter1.hasNext()) - { - Category category = (Category)iter1.next(); - - buildList.append("'"); - buildList.append(menuPrefix); - buildList.append(category.getRanking()); - buildList.append("','"); - buildList.append(submenuPrefix); - buildList.append(category.getRanking()); - buildList.append("','"); - buildList.append(mbutPrefix); - buildList.append(category.getRanking()); - buildList.append("'"); - - if (iter1.hasNext()) - buildList.append(","); - }%> - - -
- <% - int topCord = 140; - int zIndex = 105; - - Iterator iter2 = categories.iterator(); - while(iter2.hasNext()) - { - Category category = (Category)iter2.next(); - %> - - <% - topCord=topCord + 30; - zIndex=zIndex + 1; - } - - int topSubMenu = 72; - - Iterator iter3 = categories.iterator(); - while(iter3.hasNext()) - { - Category category = (Category)iter3.next(); - List lessons = webSession.getLessons(category); - Iterator iter4 = lessons.iterator(); - %> - <% - }%> -
-
-
- <% if (currentLesson.getAvailableLanguages().size() != 0 ) - { - %> -
- Choose another language:
- <% - } else { - %> - Internationalization is not available for this lesson - <% - } - %> -
-
- LogOut Help -
-
<%=currentLesson.getTitle()%>
-
- <% - if (webSession.isAuthorizedInLesson(webSession.getRole(), WebSession.SHOWHINTS)) - { - %> - - Previous Hint - - - Hints - - - Next Hint - - <%}%> - - Show Params - - - Show Cookies - - - Lesson Plans - - <% - if (webSession.isAuthorizedInLesson(webSession.getRole(), WebSession.SHOWSOURCE)) - { - %> - - Show Java - - - Show Solution - - <%}%> - -
-
- -
- <% - if (currentLesson != null) - { - %> - - <% - } - %> -
-
- <% - if (webSession.getHint() != null) - { - printHint = "
" + webSession.getHint() + "

"; - out.println(printHint); - } - - if (webSession.getParams() != null) - { - Iterator i = webSession.getParams().iterator(); - while (i.hasNext()) - { - Parameter p = (Parameter) i.next(); - printParameters = "
" + p.getName() + "=" + p.getValue() + "

"; - out.println(printParameters); - } - } - - if (webSession.getCookies() != null) - { - Iterator i = webSession.getCookies().iterator(); - while (i.hasNext()) - { - Cookie c = (Cookie) i.next(); - printCookies = "
" + c.getName() + " \"\" " + c.getValue() + "

"; - out.println(printCookies); - } - }%> - -
- <% - AbstractLesson lesson = webSession.getCurrentLesson(); - if (lesson instanceof RandomLessonAdapter) { - RandomLessonAdapter rla = (RandomLessonAdapter) lesson; - %> -
Stage <%= rla.getLessonTracker(webSession).getStageNumber(rla.getStage(webSession)) + 1 %>
- <% - } - %> - <%=webSession.getInstructions()%>
-
<%=webSession.getMessage()%>
- - <% - if (currentLesson.getTemplatePage(webSession) != null) - { - //System.out.println("Main.jsp - current lesson: " + currentLesson.getName() ); - //System.out.println(" - template Page: " + currentLesson.getTemplatePage(webSession)); - %> - - <% - } - else - { - %> -
<%=currentLesson.getContent()%>
- <% - } - %> -
- <% out.println(currentLesson.getCredits());%> -
-
-
- - -
- - +<%@ page contentType="text/html; charset=ISO-8859-1" language="java" + import="org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.Category, org.owasp.webgoat.lessons.AbstractLesson, org.owasp.webgoat.util.*, java.util.*" + errorPage="" %> +<% + Course course = ((Course) session.getAttribute("course")); + WebSession webSession = ((WebSession) session.getAttribute("websession")); + AbstractLesson currentLesson = webSession.getCurrentLesson(); +%> + + +<%@page import="org.owasp.webgoat.lessons.RandomLessonAdapter"%> + + + + <%=currentLesson.getTitle()%> + + + + + + + + + + + <% + final String menuPrefix = WebSession.MENU; + final String submenuPrefix = "submenu"; + final String mbutPrefix = "mbut"; + String printHint = ""; + String printParameters = ""; + String printCookies = ""; + String lessonComplete = ""; + + List categories = course.getCategories(); + + StringBuffer buildList = new StringBuffer(); + + Iterator iter1 = categories.iterator(); + while (iter1.hasNext()) { + Category category = (Category) iter1.next(); + + buildList.append("'"); + buildList.append(menuPrefix); + buildList.append(category.getRanking()); + buildList.append("','"); + buildList.append(submenuPrefix); + buildList.append(category.getRanking()); + buildList.append("','"); + buildList.append(mbutPrefix); + buildList.append(category.getRanking()); + buildList.append("'"); + + if (iter1.hasNext()) { + buildList.append(","); + } + }%> + + +
+ <% + int topCord = 140; + int zIndex = 105; + + Iterator iter2 = categories.iterator(); + while (iter2.hasNext()) { + Category category = (Category) iter2.next(); + %> + + <% + topCord = topCord + 30; + zIndex = zIndex + 1; + } + + int topSubMenu = 72; + + Iterator iter3 = categories.iterator(); + while (iter3.hasNext()) { + Category category = (Category) iter3.next(); + List lessons = webSession.getLessons(category); + Iterator iter4 = lessons.iterator(); + %> + <% + }%> +
+
+
+ <% if (currentLesson.getAvailableLanguages().size() != 0) { + %> +
+ Choose another language:
+ <% + } else { + %> + Internationalization is not available for this lesson + <% + } + %> +
+
+ LogOut Help +
+
<%=currentLesson.getTitle()%>
+
+ <% + if (webSession.isAuthorizedInLesson(webSession.getRole(), WebSession.SHOWHINTS)) { + %> + + Previous Hint + + + Hints + + + Next Hint + + <%}%> + + Show Params + + + Show Cookies + + + Lesson Plans + + <% + if (webSession.isAuthorizedInLesson(webSession.getRole(), WebSession.SHOWSOURCE)) { + %> + + Show Java + + + Show Solution + + <%}%> + +
+
+ +
+ <% + if (currentLesson != null) { + %> + + <% + } + %> +
+
+ <% + if (webSession.getHint() != null) { + printHint = "
" + webSession.getHint() + "

"; + out.println(printHint); + } + + if (webSession.getParams() != null) { + Iterator i = webSession.getParams().iterator(); + while (i.hasNext()) { + Parameter p = (Parameter) i.next(); + printParameters = "
" + p.getName() + "=" + p.getValue() + "

"; + out.println(printParameters); + } + } + + if (webSession.getCookies() != null) { + Iterator i = webSession.getCookies().iterator(); + while (i.hasNext()) { + Cookie c = (Cookie) i.next(); + printCookies = "
" + c.getName() + " \"\" " + c.getValue() + "

"; + out.println(printCookies); + } + }%> + +
+ <% + AbstractLesson lesson = webSession.getCurrentLesson(); + if (lesson instanceof RandomLessonAdapter) { + RandomLessonAdapter rla = (RandomLessonAdapter) lesson; + %> +
Stage <%= rla.getLessonTracker(webSession).getStageNumber(rla.getStage(webSession)) + 1%>
+ <% + } + %> + <%=webSession.getInstructions()%>
+
<%=webSession.getMessage()%>
+ + <% + if (currentLesson.getTemplatePage(webSession) != null) { + //System.out.println("Main.jsp - current lesson: " + currentLesson.getName() ); + //System.out.println(" - template Page: " + currentLesson.getTemplatePage(webSession)); +%> + + <% + } else { + %> +
<%=currentLesson.getContent()%>
+ <% + } + %> +
+ <% out.println(currentLesson.getCredits());%> +
+
+
+ + +
+ + diff --git a/webapp/webgoat.jsp b/webapp/webgoat.jsp index d33401a2d..a9632dc99 100644 --- a/webapp/webgoat.jsp +++ b/webapp/webgoat.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")); %> @@ -22,7 +22,7 @@ The exercises are intended to provide hands on experience with application penetration testing techniques.

The WebGoat project is led - by Bruce Mayhew. Please send all comments to Bruce at <%=webSession.getWebgoatContext().getFeedbackAddress()%>.

+ by Bruce Mayhew. Please send all comments to Bruce at [TODO, session was blowing up here for some reason].