dubey/WebGoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/v8.0.0.M18'

Browse Source
This commit is contained in:
Nanne Baars
2018-06-20 16:32:31 +02:00
parent 9af0054b5b c7da546249
commit 12123ef13b
29 changed files with 93 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
webgoat-container/src/main/java/org/owasp/webgoat/session/CreateDB.java
View File

@ -232,7 +232,7 @@ public class CreateDB {
// Create the new table
try {
String createTableStatement = "CREATE TABLE user_system_data (" + "userid varchar(5) not null primary key,"
String createTableStatement = "CREATE TABLE user_system_data (" + "userid int not null primary key,"
+ "user_name varchar(12)," + "password varchar(10)," + "cookie varchar(30)" + ")";
statement.executeUpdate(createTableStatement);
} catch (SQLException e) {
@ -240,11 +240,11 @@ public class CreateDB {
}
// Populate
String insertData1 = "INSERT INTO user_system_data VALUES ('101','jsnow','passwd1', '')";
String insertData2 = "INSERT INTO user_system_data VALUES ('102','jdoe','passwd2', '')";
String insertData3 = "INSERT INTO user_system_data VALUES ('103','jplane','passwd3', '')";
String insertData4 = "INSERT INTO user_system_data VALUES ('104','jeff','jeff', '')";
String insertData5 = "INSERT INTO user_system_data VALUES ('105','dave','dave', '')";
String insertData1 = "INSERT INTO user_system_data VALUES (101,'jsnow','passwd1', '')";
String insertData2 = "INSERT INTO user_system_data VALUES (102,'jdoe','passwd2', '')";
String insertData3 = "INSERT INTO user_system_data VALUES (103,'jplane','passwd3', '')";
String insertData4 = "INSERT INTO user_system_data VALUES (104,'jeff','jeff', '')";
String insertData5 = "INSERT INTO user_system_data VALUES (105,'dave','passW0rD', '')";
statement.executeUpdate(insertData1);
statement.executeUpdate(insertData2);
statement.executeUpdate(insertData3);

2
webgoat-container/src/main/java/org/owasp/webgoat/users/UserForm.java
View File

@ -17,7 +17,7 @@ public class UserForm {
@NotNull
@Size(min=6, max=20)
@Pattern(regexp = "[a-zA-Z0-9]*", message = "can only contain letters and digits")
@Pattern(regexp = "[a-zA-Z0-9-]*", message = "can only contain letters, digits, and -")
private String username;
@NotNull
@Size(min=6, max=10)

3
webgoat-container/src/main/resources/static/js/goatApp/controller/LessonController.js
View File

@ -79,6 +79,7 @@ define(['jquery',
this.listenTo(this.lessonHintView, 'hints:hideButton', this.onHideHintsButton);
this.lessonContentView.navToPage(pageNum);
this.lessonHintView.hideHints();
this.lessonHintView.showFirstHint();
//this.lessonHintView.selectHints();
this.titleView.render(this.lessonInfoModel.get('lessonTitle'));
return;
@ -160,7 +161,7 @@ define(['jquery',
}
//
this.lessonHintView.render();
if (this.lessonHintView.getHintsCount > 0) {
if (this.lessonHintView.getHintsCount() > 0) {
this.helpControlsView.showHintsButton();
} else {
this.helpControlsView.hideHintsButton();

6
webgoat-container/src/main/resources/static/js/goatApp/model/LessonContentModel.js
View File

@ -32,7 +32,11 @@ define(['jquery',
}
this.set('content',content);
this.set('lessonUrl',document.URL.replace(/\.lesson.*/,'.lesson'));
this.set('pageNum',document.URL.replace(/.*\.lesson\/(\d{1,4})$/,'$1'));
if (/.*\.lesson\/(\d{1,4})$/.test(document.URL)) {
this.set('pageNum',document.URL.replace(/.*\.lesson\/(\d{1,4})$/,'$1'));
} else {
this.set('pageNum',0);
}
this.trigger('content:loaded',this,loadHelps);
},

20
webgoat-container/src/main/resources/static/js/goatApp/view/HintView.js
View File

@ -32,21 +32,19 @@ function($,
toggleLabel: function() {
if (this.isVisible()) {
$('show-hints-button').text('Hide hints');
$('#show-hints-button').text('Hide hints');
} else {
$('show-hints-button').text('Show hints');
$('#show-hints-button').text('Show hints');
}
},
render:function() {
if (this.isVisible()) {
this.$el.hide(350);
this.$el.hide(350, this.toggleLabel.bind(this));
} else if (this.hintsToShow.length > 0) {
this.$el.show(350);
this.$el.show(350, this.toggleLabel.bind(this));
}
this.toggleLabel()
if (this.hintsToShow.length > 0) {
this.hideShowPrevNextButtons();
}
@ -90,9 +88,9 @@ function($,
hideHints: function() {
if (this.$el.is(':visible')) {
this.$el.hide(350);
this.$el.hide(350, this.toggleLabel.bind(this));
}
},
},
showNextHint: function() {
this.curHint = (this.curHint < this.hintsToShow.length -1) ? this.curHint+1 : this.curHint;
@ -106,6 +104,12 @@ function($,
this.displayHint(this.curHint);
},
showFirstHint: function() {
this.curHint = 0;
this.hideShowPrevNextButtons();
this.displayHint(this.curHint);
},
displayHint: function(curHint) {
if(this.hintsToShow.length == 0) {
// this.hideHints();

5
webgoat-container/src/main/resources/templates/list_users.html
View File

@ -123,8 +123,9 @@
<section class="main-content-wrapper">
<section id="main-content"> <!--ng-controller="goatLesson"-->
<div id="lesson-page" class="pages">
<span th:text="${numUsers}"> Users in WebGoat</span>
<!-- iterate over users below -->su
<span th:text="${numUsers}"></span>
<span> Users in WebGoat</span>
<div sec:authorize="hasAuthority('WEBGOAT_ADMIN')">
<h3>WebGoat Users</h3>
<div th:each="user : ${allUsers}">