diff --git a/src/main/webapp/WEB-INF/pages/about.jsp b/src/main/webapp/WEB-INF/pages/about.jsp
index 785761353..08efb3a2b 100644
--- a/src/main/webapp/WEB-INF/pages/about.jsp
+++ b/src/main/webapp/WEB-INF/pages/about.jsp
@@ -1,124 +1,97 @@
<%@ page contentType="text/html; charset=ISO-8859-1" language="java"
errorPage=""%>
-
-
-
+
-
-
-
Thank you for using WebGoat! This program is a demonstration of common web application flaws.
- The exercises are intended to provide hands on experience with
- application penetration testing techniques.
-
The WebGoat project is led
- by Bruce Mayhew. Please send all comments to Bruce at [TODO, session was blowing up here for some reason].
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- WebGoat Authors
-
-
-
-
-
- Bruce Mayhew
-
-
-
-
-
- Jeff Williams
-
-
-
-
-
- WebGoat Design Team
-
-
-
- V5.4 Lesson Contributers
-
-
-
-
- David Anderson
- Laurence Casey (Graphics)
- Rogan Dawes
- Bruce Mayhew
-
-
- Sherif Koussa
- Yiannis Pavlosoglou
-
-
-
-
-
-
- Special Thanks
- for V5.4
-
-
- Documentation
- Contributers
-
-
-
-
- Brian Ciomei (Multitude of bug fixes)
- To all who have sent comments
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
Thanks for hacking The Goat!
+
WebGoat is a demonstration of common web application flaws. The
+ associated exercises are intended to provide hands-on experience with
+ techniques aimed at demonstrating and testing application penetration.
+
+
From the entire WebGoat team, we appreciate your interest and efforts
+ in making applications not just better, but safer and more secure for
+ everyone. We, as well as our sacrificial goat, thank you.
+
Version: 6.0
+
+
+
Contact us:
+
+ WebGoat mailing list: owasp-webgoat@lists.owasp.org
+ Bruce Mayhew: webgoat@owasp.org
+
+
+
+
+
+
+
WebGoat Authors
+
+ Bruce Mayhew (Project Lead)
+ Jeff Williams (Original Idea)
+ Richard Lawson (Architect)
+ Jason White (Architect)
+
+
+
+
+
WebGoat Design Team
+
+ Richard Lawson
+ Bruce Mayhew
+ Jason White
+ Ali Looney (User Interface)
+ Jeff Wayman (Website and Docs)
+
+
+
+
+
+
+
Active Contributors
+
+ Nanne Baars (Developer)
+ Dave Cowden (Everything)
+ Keith Gasser (Survey)
+ Li Simon (Developer)
+
+
+
+
+
Past Contributors
+
+ David Anderson (Developer/Design)
+ Christopher Blum (Lessons)
+ Laurence Casey (Graphics)
+ Brian Ciomei (Bug fixes)
+ Rogan Dawes (Lessons)
+ Erwin Geirnaert (Solutions)
+ Aung Knant (Documentation)
+ Ryan Knell (Lessons)
+ Christine Koppeit (Build)
+ Sherif Kousa (Lessons/Documentation)
+ Reto Lippuner (Lessons)
+ PartNet (Lessons)
+ Yiannis Pavlosoglou (Lessons)
+ Eric Sheridan (Lessons)
+ Alex Smolen (Lessons)
+ Chuck Willis (Lessons)
+ Marcel Wirth (Lessons)
+
+
+
Did we miss you? Our sincere apologies, as we know there have
+ been many contributors over the years. If your name does not
+ appear in any of the lists above, please send us a note. We'll
+ get you added with no further sacrifices required.
+
+
+
+
-
-
-
-
WARNING
- While running this program, your machine is extremely vulnerable to
- attack if you are not running on localhost. If you are NOT running on localhost (default configuration), You should disconnect from the network while using this program.
-
-
- This program is for educational purposes only. Use of these techniques
- without permission could lead to job termination, financial liability,
- and/or criminal penalties.
-
-
-
diff --git a/src/main/webapp/WEB-INF/pages/main_new.jsp b/src/main/webapp/WEB-INF/pages/main_new.jsp
index 02691348e..a2d3c16bc 100644
--- a/src/main/webapp/WEB-INF/pages/main_new.jsp
+++ b/src/main/webapp/WEB-INF/pages/main_new.jsp
@@ -57,7 +57,7 @@
-
WebGoat V6.0
+
WebGoat
@@ -354,10 +354,11 @@
}
-
+
diff --git a/src/main/webapp/WEB-INF/spring-security.xml b/src/main/webapp/WEB-INF/spring-security.xml
index 50f249aa6..ca19c1d4b 100644
--- a/src/main/webapp/WEB-INF/spring-security.xml
+++ b/src/main/webapp/WEB-INF/spring-security.xml
@@ -21,6 +21,7 @@
+
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 52ab6756b..5d2c9720c 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -323,7 +323,7 @@
- login.mvc
+ index.jsp
diff --git a/src/main/webapp/css/img/logoBG.jpg b/src/main/webapp/css/img/logoBG.jpg
new file mode 100644
index 000000000..cdc20d82e
Binary files /dev/null and b/src/main/webapp/css/img/logoBG.jpg differ
diff --git a/src/main/webapp/css/main.css b/src/main/webapp/css/main.css
index aa8eb698e..ad46de988 100644
--- a/src/main/webapp/css/main.css
+++ b/src/main/webapp/css/main.css
@@ -74,16 +74,16 @@ img {
#header .brand {
float: left;
width: 240px;
- min-height: 80px;
- padding: 0 0 0 10px;
+ height: 80px;
+ padding: 0;
position: relative;
- background: #e84c3d url('img/logo.png') no-repeat 25px 26px;
+ background: url('img/logoBG.jpg') no-repeat 0px 0px;
}
#header .logo {
color: #fff;
font-size: 1.7em;
text-transform: uppercase;
- padding: 23px 0 0 57px;
+ padding: 23px 0 0 75px;
display: inline-block;
}
#header .logo span {
@@ -714,6 +714,17 @@ fieldset[disabled] .btn-warning.active {
color: #fff;
border: none;
}
+
+/* ==========================================================================
+ Modal
+ ========================================================================== */
+.modal-footer .btn + .btn {
+ margin-bottom: 5px;
+}
+.modal .modal-body.modal-scroll {
+ max-height: 350px;
+ overflow-y: auto;
+}
/* ==========================================================================
Media Queries
========================================================================== */
@@ -774,7 +785,7 @@ fieldset[disabled] .btn-warning.active {
#topLinks {
float:right;
- margin-right:5px;s
+ margin-right:5px;
margin-top:3px;
}
diff --git a/src/main/webapp/css/webgoat.css b/src/main/webapp/css/webgoat.css
index 0aae04d38..dd61f086b 100644
--- a/src/main/webapp/css/webgoat.css
+++ b/src/main/webapp/css/webgoat.css
@@ -1,3 +1,4 @@
+/*
body{
min-width: 800px;
font-family: Arial,sans-serif;
@@ -49,7 +50,7 @@ h5{
font-size: 100%;
color: #334d55;
}
-
+*/
ul{
list-style-type: square;
}
diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp
new file mode 100644
index 000000000..0db641a6f
--- /dev/null
+++ b/src/main/webapp/index.jsp
@@ -0,0 +1,3 @@
+<%@ page session="false" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+
diff --git a/src/main/webapp/js/goatControllers.js b/src/main/webapp/js/goatControllers.js
index 157401a4e..8af941dc6 100644
--- a/src/main/webapp/js/goatControllers.js
+++ b/src/main/webapp/js/goatControllers.js
@@ -151,7 +151,7 @@ goat.controller('goatLesson', function($scope, $http, $modal, $log, $templateCac
$scope.showAbout = function() {
$('#aboutModal').modal({
- remote: 'about.mvc'
+ //remote: 'about.mvc'
});
};