XXE successfully completed message was no longer shown, fixed it by using form POST together with customjs functions.

Introduced callback functionality which you can specify after the posting in order to be able to load the comments list again.
This commit is contained in:
Nanne Baars
2017-06-12 15:08:55 +02:00
parent 19a4859e4f
commit 52a48df70c
5 changed files with 26 additions and 27 deletions
webgoat-container/src/main/resources/static/js/goatApp/view
webgoat-lessons
sol.txt
xxe
src
main
java
org
owasp
webgoat
resources

@ -80,7 +80,9 @@ define(['jquery',
var self = this; var self = this;
// TODO custom Data prep for submission // TODO custom Data prep for submission
var prepareDataFunctionName = $(curForm).attr('prepareData'); var prepareDataFunctionName = $(curForm).attr('prepareData');
var callbackFunctionName = $(curForm).attr('callback');
var submitData = (typeof webgoat.customjs[prepareDataFunctionName] === 'function') ? webgoat.customjs[prepareDataFunctionName]() : $(curForm).serialize(); var submitData = (typeof webgoat.customjs[prepareDataFunctionName] === 'function') ? webgoat.customjs[prepareDataFunctionName]() : $(curForm).serialize();
var callbackFunction = (typeof webgoat.customjs[callbackFunctionName] === 'function') ? webgoat.customjs[callbackFunctionName] : function() {};
// var submitData = this.$form.serialize(); // var submitData = this.$form.serialize();
this.curForm = curForm; this.curForm = curForm;
this.$curFeedback = $(curForm).closest('.attack-container').find('.attack-feedback'); this.$curFeedback = $(curForm).closest('.attack-container').find('.attack-feedback');
@ -93,14 +95,16 @@ define(['jquery',
url:formUrl, url:formUrl,
method:formMethod, method:formMethod,
contentType:contentType, contentType:contentType,
data: submitData data: submitData,
complete: function (data) {
callbackFunction();
}
}).then(self.onSuccessResponse.bind(self), self.onErrorResponse.bind(self)); }).then(self.onSuccessResponse.bind(self), self.onErrorResponse.bind(self));
return false; return false;
}, },
onSuccessResponse: function(data) { onSuccessResponse: function(data) {
this.renderFeedback(data.feedback); this.renderFeedback(data.feedback);
this.renderOutput(data.output || ""); this.renderOutput(data.output || "");
//TODO: refactor back assignmentCompleted in Java //TODO: refactor back assignmentCompleted in Java
if (data.lessonCompleted || data.assignmentCompleted) { if (data.lessonCompleted || data.assignmentCompleted) {

@ -11,7 +11,7 @@ Smith' union select userid,user_name, password,cookie,cookie, cookie,userid from
## XXE ## ## XXE ##
Simple - <?xml version="1.0" standalone="yes" ?><!DOCTYPE user [<!ENTITY root SYSTEM "file:///"> ]><user> <username>&root;</username><password>test</password></user> Simple - <?xml version="1.0" standalone="yes" ?><!DOCTYPE user [<!ENTITY root SYSTEM "file:///"> ]><comment><text>&root;</text></comment>
Modern Rest Framework - change content type to: Content-Type: application/xml && Modern Rest Framework - change content type to: Content-Type: application/xml &&
<?xml version="1.0" standalone="yes" ?><!DOCTYPE user [<!ENTITY root SYSTEM "file:///"> ]><user> <username>&root;</username><password>test</password></user> <?xml version="1.0" standalone="yes" ?><!DOCTYPE user [<!ENTITY root SYSTEM "file:///"> ]><user> <username>&root;</username><password>test</password></user>

@ -9,7 +9,6 @@ import org.owasp.webgoat.assignments.AttackResult;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
@ -65,7 +64,7 @@ public class SimpleXXE extends AssignmentEndpoint {
@RequestMapping(method = POST, consumes = ALL_VALUE, produces = APPLICATION_JSON_VALUE) @RequestMapping(method = POST, consumes = ALL_VALUE, produces = APPLICATION_JSON_VALUE)
@ResponseBody @ResponseBody
public AttackResult createNewComment(@RequestBody String commentStr, @RequestHeader("Content-Type") String contentType) throws Exception { public AttackResult createNewComment(@RequestBody String commentStr) throws Exception {
String error = ""; String error = "";
try { try {
Comment comment = comments.parseXml(commentStr); Comment comment = comments.parseXml(commentStr);

@ -24,8 +24,10 @@
<form class="attack-form" accept-charset="UNKNOWN" <form class="attack-form" accept-charset="UNKNOWN"
method="POST" name="form" method="POST" name="form"
action="/WebGoat/xxe/simple" prepareData="simpleXXE"
enctype="application/json;charset=UTF-8"> callback="simpleXXECallback"
contentType="application/xml"
action="/WebGoat/xxe/simple">
<div class="container-fluid"> <div class="container-fluid">
<div class="panel post"> <div class="panel post">
<div class="post-heading"> <div class="post-heading">
@ -54,7 +56,7 @@
<input class="form-control" id="commentInputSimple" placeholder="Add a comment" <input class="form-control" id="commentInputSimple" placeholder="Add a comment"
type="text"/> type="text"/>
<span class="input-group-addon"> <span class="input-group-addon">
<i id="postCommentSimple" class="fa fa-edit" style="font-size: 20px"></i> <button id="postCommentSimple" class="fa fa-edit" style="font-size: 20px"></button>
</span> </span>
</div> </div>
<ul class="comments-list"> <ul class="comments-list">

@ -1,23 +1,17 @@
$(document).ready(function () { webgoat.customjs.simpleXXE = function () {
$("#postCommentSimple").unbind();
$("#postCommentSimple").on("click", function () {
var commentInput = $("#commentInputSimple").val(); var commentInput = $("#commentInputSimple").val();
var xml = '<?xml version="1.0"?>' + var xml = '<?xml version="1.0"?>' +
'<comment>' + '<comment>' +
' <text>' + commentInput + '</text>' + ' <text>' + commentInput + '</text>' +
'</comment>'; '</comment>';
$.ajax({ return xml;
type: 'POST', }
url: 'xxe/simple',
data: xml, webgoat.customjs.simpleXXECallback = function() {
contentType: "application/xml", getComments('#commentsListSimple');
dataType: 'xml', }
complete: function (data) {
$("#commentInputSimple").val(''); $(document).ready(function () {
getComments('#commentsListSimple')
}
})
});
getComments('#commentsListSimple'); getComments('#commentsListSimple');
}); });