From 411796123603baec8ad3120abfe4ec9267af43dd Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Thu, 1 Feb 2018 10:42:04 +0000 Subject: [PATCH] Relax validation of git urls --- editor/js/ui/projects/projectSettings.js | 3 ++- editor/js/ui/projects/projects.js | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/editor/js/ui/projects/projectSettings.js b/editor/js/ui/projects/projectSettings.js index e85999228..263bee66e 100644 --- a/editor/js/ui/projects/projectSettings.js +++ b/editor/js/ui/projects/projectSettings.js @@ -1288,7 +1288,8 @@ RED.projects.settings = (function() { var validateForm = function() { var validName = /^[a-zA-Z0-9\-_]+$/.test(remoteNameInput.val()); - var validRepo = /^(?:file|git|ssh|https?|[\d\w\.\-_]+@[\w\.]+):(?:\/\/)?[\w\.@:\/~_-]+(?:\.git)?(?:\/?|\#[\d\w\.\-_]+?)$/.test(remoteURLInput.val()); + // var validRepo = /^(?:file|git|ssh|https?|[\d\w\.\-_]+@[\w\.]+):(?:\/\/)?[\w\.@:\/~_-]+(?:\.git)?(?:\/?|\#[\d\w\.\-_]+?)$/.test(remoteURLInput.val()); + var validRepo = !/\s/.test(remoteURLInput.val()); saveButton.attr('disabled',(!validName || !validRepo)) remoteNameInput.toggleClass('input-error',remoteNameInputChanged&&!validName); if (popover) { diff --git a/editor/js/ui/projects/projects.js b/editor/js/ui/projects/projects.js index ed7bde4ec..cf6cc7b68 100644 --- a/editor/js/ui/projects/projects.js +++ b/editor/js/ui/projects/projects.js @@ -681,7 +681,8 @@ RED.projects = (function() { } else if (projectType === 'clone') { var repo = projectRepoInput.val(); - var validRepo = /^(?:file|git|ssh|https?|[\d\w\.\-_]+@[\w\.]+):(?:\/\/)?[\w\.@:\/~_-]+(?:\/?|\#[\d\w\.\-_]+?)$/.test(repo); + // var validRepo = /^(?:file|git|ssh|https?|[\d\w\.\-_]+@[\w\.]+):(?:\/\/)?[\w\.@:\/~_-]+(?:\/?|\#[\d\w\.\-_]+?)$/.test(repo); + var validRepo = !/\s/.test(repo); if (!validRepo) { if (projectRepoChanged) { projectRepoInput.addClass("input-error"); @@ -690,7 +691,7 @@ RED.projects = (function() { } else { projectRepoInput.removeClass("input-error"); } - if (/^(?:ssh|[\d\w\.\-_]+@[\w\.]+):(?:\/\/)?/.test(repo)) { + if (/^(?:ssh|[\S]+?@[\S]+?):(?:\/\/)?/.test(repo)) { $(".projects-dialog-screen-create-row-creds").hide(); $(".projects-dialog-screen-create-row-sshkey").show(); // if ( !getSelectedSSHKey(projectRepoSSHKeySelect) ) {