extended domain validation (#24)

retailcrm · Feb 9, 2021 · 6ae7bdc · 6ae7bdc
1 parent d15ed7f
commit 6ae7bdc
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/core/config.go b/core/config.go
@@ -17,7 +17,7 @@ var (
 	}
 	markdownSymbols = []string{"*", "_", "`", "["}
 	regCommandName  = regexp.MustCompile(
-		`^https://?[\da-z.-]+\.(retailcrm\.(ru|pro|es)|ecomlogic\.com|simlachat\.(com|ru))/?$`)
+		`^https://?[\da-z.-]+\.(retailcrm\.(ru|pro|es)|ecomlogic\.com|simla(chat)?\.(com|ru))/?$`)
 	slashRegex = regexp.MustCompile(`/+$`)
 )
 

diff --git a/core/validator_test.go b/core/validator_test.go
@@ -54,10 +54,22 @@ func (s *ValidatorSuite) Test_ValidationFails() {
 }
 
 func (s *ValidatorSuite) Test_ValidationSuccess() {
-	conn := Connection{
-		Key: "key",
-		URL: "https://test.retailcrm.pro",
+	domains := []string{
+		"https://asd.retailcrm.ru",
+		"https://test.retailcrm.pro",
+		"https://raisa.retailcrm.es",
+		"https://blabla.simla.com",
+		"https://blabla.simla.ru",
+		"https://blabla.simlachat.com",
+		"https://blabla.simlachat.ru",
+	}
+
+	for _, domain := range domains {
+		conn := Connection{
+			Key: "key",
+			URL: domain,
+		}
+		err := s.engine.Struct(conn)
+		assert.NoError(s.T(), err, s.getError(err))
 	}
-	err := s.engine.Struct(conn)
-	assert.NoError(s.T(), err, s.getError(err))
 }