From faf9e8462638a05167bdf3583788360e4e418607 Mon Sep 17 00:00:00 2001 From: Rick Lawson Date: Wed, 17 Sep 2014 07:54:37 -0400 Subject: [PATCH] WEB-136 Lesson Restart add service --- .../webgoat/service/RestartLessonService.java | 59 +++++++++++++++++++ .../org/owasp/webgoat/session/WebSession.java | 2 +- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 src/main/java/org/owasp/webgoat/service/RestartLessonService.java diff --git a/src/main/java/org/owasp/webgoat/service/RestartLessonService.java b/src/main/java/org/owasp/webgoat/service/RestartLessonService.java new file mode 100644 index 000000000..1f0c994ed --- /dev/null +++ b/src/main/java/org/owasp/webgoat/service/RestartLessonService.java @@ -0,0 +1,59 @@ +/*************************************************************************************************** + * + * + * This file is part of WebGoat, an Open Web Application Security Project utility. For details, + * please see http://www.owasp.org/ + * + * Copyright (c) 2002 - 20014 Bruce Mayhew + * + * This program is free software; you can redistribute it and/or modify it under the terms of the + * GNU General Public License as published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without + * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program; if + * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + * + * Getting Source ============== + * + * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software + * projects. + * + * For details, please see http://webgoat.github.io + */ +package org.owasp.webgoat.service; + +import javax.servlet.http.HttpSession; +import org.owasp.webgoat.session.WebSession; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * + * @author rlawson + */ +@Controller +public class RestartLessonService extends BaseService { + + /** + * Returns current lesson + * + * @param session + * @return + */ + @RequestMapping(value = "/restartlesson.mvc", produces = "text/text") + public @ResponseBody + String restartLesson(HttpSession session) { + WebSession ws = getWebSession(session); + int currentScreen = ws.getCurrentScreen(); + if(currentScreen > 0){ + ws.restartLesson(currentScreen); + } + return ws.getCurrentLesson().getLink(); + } +} diff --git a/src/main/java/org/owasp/webgoat/session/WebSession.java b/src/main/java/org/owasp/webgoat/session/WebSession.java index 5fba2bbf1..7bf0922f4 100644 --- a/src/main/java/org/owasp/webgoat/session/WebSession.java +++ b/src/main/java/org/owasp/webgoat/session/WebSession.java @@ -939,7 +939,7 @@ public class WebSession { } } - private void restartLesson(int lessonId) { + public void restartLesson(int lessonId) { AbstractLesson al = getLesson(lessonId); System.out.println("Restarting lesson: " + al); al.getLessonTracker(this).setCompleted(false);