Commit Graph

96 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
f9dd1ee0e8 REMOVED ECS completely 2016-11-15 22:45:18 +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
5babe19f2b Fixed issue with lesson tracking 2016-11-15 09:28:39 +01:00
8c231bbd6d Removing profiles from pom.xml 2016-10-30 16:54:20 +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
9d93220c39 excluding webdrivers 2016-09-23 21:25:29 +02:00
5d69467c6f Added testcase for RoleBasedAccessControl 2016-09-22 17:46:13 +02:00
c7a03abdc3 Fixing the functional testcases together with Travis CI which stopped due to excessive logging from the Tomcat 7 Maven plugin 2016-09-19 23:42:21 +02:00
12e2624eee bumping version on feature branch to reflect plans 2016-08-30 12:17:13 -04: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
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
d0acfc00c0 Menu options about version, user info work again. 2016-04-09 22:08:40 +02:00
a8ea4a16e6 Images from solutions are loading again 2016-04-09 14:09:34 +02:00
8ff02cab6d Fully working WebGoat after migrating to Spring Boot. 2016-04-09 14:09:29 +02:00
ecc8cb391b First attempt to remove JSP and move to Thymeleaf and update to Spring Boot. The Thymeleaf templates can be loaded as snippets which makes it more easy to move away from ECS and create normal HTML pages for a lesson. 2016-04-09 14:06:03 +02:00
724c084abf Updading develop branch pom versions to 7.1-SNAPSHOT 2016-02-01 18:30:53 -05:00
f825bead8b The OWASP WebGoat 7.0.1 Release 2016-02-01 18:09:48 -05:00
35e9b36b00 [maven-release-plugin] prepare for next development iteration 2016-02-01 13:57:19 -05:00
dcf1995fe8 [maven-release-plugin] prepare release 7.0 2016-02-01 13:57:16 -05:00
023966fbb1 changed back to compile phase, package phase breaks the war-exec.jar construction 2015-11-30 08:51:53 -05:00
4c538ee398 #66 Fixing jar plugin lifecycle issue 2015-11-12 20:49:51 +00:00
ba20f8d14b Fix javax.mail dependecy and update versions
Signed-off-by: Doug Morato <dm@corp.io>
2015-10-27 22:15:14 -04:00
441543100f Revert tomcat7 maven plugin to 2.1
Knonw bug on version 2.2 of the tomcat7-maven-plugin on extracting the temp directories for exec jar

Info: https://issues.apache.org/jira/browse/MTOMCAT-211
https://fisheye6.atlassian.com/changelog/tomcat?cs=1539956
https://fisheye6.atlassian.com/changelog/tomcat?cs=1539209
Signed-off-by: Doug Morato <dm@corp.io>
2015-10-25 22:51:28 -04:00
7e2d36ee48 Coveralls should be on Parent Pom
moving the coverall plugin to the parent pom level

Signed-off-by: Doug Morato <dm@corp.io>
2015-10-24 20:26:17 -04:00
cffb515851 Adding Coveralls support
Coveralls.IO is free service to report on Code Coverage for Open-Source projects. Enabling the reporting using the maven cobertura plugin

Signed-off-by: Doug Morato <dm@corp.io>
2015-10-24 19:40:39 -04:00
f6c2c4bacb The jar snapshot doesn't run #108 (2) 2015-10-07 22:47:39 +02:00
86e4fd1c85 i8n highlighting #96 2015-09-24 10:09:07 +02:00
8d2771c108 Adding the ability to reload plugins directly from the interface instead of restarting Tomcat 2015-09-22 20:38:19 +02:00
f3b52d4423 Improving naming convention on tomcat execution goal for integration tests 2015-09-16 21:10:11 -04:00
7b43c89e1c Improve poms to comply with Maven OSS submission requirements 2015-09-15 22:22:40 -04:00
62db0bfdef Adding basic Integration Tests with Sauce Labs integration 2015-08-24 19:24:22 -04:00
2212bd0805 Initial push of testing work 2015-08-24 19:24:21 -04:00
640b9001c4 Fix URL for tomcat7:deploy goal 2015-08-20 21:53:25 +02:00
4d26d84eef Fixing all build warnings during Maven build 2015-08-20 21:53:16 +02:00
fb63a325f7 Update parent pom.xml to version 7.0-SNAPSHOT. Fix indentation 2015-08-20 21:52:15 +02:00
42f373d66a Moved Maven multiproject setup 2015-08-11 21:57:12 +02:00