actual working version of vulnerable components part 5

This commit is contained in:
René Zubcevic 2020-04-08 10:05:42 +02:00 committed by Nanne Baars
parent e25f7a7560
commit e921fb66a9
3 changed files with 13 additions and 10 deletions

View File

@ -6,6 +6,7 @@
define(['jquery', define(['jquery',
'libs/jquery-vuln', 'libs/jquery-vuln',
'jqueryuivuln',
'underscore', 'underscore',
'backbone', 'backbone',
'goatApp/controller/LessonController', 'goatApp/controller/LessonController',
@ -13,8 +14,9 @@ define(['jquery',
'goatApp/view/LessonContentView', 'goatApp/view/LessonContentView',
'goatApp/view/MenuView', 'goatApp/view/MenuView',
'goatApp/view/TitleView' 'goatApp/view/TitleView'
], function (jquery, ], function ($,
jqueryvuln, $vuln,
jqueryui,
_, _,
Backbone, Backbone,
LessonController, LessonController,
@ -24,17 +26,17 @@ define(['jquery',
TitleView) { TitleView) {
function getContentElement() { function getContentElement() {
return jquery('#main-content'); return $('#main-content');
}; };
function render(view) { function render(view) {
jquery('div.pages').hide(); $('div.pages').hide();
//TODO this works for now because we only have one page we should rewrite this a bit //TODO this works for now because we only have one page we should rewrite this a bit
if (view != null) { if (view != null) {
jquery('#report-card-page').show(); $('#report-card-page').show();
} else { } else {
jquery('#lesson-title').show(); $('#lesson-title').show();
jquery('#lesson-page').show(); $('#lesson-page').show();
} }
}; };
@ -56,8 +58,8 @@ define(['jquery',
titleView: null, titleView: null,
setUpCustomJS: function () { setUpCustomJS: function () {
webgoat.customjs.jquery = jquery; //passing jquery into custom js scope ... still klunky, but works for now webgoat.customjs.jquery = $; //passing jquery into custom js scope ... still klunky, but works for now
webgoat.customjs.jqueryVuln = jqueryvuln;//ui;//$vuln; webgoat.customjs.jqueryVuln = $vuln;
// shim to support xss lesson // shim to support xss lesson
webgoat.customjs.phoneHome = function (e) { webgoat.customjs.phoneHome = function (e) {

View File

@ -1,4 +1,4 @@
var jQuery = require('jquery'); var jQuery = require('libs/jquery-vuln');
/*! jQuery UI - v1.10.3 - 2013-05-03 /*! jQuery UI - v1.10.3 - 2013-05-03
* http://jqueryui.com * http://jqueryui.com

View File

@ -25,6 +25,7 @@ require.config({
baseUrl: "js/", baseUrl: "js/",
paths: { paths: {
jquery: 'libs/jquery.min', jquery: 'libs/jquery.min',
jqueryuivuln: 'libs/jquery-ui-1.10.4',
jqueryui: 'libs/jquery-ui.min', jqueryui: 'libs/jquery-ui.min',
underscore: 'libs/underscore-min', underscore: 'libs/underscore-min',
backbone: 'libs/backbone-min', backbone: 'libs/backbone-min',