archive-gh-me/serverless
1
0
Fork 0
mirror of https://github.com/serverless/serverless.git synced 2026-01-18 14:58:43 +00:00
Code Issues Projects Releases Wiki Activity

fixed domain validation. closes #349

Browse Source
This commit is contained in:
Eslam A. Hefnawy 2015-12-12 00:42:28 +02:00
parent 98eb2a5e86
commit c346de3f6f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/actions/ProjectCreate.js
View File

@ -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