Skip to content

Commit bdb9d33

Browse files
act-iveact-ive
committed
Merge branch 'next' of https://github.com/WebGoat/WebGoat into next
2 parents d72d1f0 + 5f45e6e commit bdb9d33

File tree

9 files changed

+118
-128
lines changed

9 files changed

+118
-128
lines changed

‎src/main/webapp/WEB-INF/pages/about.jsp‎

Lines changed: 91 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -1,124 +1,97 @@
11
<%@ page contentType="text/html; charset=ISO-8859-1" language="java"
22
errorPage=""%>
33

4-
<!-- Latest compiled and minified CSS -->
5-
<link rel="stylesheet" href="plugins/bootstrap/css/bootstrap.min.css"/>
6-
<link rel="stylesheet" href="css/webgoat.css" type="text/css" />
4+
<!-- This modal content is included into the main_new.jsp -->
75

8-
<div class="modal-header">
9-
<button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
10-
<h1 class="modal-title" id="myModalLabel">About WebGoat</h1>
11-
</div>
12-
<div class="modal-body">
13-
<p>Thank you for using WebGoat! This program is a demonstration of common web application flaws.
14-
The exercises are intended to provide hands on experience with
15-
application penetration testing techniques. </p>
16-
<p>The WebGoat project is led
17-
by Bruce Mayhew. Please send all comments to Bruce at [TODO, session was blowing up here for some reason].</p>
18-
19-
<div id="team">
20-
<table border="0" align="center" class="lessonText">
21-
<tr>
22-
<td width="50%">
23-
<div align="center"><a href="http://www.owasp.org"><img
24-
border="0" src="images/logos/owasp.jpg" alt="OWASP Foundation"
25-
longdesc="http://www.owasp.org" /></a></div>
26-
</td>
27-
<td width="50%">
28-
<div align="center"><a href="http://www.aspectsecurity.com"><img
29-
border="0" src="images/logos/aspect.jpg" alt="Aspect Security"
30-
longdesc="http://www.aspectsecurity.com" /></a></div>
31-
</td>
32-
</tr>
33-
<tr>
34-
<td colspan="2">
35-
<div align="center"><span class="style1">
36-
WebGoat Authors </span></div>
37-
</td>
38-
</tr>
39-
<tr>
40-
<td colspan="2">
41-
<div align="center"><span class="style2">
42-
Bruce Mayhew </span></div>
43-
</td>
44-
</tr>
45-
<tr>
46-
<td colspan="2">
47-
<div align="center"><span class="style2">
48-
Jeff Williams </span></div>
49-
</td>
50-
</tr>
51-
<tr>
52-
<td width="50%">
53-
<div align="center"><span class="style1"><br />
54-
WebGoat Design Team </span></div>
55-
</td>
56-
<td width="50%">
57-
<div align="center"><span class="style1"><br />
58-
V5.4 Lesson Contributers </span></div>
59-
</td>
60-
</tr>
61-
<tr>
62-
<td valign="top">
63-
<div align="center" class="style2">David Anderson</div>
64-
<div align="center" class="style2">Laurence Casey (Graphics)</div>
65-
<div align="center" class="style2">Rogan Dawes</div>
66-
<div align="center" class="style2">Bruce Mayhew</div>
67-
</td>
68-
<td valign="top">
69-
<div align="center" class="style2">Sherif Koussa</div>
70-
<div align="center" class="style2">Yiannis Pavlosoglou</div>
71-
<div align="center" class="style2"></div>
72-
73-
</td>
74-
</tr>
75-
<tr>
76-
<td height="25" valign="bottom">
77-
<div align="center"><span class="style1">Special Thanks
78-
for V5.4</span></div>
79-
</td>
80-
<td height="25" valign="bottom">
81-
<div align="center"><span class="style1">Documentation
82-
Contributers</span></div>
83-
</td>
84-
</tr>
85-
<tr>
86-
<td>
87-
<div align="center" class="style2">Brian Ciomei (Multitude of bug fixes)</div>
88-
<div align="center" class="style2">To all who have sent comments</div>
89-
90-
</td>
91-
<td>
92-
<div align="center" class="style2">
93-
<a href="http://www.zionsecurity.com/" target="_blank">Erwin Geirnaert</a></div>
94-
<div align="center" class="style2">
95-
<a href="http://yehg.org/" target="_blank">Aung Khant</a></div>
96-
<div align="center" class="style2">
97-
<a href="http://www.softwaresecured.com" target="blank">Sherif Koussa</a>
98-
</div>
99-
</td>
100-
</tr>
101-
<tr>
102-
<td>
103-
<div align="center" class="style2">&nbsp;</div>
104-
</td>
105-
</tr>
106-
</table>
6+
<div class="modal-content">
7+
<div class="modal-header">
8+
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
9+
<h3 class="modal-title" id="myModalLabel">About WebGoat - Provided by the OWASP Foundation</h3>
10+
</div>
11+
<div class="modal-body modal-scroll">
12+
<p>Thanks for hacking The Goat!</p>
13+
<p>WebGoat is a demonstration of common web application flaws. The
14+
associated exercises are intended to provide hands-on experience with
15+
techniques aimed at demonstrating and testing application penetration.
16+
</p>
17+
<p>From the entire WebGoat team, we appreciate your interest and efforts
18+
in making applications not just better, but safer and more secure for
19+
everyone. We, as well as our sacrificial goat, thank you.</p>
20+
<p>Version: 6.0</p>
21+
<div class="row">
22+
<div class="col-md-6">
23+
<p>Contact us:
24+
<ul>
25+
<li>WebGoat mailing list: [email protected]</li>
26+
<li>Bruce Mayhew: [email protected]</li>
27+
</ul>
28+
</p>
29+
</div>
30+
</div>
31+
<div class="row">
32+
<div class="col-md-6">
33+
<p>WebGoat Authors
34+
<ul>
35+
<li>Bruce Mayhew (Project Lead)</li>
36+
<li>Jeff Williams (Original Idea)</li>
37+
<li>Richard Lawson (Architect)</li>
38+
<li>Jason White (Architect)</li>
39+
</ul>
40+
</p>
41+
</div>
42+
<div class="col-md-6">
43+
<p>WebGoat Design Team
44+
<ul>
45+
<li>Richard Lawson</li>
46+
<li>Bruce Mayhew</li>
47+
<li>Jason White</li>
48+
<li>Ali Looney (User Interface)</li>
49+
<li>Jeff Wayman (Website and Docs)</li>
50+
</ul>
51+
</p>
52+
</div>
53+
</div>
54+
<div class="row">
55+
<div class="col-md-6">
56+
<p>Active Contributors
57+
<ul>
58+
<li>Nanne Baars (Developer)</li>
59+
<li>Dave Cowden (Everything)</li>
60+
<li>Keith Gasser (Survey)</li>
61+
<li>Li Simon (Developer)</li>
62+
</ul>
63+
</p>
64+
</div>
65+
<div class="col-md-6">
66+
<p>Past Contributors
67+
<ul>
68+
<li>David Anderson (Developer/Design)</li>
69+
<li>Christopher Blum (Lessons)</li>
70+
<li>Laurence Casey (Graphics)</li>
71+
<li>Brian Ciomei (Bug fixes)</li>
72+
<li>Rogan Dawes (Lessons)</li>
73+
<li>Erwin Geirnaert (Solutions)</li>
74+
<li>Aung Knant (Documentation)</li>
75+
<li>Ryan Knell (Lessons)</li>
76+
<li>Christine Koppeit (Build)</li>
77+
<li>Sherif Kousa (Lessons/Documentation)</li>
78+
<li>Reto Lippuner (Lessons)</li>
79+
<li>PartNet (Lessons)</li>
80+
<li>Yiannis Pavlosoglou (Lessons)</li>
81+
<li>Eric Sheridan (Lessons)</li>
82+
<li>Alex Smolen (Lessons)</li>
83+
<li>Chuck Willis (Lessons)</li>
84+
<li>Marcel Wirth (Lessons)</li>
85+
</ul>
86+
</p>
87+
<p>Did we miss you? Our sincere apologies, as we know there have
88+
been many contributors over the years. If your name does not
89+
appear in any of the lists above, please send us a note. We'll
90+
get you added with no further sacrifices required.</p>
91+
</div>
92+
</div>
93+
</div>
94+
<div class="modal-footer">
95+
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
10796
</div>
108-
<div align="center" class="style2">&nbsp;</div>
109-
<div align="center" class="style2">&nbsp;</div>
110-
<div align="center" class="style2">&nbsp;</div>
111-
<div id="warning">WARNING<br />
112-
While running this program, your machine is extremely vulnerable to
113-
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.
114-
<br />
115-
<br />
116-
This program is for educational purposes only. Use of these techniques
117-
without permission could lead to job termination, financial liability,
118-
and/or criminal penalties.</div>
119-
</div>
120-
<div class="modal-footer">
121-
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
12297
</div>
123-
124-

‎src/main/webapp/WEB-INF/pages/main_new.jsp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757

5858

5959
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
60-
<title>WebGoat V6.0</title>
60+
<title>WebGoat</title>
6161
</head>
6262

6363
<body class="animated fadeIn" ng-app="goatApp">
@@ -354,10 +354,11 @@
354354
}
355355
356356
</script>
357-
<!-- Modal -->
357+
<!-- About WebGoat Modal -->
358358
<div class="modal fade" id="aboutModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
359359
<div class="modal-dialog modal-lg">
360360
<div class="modal-content">
361+
<jsp:include page="../pages/about.jsp"/>
361362
</div>
362363
</div>
363364
</div>

‎src/main/webapp/WEB-INF/spring-security.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<http use-expressions="true">
2222
<intercept-url pattern="/login.mvc" access="permitAll" />
2323
<intercept-url pattern="/logout.mvc" access="permitAll" />
24+
<intercept-url pattern="/index.jsp" access="permitAll" />
2425
<intercept-url pattern="/servlet/AdminServlet/**" access="hasAnyRole('ROLE_WEBGOAT_ADMIN','ROLE_SERVER_ADMIN')" />
2526
<intercept-url pattern="/JavaSource/**" access="hasRole('ROLE_SERVER_ADMIN')" />
2627
<intercept-url pattern="/**" access="hasAnyRole('ROLE_WEBGOAT_USER','ROLE_WEBGOAT_ADMIN','ROLE_SERVER_ADMIN')" />

‎src/main/webapp/WEB-INF/web.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@
323323
</mime-mapping>
324324

325325
<welcome-file-list>
326-
<welcome-file>login.mvc</welcome-file>
326+
<welcome-file>index.jsp</welcome-file>
327327
</welcome-file-list>
328328

329329
</web-app>

‎src/main/webapp/css/img/logoBG.jpg‎

17.5 KB
Loading

‎src/main/webapp/css/main.css‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,16 @@ img {
7474
#header .brand {
7575
float: left;
7676
width: 240px;
77-
min-height: 80px;
78-
padding: 0 0 0 10px;
77+
height: 80px;
78+
padding: 0;
7979
position: relative;
80-
background: #e84c3d url('img/logo.png') no-repeat 25px 26px;
80+
background: url('img/logoBG.jpg') no-repeat 0px 0px;
8181
}
8282
#header .logo {
8383
color: #fff;
8484
font-size: 1.7em;
8585
text-transform: uppercase;
86-
padding: 23px 0 0 57px;
86+
padding: 23px 0 0 75px;
8787
display: inline-block;
8888
}
8989
#header .logo span {
@@ -714,6 +714,17 @@ fieldset[disabled] .btn-warning.active {
714714
color: #fff;
715715
border: none;
716716
}
717+
718+
/* ==========================================================================
719+
Modal
720+
========================================================================== */
721+
.modal-footer .btn + .btn {
722+
margin-bottom: 5px;
723+
}
724+
.modal .modal-body.modal-scroll {
725+
max-height: 350px;
726+
overflow-y: auto;
727+
}
717728
/* ==========================================================================
718729
Media Queries
719730
========================================================================== */
@@ -774,7 +785,7 @@ fieldset[disabled] .btn-warning.active {
774785

775786
#topLinks {
776787
float:right;
777-
margin-right:5px;s
788+
margin-right:5px;
778789
margin-top:3px;
779790
}
780791

‎src/main/webapp/css/webgoat.css‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/*
12
body{
23
min-width: 800px;
34
font-family: Arial,sans-serif;
@@ -49,7 +50,7 @@ h5{
4950
font-size: 100%;
5051
color: #334d55;
5152
}
52-
53+
*/
5354
ul{
5455
list-style-type: square;
5556
}

‎src/main/webapp/index.jsp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<%@ page session="false" %>
2+
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
3+
<c:redirect url="/login.mvc"/>

‎src/main/webapp/js/goatControllers.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ goat.controller('goatLesson', function($scope, $http, $modal, $log, $templateCac
151151

152152
$scope.showAbout = function() {
153153
$('#aboutModal').modal({
154-
remote: 'about.mvc'
154+
//remote: 'about.mvc'
155155
});
156156
};
157157

0 commit comments

Comments
 (0)