1462 Commits

Author SHA1 Message Date
Nanne Baars
490f542885 Merge pull request #298 from WebGoat/lesson_overview
#276 Automatic lesson summary page
2016-12-28 10:21:07 +01:00
Nanne Baars
9c03b6f63b #276 Automatic lesson summary page
- Basic overview of all the assignments needed to be solved in a lesson
 - Clicking on a link will jump to the correct page with the assignment
 - Lesson completed also updates lesson overview immediately
2016-12-28 10:14:34 +01:00
Nanne Baars
de4e581ee4 Update .travis.yml 2016-12-24 09:26:21 +01:00
Nanne Baars
0d0d2258d8 Changing install to package to include lessons as well 2016-12-24 09:24:22 +01:00
Jason White
282073ed2d Adding ZAP content for HTTP Basics 2016-12-22 16:37:57 -05:00
Jason White
35055eeb3c #296 updates href according to to page nav 2016-12-22 15:08:33 -05:00
Nanne
025ac49e19 Merge pull request #295 from zupzup/feature/asciidoc_syntax_highlight
Issue #275: Activate Syntax Highlighting with Coderay in Asciidoc
2016-12-16 16:53:51 +01:00
Nanne
4392150561 Merge branch 'develop' into feature/asciidoc_syntax_highlight 2016-12-16 16:44:42 +01:00
Nanne
bfe06f9026 Merge pull request #294 from zupzup/images_in_asciidoc
Issue #293: fix images in asciidoc by setting backend to xhtml
2016-12-16 16:43:07 +01:00
Mario Zupan
6fa894938b Issue #275: Activate Syntax Highlighting with Coderay in Asciidoc templates 2016-12-15 17:37:30 +01:00
Mario Zupan
81e3000f2d Issue #293: fix images in asciidoc by setting backend to xhtml 2016-12-11 20:05:28 +01:00
Nanne Baars
b8b632905d Fixing failing unit test 2016-12-08 22:06:21 +01:00
Jason White
f8c4d2232b quick update of README, removing -DskipTests 2016-12-07 09:02:25 -05:00
Jason White
3ab86d69ca temporary commenting out test additions that were breaking build/run 2016-12-07 08:46:13 -05:00
Jason White
1a9dcc1d21 moving vagrant instructions down 2016-12-05 07:58:05 -05:00
Jason White
54a152eb22 quick/temporary update for README for 8.x 2016-12-05 07:55:57 -05:00
misfir3
2850beed22 Merge pull request #291 from zupzup/feature/asyncerrorhandling
Feature/asyncerrorhandling
2016-12-02 12:14:28 -05:00
Mario Zupan
16e5df09b5 Fix wrong comment 2016-12-02 13:51:46 +01:00
Mario Zupan
feb38eef8c Issue #160: Provide Async Error Handling
Added Toast notification for unexpected errors
    On 401 and 403 Errors, user is redirected to login
2016-12-02 13:37:25 +01:00
Nanne Baars
e5ed24fcf7 Added testcase for LabelService 2016-11-29 21:27:11 +01:00
Nanne Baars
5f0ab09866 Added license 2016-11-29 20:31:28 +01:00
Nanne Baars
1a854a500e Lesson overview 2016-11-29 20:27:54 +01:00
misfir3
df29b36389 Merge pull request #289 from zupzup/feature/labelservice
Issue #265: Created LabelService to support UI localization
2016-11-29 12:57:53 -05:00
Nanne Baars
c7e46bf3c9 Only uploading war 2016-11-23 23:37:34 +01:00
Jason White
e183c8d8b3 implementing support for dom xss 2016-11-23 17:25:47 -05:00
Nanne Baars
5347311319 XXE last assignment completely working 2016-11-23 17:09:35 +01:00
Nanne Baars
c80bfcbc2f First checkin for CSRF
(cherry picked from commit a01a767)
2016-11-23 17:09:35 +01:00
Mario Zupan
2b0b49c0c2 Remove unused import 2016-11-23 15:36:02 +01:00
Jason White
0aa9c29256 adding direct to page navigation route 2016-11-23 09:32:06 -05:00
Mario Zupan
6acd149e5f Issue #265: Created LabelService to support UI localization 2016-11-23 14:20:43 +01:00
Jason White
4940a12d0d button size fix 2016-11-22 16:25:19 -05:00
mayhew64
32d1009390 Reflected xss working - still have to think how to get the success criteria. Page needs some work though 2016-11-21 23:09:58 -05:00
Bruce Mayhew
edaadecc38 Merge pull request #286 from WebGoat/feature/spring-boot
First draft at XSS
2016-11-21 18:37:53 -05:00
Jason White
2647722842 fixing typo 2016-11-21 13:50:21 -05:00
mayhew64
95607089d4 First draft at XSS 2016-11-21 13:39:43 -05:00
Jason White
7d28e9c1b8 bring jquery into custom namespace ... simple hack for now 2016-11-21 13:18:38 -05:00
Doug Morato
79e0cc0842 Merge pull request #282 from span/fix-broken-vagrant-setup
Fix intellij link and use master branch for vagrant images
2016-11-21 09:34:16 -05:00
Daniel Kvist
1347c8b5f6 Fix intellij link and use master branch for vagrant images in #262 2016-11-20 21:39:11 +01:00
Nanne Baars
faeb5b1b24 Push develop to s3 2016-11-19 15:29:05 +01:00
Nanne Baars
431222e740 Push multiple branches 2016-11-19 15:11:53 +01:00
Nanne Baars
323946dcce Moved to 8.0-SNAPSHOT 2016-11-19 13:38:24 +01:00
Doug Morato
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
Doug Morato
b5467f0e59 Prepare pom for next development iteration
Signed-off-by: Doug Morato <dm@corp.io>
2016-11-18 16:39:49 -05:00
Doug Morato
2d1a89e791 [maven-release-plugin] prepare release 7.1
Signed-off-by: Doug Morato <dm@corp.io>
7.1
2016-11-18 16:37:59 -05:00
Doug Morato
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
Doug Morato
114f220c15 Do not auto release when using maven release plugin 2016-11-18 13:08:14 -05:00
Doug Morato
ddf4072ada Updated maven plugins used for OSSRH releases 2016-11-18 11:54:57 -05:00
Nanne Baars
f2a114419a XXE checkin 2016-11-18 10:39:39 +01:00
Nanne Baars
38e5999472 XXE checkin 2016-11-17 17:36:17 +01:00
Nanne Baars
f698a2d6ae XXE first attempt 2016-11-17 16:27:41 +01:00