loadLessonFromPlugin.
- * - * @param context a {@link javax.servlet.ServletContext} object. */ - public void loadLessonFromPlugin(ServletContext context) { + public void loadLessonFromPlugin() { Resource resource = new ClassPathResource("/plugin_lessons/plugin_lessons_marker.txt"); String pluginPath = null; String targetPath = null; @@ -380,7 +378,7 @@ public class Course { public void loadCourses(WebgoatContext webgoatContext, ServletContext context, String path) { logger.info("Loading courses: " + path); this.webgoatContext = webgoatContext; - loadLessonFromPlugin(context); + loadLessonFromPlugin(); LegacyLoader loader = new LegacyLoader(); lessons.addAll(loader.loadLessons(webgoatContext, context, path, properties)); } diff --git a/webgoat-container/src/main/webapp/META-INF/MANIFEST.MF b/webgoat-container/src/main/old/META-INF/MANIFEST.MF similarity index 100% rename from webgoat-container/src/main/webapp/META-INF/MANIFEST.MF rename to webgoat-container/src/main/old/META-INF/MANIFEST.MF diff --git a/webgoat-container/src/main/webapp/META-INF/context.xml b/webgoat-container/src/main/old/META-INF/context.xml similarity index 100% rename from webgoat-container/src/main/webapp/META-INF/context.xml rename to webgoat-container/src/main/old/META-INF/context.xml diff --git a/webgoat-container/src/main/webapp/WEB-INF/context.xml b/webgoat-container/src/main/old/WEB-INF/context.xml similarity index 100% rename from webgoat-container/src/main/webapp/WEB-INF/context.xml rename to webgoat-container/src/main/old/WEB-INF/context.xml diff --git a/webgoat-container/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xmlold b/webgoat-container/src/main/old/WEB-INF/mvc-dispatcher-servlet.xmlold similarity index 100% rename from webgoat-container/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xmlold rename to webgoat-container/src/main/old/WEB-INF/mvc-dispatcher-servlet.xmlold diff --git a/webgoat-container/src/main/webapp/WEB-INF/pages/about.jsp b/webgoat-container/src/main/old/WEB-INF/pages/about.jsp similarity index 100% rename from webgoat-container/src/main/webapp/WEB-INF/pages/about.jsp rename to webgoat-container/src/main/old/WEB-INF/pages/about.jsp diff --git a/webgoat-container/src/main/webapp/WEB-INF/pages/login.jsp b/webgoat-container/src/main/old/WEB-INF/pages/login.jsp similarity index 100% rename from webgoat-container/src/main/webapp/WEB-INF/pages/login.jsp rename to webgoat-container/src/main/old/WEB-INF/pages/login.jsp diff --git a/webgoat-container/src/main/webapp/WEB-INF/pages/logout.jsp b/webgoat-container/src/main/old/WEB-INF/pages/logout.jsp similarity index 100% rename from webgoat-container/src/main/webapp/WEB-INF/pages/logout.jsp rename to webgoat-container/src/main/old/WEB-INF/pages/logout.jsp diff --git a/webgoat-container/src/main/webapp/WEB-INF/pages/main_new.jsp b/webgoat-container/src/main/old/WEB-INF/pages/main_new.jsp similarity index 100% rename from webgoat-container/src/main/webapp/WEB-INF/pages/main_new.jsp rename to webgoat-container/src/main/old/WEB-INF/pages/main_new.jsp diff --git a/webgoat-container/src/main/webapp/WEB-INF/pages/widgets/cookies_and_params.jsp b/webgoat-container/src/main/old/WEB-INF/pages/widgets/cookies_and_params.jsp similarity index 100% rename from webgoat-container/src/main/webapp/WEB-INF/pages/widgets/cookies_and_params.jsp rename to webgoat-container/src/main/old/WEB-INF/pages/widgets/cookies_and_params.jsp diff --git a/webgoat-container/src/main/webapp/WEB-INF/pages/widgets/hints.jsp b/webgoat-container/src/main/old/WEB-INF/pages/widgets/hints.jsp similarity index 100% rename from webgoat-container/src/main/webapp/WEB-INF/pages/widgets/hints.jsp rename to webgoat-container/src/main/old/WEB-INF/pages/widgets/hints.jsp diff --git a/webgoat-container/src/main/webapp/WEB-INF/server-config.wsdd b/webgoat-container/src/main/old/WEB-INF/server-config.wsdd similarity index 97% rename from webgoat-container/src/main/webapp/WEB-INF/server-config.wsdd rename to webgoat-container/src/main/old/WEB-INF/server-config.wsdd index 667abb2df..a32f6c661 100644 --- a/webgoat-container/src/main/webapp/WEB-INF/server-config.wsdd +++ b/webgoat-container/src/main/old/WEB-INF/server-config.wsdd @@ -1,69 +1,69 @@ - -![](\"images/buttons/lessonComplete.jpg\")
";
-
- List categories = course.getCategories();
-
- StringBuffer buildList = new StringBuffer();
-
- Iterator iter1 = categories.iterator();
- while (iter1.hasNext()) {
- Category category = (Category) iter1.next();
-
- buildList.append("'");
- buildList.append(menuPrefix);
- buildList.append(category.getRanking());
- buildList.append("','");
- buildList.append(submenuPrefix);
- buildList.append(category.getRanking());
- buildList.append("','");
- buildList.append(mbutPrefix);
- buildList.append(category.getRanking());
- buildList.append("'");
-
- if (iter1.hasNext()) {
- buildList.append(",");
- }
- }%>
-
-
-
- <%
- int topCord = 140;
- int zIndex = 105;
-
- Iterator iter2 = categories.iterator();
- while (iter2.hasNext()) {
- Category category = (Category) iter2.next();
- %>
-
- <%
- topCord = topCord + 30;
- zIndex = zIndex + 1;
- }
-
- int topSubMenu = 72;
-
- Iterator iter3 = categories.iterator();
- while (iter3.hasNext()) {
- Category category = (Category) iter3.next();
- List lessons = webSession.getLessons(category);
- Iterator iter4 = lessons.iterator();
- %>
- <%
- }%>
-
-
-
-
+<%@ page contentType="text/html; charset=ISO-8859-1" language="java"
+ import="org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.Category, org.owasp.webgoat.lessons.AbstractLesson, org.owasp.webgoat.util.*, java.util.*"
+ errorPage="" %>
+<%
+ WebSession webSession = ((WebSession) session.getAttribute(WebSession.SESSION));
+ Course course = webSession.getCourse();
+ AbstractLesson currentLesson = webSession.getCurrentLesson();
+ LabelManager labelManager = BeanProvider.getBean("labelManager", LabelManager.class);
+%>
+
+
+<%@page import="org.owasp.webgoat.lessons.RandomLessonAdapter"%>
+
+
+
+ 
<%=category.getName()%>
-
-
- <% if (currentLesson.getAvailableLanguages().size() != 0) {
- %>
-
- <%
- } else {
- %>
- Internationalization is not available for this lesson
- <%
- }
- %>
-
- 
-
-
- <%=currentLesson.getTitle()%>
-
- <%
- if (webSession.isAuthorizedInLesson(webSession.getRole(), WebSession.SHOWHINTS)) {
- %>
-
- 
-
-
- 
-
-
- 
-
- <%}%>
-
- 
-
-
- 
-
-
- 
-
- <%
- if (webSession.isAuthorizedInLesson(webSession.getRole(), WebSession.SHOWSOURCE)) {
- %>
-
- 
-
-
- 
-
- <%}%>
-
-
-
-
-
-
-
-
-
-
- <%}%>
-
-
-
-
-
-
-
-
-
- <%
- if (webSession.isAuthorizedInLesson(webSession.getRole(), WebSession.SHOWSOURCE)) {
- %>
-
-
-
-
-
-
- <%}%>
-
-
-
-
-
-
- <%
- if (currentLesson != null) {
- %>
-
- <%
- }
- %>
-
-
- <%
- if (webSession.getHint() != null) {
- printHint = "
"; - out.println(printHint); - } - - if (webSession.getParams() != null) { - Iterator i = webSession.getParams().iterator(); - while (i.hasNext()) { - Parameter p = (Parameter) i.next(); - printParameters = "
"; - out.println(printParameters); - } - } - - if (webSession.getCookies() != null) { - Iterator i = webSession.getCookies().iterator(); - while (i.hasNext()) { - Cookie c = (Cookie) i.next(); - printCookies = "
"; - out.println(printCookies); - } - }%> - -
- " + webSession.getHint() + "
"; - out.println(printHint); - } - - if (webSession.getParams() != null) { - Iterator i = webSession.getParams().iterator(); - while (i.hasNext()) { - Parameter p = (Parameter) i.next(); - printParameters = "
" + p.getName() + "=" + p.getValue() + "
"; - out.println(printParameters); - } - } - - if (webSession.getCookies() != null) { - Iterator i = webSession.getCookies().iterator(); - while (i.hasNext()) { - Cookie c = (Cookie) i.next(); - printCookies = "
" + c.getName() + " ![\"\"](\"images/icons/rightArrow.jpg\")
" + c.getValue() + "
" + c.getValue() + ""; - out.println(printCookies); - } - }%> - -
- <%
- AbstractLesson lesson = webSession.getCurrentLesson();
- if (lesson instanceof RandomLessonAdapter) {
- RandomLessonAdapter rla = (RandomLessonAdapter) lesson;
- %>
-
- Stage <%= rla.getLessonTracker(webSession).getStageNumber(rla.getStage(webSession)) + 1%>
- <%
- }
- %>
- <%=webSession.getInstructions()%><%=webSession.getMessage()%>
-
- <%
- if (currentLesson.getTemplatePage(webSession) != null) {
- //System.out.println("Main.jsp - current lesson: " + currentLesson.getName() );
- //System.out.println(" - template Page: " + currentLesson.getTemplatePage(webSession));
-%>
- <%=currentLesson.getContent()%>
- <%
- }
- %>
-
-
-
- ";
+
+ List categories = course.getCategories();
+
+ StringBuffer buildList = new StringBuffer();
+
+ Iterator iter1 = categories.iterator();
+ while (iter1.hasNext()) {
+ Category category = (Category) iter1.next();
+
+ buildList.append("'");
+ buildList.append(menuPrefix);
+ buildList.append(category.getRanking());
+ buildList.append("','");
+ buildList.append(submenuPrefix);
+ buildList.append(category.getRanking());
+ buildList.append("','");
+ buildList.append(mbutPrefix);
+ buildList.append(category.getRanking());
+ buildList.append("'");
+
+ if (iter1.hasNext()) {
+ buildList.append(",");
+ }
+ }%>
+
+
+
+ <%
+ int topCord = 140;
+ int zIndex = 105;
+
+ Iterator iter2 = categories.iterator();
+ while (iter2.hasNext()) {
+ Category category = (Category) iter2.next();
+ %>
+
+ <%
+ topCord = topCord + 30;
+ zIndex = zIndex + 1;
+ }
+
+ int topSubMenu = 72;
+
+ Iterator iter3 = categories.iterator();
+ while (iter3.hasNext()) {
+ Category category = (Category) iter3.next();
+ List lessons = webSession.getLessons(category);
+ Iterator iter4 = lessons.iterator();
+ %>
+ <%
+ }%>
+
+
+
+
diff --git a/webgoat-container/src/main/webapp/plugin_lessons/ReadMe.txt b/webgoat-container/src/main/old/plugin_lessons/ReadMe.txt
similarity index 100%
rename from webgoat-container/src/main/webapp/plugin_lessons/ReadMe.txt
rename to webgoat-container/src/main/old/plugin_lessons/ReadMe.txt
diff --git a/webgoat-container/src/main/old/plugin_lessons/command-injection-1.0.jar b/webgoat-container/src/main/old/plugin_lessons/command-injection-1.0.jar
new file mode 100644
index 000000000..0dfd22c05
Binary files /dev/null and b/webgoat-container/src/main/old/plugin_lessons/command-injection-1.0.jar differ
diff --git a/webgoat-container/src/main/old/plugin_lessons/common-1.0.jar b/webgoat-container/src/main/old/plugin_lessons/common-1.0.jar
new file mode 100644
index 000000000..7ef3bbfa3
Binary files /dev/null and b/webgoat-container/src/main/old/plugin_lessons/common-1.0.jar differ
diff --git a/webgoat-container/src/main/old/plugin_lessons/cross-site-scripting-1.0.jar b/webgoat-container/src/main/old/plugin_lessons/cross-site-scripting-1.0.jar
new file mode 100644
index 000000000..04cb8aa8c
Binary files /dev/null and b/webgoat-container/src/main/old/plugin_lessons/cross-site-scripting-1.0.jar differ
diff --git a/webgoat-container/src/main/old/plugin_lessons/csrf-1.0.jar b/webgoat-container/src/main/old/plugin_lessons/csrf-1.0.jar
new file mode 100644
index 000000000..690e67704
Binary files /dev/null and b/webgoat-container/src/main/old/plugin_lessons/csrf-1.0.jar differ
diff --git a/webgoat-container/src/main/old/plugin_lessons/csrf-prompt-by-pass-1.0.jar b/webgoat-container/src/main/old/plugin_lessons/csrf-prompt-by-pass-1.0.jar
new file mode 100644
index 000000000..29f77c5cd
Binary files /dev/null and b/webgoat-container/src/main/old/plugin_lessons/csrf-prompt-by-pass-1.0.jar differ
diff --git a/webgoat-container/src/main/old/plugin_lessons/goat-hills-financial-1.0.jar b/webgoat-container/src/main/old/plugin_lessons/goat-hills-financial-1.0.jar
new file mode 100644
index 000000000..2ec2f5017
Binary files /dev/null and b/webgoat-container/src/main/old/plugin_lessons/goat-hills-financial-1.0.jar differ
diff --git a/webgoat-container/src/main/old/plugin_lessons/soap-request-1.0.jar b/webgoat-container/src/main/old/plugin_lessons/soap-request-1.0.jar
new file mode 100644
index 000000000..21b0f4b5e
Binary files /dev/null and b/webgoat-container/src/main/old/plugin_lessons/soap-request-1.0.jar differ
diff --git a/webgoat-container/src/main/old/plugin_lessons/ws-sql-injection-1.0.jar b/webgoat-container/src/main/old/plugin_lessons/ws-sql-injection-1.0.jar
new file mode 100644
index 000000000..764a2d7c1
Binary files /dev/null and b/webgoat-container/src/main/old/plugin_lessons/ws-sql-injection-1.0.jar differ
diff --git a/webgoat-container/src/main/old/plugin_lessons/wsdl-scanning-1.0.jar b/webgoat-container/src/main/old/plugin_lessons/wsdl-scanning-1.0.jar
new file mode 100644
index 000000000..79685c461
Binary files /dev/null and b/webgoat-container/src/main/old/plugin_lessons/wsdl-scanning-1.0.jar differ
diff --git a/webgoat-container/src/main/webapp/reportBug.jsp b/webgoat-container/src/main/old/reportBug.jsp
similarity index 100%
rename from webgoat-container/src/main/webapp/reportBug.jsp
rename to webgoat-container/src/main/old/reportBug.jsp
diff --git a/webgoat-container/src/main/webapp/sideWindow.jsp b/webgoat-container/src/main/old/sideWindow.jsp
similarity index 96%
rename from webgoat-container/src/main/webapp/sideWindow.jsp
rename to webgoat-container/src/main/old/sideWindow.jsp
index b9766a0a6..e52657514 100644
--- a/webgoat-container/src/main/webapp/sideWindow.jsp
+++ b/webgoat-container/src/main/old/sideWindow.jsp
@@ -1,28 +1,28 @@
-<%@ page contentType="text/html; charset=ISO-8859-1" language="java"
- import="org.owasp.webgoat.session.WebSession"
- errorPage="" %>
-
-<%
-WebSession webSession = ((WebSession)session.getAttribute("websession"));
-%>
-
-
-
-
-
-
+
+
+ <% if (currentLesson.getAvailableLanguages().size() != 0) {
+ %>
+
+ <%
+ } else {
+ %>
+ Internationalization is not available for this lesson
+ <%
+ }
+ %>
+
+
+
+
+ <%=currentLesson.getTitle()%>
+
+ <%
+ if (webSession.isAuthorizedInLesson(webSession.getRole(), WebSession.SHOWHINTS)) {
+ %>
+
+
+
+
+
+
+
+
+
+ <%}%>
+
+
+
+
+
+
+
+
+
+ <%
+ if (webSession.isAuthorizedInLesson(webSession.getRole(), WebSession.SHOWSOURCE)) {
+ %>
+
+
+
+
+
+
+ <%}%>
+
+
+
+
+
+
+
+
+
+
+ <%}%>
+
+
+
+
+
+
+
+
+
+ <%
+ if (webSession.isAuthorizedInLesson(webSession.getRole(), WebSession.SHOWSOURCE)) {
+ %>
+
+
+
+
+
+
+ <%}%>
+
+
+
+
+
+
+ <%
+ if (currentLesson != null) {
+ %>
+
+ <%
+ }
+ %>
+
+
+ <%
+ if (webSession.getHint() != null) {
+ printHint = "
"; + out.println(printHint); + } + + if (webSession.getParams() != null) { + Iterator i = webSession.getParams().iterator(); + while (i.hasNext()) { + Parameter p = (Parameter) i.next(); + printParameters = "
"; + out.println(printParameters); + } + } + + if (webSession.getCookies() != null) { + Iterator i = webSession.getCookies().iterator(); + while (i.hasNext()) { + Cookie c = (Cookie) i.next(); + printCookies = "
"; + out.println(printCookies); + } + }%> + +
+ " + webSession.getHint() + "
"; + out.println(printHint); + } + + if (webSession.getParams() != null) { + Iterator i = webSession.getParams().iterator(); + while (i.hasNext()) { + Parameter p = (Parameter) i.next(); + printParameters = "
" + p.getName() + "=" + p.getValue() + "
"; + out.println(printParameters); + } + } + + if (webSession.getCookies() != null) { + Iterator i = webSession.getCookies().iterator(); + while (i.hasNext()) { + Cookie c = (Cookie) i.next(); + printCookies = "
" + c.getName() + " " + c.getValue() + "
" + c.getValue() + ""; + out.println(printCookies); + } + }%> + +
+ <%
+ AbstractLesson lesson = webSession.getCurrentLesson();
+ if (lesson instanceof RandomLessonAdapter) {
+ RandomLessonAdapter rla = (RandomLessonAdapter) lesson;
+ %>
+
+ Stage <%= rla.getLessonTracker(webSession).getStageNumber(rla.getStage(webSession)) + 1%>
+ <%
+ }
+ %>
+ <%=webSession.getInstructions()%><%=webSession.getMessage()%>
+
+ <%
+ if (currentLesson.getTemplatePage(webSession) != null) {
+ //System.out.println("Main.jsp - current lesson: " + currentLesson.getName() );
+ //System.out.println(" - template Page: " + currentLesson.getTemplatePage(webSession));
+%>
+ <%=currentLesson.getContent()%>
+ <%
+ }
+ %>
+
+
+
+
- <%
- String source = webSession.getSource();
- if (source != null)
- {
- String printSource = "
"; - out.println(printSource); - } - %> -
-
-
+<%@ page contentType="text/html; charset=ISO-8859-1" language="java"
+ import="org.owasp.webgoat.session.WebSession"
+ errorPage="" %>
+
+<%
+WebSession webSession = ((WebSession)session.getAttribute("websession"));
+%>
+
+
+
+
+
+" + source + "
"; - out.println(printSource); - } - %> -
+ <%
+ String source = webSession.getSource();
+ if (source != null)
+ {
+ String printSource = "
"; + out.println(printSource); + } + %> +
+
+
diff --git a/webgoat-container/src/main/webapp/users/ReadMe.txt b/webgoat-container/src/main/old/users/ReadMe.txt
similarity index 100%
rename from webgoat-container/src/main/webapp/users/ReadMe.txt
rename to webgoat-container/src/main/old/users/ReadMe.txt
diff --git a/webgoat-container/src/main/webapp/webgoat.jsp b/webgoat-container/src/main/old/webgoat.jsp
similarity index 100%
rename from webgoat-container/src/main/webapp/webgoat.jsp
rename to webgoat-container/src/main/old/webgoat.jsp
diff --git a/webgoat-container/src/main/webapp/webgoat_challenge.jsp b/webgoat-container/src/main/old/webgoat_challenge.jsp
similarity index 97%
rename from webgoat-container/src/main/webapp/webgoat_challenge.jsp
rename to webgoat-container/src/main/old/webgoat_challenge.jsp
index ac437dab9..65b61ee55 100644
--- a/webgoat-container/src/main/webapp/webgoat_challenge.jsp
+++ b/webgoat-container/src/main/old/webgoat_challenge.jsp
@@ -1,100 +1,100 @@
-<%@ page contentType="text/html; charset=ISO-8859-1" language="java"
- errorPage=""%>
-
-
-
-
+<%@ page contentType="text/html; charset=ISO-8859-1" language="java"
+ errorPage=""%>
+
+
+
+
diff --git a/webgoat-container/src/main/webapp/WEB-INF/lib/placeholder.txt b/webgoat-container/src/main/webapp/WEB-INF/lib/placeholder.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/webgoat_developer_bootstrap.sh b/webgoat_developer_bootstrap.sh
index 3a6762c6c..45d52e3bf 100755
--- a/webgoat_developer_bootstrap.sh
+++ b/webgoat_developer_bootstrap.sh
@@ -164,7 +164,7 @@ developer_bootstrap() {
horizontal_rule
echo "$COL_MAGENTA"
echo "$COL_CYAN ***** Starting WebGoat using the embedded Tomcat ***** $COL_RESET"
- echo " Please be patient.... The startup of the server can take from 30s to 3 minutes."
+ echo " Please be patient.... The startup of the server takes about 5 seconds..."
echo " WebGoat will be ready for you when you see the following message on the command prompt:"
echo "$COL_YELLOW INFO: Starting ProtocolHandler ["http-bio-8080"] $COL_RESET"
echo "$COL_CYAN When you see the message above, open a web browser and navigate to http://localhost:8080/WebGoat/ $COL_RESET"
@@ -179,7 +179,7 @@ developer_bootstrap() {
sleep 5
# Starting WebGoat
- mvn -q -DskipTests -file WebGoat/pom.xml -pl webgoat-container tomcat7:run-war
+ mvn -q -pl webgoat-container spring-boot:run
}
# Start main script
" + source + "
"; + out.println(printSource); + } + %> +