Skip to content

Commit 1e5e9c0

Browse files
lawson89lawson89
committed
WEB-25 - Content for About Page
WEB-24 - Unauthenticated access should redirect to login page
1 parent c9e6d1f commit 1e5e9c0

File tree

8 files changed

+108
-123
lines changed

8 files changed

+108
-123
lines changed

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

Lines changed: 86 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -1,124 +1,92 @@
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</h3>
10+
</div>
11+
<div class="modal-body modal-scroll">
12+
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean quis posuere sapien, at ornare neque. Curabitur commodo efficitur ante, at finibus ex faucibus ut. Vivamus id diam blandit, convallis justo sed, vehicula sem. Cras a semper ex. Etiam dignissim tempus metus, sit amet blandit arcu pulvinar ac. Mauris dignissim rutrum ante sit amet posuere. Proin mollis sapien augue, at tempor metus iaculis eu. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Cras elementum finibus tincidunt.</p>
13+
<p>Version</p>
14+
<p>OWASP Reference - probably text and image</p>
15+
<div class="row">
16+
<div class="col-md-6">
17+
<p>WebGoat Authors
18+
<ul>
19+
<li>name...</li>
20+
<li>name...</li>
21+
<li>name...</li>
22+
</ul>
23+
</p>
24+
</div>
25+
<div class="col-md-6">
26+
<p>WebGoat Design Team
27+
<ul>
28+
<li>name...</li>
29+
<li>name...</li>
30+
<li>name...</li>
31+
</ul>
32+
</p>
33+
</div>
34+
</div>
35+
<div class="row">
36+
<div class="col-md-6">
37+
<p>Active Contributors
38+
<ul>
39+
<li>name... (Role)</li>
40+
<li>name... (Role)</li>
41+
<li>name... (Role)</li>
42+
<li>name... (Role)</li>
43+
<li>name... (Role)</li>
44+
<li>name... (Role)</li>
45+
<li>name... (Role)</li>
46+
<li>name... (Role)</li>
47+
<li>name... (Role)</li>
48+
<li>name... (Role)</li>
49+
<li>name... (Role)</li>
50+
<li>name... (Role)</li>
51+
<li>name... (Role)</li>
52+
</ul>
53+
</p>
54+
</div>
55+
<div class="col-md-6">
56+
<p>Past Contributors
57+
<ul>
58+
<li>name... (Role)</li>
59+
<li>name... (Role)</li>
60+
<li>name... (Role)</li>
61+
<li>name... (Role)</li>
62+
<li>name... (Role)</li>
63+
<li>name... (Role)</li>
64+
<li>name... (Role)</li>
65+
<li>name... (Role)</li>
66+
<li>name... (Role)</li>
67+
<li>name... (Role)</li>
68+
<li>name... (Role)</li>
69+
<li>name... (Role)</li>
70+
<li>name... (Role)</li>
71+
<li>name... (Role)</li>
72+
<li>name... (Role)</li>
73+
<li>name... (Role)</li>
74+
<li>name... (Role)</li>
75+
<li>name... (Role)</li>
76+
<li>name... (Role)</li>
77+
<li>name... (Role)</li>
78+
<li>name... (Role)</li>
79+
<li>name... (Role)</li>
80+
<li>name... (Role)</li>
81+
<li>name... (Role)</li>
82+
<li>name... (Role)</li>
83+
<li>name... (Role)</li>
84+
</ul>
85+
</p>
86+
</div>
87+
</div>
88+
</div>
89+
<div class="modal-footer">
90+
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
10791
</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>
12292
</div>
123-
124-

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,10 +350,11 @@
350350
}
351351
352352
</script>
353-
<!-- Modal -->
353+
<!-- About WebGoat Modal -->
354354
<div class="modal fade" id="aboutModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
355355
<div class="modal-dialog modal-lg">
356356
<div class="modal-content">
357+
<jsp:include page="../pages/about.jsp"/>
357358
</div>
358359
</div>
359360
</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/main.css‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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)