Skip to content

Commit 809ef80

Browse files
committed
autowire servlet context instead of getting from request
1 parent fc8d4d4 commit 809ef80

File tree

1 file changed

+6
-1
lines changed
  • src/main/java/org/owasp/webgoat/controller

1 file changed

+6
-1
lines changed

src/main/java/org/owasp/webgoat/controller/Start.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@
66
package org.owasp.webgoat.controller;
77

88
import java.util.Collection;
9+
import javax.servlet.ServletContext;
910
import javax.servlet.http.HttpServletRequest;
1011
import javax.servlet.http.HttpSession;
1112
import org.apache.commons.lang3.StringUtils;
1213
import org.owasp.webgoat.session.WebSession;
1314
import org.slf4j.Logger;
1415
import org.slf4j.LoggerFactory;
16+
import org.springframework.beans.factory.annotation.Autowired;
1517
import org.springframework.security.core.GrantedAuthority;
1618
import org.springframework.security.core.context.SecurityContextHolder;
1719
import org.springframework.stereotype.Controller;
@@ -31,6 +33,9 @@ public class Start {
3133

3234
private static final String WELCOMED = "welcomed";
3335

36+
@Autowired
37+
private ServletContext servletContext;
38+
3439
@RequestMapping(value = "start.mvc", method = {RequestMethod.GET, RequestMethod.POST})
3540
public ModelAndView start(HttpServletRequest request,
3641
@RequestParam(value = "error", required = false) String error,
@@ -48,7 +53,7 @@ public ModelAndView start(HttpServletRequest request,
4853
model.addObject("role", role);
4954
model.addObject("user", user);
5055

51-
String contactEmail = request.getServletContext().getInitParameter("email");
56+
String contactEmail = servletContext.getInitParameter("email");
5257
model.addObject("contactEmail", contactEmail);
5358

5459
// if everything ok then go to webgoat UI

0 commit comments

Comments
 (0)