1289 Commits

Author SHA1 Message Date
Jason White
e3c488c624 reverting local test that was committed 2016-07-26 17:12:37 -04:00
Jason White
c5535603dc committing for local test purposes unrelated to webgoat 2016-07-26 17:09:29 -04:00
Jason White
f57d076fab turning off test in the interim 2016-07-05 08:24:28 -04:00
Jason White
8e862ba9c3 changing to 'id' for linking in YmlBasedLesson 2016-07-05 08:22:37 -04:00
Jason White
d27712affa incremental UI changes 2016-07-05 08:16:32 -04:00
Nanne Baars
c350e86772 YML config should override lesson class 2016-06-29 12:08:13 +02:00
Nanne Baars
0a26e05ca5 for the menu part 2016-06-29 11:40:18 +02:00
Nanne
85fb5a2661 Merge pull request #246 from misfir3/feature/spring-boot
updates from day 1 @AppSec EU
2016-06-29 10:54:45 +02:00
Jason White
1761868cec Merge remote-tracking branch 'upstream/feature/spring-boot' into feature/spring-boot 2016-06-29 10:45:58 +02:00
Jason White
a8ac2d7a0c moving attack form to modal/overlay ... initial cut 2016-06-29 10:39:54 +02:00
Nanne Baars
f12c06fc55 Reading yml file based lesson configuration 2016-06-29 07:14:39 +02:00
Jason White
f203f38702 Merge remote-tracking branch 'upstream/feature/spring-boot' into feature/spring-boot 2016-06-28 17:04:12 +02:00
Jason White
501ec1f9e0 Turning off caching in spring boot for dev purposes 2016-06-28 16:22:50 +02:00
Jason White
3f37b06d1f initial support for separation of content from attack in UI 2016-06-28 16:21:14 +02:00
Jason White
0aa94a71e5 initial support for separation of content from attack in UI 2016-06-28 16:20:40 +02:00
Nanne Baars
966e5b9e0a Added Docker support. 2016-06-28 07:46:34 +02:00
Nanne Baars
374ae376e3 clean up 2016-06-02 21:59:08 +02:00
Nanne Baars
63398aaf6d Thymeleaf works with AsciiDoc 2016-05-15 10:38:22 +02:00
Nanne Baars
e8628599fe Thymeleaf resolver does not need WebSession anymore 2016-05-13 15:57:52 +02:00
Nanne Baars
22d2255664 Made lesson resolution with Thymeleaf dynamic 2016-05-13 15:42:48 +02:00
Nanne Baars
4a19ddf40a Endpoints provided by lessons now work 2016-05-13 14:45:53 +02:00
Nanne Baars
79102c6ddd Lessons which load JavaScript etc now works 2016-04-26 18:59:51 +02:00
Nanne Baars
9066e45725 Updating README and moving webapp dir to old 2016-04-10 21:22:20 +02:00
Nanne Baars
289da771c9 Login and logout works together with context root 2016-04-10 14:56:27 +02:00
Nanne Baars
d0acfc00c0 Menu options about version, user info work again. 2016-04-09 22:08:40 +02:00
Nanne Baars
576333af7c Merging changes from Daniel back into the Spring Boot structure
- different js location
  - Fixed label debugging which kept on reloading and reloading the lesson
  - Changes from .jsp merged into .html
2016-04-09 15:40:53 +02:00
Nanne Baars
a8ea4a16e6 Images from solutions are loading again 2016-04-09 14:09:34 +02:00
Nanne Baars
8ff02cab6d Fully working WebGoat after migrating to Spring Boot. 2016-04-09 14:09:29 +02:00
Nanne Baars
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
Nanne
7f91671c8f Merge pull request #229 from span/start-page-link
Fix broken start/home link on logo
2016-04-08 18:27:37 +02:00
Nanne
a8f8d4b4fa Merge pull request #228 from span/developer-controls
Developer controls
2016-04-08 18:27:29 +02:00
Nanne
263ce31db3 Merge pull request #224 from WebGoat/feature/137
Admin should also be able to see the solution, source and lesson plan.
2016-04-08 18:27:21 +02:00
Nanne
407a5a810b Merge pull request #220 from WebGoat/feature/169
Feature/169
2016-04-08 18:27:12 +02:00
Nanne
46b24d72c9 Merge pull request #212 from nbaars/develop
Fixed #184
2016-04-08 18:27:00 +02:00
Daniel Kvist
0401779f58 Fix broken test 2016-03-31 23:06:16 +02:00
Daniel Kvist
7758947711 Load welcome.mvc instead of start.mvc when navigating home on the log, fixes #218 2016-03-31 23:02:54 +02:00
Daniel Kvist
58ae7f3727 Move loading of developer controls so they do not reload every time. Also reload current lesson after reloading labels. Ref webgoat/webgoat#93. 2016-03-31 22:56:17 +02:00
Daniel Kvist
2be4248ea3 Add menu toggle to show/hide the controls. Ref webgoat/webgoat#93 2016-03-30 22:38:18 +02:00
Daniel Kvist
e6fb74fa55 Implementation of developer controls to reload plugins and set label debugging from the GUI. Ref: webgoat/webgoat#93 2016-03-30 22:07:11 +02:00
Nanne Baars
b06d9ffd81 Admin should also be able to see the solution, source and lesson plan. 2016-03-29 01:24:07 +02:00
Nanne
a52df28ec6 Merge pull request #223 from WebGoat/features/221
Fixed the classnames in the wsdd config file (moved to different pack…
2016-03-29 00:25:00 +02:00
Nanne Baars
042a62624f Fixed the classnames in the wsdd config file (moved to different package) 2016-03-29 00:17:01 +02:00
Nanne Baars
015dcbde38 Added image for Github developers documentation about lesson progress implementation. 2016-03-28 08:38:25 +02:00
Nanne Baars
60192db921 Renamed everything to 'progress' instead of 'completed' 2016-03-28 08:37:18 +02:00
Nanne
765b212032 Merge pull request #219 from muzir/patch-1
Update README.MD
2016-03-27 17:46:51 +02:00
Nanne Baars
b4cc27c761 Lesson completed message is now within js which makes it possible to show the Congratulation message after the CSRF link has been clicked.
Same as marking the lesson complete green checkbox
2016-03-27 17:46:06 +02:00
erhun
c11ecef099 Update README.MD
grammar fix
2016-03-25 10:28:07 +02:00
Nanne
35bd866873 Merge pull request #214 from span/restart-button
Fix #213 by changing the id of the restart button to the correct id
2016-03-19 15:22:41 +01:00
Nanne Baars
1815494681 Injection Flaws -> Limit Command Injection success to a set of commands and clarify this to the user #179
- Defuse command boolean flag is no longer necessary due to a change in the lesson, removed this flag from the webgoat-container project
2016-03-19 12:40:28 +01:00
Daniel Kvist
6c92f0629e Fix #213 by changing the id of the restart button to the correct it 2016-03-18 21:11:49 +01:00