diff --git a/README.txt b/README.txt index 443b635ba..a5b6af665 100644 --- a/README.txt +++ b/README.txt @@ -3,14 +3,13 @@ ********** August 23, 2014 ********** ** -** Home Page: http://code.google.com/p/webgoat -** Home Page: http://www.owasp.org/index.php/Category:OWASP_WebGoat_Project -** Source Code: http://code.google.com/p/webgoat/source/checkout -** Download: http://code.google.com/p/webgoat/downloads/list -** Download: http://sourceforge.net/project/showfiles.php?group_id=64424&package_id=61824 (older stuff) -** User Guide: http://www.owasp.org/index.php/WebGoat_User_and_Install_Guide_Table_of_Contents -** Wiki: http://code.google.com/p/webgoat/w/list -** FAQ: http://code.google.com/p/webgoat/wiki/FAQ +** Home Page: http://webgoat.github.io +** Home Page: http://www.owasp.org/index.php/Category:OWASP_WebGoat_Project +** Source Code: https://github.com/WebGoat/WebGoat +** Easy-Run Download: https://webgoat.atlassian.net/builds/browse/WEB-DAIL/latestSuccessful/artifact/JOB1/WebGoat-Embedded-Tomcat/WebGoat-6.0-SNAPSHOT-war-exec.jar +** User Guide: http://www.owasp.org/index.php/WebGoat_User_and_Install_Guide_Table_of_Contents +** Wiki: http://code.google.com/p/webgoat/w/list +** FAQ: http://code.google.com/p/webgoat/wiki/FAQ ** Contact Info: webgoat@owasp.org (Direct to Bruce Mayhew) ** Mailing List: owasp-webgoat@lists.owasp.org (WebGoat Community - For most questions) ** @@ -45,7 +44,7 @@ Follow these instructions if you simply wish to run WebGoat Prerequisites: Java VM >= 1.6 installed ( JDK 1.7 recommended) Download the executable jar file to any location of your choice from: - http://github.com/path/to/download/WebGoat-6.0-exec-war.jar + https://webgoat.atlassian.net/builds/browse/WEB-DAIL/latestSuccessful/artifact/JOB1/WebGoat-Embedded-Tomcat/WebGoat-6.0-SNAPSHOT-war-exec.jar Run it using java: java -jar WebGoat-6.0-exec-war.jar diff --git a/src/main/java/org/owasp/webgoat/service/BaseService.java b/src/main/java/org/owasp/webgoat/service/BaseService.java index 94513d480..0243dab2b 100644 --- a/src/main/java/org/owasp/webgoat/service/BaseService.java +++ b/src/main/java/org/owasp/webgoat/service/BaseService.java @@ -30,6 +30,8 @@ */ package org.owasp.webgoat.service; +import java.io.PrintWriter; +import java.io.StringWriter; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import org.owasp.webgoat.controller.Welcome; @@ -59,7 +61,8 @@ public abstract class BaseService { logger.error("Exception handler for service caught exception when processing: " + url, ex); ExceptionInfo response = new ExceptionInfo(); response.setUrl(url); - response.setMessage(ex.toString()); + + response.setMessage(getStringStackTrace(ex)); return response; } @@ -77,4 +80,10 @@ public abstract class BaseService { return ws; } + public String getStringStackTrace(Throwable t){ + StringWriter sw = new StringWriter(); + PrintWriter pw = new PrintWriter(sw); + t.printStackTrace(pw); + return sw.toString(); + } } diff --git a/src/main/webapp/WEB-INF/pages/main_new.jsp b/src/main/webapp/WEB-INF/pages/main_new.jsp index 0a4af7f15..01ef2c08b 100644 --- a/src/main/webapp/WEB-INF/pages/main_new.jsp +++ b/src/main/webapp/WEB-INF/pages/main_new.jsp @@ -52,11 +52,13 @@ + +