914 Commits

Author SHA1 Message Date
Nanne Baars
21d450f320 Added a method so we can fetch the absolute path of a lesson 2015-06-26 11:00:18 +02:00
Nanne Baars
df0034cbc2 Fixed rewriting paths in the jsp/js and css resources 2015-06-23 22:56:56 +02:00
mayhew64
1e7edc83ef Merge pull request #6 from nbaars/master
Classloader introduced
2015-06-22 09:47:00 -04:00
Nanne Baars
09cd0fcb3a fixed merge issue 2015-06-22 13:38:58 +02:00
Nanne Baars
9d6ae40665 Updated README for the new classloader module 2015-06-22 13:24:27 +02:00
Nanne Baars
08beac23b5 Added methods for retrieving the correct directory in which resources resided (like js, jsp etc) 2015-06-22 13:13:48 +02:00
Nanne Baars
d1d31e158c Adding gitgnore 2015-06-19 14:50:19 +02:00
Nanne Baars
bcad926986 Adding the release directory 2015-06-19 14:47:58 +02:00
Nanne Baars
896dc18a50 Adding the classloader directory 2015-06-19 14:47:20 +02:00
Nanne Baars
d5e7977f05 Merge branch 'classloading' 2015-06-19 13:53:37 +02:00
Nanne Baars
c71d774abf Fixed classloading issue when using a jsp in a lesson 2015-06-19 13:52:43 +02:00
mayhew64
b01aef83f8 Merge pull request #5 from iammyr/patch-1
Instructions for manual deployment
2015-06-17 08:49:16 -04:00
Myriam Leggieri
edc57f1b5a Instructions for manual deployment
Include instructions for developers on how to manually deploy the project in tomcat. In particular, it wouldn't be immediate otherwise, to figure out that it is necessary to clone WebGoat-Lessons first. Otherwise the app would be stuck on the login page.
2015-06-17 10:00:03 +01:00
mayhew64
a80313b26b Merge pull request #4 from nbaars/master
Renamed the jar file
2015-05-11 12:58:40 -04:00
Nanne Baars
c24f556544 Renamed the jar file 2015-05-11 18:38:54 +03:00
mayhew64
717f4a3258 Merge pull request #3 from nbaars/fixing-classloader-issue
Fixed classloading issues when a lesson contains an inner class. The plu...
2015-05-04 12:37:34 -04:00
Nanne Baars
264824eb14 Fixed classloading issues when a lesson contains an inner class. The plugin classloader only expected the lesson to be loaded, now we keep track of all the classes loaded for each plugin. For each class found in the plugin a plugin classloader was created we need one classloader per plugin
Also needed to rewrite the findClass method to lookup the class in the list instead of loading the class from the byte array.
2015-05-04 15:25:28 +02:00
mayhew64
6e8d8562d6 WEB-203 deprecated getCredits - credits moved to the about page 2015-05-03 16:31:52 -04:00
mayhew64
547fd36507 Merge pull request #2 from nbaars/master
Generate separate jar file to use in the lessons project
2015-05-03 07:27:32 -04:00
Nanne Baars
7ce17e7404 Merge remote-tracking branch 'upstream/master' 2015-05-03 07:56:35 +02:00
Nanne Baars
6866208ca2 Changed pom.xml to also build a jar file and upload it to the repository 2015-05-03 07:50:29 +02:00
mayhew64
8a55a73a01 Update pom.xml
Change the artifact to be lower case; web goat-container vs WebGoat-Container
2015-05-02 19:15:49 -04:00
mayhew64
b0fc816fbf Merge pull request #1 from nbaars/master
Bug fix: lesson solution not showing
2015-04-23 16:09:48 -04:00
nbaars
35c8c79138 Fixing pom warnings during maven build 2015-04-11 07:18:57 +02:00
nbaars
b439c6100e Added error logging for missing lesson solution 2015-04-06 18:45:13 +02:00
nbaars
edbb09250c Solution was no longer showing in WebGoat 2015-04-06 18:33:38 +02:00
mayhew64
6116b8e368 Merge pull request #42 from nbaars/webgoat-container
Webgoat container
2015-03-06 08:25:28 -05:00
nbaars
3e9331d46e Refactoring creation of the lesson moving it towards the plugin 2015-03-01 15:59:42 +01:00
nbaars
4865a4b606 Solution and Java source are optional they don't need to be presnt in a plugin 2015-03-01 15:49:27 +01:00
mayhew64
b6257c0fbc Merge pull request #41 from nbaars/webgoat-container
Webgoat container
2015-02-27 13:19:34 -05:00
nbaars
6e25026391 Merge remote-tracking branch 'upstream/webgoat-container' into webgoat-container
Conflicts:
	src/main/java/org/owasp/webgoat/session/Course.java
2015-02-23 20:33:22 +01:00
nbaars
a815692149 Added plugin_extracted to gitignore 2015-02-23 20:29:09 +01:00
nbaars
f140669edf WEB-197 Images referenced in the plans are not changed by the plugin loader 2015-02-23 12:45:19 +01:00
nbaars
32b6ef9c53 Fixed WEB-198 Text of the lesson plan not above the assignment 2015-02-23 12:43:26 +01:00
mayhew64
4c30957a2d Merge pull request #36 from WebGoat/legacy-loader
WEB-183 Loading of Admin screens
Nanne +1'd
2015-02-12 12:37:46 -05:00
nbaars
cce6e2ff99 Merge remote-tracking branch 'upstream/webgoat-container' into webgoat-container 2015-02-11 17:46:48 +01:00
mayhew64
6460314bcb Merge pull request #35 from nbaars/webgoat-container
Added separate log file for testing purposes
2015-02-10 19:03:38 -05:00
Bruce Mayhew
b447c2a119 WEB-183 Loading of Admin screens 2015-02-10 15:54:25 -05:00
nbaars
d9ef5fc2ce Merge remote-tracking branch 'upstream/webgoat-container' into webgoat-container 2015-02-10 16:23:07 +01:00
nbaars
450c0f673f Added separate log file for testing purposes 2015-02-10 14:56:02 +01:00
mayhew64
f6a839251a Merge pull request #34 from nbaars/webgoat-container
This looks good.  Nice improvements
2015-02-08 10:24:24 -05:00
nbaars
bc21a86b68 Fixed hard coded rewriting of html files was fixed on SqlStringInjection
Added testcases for this situation
2015-02-08 14:12:01 +01:00
nbaars
861f3e9d37 Moved loading to separate object. Added a unit test for loading the properties 2015-02-07 12:40:17 +01:00
Bruce Mayhew
1d7ecb0627 moved global properties from lessons to container, added loading of global properties to course, updated SqlInjection lesson 2015-02-06 08:49:06 -05:00
Bruce Mayhew
cbc58dc4fa Merge branch 'webgoat-container' of https://github.com/WebGoat/WebGoat into webgoat-container 2015-01-28 07:02:26 -05:00
Bruce Mayhew
887b81e1a4 removing residual plugin files for sql injection 2015-01-28 06:58:41 -05:00
mayhew64
6fc708a705 Merge pull request #33 from nbaars/webgoat-container
Webgoat container
2015-01-28 06:50:54 -05:00
nbaars
5d2019fb18 making the images work as well 2015-01-15 21:38:11 +01:00
nbaars
9b033a360a new lessons jar 2015-01-13 19:27:20 +01:00
nbaars
b0619ef5db clean up course class 2015-01-11 18:52:55 +01:00