Commit Graph

563 Commits

Author SHA1 Message Date
323946dcce Moved to 8.0-SNAPSHOT 2016-11-19 13:38:24 +01:00
3340eb92dd Merge branch 'feature/spring-boot' into develop
* feature/spring-boot: (92 commits)
  XXE checkin
  XXE checkin
  XXE first attempt
  HTTP-Basics mark lesson complete issue fixed
  cleaning up some
  fixing the scroll 'sliver' problem. Likely need to check back on this when menu grows again
  lesson pagination fixes mainly, some other fixes included & clean up
  Incremental style changes
  refactor to help accomodate multiple attacks and output in one 'page'
  Updated some of the credits
  double-feedback fix on single page
  commenting out to stop redundant callbacks
  few cleanup items, added least privilege
  Fixed test for password
  First wave is complete; some rendering issues
  Trying to wire up the DB connection and fill out first sql stub
  Fixing hide/show of next/prev buttons
  another stub
  First round of sql injection with stubs
  Give focus to username when loading the login page
  ...

Signed-off-by: Doug Morato <dm@corp.io>

# Conflicts:
#	.travis.yml
#	README.MD
#	pom.xml
#	webgoat-container/pom.xml
#	webgoat-container/src/main/java/org/owasp/webgoat/HammerHead.java
#	webgoat-container/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java
#	webgoat-container/src/main/java/org/owasp/webgoat/lessons/LessonAdapter.java
#	webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginsLoader.java
#	webgoat-container/src/main/java/org/owasp/webgoat/service/RestartLessonService.java
#	webgoat-container/src/main/java/org/owasp/webgoat/session/WebgoatContext.java
#	webgoat-container/src/main/resources/static/js/goatApp/controller/LessonController.js
#	webgoat-container/src/main/resources/webgoat.properties
#	webgoat-container/src/main/webapp/META-INF/context.xml
#	webgoat-container/src/main/webapp/WEB-INF/context.xml
#	webgoat-container/src/main/webapp/js/goatApp/view/LessonContentView.js
#	webgoat-container/src/test/java/org/owasp/webgoat/plugins/WebGoatIT.java
#	webgoat-container/src/test/resources/log4j.properties
#	webgoat_developer_bootstrap.sh
2016-11-18 22:37:39 -05:00
b5467f0e59 Prepare pom for next development iteration
Signed-off-by: Doug Morato <dm@corp.io>
2016-11-18 16:39:49 -05:00
2d1a89e791 [maven-release-plugin] prepare release 7.1
Signed-off-by: Doug Morato <dm@corp.io>
2016-11-18 16:37:59 -05:00
d3e4792b37 Fix javadoc warnings and errors
In preparation of release fix javadoc warnings and errors

Signed-off-by: Doug Morato <dm@corp.io>
2016-11-18 16:33:02 -05:00
f2a114419a XXE checkin 2016-11-18 10:39:39 +01:00
5c800f6f2b cleaning up some 2016-11-17 08:35:35 -05:00
80d990cd1b fixing the scroll 'sliver' problem. Likely need to check back on this when menu grows again 2016-11-17 08:32:51 -05:00
d11635f9da lesson pagination fixes mainly, some other fixes included & clean up 2016-11-17 08:06:06 -05:00
1436839b42 Incremental style changes 2016-11-17 08:06:06 -05:00
bd4e364fe3 Updated some of the credits 2016-11-16 18:38:27 -05:00
02bd7e1299 double-feedback fix on single page 2016-11-16 18:03:46 -05:00
11224bc02d commenting out to stop redundant callbacks 2016-11-16 18:03:46 -05:00
29447a11b4 First wave is complete; some rendering issues 2016-11-16 13:41:51 -05:00
24b2e79dc5 Trying to wire up the DB connection and fill out first sql stub 2016-11-15 22:40:24 -05:00
ec2fc5a77c Fixing hide/show of next/prev buttons 2016-11-15 21:01:16 -05:00
50c89acc51 Give focus to username when loading the login page 2016-11-15 22:49:47 +01:00
f9dd1ee0e8 REMOVED ECS completely 2016-11-15 22:45:18 +01:00
5dc1fc8655 Updating the Docker image 2016-11-15 20:42:30 +01:00
dbcd5cce3a Adding more trace logging during the loading of the plugins 2016-11-15 18:34:52 +01:00
640e3ffb4e mvn clean should also clean lesson jar files added .webgoat directory as well 2016-11-15 18:12:29 +01:00
b54ca61c84 mvn clean should also clean lesson jar files 2016-11-15 17:47:25 +01:00
2728158f14 #271 Reset lesson does not work anymore 2016-11-15 10:26:09 +01:00
5babe19f2b Fixed issue with lesson tracking 2016-11-15 09:28:39 +01:00
0bec575913 Moving forward cleaning up some unnecessary lesson super classes which we
do not need to support anymore in 8.0:

- Introduced DI thoughout the code base
- Removed most superclasses of a lesson
- Hammerhead is now simplified to only one line of code
- Cleaned up WebSession
- Removed code which dealt with user roles, lesson fetching, username etc
- LessonTracker improvements
- Removed almost all code from the Screen class
- Removed ECS from the container project
- Removed adminstration pages, contained a lot of ECS codes which is much
  simpler to just rewrite when necessary
2016-11-06 21:09:47 +01:00
8c231bbd6d Removing profiles from pom.xml 2016-10-30 16:54:20 +01:00
63e051b617 Updating Docker image file to 8.0-SNAPSHOT 2016-10-30 16:37:47 +01:00
e86d5b6820 Fixing Travis build - removing Sauce test cases as it will be much easier to create testcases and the UI is created based on asciidoc templates. 2016-10-30 15:41:45 +01:00
89a717bbd2 Clean up and introduced Spring Dev tools to automatically reload classes. 2016-10-30 15:13:32 +01:00
b8992bdc0e Spring Boot reload automatically enabled 2016-10-16 10:38:14 -04:00
660f8bc660 No more yml(3) 2016-10-13 06:35:46 -04:00
5ac9a3b69d No more yml(2) 2016-10-12 17:40:23 -04:00
002276e65f Merge branch 'feature/spring-boot' of github.com:WebGoat/WebGoat into feature/spring-boot 2016-10-12 15:29:15 -04:00
1d3286733c minor style update 2016-10-12 15:28:39 -04:00
7fe6e1bb6e No more yml 2016-10-12 15:21:52 -04:00
9abb4e56b9 Updated SauceLabs Integration Tests browser versions 2016-10-12 15:12:59 -04:00
22a76624e6 Pagination fixes, lesson completion update 2016-10-12 14:02:18 -04:00
2803607901 WIP lesson completion 2016-10-12 13:40:54 -04:00
217d87e523 support for custom js functions on data submission and some other UI enhancements 2016-10-12 11:28:53 -04:00
807e343603 Fixing individual form submits 2016-10-12 10:51:19 -04:00
44366361a3 Added output and always show congratulations on success with custome feedback 2016-10-11 17:25:35 -04:00
f5935c6923 Added a custom success(string) method 2016-10-11 16:52:33 -04:00
7323a1fa85 Hints back on main screen 2016-10-11 16:28:23 -04:00
2699a67c8a wip 2016-10-11 15:48:26 -04:00
b67bc85ad6 Feedback/output integration ... currently requires html div's in lesson template 2016-10-11 13:51:20 -04:00
d9e7ab724d disabling csrf 2016-10-11 11:41:48 -04:00
ee05ad932a uncomment lesson loading 2016-10-11 11:14:37 -04:00
38081b874a ajaxifcation and pagination updated 2016-10-11 10:36:18 -04:00
7d2f1f0a3a temp fix 2016-10-11 09:20:39 -04:00
829dcd2b29 initial test version of CustomGoat.js ... TBD on if we will keep it 2016-10-11 09:06:35 -04:00