From c8fad669734a0f2cef2976e42822a51a7e0c9537 Mon Sep 17 00:00:00 2001
From: Nanne Baars
Date: Sat, 14 Aug 2021 12:33:28 +0200
Subject: [PATCH] #1024: Update landing page
---
docker/Dockerfile | 7 ---
docker/Readme.md | 2 +-
docker/index.html | 107 +++++++++++++++++++++++++++++-----------------
docker/start.sh | 2 +-
4 files changed, 69 insertions(+), 49 deletions(-)
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 @@
-
- OWASP WebGoat Training tools
-
- Use the following links to access the WebGoat and WebWolf applications.
- Register a user using WebGoat. The same user can access WebWolf.
-
-
- Use without special host name entries
-
-
-
- Use with www.webgoat.local and www.webwolf.local
-
- Add the following entries to your local hosts file on Windows (c:\Windows\System32\drivers\etc\hosts) or Linux (/etc/hosts)
-
-
-127.0.0.1 www.webgoat.local www.webwolf.local
-
- Then use the following URL's:
-
-
-
- WebGoat URL |
- http://www.webgoat.local/WebGoat |
-
-
- WebWolf URL |
- http://www.webwolf.local/WebWolf |
-
-
-
+
+
+
+
+
+
+
+
+
+ Landing page for WebGoat and WebWolf
+
+
+
+ WebGoat is a deliberately insecure web application maintained by OWASP 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.
+
+
+
+
+Click on one of the images to go to WebGoat or WebWolf
+
+
+
+
+
+

+

+
+
+
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