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

some cleanup, and removing unneeded ClassNotFoundExceptions

Browse Source 
git-svn-id: http://webgoat.googlecode.com/svn/trunk/webgoat@361 4033779f-a91e-0410-96ef-6bf7bf53c507
This commit is contained in:
brandon.devries
2008-08-12 14:33:22 +00:00
parent 9c84df3d6c
commit 775fdad7c4
10 changed files with 34 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,13 +51,12 @@ public class DatabaseUtilities
private static Map<String, Connection> connections = new HashMap<String, Connection>();
private static Map<String, Boolean> dbBuilt = new HashMap<String, Boolean>();
public static Connection getConnection(WebSession s) throws ClassNotFoundException, SQLException
public static Connection getConnection(WebSession s) throws SQLException
{
return getConnection(s.getUserName(), s.getWebgoatContext());
}
public static synchronized Connection getConnection(String user, WebgoatContext context)
throws ClassNotFoundException, SQLException
public static synchronized Connection getConnection(String user, WebgoatContext context) throws SQLException
{
Connection conn = connections.get(user);
if (conn != null && !conn.isClosed()) return conn;
@ -87,8 +86,9 @@ public class DatabaseUtilities
}
}
private static Connection makeConnection(String user, WebgoatContext context) throws ClassNotFoundException,
SQLException
private static Connection makeConnection(String user, WebgoatContext context) throws SQLException
{
try
{
Class.forName(context.getDatabaseDriver());
@ -98,6 +98,11 @@ public class DatabaseUtilities
String password = context.getDatabasePassword();
String url = context.getDatabaseConnectionString();
return DriverManager.getConnection(url, userPrefix + "_" + user, password);
} catch (ClassNotFoundException cnfe)
{
cnfe.printStackTrace();
throw new SQLException("Couldn't load the database driver: " + cnfe.getLocalizedMessage());
}
}
private static Connection getHsqldbConnection(String user, WebgoatContext context) throws ClassNotFoundException,

23
main/project/JavaSource/org/owasp/webgoat/session/WebSession.java
View File

@ -3,6 +3,7 @@ package org.owasp.webgoat.session;
import java.io.IOException;
import java.io.PrintWriter;
import java.security.Principal;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.ArrayList;
@ -219,7 +220,7 @@ public class WebSession
course.loadCourses(webgoatContext, context, "/");
}
public static synchronized Connection getConnection(WebSession s) throws SQLException, ClassNotFoundException
public static synchronized Connection getConnection(WebSession s) throws SQLException
{
return DatabaseUtilities.getConnection(s);
}
@ -727,6 +728,11 @@ public class WebSession
message.append("<BR>" + " * " + text);
}
public void setLineBreak(String text)
{
message.append("<BR><BR>" + text);
}
/**
* Description of the Method
*
@ -779,10 +785,11 @@ public class WebSession
*/
public String getUserName()
{
// System.out.println("Request: " + getRequest() );
// System.out.println("Principal: " + getRequest().getUserPrincipal() );
// System.out.println("Name: " + getRequest().getUserPrincipal().getName( ) );
return getRequest().getUserPrincipal().getName();
HttpServletRequest request = getRequest();
if (request == null) throw new RuntimeException("Could not find the ServletRequest in the web session");
Principal principal = request.getUserPrincipal();
if (principal == null) throw new RuntimeException("Could not find the Principal in the Servlet Request");
return principal.getName();
}
/**
@ -888,6 +895,7 @@ public class WebSession
RandomLessonAdapter rla = (RandomLessonAdapter) al;
int stage = myParser.getIntParameter(STAGE) - 1;
String[] stages = rla.getStages();
if (stages == null) stages = new String[0];
if (stage >= 0 && stage < stages.length) rla.setStage(this, stages[stage]);
} catch (ParameterNotFoundException pnfe)
{
@ -979,6 +987,11 @@ public class WebSession
SequentialLessonAdapter sla = (SequentialLessonAdapter) al;
sla.getLessonTracker(this).setStage(1);
}
else if (al instanceof RandomLessonAdapter)
{
RandomLessonAdapter rla = (RandomLessonAdapter) al;
rla.setStage(this, rla.getStages()[0]);
}
}
/**