986 Commits

Author SHA1 Message Date
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
nbaars
bb0d27d14b properties now correctly loaden 2015-01-10 10:43:00 +01:00
nbaars
2828e5143e restored local controller 2015-01-10 10:35:46 +01:00
nbaars
36ea6ad12d clean i18n directory when first time loading 2015-01-10 10:24:51 +01:00
nbaars
3d6236242f properties loaded from plugin 2015-01-10 10:12:08 +01:00
nbaars
3d8a345264 Added the resource bundles in the already present WebGoatLabels.properties temporary workaround 2015-01-07 17:34:33 +01:00
nbaars
744630ca4c Lesson source file, lesson plan and lesson solution are loaded from the plugin. 2015-01-07 13:45:27 +01:00
nbaars
da7feccffb coupled WEB-173 with webcontainer 2015-01-06 17:49:42 +01:00
nbaars
b7d5bf4dd1 building war and jar 2015-01-06 14:37:41 +01:00
nbaars
60ed5d7020 Restoring conf management page, server crashed during startup 2015-01-06 13:01:17 +01:00
nbaars
fdae4a1172 Changing jar to war 2015-01-05 21:15:44 +01:00
nbaars
6aa3092761 changing language level to Java 7 2015-01-05 20:57:38 +01:00
nbaars
6c83ee5cb1 Changed the config of the Tomcat plugin 2015-01-05 19:11:17 +01:00
nbaars
3525226e68 Adding possibility to reload the plugins 2015-01-05 19:10:36 +01:00
nbaars
34694b01c0 refactored so the extracting is not tangled with the loading the plugin 2015-01-04 14:18:48 +01:00
nbaars
c39d673439 removed main method used for testing 2015-01-04 13:27:35 +01:00
nbaars
ca6984e939 Also extract html files
(cherry picked from commit 856bdab)
2015-01-04 13:26:35 +01:00
nbaars
0d48b83e82 Also extract html files
(cherry picked from commit 2933b79)
2015-01-04 13:26:02 +01:00
nbaars
720040d1f8 Loading classes from the plugin archive
(cherry picked from commit 2adf04c)
2015-01-04 13:25:39 +01:00
Bruce Mayhew
4f6ba2711f Changed the pom to build the container artifact and deleted the plugin 2015-01-02 14:29:08 -05:00
Bruce Mayhew
1a5358458c Removed all lesson specific source and resources 2015-01-02 13:40:15 -05:00
mayhew64
06237b8cef Merge pull request #28 from juliadotter/WEB-169
Fixed bug WEB-169
2014-12-19 07:16:14 -05:00
mayhew64
8ee94df8b4 Merge pull request #27 from juliadotter/WEB-172
Fixed bug WEB-172
2014-12-19 07:15:32 -05:00
mayhew64
ebee8e9562 Merge pull request #24 from arajparaj/master
Fixed the link to download jar file
2014-12-19 07:13:33 -05:00
mayhew64
3311cef85c Merge pull request #22 from jaqqbek/ZipBomb
New Lesson ZipBomb
2014-12-19 07:12:50 -05:00
Jason White
bd103ed8db Merging fix for WEB-161 .. http-only link fix 2014-12-17 20:02:32 -05:00
Nina Alex Juliadotter
1fd2fd7b42 Fixed bug WEB-169 2014-12-15 19:52:53 +11:00
Nina Alex Juliadotter
d714aad80f Fixed bug WEB-172 2014-12-15 18:39:45 +11:00
Nina Alex Juliadotter
e0da681402 Resolve HttpOnly Test bug WEB-161 2014-12-09 20:52:35 +11:00