Add region validation using DNS Host label regex (#3368)

aws · Jul 27, 2020 · 5e0d7f6 · 5e0d7f6
1 parent 788a009
commit 5e0d7f6
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 13 deletions.
diff --git a/.changes/next-release/bugfix-Region-3a08ee8a.json b/.changes/next-release/bugfix-Region-3a08ee8a.json
@@ -0,0 +1,5 @@
+{
+  "type": "bugfix",
+  "category": "Region",
+  "description": "Add region validation using DNS Host label regex"
+}
diff --git a/lib/event_listeners.js b/lib/event_listeners.js
@@ -88,9 +88,15 @@ AWS.EventListeners = {
     });
 
     add('VALIDATE_REGION', 'validate', function VALIDATE_REGION(req) {
-      if (!req.service.config.region && !req.service.isGlobalEndpoint) {
-        req.response.error = AWS.util.error(new Error(),
-          {code: 'ConfigError', message: 'Missing region in config'});
+      if (!req.service.isGlobalEndpoint) {
+        var dnsHostRegex = new RegExp(/^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]{0,61}[a-zA-Z0-9])$/);
+        if (!req.service.config.region) {
+          req.response.error = AWS.util.error(new Error(),
+            {code: 'ConfigError', message: 'Missing region in config'});
+        } else if (!dnsHostRegex.test(req.service.config.region)) {
+          req.response.error = AWS.util.error(new Error(),
+            {code: 'ConfigError', message: 'Invalid region in config'});
+        }
       }
     });
 

diff --git a/test/event_listeners.spec.js b/test/event_listeners.spec.js