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

Merge pull request #205 from muzir/develop

Browse Source 
-- Remove raw type usage, add type check parameter.
This commit is contained in:
Nanne 2016-02-25 22:06:24 +01:00
commit f5a5335e31
4 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webgoat-container/src/main/java/org/owasp/webgoat/Catcher.java
View File

@ -96,7 +96,7 @@ public class Catcher extends HammerHead
// property file. No other control parameters are supported at this time. // property file. No other control parameters are supported at this time.
if (!property.equals(EMPTY_STRING)) if (!property.equals(EMPTY_STRING))
{ {
Enumeration e = session.getParser().getParameterNames(); Enumeration<String> e = session.getParser().getParameterNames();
while (e.hasMoreElements()) while (e.hasMoreElements())
{ {

1
webgoat-container/src/main/java/org/owasp/webgoat/HammerHead.java
View File

@ -63,7 +63,6 @@ public class HammerHead extends HttpServlet {
final Logger logger = LoggerFactory.getLogger(HammerHead.class); final Logger logger = LoggerFactory.getLogger(HammerHead.class);
private static final String WELCOMED = "welcomed";
/** /**
* *

34
webgoat-container/src/main/java/org/owasp/webgoat/application/WebGoatServletListener.java
View File

@ -5,7 +5,22 @@
*/ */
package org.owasp.webgoat.application; package org.owasp.webgoat.application;
import com.google.common.collect.Maps; import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Paths;
import java.sql.Driver;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.util.Enumeration;
import java.util.Set;
import java.util.jar.Attributes;
import java.util.jar.Manifest;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
import javax.servlet.ServletRegistration;
import org.owasp.webgoat.HammerHead; import org.owasp.webgoat.HammerHead;
import org.owasp.webgoat.lessons.LessonServletMapping; import org.owasp.webgoat.lessons.LessonServletMapping;
import org.owasp.webgoat.plugins.PluginsLoader; import org.owasp.webgoat.plugins.PluginsLoader;
@ -15,22 +30,6 @@ import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider; import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
import org.springframework.core.type.filter.AnnotationTypeFilter; import org.springframework.core.type.filter.AnnotationTypeFilter;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
import javax.servlet.ServletRegistration;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Paths;
import java.sql.Driver;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.util.Enumeration;
import java.util.Map;
import java.util.Set;
import java.util.jar.Attributes;
import java.util.jar.Manifest;
/** /**
* Web application lifecycle listener. * Web application lifecycle listener.
* *
@ -55,7 +54,6 @@ public class WebGoatServletListener implements ServletContextListener {
private void loadServlets(ServletContextEvent sce) { private void loadServlets(ServletContextEvent sce) {
final ServletContext servletContext = sce.getServletContext(); final ServletContext servletContext = sce.getServletContext();
Map<String, Class> controllers = Maps.newHashMap();
ClassPathScanningCandidateComponentProvider provider = new ClassPathScanningCandidateComponentProvider( ClassPathScanningCandidateComponentProvider provider = new ClassPathScanningCandidateComponentProvider(
false); false);
provider.addIncludeFilter(new AnnotationTypeFilter(LessonServletMapping.class)); provider.addIncludeFilter(new AnnotationTypeFilter(LessonServletMapping.class));

2
webgoat-container/src/main/java/org/owasp/webgoat/session/ParameterParser.java
View File

@ -467,7 +467,7 @@ public class ParameterParser {
* *
* @return The parameterNames value * @return The parameterNames value
*/ */
public Enumeration getParameterNames() { public Enumeration<String> getParameterNames() {
if (request == null) { if (request == null) {
return (null); return (null);
} }