diff --git a/java/org/owasp/webgoat/HammerHead.java b/java/org/owasp/webgoat/HammerHead.java index 9bce10cc7..5a6798631 100644 --- a/java/org/owasp/webgoat/HammerHead.java +++ b/java/org/owasp/webgoat/HammerHead.java @@ -207,7 +207,8 @@ public class HammerHead extends HttpServlet { session.setAttribute(WELCOMED, "true"); page = "/webgoat.jsp"; } else { - page = "/main.jsp"; + //page = "/main.jsp"; + page = "/lesson_content.jsp"; } return page; diff --git a/java/org/owasp/webgoat/controller/Start.java b/java/org/owasp/webgoat/controller/Start.java new file mode 100644 index 000000000..8b0f5843c --- /dev/null +++ b/java/org/owasp/webgoat/controller/Start.java @@ -0,0 +1,37 @@ +/* + * 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 javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +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 Start { + + private static final String WELCOMED = "welcomed"; + + @RequestMapping(value = "start.mvc", method = {RequestMethod.GET, RequestMethod.POST}) + public ModelAndView start(HttpServletRequest request, + @RequestParam(value = "error", required = false) String error, + @RequestParam(value = "logout", required = false) String logout) { + + //@TODO put stuff here the main page needs to access + ModelAndView model = new ModelAndView(); + model.setViewName("main_new"); + + return model; + + } +} diff --git a/java/org/owasp/webgoat/lessons/HttpBasics.java b/java/org/owasp/webgoat/lessons/HttpBasics.java index aa162aa7c..03c36484a 100644 --- a/java/org/owasp/webgoat/lessons/HttpBasics.java +++ b/java/org/owasp/webgoat/lessons/HttpBasics.java @@ -1,4 +1,3 @@ - package org.owasp.webgoat.lessons; import java.util.ArrayList; @@ -11,120 +10,113 @@ import org.owasp.webgoat.session.ECSFactory; import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.util.WebGoatI18N; - -/*************************************************************************************************** - * - * - * This file is part of WebGoat, an Open Web Application Security Project utility. For details, - * please see http://www.owasp.org/ - * +/** + * ************************************************************************************************* + * + * + * 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. - * + * + * 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. - * + * + * 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 Bruce Mayhew WebGoat * @created October 28, 2003 */ -public class HttpBasics extends LessonAdapter -{ - private final static String PERSON = "person"; +public class HttpBasics extends LessonAdapter { - /** - * Description of the Method - * - * @param s - * Description of the Parameter - * @return Description of the Return Value - */ - protected Element createContent(WebSession s) - { - ElementContainer ec = new ElementContainer(); + private final static String PERSON = "person"; - StringBuffer person = null; - try - { - ec.addElement(new StringElement(WebGoatI18N.get("EnterYourName")+": ")); + /** + * Description of the Method + * + * @param s Description of the Parameter + * @return Description of the Return Value + */ + protected Element createContent(WebSession s) { + ElementContainer ec = new ElementContainer(); - person = new StringBuffer(s.getParser().getStringParameter(PERSON, "")); - person.reverse(); + StringBuffer person = null; + try { + ec.addElement(new StringElement(WebGoatI18N.get("EnterYourName") + ": ")); - Input input = new Input(Input.TEXT, PERSON, person.toString()); - ec.addElement(input); + person = new StringBuffer(s.getParser().getStringParameter(PERSON, "")); + person.reverse(); - Element b = ECSFactory.makeButton(WebGoatI18N.get("Go!")); - ec.addElement(b); - } catch (Exception e) - { - s.setMessage("Error generating " + this.getClass().getName()); - e.printStackTrace(); - } + Input input = new Input(Input.TEXT, PERSON, person.toString()+"RICK"); + ec.addElement(input); - if (!person.toString().equals("") && getLessonTracker(s).getNumVisits() > 3) - { - makeSuccess(s); - } + Element b = ECSFactory.makeButton(WebGoatI18N.get("Go!")); + ec.addElement(b); + } catch (Exception e) { + s.setMessage("Error generating " + this.getClass().getName()); + e.printStackTrace(); + } - return (ec); - } + if (!person.toString().equals("") && getLessonTracker(s).getNumVisits() > 3) { + makeSuccess(s); + } - /** - * Gets the hints attribute of the HelloScreen object - * - * @return The hints value - */ - public List getHints(WebSession s) - { - List hints = new ArrayList(); - hints.add("Type in your name and press 'go'"); - hints.add("Turn on Show Parameters or other features"); - hints.add("Try to intercept the request with WebScarab"); - hints.add("Press the Show Lesson Plan button to view a lesson summary"); - hints.add("Press the Show Solution button to view a lesson solution"); + return (ec); + } - return hints; - } + /** + * Gets the hints attribute of the HelloScreen object + * + * @return The hints value + */ + public List getHints(WebSession s) { + List hints = new ArrayList(); + hints.add("Type in your name and press 'go'"); + hints.add("Turn on Show Parameters or other features"); + hints.add("Try to intercept the request with WebScarab"); + hints.add("Press the Show Lesson Plan button to view a lesson summary"); + hints.add("Press the Show Solution button to view a lesson solution"); - /** - * Gets the ranking attribute of the HelloScreen object - * - * @return The ranking value - */ - private final static Integer DEFAULT_RANKING = new Integer(10); + return hints; + } - protected Integer getDefaultRanking() - { - return DEFAULT_RANKING; - } + /** + * Gets the ranking attribute of the HelloScreen object + * + * @return The ranking value + */ + private final static Integer DEFAULT_RANKING = new Integer(10); - protected Category getDefaultCategory() - { - return Category.GENERAL; - } + protected Integer getDefaultRanking() { + return DEFAULT_RANKING; + } - /** - * Gets the title attribute of the HelloScreen object - * - * @return The title value - */ - public String getTitle() - { - return ("Http Basics"); - } + protected Category getDefaultCategory() { + return Category.GENERAL; + } + + /** + * Gets the title attribute of the HelloScreen object + * + * @return The title value + */ + public String getTitle() { + return ("Http Basics"); + } } diff --git a/java/org/owasp/webgoat/lessons/LessonAdapter.java b/java/org/owasp/webgoat/lessons/LessonAdapter.java index d490e6c7b..b4e3813bb 100644 --- a/java/org/owasp/webgoat/lessons/LessonAdapter.java +++ b/java/org/owasp/webgoat/lessons/LessonAdapter.java @@ -1,4 +1,3 @@ - package org.owasp.webgoat.lessons; import java.io.BufferedReader; @@ -18,249 +17,226 @@ import org.apache.ecs.html.Table; import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.util.WebGoatI18N; - -/*************************************************************************************************** - * - * - * This file is part of WebGoat, an Open Web Application Security Project utility. For details, - * please see http://www.owasp.org/ - * +/** + * ************************************************************************************************* + * + * + * 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. - * + * + * 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. - * + * + * 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 Bruce Mayhew WebGoat * @created October 28, 2003 */ -public abstract class LessonAdapter extends AbstractLesson -{ +public abstract class LessonAdapter extends AbstractLesson { - /** - * Description of the Method - * - * @param s - * Description of the Parameter - * @return Description of the Return Value - */ - protected Element createContent(WebSession s) - { - // Mark this lesson as completed. - makeSuccess(s); + /** + * Description of the Method + * + * @param s Description of the Parameter + * @return Description of the Return Value + */ + protected Element createContent(WebSession s) { + // Mark this lesson as completed. + makeSuccess(s); - ElementContainer ec = new ElementContainer(); + ElementContainer ec = new ElementContainer(); - ec.addElement(new Center().addElement(new H3().addElement(new StringElement( - "Detailed Lesson Creation Instructions.")))); - ec.addElement(new P()); - ec - .addElement(new StringElement( - "Lesson are simple to create and very little coding is required.   " - + "In fact, most lessons can be created by following the easy to use instructions in the " - + "WebGoat User Guide.  " - + "If you would prefer, send your lesson ideas to " - + getWebgoatContext().getFeedbackAddressHTML())); + ec.addElement(new Center().addElement(new H3().addElement(new StringElement( + "Detailed Lesson Creation Instructions.")))); + ec.addElement(new P()); + ec + .addElement(new StringElement( + "Lesson are simple to create and very little coding is required.   " + + "In fact, most lessons can be created by following the easy to use instructions in the " + + "WebGoat User Guide.  " + + "If you would prefer, send your lesson ideas to " + + getWebgoatContext().getFeedbackAddressHTML())); - String fileName = s.getContext().getRealPath("WEB-INF/classes/New Lesson Instructions.txt"); - if (fileName != null) - { - try - { - PRE pre = new PRE(); - BufferedReader in = new BufferedReader(new FileReader(fileName)); - String line = null; - while ((line = in.readLine()) != null) - { - pre.addElement(line + "\n"); - } - ec.addElement(pre); - } catch (Exception e) - { - e.printStackTrace(); - } - } - return (ec); - } + String fileName = s.getContext().getRealPath("WEB-INF/classes/New Lesson Instructions.txt"); + if (fileName != null) { + try { + PRE pre = new PRE(); + BufferedReader in = new BufferedReader(new FileReader(fileName)); + String line = null; + while ((line = in.readLine()) != null) { + pre.addElement(line + "\n"); + } + ec.addElement(pre); + } catch (Exception e) { + e.printStackTrace(); + } + } + return (ec); + } - /** - * Gets the category attribute of the LessonAdapter object. The default category is "General" - * Only override this method if you wish to create a new category or if you wish this lesson to - * reside within a category other the "General" - * - * @return The category value - */ - protected Category getDefaultCategory() - { - return Category.GENERAL; - } + /** + * Gets the category attribute of the LessonAdapter object. The default + * category is "General" Only override this method if you wish to create a + * new category or if you wish this lesson to reside within a category other + * the "General" + * + * @return The category value + */ + protected Category getDefaultCategory() { + return Category.GENERAL; + } - protected boolean getDefaultHidden() - { - return false; - } + protected boolean getDefaultHidden() { + return false; + } - private final static Integer DEFAULT_RANKING = new Integer(1000); + private final static Integer DEFAULT_RANKING = new Integer(1000); - protected Integer getDefaultRanking() - { - return DEFAULT_RANKING; - } + protected Integer getDefaultRanking() { + return DEFAULT_RANKING; + } - /** - * Gets the hintCount attribute of the LessonAdapter object - * - * @return The hintCount value - */ - public int getHintCount(WebSession s) - { - return getHints(s).size(); - } + /** + * Gets the hintCount attribute of the LessonAdapter object + * + * @return The hintCount value + */ + public int getHintCount(WebSession s) { + return getHints(s).size(); + } - /** - * Fill in a minor hint that will help people who basically get it, but are stuck on somthing - * silly. Hints will be returned to the user in the order they appear below. The user must click - * on the "next hint" button before the hint will be displayed. - * - * @return The hint1 value - */ - protected List getHints(WebSession s) - { - List hints = new ArrayList(); - hints.add("There are no hints defined."); - return hints; - } + /** + * Fill in a minor hint that will help people who basically get it, but are + * stuck on somthing silly. Hints will be returned to the user in the order + * they appear below. The user must click on the "next hint" button before + * the hint will be displayed. + * + * @return The hint1 value + */ + protected List getHints(WebSession s) { + List hints = new ArrayList(); + hints.add("There are no hints defined."); + return hints; + } - /** - * Gets the credits attribute of the AbstractLesson object - * - * @return The credits value - */ - public Element getCredits() - { - return new StringElement(); - } + /** + * Gets the credits attribute of the AbstractLesson object + * + * @return The credits value + */ + public Element getCredits() { + return new StringElement(); + } - /** - * Gets the instructions attribute of the LessonAdapter object. Instructions will rendered as - * html and will appear below the control area and above the actual lesson area. Instructions - * should provide the user with the general setup and goal of the lesson. - * - * @return The instructions value - */ - public String getInstructions(WebSession s) - { - StringBuffer buff = new StringBuffer(); - String lang = s.getCurrrentLanguage(); - try - { - String fileName = s.getWebResource(getLessonPlanFileName(lang)); - if (fileName != null) - { - BufferedReader in = new BufferedReader(new FileReader(fileName)); - String line = null; - boolean startAppending = false; - while ((line = in.readLine()) != null) - { - if (line.indexOf("") != -1) - { - startAppending = true; - continue; - } - if (line.indexOf("") != -1) - { - startAppending = false; - continue; - } - if (startAppending) - { - buff.append(line + "\n"); - } - } - } - } catch (Exception e) - { - } + /** + * Gets the instructions attribute of the LessonAdapter object. Instructions + * will rendered as html and will appear below the control area and above + * the actual lesson area. Instructions should provide the user with the + * general setup and goal of the lesson. + * + * @return The instructions value + */ + public String getInstructions(WebSession s) { + StringBuffer buff = new StringBuffer(); + String lang = s.getCurrrentLanguage(); + try { + String fileName = s.getWebResource(getLessonPlanFileName(lang)); + if (fileName != null) { + BufferedReader in = new BufferedReader(new FileReader(fileName)); + String line = null; + boolean startAppending = false; + while ((line = in.readLine()) != null) { + if (line.indexOf("") != -1) { + startAppending = true; + continue; + } + if (line.indexOf("") != -1) { + startAppending = false; + continue; + } + if (startAppending) { + buff.append(line + "\n"); + } + } + } + } catch (Exception e) { + } - return buff.toString(); + return buff.toString(); - } + } - /** - * Fill in a descriptive title for this lesson. The title of the lesson. This will appear above - * the control area at the top of the page. This field will be rendered as html. - * - * @return The title value - */ - public String getTitle() - { - return "Untitled Lesson " + getScreenId(); - } + /** + * Fill in a descriptive title for this lesson. The title of the lesson. + * This will appear above the control area at the top of the page. This + * field will be rendered as html. + * + * @return The title value + */ + public String getTitle() { + return "Untitled Lesson " + getScreenId(); + } - public String getCurrentAction(WebSession s) - { - return s.getLessonSession(this).getCurrentLessonScreen(); - } + public String getCurrentAction(WebSession s) { + return s.getLessonSession(this).getCurrentLessonScreen(); + } - public void setCurrentAction(WebSession s, String lessonScreen) - { - s.getLessonSession(this).setCurrentLessonScreen(lessonScreen); - } + public void setCurrentAction(WebSession s, String lessonScreen) { + s.getLessonSession(this).setCurrentLessonScreen(lessonScreen); + } - public Object getSessionAttribute(WebSession s, String key) - { - return s.getRequest().getSession().getAttribute(key); - } + public Object getSessionAttribute(WebSession s, String key) { + return s.getRequest().getSession().getAttribute(key); + } - public void setSessionAttribute(WebSession s, String key, Object value) - { - s.getRequest().getSession().setAttribute(key, value); - } + public void setSessionAttribute(WebSession s, String key, Object value) { + s.getRequest().getSession().setAttribute(key, value); + } - /** - * Description of the Method - * - * @param s - * Description of the Parameter - * @return Description of the Return Value - */ - protected Element makeSuccess(WebSession s) - { - getLessonTracker(s).setCompleted(true); + /** + * Description of the Method + * + * @param s Description of the Parameter + * @return Description of the Return Value + */ + protected Element makeSuccess(WebSession s) { + getLessonTracker(s).setCompleted(true); - s.setMessage(WebGoatI18N.get("LessonCompleted")); + s.setMessage(WebGoatI18N.get("LessonCompleted")); - return (null); - } + return (null); + } - /** - * Gets the credits attribute of the AbstractLesson object - * - * @return The credits value - */ - protected Element getCustomCredits(String text, Element e) - { - Table t = new Table().setCellSpacing(0).setCellPadding(0).setBorder(0).setWidth("90%").setAlign("RIGHT"); - TR tr = new TR(); - tr.addElement(new TD(text).setVAlign("MIDDLE").setAlign("RIGHT").setWidth("100%")); - tr.addElement(new TD(e).setVAlign("MIDDLE").setAlign("RIGHT")); - t.addElement(tr); - return t; - } + /** + * Gets the credits attribute of the AbstractLesson object + * + * @return The credits value + */ + protected Element getCustomCredits(String text, Element e) { + Table t = new Table().setCellSpacing(0).setCellPadding(0).setBorder(0).setWidth("90%").setAlign("RIGHT"); + TR tr = new TR(); + tr.addElement(new TD(text).setVAlign("MIDDLE").setAlign("RIGHT").setWidth("100%")); + tr.addElement(new TD(e).setVAlign("MIDDLE").setAlign("RIGHT")); + t.addElement(tr); + return t; + } } diff --git a/java/org/owasp/webgoat/session/Screen.java b/java/org/owasp/webgoat/session/Screen.java index 66aeb227a..a9d0820c7 100644 --- a/java/org/owasp/webgoat/session/Screen.java +++ b/java/org/owasp/webgoat/session/Screen.java @@ -196,12 +196,13 @@ public abstract class Screen { */ public void output(PrintWriter out) { - // format output -- then send to printwriter + // format output -- then send to printwriter // otherwise we're doing way too much SSL encryption work out.print(getContent()); } + // TODO we could hook all forms here with javascript call to ajax forms plugin public String getContent() { return (content == null) ? "" : content.toString(); } diff --git a/webapp/WEB-INF/pages/main_new.jsp b/webapp/WEB-INF/pages/main_new.jsp new file mode 100644 index 000000000..7a06d803c --- /dev/null +++ b/webapp/WEB-INF/pages/main_new.jsp @@ -0,0 +1,256 @@ +<%@ page contentType="text/html; charset=ISO-8859-1" language="java" + errorPage=""%> +<%@page import="org.owasp.webgoat.session.WebSession"%> +<% + //WebSession webSession = ((WebSession) session.getAttribute("websession")); +%> + + + + + + WebGoat V6.0 + + + + + + + + + +
+
+
+ + + +
+
+

Lesson Content

+ +
+ Lesson content goes here +
+ + +
+
+
+ + + + + + + + diff --git a/webapp/WEB-INF/pages/welcome.jsp b/webapp/WEB-INF/pages/welcome.jsp index a9632dc99..9afe2118a 100644 --- a/webapp/WEB-INF/pages/welcome.jsp +++ b/webapp/WEB-INF/pages/welcome.jsp @@ -109,7 +109,7 @@
-
diff --git a/webapp/lesson_content.jsp b/webapp/lesson_content.jsp new file mode 100644 index 000000000..5f68051c1 --- /dev/null +++ b/webapp/lesson_content.jsp @@ -0,0 +1,58 @@ +<%@ 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"%> + + + + +
+ <% + 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()%>
+<% + } +%> + + + + + +