572 Commits

Author SHA1 Message Date
Nanne Baars
e1829e209c Implemented lesson information which gives a mapping between the menu and the actual WebGoat-Lessons project. 2015-10-04 11:56:12 +02:00
Nanne Baars
a6a1b32939 Removed credits from lessons 2015-10-03 18:21:54 +02:00
Nanne Baars
487bc71df1 Moved the logic to the plugin loader which makes the context listener obsolete 2015-09-30 23:08:10 +02:00
Nanne Baars
219b38315b Make sure WEB-INF/lib dir is available 2015-09-30 19:10:33 +02:00
Nanne Baars
2ca5dda37b Reloading finished 2015-09-30 19:03:49 +02:00
Nanne Baars
6a00d66f8b Plugins are now reloaded 2015-09-29 21:41:36 +02:00
Nanne Baars
33d251a147 Fixed goathills lesson with JSP now load correctly again(2) 2015-09-29 20:39:09 +02:00
Nanne Baars
d4450da5d7 Fixed goathills lesson with JSP now load correctly again 2015-09-28 23:27:58 +02:00
Nanne Baars
c0d727d1f2 Merge remote-tracking branch 'upstream/master' 2015-09-24 10:09:38 +02:00
Nanne Baars
86e4fd1c85 i8n highlighting #96 2015-09-24 10:09:07 +02:00
mayhew64
77f3c5135f Merge pull request #101 from misfir3/master
#97, updating controls for hints, source, solution and plans on lessons
2015-09-23 10:00:12 -04:00
Jason White
1bd6a9e0e7 #97, updating controls for hints, source, solution and plans on lessons in challenge roles 2015-09-23 09:01:45 -04:00
Nanne Baars
87d196c427 Return indication that plugins have been reloaded 2015-09-22 21:13:41 +02:00
Nanne Baars
6f8befd9a4 Merge remote-tracking branch 'upstream/master' 2015-09-22 20:40:02 +02:00
Nanne Baars
8d2771c108 Adding the ability to reload plugins directly from the interface instead of restarting Tomcat 2015-09-22 20:38:19 +02:00
Jason White
dc57827cfc #97, Hint controls for CHALLENGE Category lessons 2015-09-21 21:24:10 -04:00
Jason White
6e670c4ac5 #23, #24 - LessonInfo Service now used for TitleView and HelpControlsView 2015-09-20 00:09:38 -04:00
Nanne Baars
901eff682f Properties are appended when loading plugins (#29) 2015-09-19 08:07:54 +02:00
mayhew64
5788fe7afe Added a lesson restart for lesson specific restart actions 2015-09-18 15:46:39 -04:00
mayhew64
ff0d5af9d2 Merge pull request #82 from mayhew64/master
Updated contributors and sponsors
2015-09-18 15:31:41 -04:00
mayhew64
1e860928e6 Revert "Added a lesson restart call to allow lesson specific restart functionality"
This reverts commit 5365f632e7d2277fa024b5a0863654c416c0b3bc.
2015-09-18 15:30:17 -04:00
mayhew64
5365f632e7 Added a lesson restart call to allow lesson specific restart functionality 2015-09-18 13:30:32 -04:00
Doug Morato
6147aebf61 Fixing inconsistent merge issues implementing nbaars fixes 2015-09-18 12:40:05 -04:00
mayhew64
7ce8273376 Updated contributors and sponsors 2015-09-18 08:39:15 -04:00
Doug Morato
06abc6e08a Merge pull request #80 from misfir3/master
#72, defaulting to firstLesson on initial redirect
2015-09-17 22:53:25 -04:00
Doug Morato
214d52685f Merge fixes from Nanne
# By Nanne Baars
# Via Nanne Baars
* 'master' of git://github.com/nbaars/WebGoat:
  Fixed loading plugins: sometimes failed file was not correctly extracted

# Conflicts:
#	webgoat-container/src/main/java/org/owasp/webgoat/plugins/Plugin.java
#	webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginExtractor.java
#	webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginFileUtils.java
#	webgoat-container/src/main/java/org/owasp/webgoat/util/LabelProvider.java
2015-09-17 22:45:14 -04:00
Jason White
9613e703f1 #72, defaulting to firstLesson on initial redirect 2015-09-17 22:24:57 -04:00
Nanne Baars
9474f66d96 Fixed loading plugins: sometimes failed file was not correctly extracted 2015-09-17 07:29:51 +02:00
Doug Morato
54b6a7e843 Adding WebGoatLabels_en.properties to fix warning on ENGLISH locale 2015-09-16 21:12:44 -04:00
Doug Morato
a8ce11ee14 Initial work on adding more browsers to SauceLabs testing 2015-09-16 21:11:54 -04:00
Doug Morato
f3b52d4423 Improving naming convention on tomcat execution goal for integration tests 2015-09-16 21:10:11 -04:00
Doug Morato
e8b9b17107 Fix javadoc errors in order to comply with Maven OSS requirements 2015-09-15 22:24:11 -04:00
Doug Morato
7b43c89e1c Improve poms to comply with Maven OSS submission requirements 2015-09-15 22:22:40 -04:00
Nanne Baars
d142407de3 Discover Clues in HTML lesson doesn't work #70 2015-09-15 23:36:24 +02:00
Nanne Baars
f31150ffdf Property files are now detected while extracting the plugin 2015-09-15 18:27:11 +02:00
Jason White
78215a7f55 #28 reimplemented for 7.0/Backbone implementation 2015-09-13 00:15:19 -04:00
Jason White
9348a0d70e Should resolve issues #25 and #2 using a backbone view to control those nav buttons 2015-09-09 12:36:36 -04:00
Nanne Baars
543e35caa1 Removed duplicate css import 2015-09-06 11:51:00 +02:00
Nanne Baars
e22ad201e6 Re-enable/update WebGoat Info link #26 2015-09-05 16:53:23 +02:00
Nanne Baars
e294bd39b9 User Info/Logout Links #25 2015-09-05 16:03:18 +02:00
Nanne Baars
18204c62c6 LessonAdapter did not read the 'New Lesson Instructions.txt' (IOException) 2015-09-05 09:43:03 +02:00
Nanne Baars
112386b43e Lab - DOM-based cross-site scripting: Java Source produces XSS alert #38 2015-09-02 23:22:24 +02:00
Nanne Baars
5ca36502d3 Weird JDK 8 issue about unable to find properties files, applied a fix and added extra logging 2015-09-01 22:52:43 +02:00
Nanne Baars
2f43c16cc1 Clicking on 'LAB: Role Based Access Control' produces 'Invalid Session' in UI #44 2015-08-28 16:24:04 +02:00
Nanne Baars
a44e08cbfd Adjusted LabelProvider to use other loader 2015-08-28 07:55:49 +02:00
Nanne Baars
010404d2e1 Increase performance while extracting the plugins 2015-08-28 07:07:12 +02:00
Nanne Baars
e81cbd34ca Http Basics lessons fails to load #53 2015-08-27 08:44:25 +02:00
mayhew64
c67bd73768 Merge pull request #50 from dougmorato/testing_work
Adding headless Integration Tests with Sauce Labs
2015-08-26 09:16:36 -04:00
Jason White
5921a098d7 Fix for #46 (Lesson Help toggle plus cleaning up button text) && fix for #39 2015-08-26 06:01:28 +02:00
Doug Morato
62db0bfdef Adding basic Integration Tests with Sauce Labs integration 2015-08-24 19:24:22 -04:00