Archives/gristlabs_grist-core
1
0
Fork 0
mirror of https://github.com/gristlabs/grist-core.git synced 2024-10-27 20:44:07 +00:00
Code Issues Projects Releases Wiki Activity

(core) Subdomain can start from a number

Browse Source 
Summary: Allowing subdomain names to start from a number.

Test Plan: Updated tests

Reviewers: paulfitz

Reviewed By: paulfitz

Subscribers: paulfitz

Differential Revision: https://phab.getgrist.com/D3009
This commit is contained in:
Jarosław Sadziński 2021-08-31 21:56:44 +02:00
parent a825115c04
commit 7e78ebfeeb
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/common/orgNameUtils.ts
View File

@ -15,7 +15,7 @@ const BLACKLISTED_SUBDOMAINS = new Set([
'w', 'ww', 'wwww', 'wwwww', 'w', 'ww', 'wwww', 'wwwww',
'docs', 'api', 'static', 'docs', 'api', 'static',
'ftp', 'imap', 'pop', 'smtp', 'mail', 'git', 'blog', 'wiki', 'support', 'kb', 'help', 'ftp', 'imap', 'pop', 'smtp', 'mail', 'git', 'blog', 'wiki', 'support', 'kb', 'help',
'admin', 'store', 'dev', 'beta', 'dev', 'admin', 'store', 'dev', 'beta',
'community', 'try', 'wpx', 'community', 'try', 'wpx',
// a few random tech brands // a few random tech brands
@ -23,6 +23,9 @@ const BLACKLISTED_SUBDOMAINS = new Set([
// updates for new special domains // updates for new special domains
'current', 'staging', 'prod', 'login', 'login-dev', 'current', 'staging', 'prod', 'login', 'login-dev',
// some domains that look suspicious
'1ogin', '1ogin-dev'
]); ]);
/** /**
@ -37,7 +40,7 @@ const BLACKLISTED_SUBDOMAINS = new Set([
*/ */
export function checkSubdomainValidity(subdomain: string): void { export function checkSubdomainValidity(subdomain: string): void {
// stick with limited alphanumeric subdomains. // stick with limited alphanumeric subdomains.
if (!(/^[a-z][-a-z0-9]*$/.test(subdomain))) { if (!(/^[a-z0-9][-a-z0-9]*$/.test(subdomain))) {
throw new Error('Domain must include letters, numbers, and dashes only.'); throw new Error('Domain must include letters, numbers, and dashes only.');
} }
// 'docs-*' is reserved for personal orgs. // 'docs-*' is reserved for personal orgs.