Allow overriding of the WebGoat context setting via environment variables
git-svn-id: http://webgoat.googlecode.com/svn/trunk@241 4033779f-a91e-0410-96ef-6bf7bf53c507
This commit is contained in:
parent
36b32849df
commit
c31ef90a3d
@ -1,5 +1,7 @@
|
|||||||
package org.owasp.webgoat.session;
|
package org.owasp.webgoat.session;
|
||||||
|
|
||||||
|
import java.util.Iterator;
|
||||||
|
|
||||||
import javax.servlet.http.HttpServlet;
|
import javax.servlet.http.HttpServlet;
|
||||||
|
|
||||||
public class WebgoatContext {
|
public class WebgoatContext {
|
||||||
@ -70,28 +72,30 @@ public class WebgoatContext {
|
|||||||
|
|
||||||
public WebgoatContext(HttpServlet servlet) {
|
public WebgoatContext(HttpServlet servlet) {
|
||||||
this.servlet = servlet;
|
this.servlet = servlet;
|
||||||
databaseConnectionString = servlet
|
databaseConnectionString = getParameter(servlet, DATABASE_CONNECTION_STRING);
|
||||||
.getInitParameter(DATABASE_CONNECTION_STRING);
|
databaseDriver = getParameter(servlet, DATABASE_DRIVER);
|
||||||
databaseDriver = servlet.getInitParameter(DATABASE_DRIVER);
|
databaseUser = getParameter(servlet, DATABASE_USER);
|
||||||
databaseUser = servlet.getInitParameter(DATABASE_USER);
|
databasePassword = getParameter(servlet, DATABASE_PASSWORD);
|
||||||
databasePassword = servlet.getInitParameter(DATABASE_PASSWORD);
|
|
||||||
|
|
||||||
// initialize from web.xml
|
// initialize from web.xml
|
||||||
showParams = "true".equals( servlet.getInitParameter( SHOWPARAMS ) );
|
showParams = "true".equals( getParameter(servlet, SHOWPARAMS ) );
|
||||||
showCookies = "true".equals( servlet.getInitParameter( SHOWCOOKIES ) );
|
showCookies = "true".equals( getParameter(servlet, SHOWCOOKIES ) );
|
||||||
showSource = "true".equals( servlet.getInitParameter( SHOWSOURCE ) );
|
showSource = "true".equals( getParameter(servlet, SHOWSOURCE ) );
|
||||||
showSolution = "true".equals( servlet.getInitParameter( SHOWSOLUTION ) );
|
showSolution = "true".equals( getParameter( servlet, SHOWSOLUTION ) );
|
||||||
defuseOSCommands = "true".equals( servlet.getInitParameter( DEFUSEOSCOMMANDS ) );
|
defuseOSCommands = "true".equals( getParameter(servlet, DEFUSEOSCOMMANDS ) );
|
||||||
enterprise = "true".equals( servlet.getInitParameter( ENTERPRISE ) );
|
enterprise = "true".equals( getParameter(servlet, ENTERPRISE ) );
|
||||||
codingExercises = "true".equals( servlet.getInitParameter( CODING_EXERCISES ) );
|
codingExercises = "true".equals( getParameter(servlet, CODING_EXERCISES ) );
|
||||||
feedbackAddress = servlet.getInitParameter( FEEDBACK_ADDRESS ) != null ? servlet
|
feedbackAddress = getParameter(servlet, FEEDBACK_ADDRESS ) != null ?
|
||||||
.getInitParameter( FEEDBACK_ADDRESS ) : feedbackAddress;
|
getParameter(servlet, FEEDBACK_ADDRESS ) : feedbackAddress;
|
||||||
showRequest = "true".equals( servlet.getInitParameter( SHOWREQUEST ) );
|
showRequest = "true".equals( getParameter(servlet, SHOWREQUEST ) );
|
||||||
isDebug = "true".equals( servlet.getInitParameter( DEBUG ) );
|
isDebug = "true".equals( getParameter(servlet, DEBUG ) );
|
||||||
servletName = servlet.getServletName();
|
servletName = servlet.getServletName();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private String getParameter(HttpServlet servlet, String key) {
|
||||||
|
return System.getProperty(key, servlet.getInitParameter(key));
|
||||||
|
}
|
||||||
/**
|
/**
|
||||||
* returns the connection string with the real path to the database
|
* returns the connection string with the real path to the database
|
||||||
* directory inserted at the word PATH
|
* directory inserted at the word PATH
|
||||||
|
Loading…
x
Reference in New Issue
Block a user