From c346de3f6fa1a665c8fcccd482d1971a622709cb Mon Sep 17 00:00:00 2001 From: "Eslam A. Hefnawy" Date: Sat, 12 Dec 2015 00:42:28 +0200 Subject: [PATCH] fixed domain validation. closes #349 --- lib/actions/ProjectCreate.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/actions/ProjectCreate.js b/lib/actions/ProjectCreate.js index 7ba9ca1d2..dc8434c4b 100644 --- a/lib/actions/ProjectCreate.js +++ b/lib/actions/ProjectCreate.js @@ -183,10 +183,10 @@ class ProjectCreate extends SPlugin { domain: { description: 'Enter a project domain (used for serverless regional bucket names): '.yellow, default: 'myapp.com', - message: 'Please enter a valid domain', + message: 'Domain must only contain lowercase letters, numbers, periods and dashes', required: true, conform: function(bucket) { - let re = /^(?!:\/\/)([a-zA-Z0-9][a-zA-Z0-9-]+\.)?[a-zA-Z0-9][a-zA-Z0-9-]+\.[a-zA-Z]{2,15}?$/i; + let re = /^[a-z0-9-.]+$/; return re.test(bucket); }, }, @@ -319,9 +319,9 @@ class ProjectCreate extends SPlugin { } // validate domain - let domainRegex = /^(?!:\/\/)([a-zA-Z0-9][a-zA-Z0-9-]+\.)?[a-zA-Z0-9][a-zA-Z0-9-]+\.[a-zA-Z]{2,15}?$/i; + let domainRegex = /^[a-z0-9-.]+$/; if(!domainRegex.test(this.evt.domain)) { - return BbPromise.reject(new SError('Please enter a valid domain')); + return BbPromise.reject(new SError('Domain must only contain lowercase letters, numbers, periods and dashes')); } // Append unique id if domain is default