diff --git a/docker/Dockerfile b/docker/Dockerfile index 31b0e9686..1437def53 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -18,12 +18,5 @@ COPY --chown=webgoat start.sh /home/webgoat EXPOSE 8080 EXPOSE 9090 -ENV WEBGOAT_PORT 8080 -ENV WEBGOAT_SSLENABLED false - -ENV GOATURL https://127.0.0.1:$WEBGOAT_PORT -ENV WOLFURL http://127.0.0.1:9090 - - WORKDIR /home/webgoat ENTRYPOINT /bin/bash /home/webgoat/start.sh $webgoat_version_env diff --git a/docker/Readme.md b/docker/Readme.md index 0e6ed7941..7d0831655 100644 --- a/docker/Readme.md +++ b/docker/Readme.md @@ -9,5 +9,5 @@ docker build --no-cache --build-arg webgoat_version=8.2.0-SNAPSHOT -t webgoat/go ## Docker run ```shell -docker run -p 80:8888 -p 8080:8080 -p 9090:9090 -e TZ=Europe/Amsterdam webgoat/goatandwolf:latest +docker run -p 127.0.0.1:80:8888 -p 127.0.0.1:8080:8080 -p 127.0.0.1:9090:9090 -e TZ=Europe/Amsterdam webgoat/goatandwolf:latest ``` \ No newline at end of file diff --git a/docker/index.html b/docker/index.html index 31f642096..43d3457f0 100644 --- a/docker/index.html +++ b/docker/index.html @@ -1,43 +1,70 @@ <!DOCTYPE html> <html> - <body> - <h1>OWASP WebGoat Training tools</h1> - <p> - Use the following links to access the WebGoat and WebWolf applications. - Register a user using WebGoat. The same user can access WebWolf. - </p> - - <h2>Use without special host name entries</h2> - - <table> - <tr> - <td>WebGoat URL</td> - <td><a href="http://127.0.0.1:8080/WebGoat" target="_blank">http://127.0.0.1:8080/WebGoat</a></td> - </tr> - <tr> - <td>WebWolf URL</td> - <td><a href="http://127.0.0.1:9090/WebWolf" target="_blank">http://127.0.0.1:9090/WebWolf</a></td> - </tr> - </table> - - <h2>Use with www.webgoat.local and www.webwolf.local</h2> - <p> - Add the following entries to your local <b><i>hosts</i></b> file on Windows (c:\Windows\System32\drivers\etc\hosts) or Linux (/etc/hosts) - -<pre> -127.0.0.1 www.webgoat.local www.webwolf.local -</pre> - Then use the following URL's: - </p> - <table> - <tr> - <td>WebGoat URL</td> - <td><a href="http://www.webgoat.local/WebGoat" target="_blank">http://www.webgoat.local/WebGoat</a></td> - </tr> - <tr> - <td>WebWolf URL</td> - <td><a href="http://www.webwolf.local/WebWolf" target="_blank">http://www.webwolf.local/WebWolf</a></td> - </tr> - <table> - </body> +<head> + <meta name="viewport" content="width=device-width, initial-scale=1"> + <style> + + .p1 { + font-family: Arial, Helvetica, sans-serif; + } + + .webgoat { + float: left; + margin-right: 250px; + text-align: center; + } + + .webwolf { + float: left; + width: 40%; + height: 40%; + text-align: center; + } + + #images { + display: flex; + align-items: center; + justify-content: center; + } + + body { + + text-align: center; + + } + </style> +</head> +<body> + + +<h1> + <center> + Landing page for WebGoat and WebWolf + </center> +</h1> +<blockquote class="p1"> + WebGoat is a deliberately insecure web application maintained by <a href="http://www.owasp.org/">OWASP</a> designed + to teach web + application security lessons. + + This program is a demonstration of common server-side application flaws. The + exercises are intended to be used by people to learn about application security and + penetration testing techniques. +</blockquote> + +<br/> + +<p class="p1">Click on one of the images to go to WebGoat or WebWolf</p> + +<br/> +<br/> + +<div id="images"> + <a href="http://127.0.0.1:8080/WebGoat" title="Open WebGoat" target="_blank"><img class="webgoat" + src="http://127.0.0.1:8080/WebGoat/css/img/logoBG.jpg"></a> + <a href="http://127.0.0.1:9090/WebWolf" title="Open WebWolf" target="_blank"><img class="webwolf" + src="http://127.0.0.1:9090/images/wolf.png"></a> +</div> + +</body> </html> diff --git a/docker/start.sh b/docker/start.sh index 26798f2b5..c55d92646 100644 --- a/docker/start.sh +++ b/docker/start.sh @@ -11,6 +11,6 @@ sleep 10 echo "Starting WebWolf..." java -Duser.home=/home/webgoat -Dfile.encoding=UTF-8 -jar webwolf.jar --webgoat.build.version=$1 --server.address=0.0.0.0 > webwolf.log & -echo "Browse to http://localhost" to get started >> webgoat.log +echo "Browse to http://localhost to get started" >> webgoat.log tail -300f webgoat.log