diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/LessonSource.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/LessonSource.java index 4cd252bd9..9f8ff6470 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/LessonSource.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/LessonSource.java @@ -168,7 +168,7 @@ public class LessonSource extends HammerHead } if (source == null) { - return "Source code is not available. Contact webgoat@aspectsecurity.com"; + return "Source code is not available. Contact webgoat@g2-inc.com"; } return (source.replaceAll("(?s)" + START_SOURCE_SKIP + ".*" + END_SOURCE_SKIP, "Code Section Deliberately Omitted")); diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/AbstractLesson.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/AbstractLesson.java index 76382f6e3..109f7c13c 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/AbstractLesson.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/AbstractLesson.java @@ -696,10 +696,10 @@ public abstract class AbstractLesson extends Screen implements Comparable Head head = new Head(); head.addElement(new Title(getSourceFileName())); head.addElement(new StringElement( - "")); + "")); head .addElement(new StringElement( - "")); + "")); Body body = new Body(); body.addElement(new StringElement(src)); @@ -1111,35 +1111,7 @@ public abstract class AbstractLesson extends Screen implements Comparable * Description of the Parameter * @return Description of the Return Value */ - /* - * public String makeSourceHTML( WebSession s ) { - * - * String className = this.getClass().getName(); String lessonName = - * className.substring( className.indexOf( '.' ) + 1 ); String filename = - * s.getSourceFile( lessonName ); - * - * String src = null; - * - * try { src = convertMetacharsJavaCode( readFromFile( new - * BufferedReader( new FileReader( filename ) ), true ) ); - * } catch ( IOException e ) { s.setMessage( "Could not find source - * file" ); src = ( "Could not find source file" ); } - * - * Html html = new Html(); - * - * Head head = new Head(); head.addElement( new Title( lessonName + - * ".java" ) ); head.addElement( new StringElement( "" ) ); head.addElement( new - * StringElement( "" ) ); - * - * Body body = new Body(); body.addElement( new StringElement( src ) ); - * - * html.addElement( head ); html.addElement( body ); - * - * return html.toString(); } - */ - + public String toString() { return getTitle(); diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/WebSession.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/WebSession.java index 90b16d495..35d09d26d 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/WebSession.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/WebSession.java @@ -247,7 +247,7 @@ public class WebSession private boolean enterprise = false; - private String feedbackAddress = "webgoat@aspectsecurity.com"; + private String feedbackAddress = "webgoat@g2-inc.com"; private boolean completedHackableAdmin = false; diff --git a/ webgoat/main/project/WebContent/WEB-INF/web-unix.xml b/ webgoat/main/project/WebContent/WEB-INF/web-unix.xml index 15b91165f..9951b3e7f 100644 --- a/ webgoat/main/project/WebContent/WEB-INF/web-unix.xml +++ b/ webgoat/main/project/WebContent/WEB-INF/web-unix.xml @@ -11,9 +11,8 @@ This web application is designed to demonstrate web application security flaws for the purpose of educating developers and security professionals about web - application security problems. The initial version was - written by Aspect Security (info@aspectsecurity.com), - and was donated to the OWASP. + application security problems. Please contact Bruce Mayhew + (webgoat@g2-inc.com) if you have any questions. @@ -37,7 +36,7 @@ email - info@aspectsecurity.com + WebGoat@g2-inc.com The EMAIL address of the administrator to whom questions and comments about this application should be addressed. @@ -139,7 +138,7 @@ example, replace "<" with "<" and ">" with ">". --> FeedbackAddress - <A HREF=mailto:webgoat@aspectsecurity.com>webgoat@aspectsecurity.com</A> + <A HREF=mailto:webgoat@g2-inc.com>webgoat@g2-inc.com</A> diff --git a/ webgoat/main/project/WebContent/WEB-INF/web-windows.xml b/ webgoat/main/project/WebContent/WEB-INF/web-windows.xml index fa164859a..e3595d6f5 100644 --- a/ webgoat/main/project/WebContent/WEB-INF/web-windows.xml +++ b/ webgoat/main/project/WebContent/WEB-INF/web-windows.xml @@ -11,9 +11,8 @@ This web application is designed to demonstrate web application security flaws for the purpose of educating developers and security professionals about web - application security problems. The initial version was - written by Aspect Security (info@aspectsecurity.com), - and was donated to the OWASP. + application security problems. Please contact Bruce Mayhew + (webgoat@g2-inc.com) if you have any questions. @@ -37,7 +36,7 @@ email - info@aspectsecurity.com + WebGoat@g2-inc.com The EMAIL address of the administrator to whom questions and comments about this application should be addressed. @@ -139,7 +138,7 @@ example, replace "<" with "<" and ">" with ">". --> FeedbackAddress - <A HREF=mailto:webgoat@aspectsecurity.com>webgoat@aspectsecurity.com</A> + <A HREF=mailto:WebGoat@g2-inc.com>WebGoat@g2-inc.com</A> diff --git a/ webgoat/main/project/WebContent/WEB-INF/web.xml b/ webgoat/main/project/WebContent/WEB-INF/web.xml index fa164859a..da78355ce 100644 --- a/ webgoat/main/project/WebContent/WEB-INF/web.xml +++ b/ webgoat/main/project/WebContent/WEB-INF/web.xml @@ -11,9 +11,8 @@ This web application is designed to demonstrate web application security flaws for the purpose of educating developers and security professionals about web - application security problems. The initial version was - written by Aspect Security (info@aspectsecurity.com), - and was donated to the OWASP. + application security problems. Please contact Bruce Mayhew + (webgoat@g2-inc.com) if you have any questions. @@ -37,7 +36,7 @@ email - info@aspectsecurity.com + WebGoat@g2-inc.com The EMAIL address of the administrator to whom questions and comments about this application should be addressed. @@ -139,7 +138,7 @@ example, replace "<" with "<" and ">" with ">". --> FeedbackAddress - <A HREF=mailto:webgoat@aspectsecurity.com>webgoat@aspectsecurity.com</A> + <A HREF=mailto:webgoat@g2-inc.com>webgoat@g2-inc.com</A>