Skip to content

Commit 59a3509

Browse files
cpjuliacpjulia
committed
Merge branch 'devel' of github.com:arangodb/arangodb into feature/supervised-aql-value
2 parents 79d6084 + 20201f1 commit 59a3509

16 files changed

+235
-83
lines changed

‎CHANGELOG‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
devel
22
-----
33

4+
* FE-636: bump express from 4.18.2 to 4.21.2 (latest 4.X version) (ensure non-vulnerable body-parser).
5+
46
* Fix a potential integer overflow in shortest path estimation.
57

68
* Fix BTS-2268: Fixed an issue where query plan for queries with subquery

‎js/apps/system/_admin/aardvark/APP/frontend/js/views/applicationDetailView.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@
199199
}
200200
window.modalView.show(
201201
'modalTable.ejs',
202-
'Result of script "' + script + '"',
202+
'Result of script "' + _.escape(script) + '"',
203203
undefined,
204204
undefined,
205205
undefined,
@@ -210,7 +210,7 @@
210210
];
211211
window.modalView.show(
212212
'modalTable.ejs',
213-
'Run script "' + script + '" on "' + this.model.get('mount') + '"',
213+
'Run script "' + _.escape(script) + '" on "' + _.escape(this.model.get('mount')) + '"',
214214
buttons,
215215
tableContent
216216
);
@@ -255,7 +255,7 @@
255255
];
256256
window.modalView.show(
257257
'modalTable.ejs',
258-
'Run tests for app "' + this.model.get('mount') + '"',
258+
'Run tests for app "' + _.escape(this.model.get('mount')) + '"',
259259
buttons,
260260
undefined,
261261
undefined,
@@ -345,18 +345,18 @@
345345
// information box info tab
346346
if (this.model.get('author')) {
347347
$('.information').append(
348-
'<p class="mount"><span>Author:</span>' + this.model.get('author') + '</p>'
348+
'<p class="mount"><span>Author:</span>' + _.escape(this.model.get('author')) + '</p>'
349349
);
350350
}
351351
if (this.model.get('mount')) {
352352
$('.information').append(
353-
'<p class="mount"><span>Mount:</span>' + this.model.get('mount') + '</p>'
353+
'<p class="mount"><span>Mount:</span>' + _.escape(this.model.get('mount')) + '</p>'
354354
);
355355
}
356356
if (this.model.get('development')) {
357357
if (this.model.get('path')) {
358358
$('.information').append(
359-
'<p class="path"><span>Path:</span>' + this.model.get('path') + '</p>'
359+
'<p class="path"><span>Path:</span>' + _.escape(this.model.get('path')) + '</p>'
360360
);
361361
}
362362
}
@@ -401,7 +401,7 @@
401401
];
402402
window.modalView.show(
403403
'modalTable.ejs',
404-
'Delete Foxx App mounted at "' + this.model.get('mount') + '"',
404+
'Delete Foxx App mounted at "' + _.escape(this.model.get('mount')) + '"',
405405
buttons,
406406
tableContent,
407407
undefined,

‎js/apps/system/_admin/aardvark/APP/frontend/js/views/applierView.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
if (window.App.naviView) {
2424
var string = 'Database';
2525
if (name) {
26-
string = string + ': ' + name;
26+
string = string + ': ' + _.escape(name);
2727
}
2828
$('#subNavigationBar .breadcrumb').html(string);
2929
} else {

‎js/apps/system/_admin/aardvark/APP/frontend/js/views/graphViewer.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162

163163
// render navigation
164164
$('#subNavigationBar .breadcrumb').html(
165-
'Graph: ' + this.name
165+
'Graph: ' + _.escape(this.name)
166166
);
167167

168168
this.resize();
@@ -458,7 +458,7 @@
458458
}
459459
} else {
460460
message = e.responseJSON.errorMessage;
461-
$('#calculatingGraph').html('Failed to fetch graph information: ' + e.responseJSON.errorMessage);
461+
$('#calculatingGraph').html('Failed to fetch graph information: ' + _.escape(e.responseJSON.errorMessage));
462462
}
463463
arangoHelper.arangoError('Graph', message);
464464
} catch (ignore) {}

‎js/apps/system/_admin/aardvark/APP/frontend/js/views/infoView.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
}
7878
window.modalView.show(
7979
'modalCollectionInfo.ejs',
80-
'Collection: ' + (this.model.get('name').length > 64 ? this.model.get('name').substr(0, 64) + "..." : this.model.get('name')),
80+
'Collection: ' + _.escape(this.model.get('name').length > 64 ? this.model.get('name').substr(0, 64) + "..." : this.model.get('name')),
8181
buttons,
8282
tableContent, null, null,
8383
null, null,

‎js/apps/system/_admin/aardvark/APP/frontend/js/views/installGitHubServiceView.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
if (window.App.naviView) {
5454
var replaceString = 'New';
5555
if (this._upgrade) {
56-
replaceString = 'Replace (' + window.App.replaceAppData.mount + ')';
56+
replaceString = 'Replace (' + _.escape(window.App.replaceAppData.mount) + ')';
5757
}
5858
$('#subNavigationBar .breadcrumb').html(
5959
'<a href="#services">Services:</a> ' + replaceString

‎js/apps/system/_admin/aardvark/APP/frontend/js/views/installNewServiceView.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
if (window.App.naviView) {
166166
var replaceString = 'New';
167167
if (this._upgrade) {
168-
replaceString = 'Replace (' + window.App.replaceAppData.mount + ')';
168+
replaceString = 'Replace (' + _.escape(window.App.replaceAppData.mount) + ')';
169169
}
170170
$('#subNavigationBar .breadcrumb').html(
171171
'<a href="#services">Services:</a> ' + replaceString

‎js/apps/system/_admin/aardvark/APP/frontend/js/views/installServiceView.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
breadcrumb: function () {
117117
var replaceString = 'New';
118118
if (this._upgrade) {
119-
replaceString = 'Replace (' + window.App.replaceAppData.mount + ')';
119+
replaceString = 'Replace (' + _.escape(window.App.replaceAppData.mount) + ')';
120120
}
121121
$('#subNavigationBar .breadcrumb').html(
122122
'<a href="#services">Services:</a> ' + replaceString

‎js/apps/system/_admin/aardvark/APP/frontend/js/views/installUploadServiceView.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
if (window.App.naviView) {
106106
var replaceString = 'New';
107107
if (this._upgrade) {
108-
replaceString = 'Replace (' + window.App.replaceAppData.mount + ')';
108+
replaceString = 'Replace (' + _.escape(window.App.replaceAppData.mount) + ')';
109109
}
110110
$('#subNavigationBar .breadcrumb').html(
111111
'<a href="#services">Services:</a> ' + replaceString

‎js/apps/system/_admin/aardvark/APP/frontend/js/views/installUrlServiceView.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
if (window.App.naviView) {
4646
var replaceString = 'New';
4747
if (this._upgrade) {
48-
replaceString = 'Replace (' + window.App.replaceAppData.mount + ')';
48+
replaceString = 'Replace (' + _.escape(window.App.replaceAppData.mount) + ')';
4949
}
5050
$('#subNavigationBar .breadcrumb').html(
5151
'<a href="#services">Services:</a> ' + replaceString

0 commit comments

Comments
 (0)