Add validation for gov-slack.com domain

Signed-off-by: Aniruddh <[email protected]>
opensearch-project · Nov 16, 2023 · aa3b636 · aa3b636
1 parent 875048f
commit aa3b636
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/...notifications/src/main/kotlin/org/opensearch/notifications/index/ConfigIndexingActions.kt b/...notifications/src/main/kotlin/org/opensearch/notifications/index/ConfigIndexingActions.kt
@@ -57,7 +57,7 @@ object ConfigIndexingActions {
     @Suppress("UnusedPrivateMember")
     private fun validateSlackConfig(slack: Slack, user: User?) {
         require(slack.url.contains(Regex("https://hooks\\.(?:gov-)?slack\\.com/services"))) {
-            "Wrong Slack url. Should contain \"hooks.slack.com/services/\""
+            "Wrong Slack url. Should contain \"hooks.slack.com/services/\" or \"hooks.gov-slack.com/services/\""
         }
     }
 

diff --git a/...ications/src/test/kotlin/org/opensearch/integtest/config/SlackNotificationConfigCrudIT.kt b/...ications/src/test/kotlin/org/opensearch/integtest/config/SlackNotificationConfigCrudIT.kt
@@ -191,7 +191,7 @@ class SlackNotificationConfigCrudIT : PluginRestTestCase() {
             fail("Expected wrong Slack URL.")
         } catch (exception: ResponseException) {
             Assert.assertEquals(
-                "Wrong Slack url. Should contain \"hooks.slack.com/services/\"",
+                "Wrong Slack url. Should contain \"hooks.slack.com/services/\" or \"hooks.gov-slack.com/services/\"",
                 jsonify(getResponseBody(exception.response))["error"].asJsonObject["reason"].asString
             )
         }

diff --git a/...ications/src/test/kotlin/org/opensearch/notifications/index/ConfigIndexingActionsTests.kt b/...ications/src/test/kotlin/org/opensearch/notifications/index/ConfigIndexingActionsTests.kt
@@ -34,18 +34,32 @@ class ConfigIndexingActionsTests {
         val user = User()
         var slack = Slack("https://hooks.slack.com/services/123456789/123456789/123456789")
         validateSlackConfig.invoke(ConfigIndexingActions, slack, user)
+        slack = Slack("https://hooks.gov-slack.com/services/123456789/123456789/123456789")
+        validateSlackConfig.invoke(ConfigIndexingActions, slack, user)
         slack = Slack("https://hooks.slack.com/services/samplesamplesamplesamplesamplesamplesamplesamplesample")
         validateSlackConfig.invoke(ConfigIndexingActions, slack, user)
+        slack = Slack("https://hooks.gov-slack.com/services/samplesamplesamplesamplesamplesamplesamplesamplesample")
+        validateSlackConfig.invoke(ConfigIndexingActions, slack, user)
         slack = Slack("http://hooks.slack.com/services/123456789/123456789/123456789/123456789")
         assertFails { validateSlackConfig.invoke(ConfigIndexingActions, slack, user) }
+        slack = Slack("http://hooks.gov-slack.com/services/123456789/123456789/123456789/123456789")
+        assertFails { validateSlackConfig.invoke(ConfigIndexingActions, slack, user) }
         slack = Slack("https://slack.com/services/123456789/123456789/123456789/123456789")
         assertFails { validateSlackConfig.invoke(ConfigIndexingActions, slack, user) }
+        slack = Slack("https://gov-slack.com/services/123456789/123456789/123456789/123456789")
+        assertFails { validateSlackConfig.invoke(ConfigIndexingActions, slack, user) }
         slack = Slack("https://hooks.slack.com/123456789/123456789/123456789/123456789/123456789")
         assertFails { validateSlackConfig.invoke(ConfigIndexingActions, slack, user) }
+        slack = Slack("https://hooks.gov-slack.com/123456789/123456789/123456789/123456789/123456789")
+        assertFails { validateSlackConfig.invoke(ConfigIndexingActions, slack, user) }
         slack = Slack("https://hook.slack.com/services/123456789/123456789/123456789/123456789/123456789")
         assertFails { validateSlackConfig.invoke(ConfigIndexingActions, slack, user) }
+        slack = Slack("https://hook.gov-slack.com/services/123456789/123456789/123456789/123456789/123456789")
+        assertFails { validateSlackConfig.invoke(ConfigIndexingActions, slack, user) }
         slack = Slack("https://hooks.slack.com/")
         assertFails { validateSlackConfig.invoke(ConfigIndexingActions, slack, user) }
+        slack = Slack("https://hooks.gov-slack.com/")
+        assertFails { validateSlackConfig.invoke(ConfigIndexingActions, slack, user) }
     }
 
     companion object {