Commit Graph

333 Commits

Author SHA1 Message Date
33dc855da7 merging from upstream
Merge remote-tracking branch 'upstream/master'
2015-05-07 18:15:47 -04:00
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
6e8d8562d6 WEB-203 deprecated getCredits - credits moved to the about page 2015-05-03 16:31:52 -04:00
6866208ca2 Changed pom.xml to also build a jar file and upload it to the repository 2015-05-03 07:50:29 +02:00
7a5c8083f5 recent changes, commit prior to merge 2015-04-25 22:12:52 -04:00
22c4ed27e4 merging from upstream WebGoat
Merge remote-tracking branch 'upstream/master'
2015-04-24 07:04:30 -04:00
1f4024d158 Initial cutover to backbone/underscore/require 2015-04-21 18:40:14 -04:00
b439c6100e Added error logging for missing lesson solution 2015-04-06 18:45:13 +02:00
edbb09250c Solution was no longer showing in WebGoat 2015-04-06 18:33:38 +02:00
3e9331d46e Refactoring creation of the lesson moving it towards the plugin 2015-03-01 15:59:42 +01:00
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
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
f140669edf WEB-197 Images referenced in the plans are not changed by the plugin loader 2015-02-23 12:45:19 +01:00
32b6ef9c53 Fixed WEB-198 Text of the lesson plan not above the assignment 2015-02-23 12:43:26 +01:00
4c30957a2d Merge pull request from WebGoat/legacy-loader
WEB-183 Loading of Admin screens
Nanne +1'd
2015-02-12 12:37:46 -05:00
b447c2a119 WEB-183 Loading of Admin screens 2015-02-10 15:54:25 -05:00
450c0f673f Added separate log file for testing purposes 2015-02-10 14:56:02 +01:00
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
861f3e9d37 Moved loading to separate object. Added a unit test for loading the properties 2015-02-07 12:40:17 +01:00
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
cbc58dc4fa Merge branch 'webgoat-container' of https://github.com/WebGoat/WebGoat into webgoat-container 2015-01-28 07:02:26 -05:00
887b81e1a4 removing residual plugin files for sql injection 2015-01-28 06:58:41 -05:00
5d2019fb18 making the images work as well 2015-01-15 21:38:11 +01:00
9b033a360a new lessons jar 2015-01-13 19:27:20 +01:00
b0619ef5db clean up course class 2015-01-11 18:52:55 +01:00
bb0d27d14b properties now correctly loaden 2015-01-10 10:43:00 +01:00
2828e5143e restored local controller 2015-01-10 10:35:46 +01:00
36ea6ad12d clean i18n directory when first time loading 2015-01-10 10:24:51 +01:00
3d6236242f properties loaded from plugin 2015-01-10 10:12:08 +01:00
3d8a345264 Added the resource bundles in the already present WebGoatLabels.properties temporary workaround 2015-01-07 17:34:33 +01:00
744630ca4c Lesson source file, lesson plan and lesson solution are loaded from the plugin. 2015-01-07 13:45:27 +01:00
da7feccffb coupled WEB-173 with webcontainer 2015-01-06 17:49:42 +01:00
60ed5d7020 Restoring conf management page, server crashed during startup 2015-01-06 13:01:17 +01:00
6aa3092761 changing language level to Java 7 2015-01-05 20:57:38 +01:00
3525226e68 Adding possibility to reload the plugins 2015-01-05 19:10:36 +01:00
34694b01c0 refactored so the extracting is not tangled with the loading the plugin 2015-01-04 14:18:48 +01:00
c39d673439 removed main method used for testing 2015-01-04 13:27:35 +01:00
ca6984e939 Also extract html files
(cherry picked from commit 856bdab)
2015-01-04 13:26:35 +01:00
0d48b83e82 Also extract html files
(cherry picked from commit 2933b79)
2015-01-04 13:26:02 +01:00
720040d1f8 Loading classes from the plugin archive
(cherry picked from commit 2adf04c)
2015-01-04 13:25:39 +01:00
4f6ba2711f Changed the pom to build the container artifact and deleted the plugin 2015-01-02 14:29:08 -05:00
1a5358458c Removed all lesson specific source and resources 2015-01-02 13:40:15 -05:00
06237b8cef Merge pull request from juliadotter/WEB-169
Fixed bug WEB-169
2014-12-19 07:16:14 -05:00
8ee94df8b4 Merge pull request from juliadotter/WEB-172
Fixed bug WEB-172
2014-12-19 07:15:32 -05:00
3311cef85c Merge pull request from jaqqbek/ZipBomb
New Lesson ZipBomb
2014-12-19 07:12:50 -05:00
1fd2fd7b42 Fixed bug WEB-169 2014-12-15 19:52:53 +11:00
d714aad80f Fixed bug WEB-172 2014-12-15 18:39:45 +11:00
e0da681402 Resolve HttpOnly Test bug WEB-161 2014-12-09 20:52:35 +11:00
e77dda3f22 Merge pull request from merwan/patch-1
Fix typo
2014-11-25 16:34:59 -05:00
f3b0ad0a3f New Lesson ZipBomb 2014-11-01 16:53:38 +01:00