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

Merge pull request #212 from nbaars/develop

Browse Source 
Fixed #184
This commit is contained in:
Nanne 2016-04-08 18:27:00 +02:00
commit 46b24d72c9
5 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
webgoat-container/src/main/java/org/owasp/webgoat/HammerHead.java
View File

@ -243,6 +243,7 @@ public class HammerHead extends HttpServlet {
httpDateFormat.setTimeZone(TimeZone.getTimeZone("GMT")); httpDateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
propertiesPath = getServletContext().getRealPath("/WEB-INF/webgoat.properties"); propertiesPath = getServletContext().getRealPath("/WEB-INF/webgoat.properties");
webgoatContext = new WebgoatContext(this); webgoatContext = new WebgoatContext(this);
logger.info("Browse to http://localhost:8080/WebGoat and happy hacking!");
} }
/** /**

15
webgoat-container/src/main/java/org/owasp/webgoat/session/WebgoatContext.java
View File

@ -51,9 +51,6 @@ public class WebgoatContext {
/** Constant <code>SHOWHINTS="ShowHints"</code> */ /** Constant <code>SHOWHINTS="ShowHints"</code> */
public final static String SHOWHINTS = "ShowHints"; public final static String SHOWHINTS = "ShowHints";
/** Constant <code>DEFUSEOSCOMMANDS="DefuseOSCommands"</code> */
public final static String DEFUSEOSCOMMANDS = "DefuseOSCommands";
/** Constant <code>FEEDBACK_ADDRESS_HTML="FeedbackAddressHTML"</code> */ /** Constant <code>FEEDBACK_ADDRESS_HTML="FeedbackAddressHTML"</code> */
public final static String FEEDBACK_ADDRESS_HTML = "FeedbackAddressHTML"; public final static String FEEDBACK_ADDRESS_HTML = "FeedbackAddressHTML";
@ -86,8 +83,6 @@ public class WebgoatContext {
private boolean showSolution = false; private boolean showSolution = false;
private boolean defuseOSCommands = false;
private boolean enterprise = false; private boolean enterprise = false;
private boolean codingExercises = false; private boolean codingExercises = false;
@ -123,7 +118,6 @@ public class WebgoatContext {
showCookies = "true".equals(getParameter(servlet, SHOWCOOKIES)); showCookies = "true".equals(getParameter(servlet, SHOWCOOKIES));
showSource = "true".equals(getParameter(servlet, SHOWSOURCE)); showSource = "true".equals(getParameter(servlet, SHOWSOURCE));
showSolution = "true".equals(getParameter(servlet, SHOWSOLUTION)); showSolution = "true".equals(getParameter(servlet, SHOWSOLUTION));
defuseOSCommands = "true".equals(getParameter(servlet, DEFUSEOSCOMMANDS));
enterprise = "true".equals(getParameter(servlet, ENTERPRISE)); enterprise = "true".equals(getParameter(servlet, ENTERPRISE));
codingExercises = "true".equals(getParameter(servlet, CODING_EXERCISES)); codingExercises = "true".equals(getParameter(servlet, CODING_EXERCISES));
feedbackAddressHTML = getParameter(servlet, FEEDBACK_ADDRESS_HTML) != null ? getParameter(servlet, feedbackAddressHTML = getParameter(servlet, FEEDBACK_ADDRESS_HTML) != null ? getParameter(servlet,
@ -192,15 +186,6 @@ public class WebgoatContext {
return (databasePassword); return (databasePassword);
} }
/**
* <p>isDefuseOSCommands.</p>
*
* @return a boolean.
*/
public boolean isDefuseOSCommands() {
return defuseOSCommands;
}
/** /**
* <p>isEnterprise.</p> * <p>isEnterprise.</p>
* *

1
webgoat-container/src/main/resources/log4j.properties
View File

@ -18,6 +18,7 @@ log4j.appender.CONSOLE.layout.conversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p
# a little less spring output # a little less spring output
log4j.category.org.springframework = INFO log4j.category.org.springframework = INFO
log4j.category.org.apache=INFO
log4j.appender.default.out=org.apache.log4j.ConsoleAppender log4j.appender.default.out=org.apache.log4j.ConsoleAppender
log4j.appender.default.out.threeshold=DEBUG log4j.appender.default.out.threeshold=DEBUG

4
webgoat-container/src/main/webapp/WEB-INF/web.xml
View File

@ -126,10 +126,6 @@
<param-name>CookieDebug</param-name> <param-name>CookieDebug</param-name>
<param-value>true</param-value> <param-value>true</param-value>
</init-param> </init-param>
<init-param>
<param-name>DefuseOSCommands</param-name>
<param-value>false</param-value>
</init-param>
<init-param> <init-param>
<param-name>Enterprise</param-name> <param-name>Enterprise</param-name>
<param-value>true</param-value> <param-value>true</param-value>

2
webgoat-container/src/main/webapp/WEB-INF/webgoat.properties
View File

@ -10,11 +10,9 @@ lesson.BasicAuthentication.hidden=true
lesson.BlindScript.hidden=true lesson.BlindScript.hidden=true
lesson.RemoteAdminFlaw.hidden=true lesson.RemoteAdminFlaw.hidden=true
lesson.HttpSplitting.hidden=true lesson.HttpSplitting.hidden=true
lesson.BasicAuthentication.hidden=true
lesson.SameOriginPolicyProtection.hidden=true lesson.SameOriginPolicyProtection.hidden=true
lesson.SilentTransactions.hidden=true lesson.SilentTransactions.hidden=true
lesson.TraceXSS.hidden=true lesson.TraceXSS.hidden=true
lesson.DBSQLInjection.hidden=true lesson.DBSQLInjection.hidden=true
lesson.DBCrossSiteScripting.hidden=true lesson.DBCrossSiteScripting.hidden=true
lesson.XPATHInjection.hidden=true
lesson.ForcedBrowsing.hidden=true lesson.ForcedBrowsing.hidden=true