711649924b
* Some initial refactoring * Make it one application * Got it working * Fix problem on Windows * Move WebWolf * Move first lesson * Moved all lessons * Fix pom.xml * Fix tests * Add option to initialize a lesson This way we can create content for each user inside a lesson. The initialize method will be called when a new user is created or when a lesson reset happens * Clean up pom.xml files * Remove fetching labels based on language. We only support English at the moment, all the lesson explanations are written in English which makes it very difficult to translate. If we only had labels it would make sense to support multiple languages * Fix SonarLint issues * And move it all to the main project * Fix for documentation paths * Fix pom warnings * Remove PMD as it does not work * Update release notes about refactoring Update release notes about refactoring Update release notes about refactoring * Fix lesson template * Update release notes * Keep it in the same repo in Dockerhub * Update documentation to show how the connection is obtained. Resolves: #1180 * Rename all integration tests * Remove command from Dockerfile * Simplify GitHub actions Currently, we use a separate actions for pull-requests and branch build. This is now consolidated in one action. The PR action triggers always, it now only trigger when the PR is opened and not in draft. Running all platforms on a branch build is a bit too much, it is better to only run all platforms when someone opens a PR. * Remove duplicate entry from release notes * Add explicit registry for base image * Lesson scanner not working when fat jar When running the fat jar we have to take into account we are reading from the jar file and not the filesystem. In this case you cannot use `getFile` for example. * added info in README and fixed release docker * changed base image and added ignore file Co-authored-by: Zubcevic.com <rene@zubcevic.com>
83 lines
3.0 KiB
Java
83 lines
3.0 KiB
Java
/*
|
|
* This file is part of WebGoat, an Open Web Application Security Project utility. For details,
|
|
* please see http://www.owasp.org/
|
|
* <p>
|
|
* Copyright (c) 2002 - 2017 Bruce Mayhew
|
|
* <p>
|
|
* 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.
|
|
* <p>
|
|
* 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.
|
|
* <p>
|
|
* 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.
|
|
* <p>
|
|
* Getting Source ==============
|
|
* <p>
|
|
* Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
|
|
* projects.
|
|
* <p>
|
|
*/
|
|
|
|
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.WebApplicationType;
|
|
import org.springframework.boot.builder.SpringApplicationBuilder;
|
|
import org.springframework.util.SocketUtils;
|
|
|
|
import java.lang.reflect.Method;
|
|
|
|
import static java.util.Optional.of;
|
|
import static java.util.Optional.ofNullable;
|
|
|
|
@Slf4j
|
|
public class StartWebGoat {
|
|
|
|
public static final String WEBGOAT_PORT = "webgoat.port";
|
|
public static final String WEBWOLF_PORT = "webwolf.port";
|
|
|
|
private static final int MAX_PORT = 9999;
|
|
|
|
public static void main(String[] args) {
|
|
setEnvironmentVariableForPort(WEBGOAT_PORT, "8080");
|
|
setEnvironmentVariableForPort(WEBWOLF_PORT, "9090");
|
|
|
|
new SpringApplicationBuilder().parent(ParentConfig.class)
|
|
.web(WebApplicationType.NONE).bannerMode(Banner.Mode.OFF)
|
|
.child(WebGoat.class)
|
|
.web(WebApplicationType.SERVLET)
|
|
.sibling(WebWolf.class).bannerMode(Banner.Mode.OFF)
|
|
.web(WebApplicationType.SERVLET)
|
|
.run(args);
|
|
}
|
|
|
|
private static void setEnvironmentVariableForPort(String name, String defaultValue) {
|
|
ofNullable(System.getProperty(name))
|
|
.or(() -> of(defaultValue))
|
|
.map(Integer::parseInt)
|
|
.map(port -> findPort(port))
|
|
.ifPresent(port -> System.setProperty(name, port));
|
|
}
|
|
|
|
public static String findPort(int port) {
|
|
try {
|
|
if (port == MAX_PORT) {
|
|
log.error("No free port found from 8080 - {}", MAX_PORT);
|
|
return "" + port;
|
|
}
|
|
return "" + SocketUtils.findAvailableTcpPort(port, port);
|
|
} catch (IllegalStateException var4) {
|
|
return findPort(port + 1);
|
|
}
|
|
}
|
|
|
|
}
|