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

Fix passing command line arguments (#1933)

Browse Source 
* fix: use banners correctly

* fix: passing command line arguments

Since we already have `webwolf.port` it makes sense to also define `webwolf.port` explicitly and not rely on `server.port`

Closes: #1910
This commit is contained in:
Nanne Baars
2024-10-27 08:39:02 +01:00
committed by GitHub
parent cf5101a633
commit 4efaf87c7e
7 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/owasp/webgoat/server/ParentConfig.java
View File

@ -1,8 +1,6 @@
package org.owasp.webgoat.server;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@Configuration
@ComponentScan("org.owasp.webgoat.server")
public class ParentConfig {}

21
src/main/java/org/owasp/webgoat/server/StartWebGoat.java
View File

@ -28,23 +28,30 @@ package org.owasp.webgoat.server;
import lombok.extern.slf4j.Slf4j;
import org.owasp.webgoat.container.WebGoat;
import org.owasp.webgoat.webwolf.WebWolf;
import org.springframework.boot.Banner;
import org.springframework.boot.ResourceBanner;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.context.ApplicationContext;
import org.springframework.core.io.ClassPathResource;
@Slf4j
public class StartWebGoat {
public static void main(String[] args) {
var parentBuilder =
new SpringApplicationBuilder()
.parent(ParentConfig.class)
.web(WebApplicationType.NONE)
.bannerMode(Banner.Mode.OFF);
parentBuilder.child(WebWolf.class).web(WebApplicationType.SERVLET).run(args);
new SpringApplicationBuilder().parent(ParentConfig.class).web(WebApplicationType.NONE);
parentBuilder
.child(WebWolf.class)
.banner(new ResourceBanner(new ClassPathResource("banner-webwolf.txt")))
.web(WebApplicationType.SERVLET)
.run(args);
ApplicationContext webGoatContext =
parentBuilder.child(WebGoat.class).web(WebApplicationType.SERVLET).run(args);
parentBuilder
.child(WebGoat.class)
.banner(new ResourceBanner(new ClassPathResource("banner-webgoat.txt")))
.web(WebApplicationType.SERVLET)
.run(args);
printStartUpMessage(webGoatContext);
}