dubey/WebGoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

autowire servlet context instead of getting from request

Browse Source
This commit is contained in:
Rick Lawson 2014-09-11 09:27:25 -04:00
parent fc8d4d495a
commit 809ef80e18
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/owasp/webgoat/controller/Start.java
View File

@ -6,12 +6,14 @@
package org.owasp.webgoat.controller; package org.owasp.webgoat.controller;
import java.util.Collection; import java.util.Collection;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.owasp.webgoat.session.WebSession; import org.owasp.webgoat.session.WebSession;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
@ -31,6 +33,9 @@ public class Start {
private static final String WELCOMED = "welcomed"; private static final String WELCOMED = "welcomed";
@Autowired
private ServletContext servletContext;
@RequestMapping(value = "start.mvc", method = {RequestMethod.GET, RequestMethod.POST}) @RequestMapping(value = "start.mvc", method = {RequestMethod.GET, RequestMethod.POST})
public ModelAndView start(HttpServletRequest request, public ModelAndView start(HttpServletRequest request,
@RequestParam(value = "error", required = false) String error, @RequestParam(value = "error", required = false) String error,
@ -48,7 +53,7 @@ public class Start {
model.addObject("role", role); model.addObject("role", role);
model.addObject("user", user); model.addObject("user", user);
String contactEmail = request.getServletContext().getInitParameter("email"); String contactEmail = servletContext.getInitParameter("email");
model.addObject("contactEmail", contactEmail); model.addObject("contactEmail", contactEmail);
// if everything ok then go to webgoat UI // if everything ok then go to webgoat UI