Commit Graph

122 Commits

Author SHA1 Message Date
5f0ab09866 Added license 2016-11-29 20:31:28 +01:00
1a854a500e Lesson overview 2016-11-29 20:27:54 +01:00
2b0b49c0c2 Remove unused import 2016-11-23 15:36:02 +01:00
6acd149e5f Issue #265: Created LabelService to support UI localization 2016-11-23 14:20:43 +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
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
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
dbcd5cce3a Adding more trace logging during the loading of the plugins 2016-11-15 18:34:52 +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
89a717bbd2 Clean up and introduced Spring Dev tools to automatically reload classes. 2016-10-30 15:13:32 +01: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
7fe6e1bb6e No more yml 2016-10-12 15:21:52 -04:00
2803607901 WIP lesson completion 2016-10-12 13:40:54 -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
2699a67c8a wip 2016-10-11 15:48:26 -04:00
d9e7ab724d disabling csrf 2016-10-11 11:41:48 -04:00
7d2f1f0a3a temp fix 2016-10-11 09:20:39 -04:00
c6ce0da44c Remove Exception from method signature
Removed null checking in favor of boolean which is explicitly value based.
2016-09-14 22:06:43 +02:00
b63f2ae44e Removed isDefuseOsCommands (no longer necessary) 2016-09-12 21:54:40 +02:00
8e9bebacd7 - Added more testcases since now we have static IDs for the lessons.
- Changed the RestartLessonService because returning the text/html triggered the browser to show a popup which made the Selenium tests fail.
2016-09-11 20:51:38 +02:00
8050bd52c4 Navigation and links are not the same after reboot #194 2016-09-10 16:14:10 +02:00
b250af3564 Introduced stanalone project which allows us to pass arguments to the Tomcat instance (eg port, address) 2016-09-09 18:35:31 +02:00
61d5116d44 Intermediate result for calling multiple lesson endpoints 2016-08-18 21:15:12 +02:00
c0ab7b7d1c Getting the attack verification to work 2016-08-08 19:38:24 +02:00
e3c488c624 reverting local test that was committed 2016-07-26 17:12:37 -04:00
c5535603dc committing for local test purposes unrelated to webgoat 2016-07-26 17:09:29 -04:00
a20532921a How to create a Legacy Lesson - instruction edit #177
Commit to fix the following issues.

1. Update the user guide to point to the wiki.
2. Add the slack channel
3. Change the feedback email to point to the group mailing list.
2016-07-16 19:08:53 +02:00
2d39ab90d2 Doesn't run with tomcat8 #161
- antiJarLocking is no longer supported in Tomcat 8. Because we have will move towards Spring Boot we will have a much better way to reload plugins so investigating the difference between Tomcat 7 and 8 is not the way to go.
2016-07-09 19:38:08 +02:00
bc30634f99 temporary restoration of isDefuseOSCommands 2016-07-06 13:33:35 -04:00
8e862ba9c3 changing to 'id' for linking in YmlBasedLesson 2016-07-05 08:22:37 -04:00
c350e86772 YML config should override lesson class 2016-06-29 12:08:13 +02:00
0a26e05ca5 for the menu part 2016-06-29 11:40:18 +02:00
1761868cec Merge remote-tracking branch 'upstream/feature/spring-boot' into feature/spring-boot 2016-06-29 10:45:58 +02:00
f12c06fc55 Reading yml file based lesson configuration 2016-06-29 07:14:39 +02:00
f203f38702 Merge remote-tracking branch 'upstream/feature/spring-boot' into feature/spring-boot 2016-06-28 17:04:12 +02:00
501ec1f9e0 Turning off caching in spring boot for dev purposes 2016-06-28 16:22:50 +02:00
966e5b9e0a Added Docker support. 2016-06-28 07:46:34 +02:00
374ae376e3 clean up 2016-06-02 21:59:08 +02:00
63398aaf6d Thymeleaf works with AsciiDoc 2016-05-15 10:38:22 +02:00
e8628599fe Thymeleaf resolver does not need WebSession anymore 2016-05-13 15:57:52 +02:00
22d2255664 Made lesson resolution with Thymeleaf dynamic 2016-05-13 15:42:48 +02:00
4a19ddf40a Endpoints provided by lessons now work 2016-05-13 14:45:53 +02:00
79102c6ddd Lessons which load JavaScript etc now works 2016-04-26 18:59:51 +02:00
9066e45725 Updating README and moving webapp dir to old 2016-04-10 21:22:20 +02:00