From 7e78ebfeebb592db4c49a00993dc4862ee09a499 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaros=C5=82aw=20Sadzi=C5=84ski?=
 <jaroslaw.sadzinski@gmail.com>
Date: Tue, 31 Aug 2021 21:56:44 +0200
Subject: [PATCH] (core) Subdomain can start from a number

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
---
 app/common/orgNameUtils.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/common/orgNameUtils.ts b/app/common/orgNameUtils.ts
index 2e85a88f..ed03c387 100644
--- a/app/common/orgNameUtils.ts
+++ b/app/common/orgNameUtils.ts
@@ -15,7 +15,7 @@ const BLACKLISTED_SUBDOMAINS = new Set([
   'w', 'ww', 'wwww', 'wwwww',
   'docs', 'api', 'static',
   'ftp', 'imap', 'pop', 'smtp', 'mail', 'git', 'blog', 'wiki', 'support', 'kb', 'help',
-  'admin', 'store', 'dev', 'beta', 'dev',
+  'admin', 'store', 'dev', 'beta',
   'community', 'try', 'wpx',
 
   // a few random tech brands
@@ -23,6 +23,9 @@ const BLACKLISTED_SUBDOMAINS = new Set([
 
   // updates for new special domains
   '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 {
   // 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.');
   }
   // 'docs-*' is reserved for personal orgs.