mirror of
https://github.com/LibreOffice/online.git
synced 2025-08-06 10:45:45 +00:00
update sanitize-url package
Change-Id: I4cc68a010f54afc02777c140b28e41c07a0011fe Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95158 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
This commit is contained in:
@ -102,7 +102,7 @@ NODE_MODULES_SRC =\
|
||||
select2@4.0.1 \
|
||||
vex-js@4.1.0 \
|
||||
l10n-for-node@0.0.1 \
|
||||
@braintree/sanitize-url@3.0.0
|
||||
@braintree/sanitize-url@4.0.1
|
||||
|
||||
LOLEAFLET_CSS =\
|
||||
$(builddir)/node_modules/select2/dist/css/select2.css \
|
||||
|
@ -2,30 +2,31 @@
|
||||
'use strict';
|
||||
|
||||
var invalidPrototcolRegex = /^(%20|\s)*(javascript|data)/im;
|
||||
var ctrlCharactersRegex = /[^\x20-\x7E]/gmi;
|
||||
var ctrlCharactersRegex = /[^\x20-\x7EÀ-ž]/gmi;
|
||||
var urlSchemeRegex = /^([^:]+):/gm;
|
||||
var relativeFirstCharacters = ['.', '/']
|
||||
var relativeFirstCharacters = ['.', '/'];
|
||||
|
||||
function isRelativeUrl(url) {
|
||||
function isRelativeUrlWithoutProtocol(url) {
|
||||
return relativeFirstCharacters.indexOf(url[0]) > -1;
|
||||
}
|
||||
|
||||
function sanitizeUrl(url) {
|
||||
var urlScheme, urlSchemeParseResults, sanitizedUrl;
|
||||
|
||||
if (!url) {
|
||||
return 'about:blank';
|
||||
}
|
||||
|
||||
var urlScheme, urlSchemeParseResults;
|
||||
var sanitizedUrl = url.replace(ctrlCharactersRegex, '');
|
||||
sanitizedUrl = url.replace(ctrlCharactersRegex, '').trim();
|
||||
|
||||
if (isRelativeUrl(sanitizedUrl)) {
|
||||
if (isRelativeUrlWithoutProtocol(sanitizedUrl)) {
|
||||
return sanitizedUrl;
|
||||
}
|
||||
|
||||
urlSchemeParseResults = sanitizedUrl.match(urlSchemeRegex);
|
||||
|
||||
if (!urlSchemeParseResults) {
|
||||
return 'about:blank';
|
||||
return sanitizedUrl;
|
||||
}
|
||||
|
||||
urlScheme = urlSchemeParseResults[0];
|
||||
|
@ -3,7 +3,7 @@
|
||||
"version": "0.8.0-dev",
|
||||
"description": "LibreOffice online front-end",
|
||||
"devDependencies": {
|
||||
"@braintree/sanitize-url": "3.0.0",
|
||||
"@braintree/sanitize-url": "4.0.1",
|
||||
"@types/jquery": "2.0.40",
|
||||
"autolinker": "1.4.3",
|
||||
"bootstrap": "3.3.6",
|
||||
|
Reference in New Issue
Block a user