Commit Graph

1480 Commits

Author SHA1 Message Date
3f43f56c90 Merge change from Nanne on testing/loading plugins
* nbaars-master:
  Fixed loading plugins: sometimes failed file was not correctly extracted
2015-09-17 22:47:10 -04:00
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
9613e703f1 , defaulting to firstLesson on initial redirect 2015-09-17 22:24:57 -04:00
0d543908f9 Merge branch 'dougmorato-release_and_docs_wip' 2015-09-18 00:25:04 +02:00
5d37de731c Fixed typo and updated contributor information 2015-09-18 00:22:12 +02:00
ce75fadc1b Merge remote-tracking branch 'upstream/master' 2015-09-17 07:51:07 +02:00
9474f66d96 Fixed loading plugins: sometimes failed file was not correctly extracted 2015-09-17 07:29:51 +02:00
171a66de57 Adding Coverity Scans integration 2015-09-16 21:59:50 -04:00
54b6a7e843 Adding WebGoatLabels_en.properties to fix warning on ENGLISH locale 2015-09-16 21:12:44 -04:00
a8ce11ee14 Initial work on adding more browsers to SauceLabs testing 2015-09-16 21:11:54 -04:00
f3b52d4423 Improving naming convention on tomcat execution goal for integration tests 2015-09-16 21:10:11 -04:00
d56ff70370 Additional pom preparations for releasing into maven OSS 2015-09-16 21:08:51 -04:00
e8b9b17107 Fix javadoc errors in order to comply with Maven OSS requirements 2015-09-15 22:24:11 -04:00
7b43c89e1c Improve poms to comply with Maven OSS submission requirements 2015-09-15 22:22:40 -04:00
ba6997f52f Merge pull request from nbaars/master
Property files are now detected while extracting the plugin
2015-09-15 18:17:24 -04:00
d142407de3 Discover Clues in HTML lesson doesn't work 2015-09-15 23:36:24 +02:00
f31150ffdf Property files are now detected while extracting the plugin 2015-09-15 18:27:11 +02:00
aabdb5c401 Update webgoat_developer_bootstrap.sh
Fixed a couple of typos
2015-09-14 17:59:28 -04:00
9a0ec81b64 Merge pull request from misfir3/master
Recent UI Fixes
2015-09-13 00:22:05 -04:00
78215a7f55 reimplemented for 7.0/Backbone implementation 2015-09-13 00:15:19 -04:00
9348a0d70e Should resolve issues and using a backbone view to control those nav buttons 2015-09-09 12:36:36 -04:00
e928871d2a Merge remote-tracking branch 'upstream/master' 2015-09-09 06:30:10 -04:00
85f18bc6d5 Merge pull request from nbaars/master
Lab - DOM-based cross-site scripting: Java Source produces XSS alert 
2015-09-09 06:29:42 -04:00
9fa79292b1 Merge remote-tracking branch 'upstream/master' 2015-09-08 18:39:08 -04:00
543e35caa1 Removed duplicate css import 2015-09-06 11:51:00 +02:00
e22ad201e6 Re-enable/update WebGoat Info link 2015-09-05 16:53:23 +02:00
e294bd39b9 User Info/Logout Links 2015-09-05 16:03:18 +02:00
5365679b7c Removed webgoat-release project now part of Travis build 2015-09-05 11:25:45 +02:00
18204c62c6 LessonAdapter did not read the 'New Lesson Instructions.txt' (IOException) 2015-09-05 09:43:03 +02:00
112386b43e Lab - DOM-based cross-site scripting: Java Source produces XSS alert 2015-09-02 23:22:24 +02:00
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
4b79d990e2 Merge remote-tracking branch 'upstream/master' 2015-09-01 06:39:14 -04:00
d126124649 Merge pull request from WebGoat/mayhew64-patch-1
Update README.MD
2015-08-28 11:35:02 -04:00
a1b1b4a28d Merge pull request from nbaars/master
Increase performance while extracting the plugins
2015-08-28 11:34:47 -04:00
16f5ca4d0b Update README.MD 2015-08-28 11:33:08 -04:00
4ba2520d33 Merge pull request from dougmorato/integration_tests
Do NOT run Integration tests on pull requests
2015-08-28 16:26:50 +02:00
2f43c16cc1 Clicking on 'LAB: Role Based Access Control' produces 'Invalid Session' in UI 2015-08-28 16:24:04 +02:00
13b63651da Replacing Maven package/verify goals by maven install, which runs all of them 2015-08-28 09:35:34 -04:00
de6f1cf289 Change travis buils to not run Integration Tests on pull requests 2015-08-28 09:07:32 -04:00
a44e08cbfd Adjusted LabelProvider to use other loader 2015-08-28 07:55:49 +02:00
010404d2e1 Increase performance while extracting the plugins 2015-08-28 07:07:12 +02:00
649cc08cb0 Merge pull request from nbaars/master
Http Basics lessons fails to load 
2015-08-27 08:52:50 -04:00
4a237d2df7 Merge remote-tracking branch 'upstream/master' 2015-08-27 06:19:43 -04:00
e81cbd34ca Http Basics lessons fails to load 2015-08-27 08:44:25 +02:00
c67bd73768 Merge pull request from dougmorato/testing_work
Adding headless Integration Tests with Sauce Labs
2015-08-26 09:16:36 -04:00
5921a098d7 Fix for (Lesson Help toggle plus cleaning up button text) && fix for 2015-08-26 06:01:28 +02:00
65621e51cf Fix for (Lesson Help toggle plus cleaning up button text) && fix for 2015-08-25 21:11:47 -04:00
2223bf8eb2 Integration tests only run on verify/install/deploy 2015-08-24 19:44:12 -04:00
8ed67ef62e Replace sauce labs config by Environment Properties 2015-08-24 19:38:37 -04:00
62db0bfdef Adding basic Integration Tests with Sauce Labs integration 2015-08-24 19:24:22 -04:00