Add phone validation

silverbackhq · Sep 17, 2019 · ff08a9a · ff08a9a
1 parent 4541e71
commit ff08a9a
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 18 deletions.
diff --git a/app/controllers/api/private/v1/status.py b/app/controllers/api/private/v1/status.py
@@ -55,9 +55,14 @@ def post(self, request):
                 'email': {
                     'value': request_data["email"],
                     'sanitize': {
+                        'escape': {},
                         'strip': {}
                     },
-                    'validate': {}
+                    'validate': {
+                        'sv_email': {
+                            'error': _('Error! Email is invalid.')
+                        }
+                    }
                 }
             })
 
@@ -67,9 +72,14 @@ def post(self, request):
                 'phone': {
                     'value': request_data["phone"],
                     'sanitize': {
+                        'escape': {},
                         'strip': {}
                     },
-                    'validate': {}
+                    'validate': {
+                        'sv_phone': {
+                            'error': _('Error! Phone number is invalid.')
+                        }
+                    }
                 }
             })
 
@@ -79,16 +89,26 @@ def post(self, request):
                 'email': {
                     'value': request_data["email"],
                     'sanitize': {
+                        'escape': {},
                         'strip': {}
                     },
-                    'validate': {}
+                    'validate': {
+                        'sv_email': {
+                            'error': _('Error! Email is invalid.')
+                        }
+                    }
                 },
                 'endpoint': {
                     'value': request_data["endpoint"],
                     'sanitize': {
+                        'escape': {},
                         'strip': {}
                     },
-                    'validate': {}
+                    'validate': {
+                        'sv_url': {
+                            'error': _('Error! Endpoint URL is invalid.')
+                        }
+                    }
                 },
                 'auth_token': {
                     'value': request_data["auth_token"],

diff --git a/app/modules/validation/extension.py b/app/modules/validation/extension.py
@@ -4,11 +4,15 @@
 
 # Standard Library
 import re
+import os
 
 # Third Party Library
-from django.core.signing import Signer
+from twilio.rest import Client
 from pyvalitron.validator import Validator
+from twilio.base.exceptions import TwilioRestException
+from django.core.signing import Signer
 from django.core.validators import URLValidator
+from django.core.validators import validate_slug
 from django.core.validators import validate_email
 from django.core.validators import validate_ipv4_address
 from django.core.validators import validate_ipv6_address
@@ -97,19 +101,22 @@ def sv_numeric(self):
         regex = re.compile(r'^[0-9]+$')
         return bool(regex.match(self._input))
 
-    def sv_host_slug(self):
-        regex = re.compile(r'^[a-z0-9-_]+$')
-        return bool(regex.match(self._input))
-
-    def sv_host_name(self):
-        regex = re.compile(r'^[a-zA-Z0-9-_\s]+$')
-        return bool(regex.match(self._input))
-
-    def sv_host_server(self):
-        return True
+    def sv_slug(self):
+        return True if validate_slug(self._input) is None else False
 
-    def sv_tls_certificate(self):
-        return True
+    def sv_phone(self):
+        if os.getenv("TEXT_MESSAGING_DRIVER", "twilio") == "twilio" and os.getenv("TWILIO_ACCOUNT_SID") and os.getenv("TWILIO_AUTH_TOKEN"):
+            client = Client(os.getenv("TWILIO_ACCOUNT_SID"), os.getenv("TWILIO_AUTH_TOKEN"))
+            try:
+                client.lookups.phone_numbers(self._input).fetch(type="carrier")
+                return True
+            except TwilioRestException as e:
+                if e.code == 20404:
+                    return False
+                else:
+                    raise e
+        else:
+            return self.sv_numeric() and len(self._input) >= 9
 
     def optional(self):
         return self._input == ""
diff --git a/app/tests/functional/controllers/api/private/v1/test_status.py b/app/tests/functional/controllers/api/private/v1/test_status.py
@@ -59,7 +59,7 @@ def test_subscribe_success02(self):
         response = self.client.post(reverse("app.api.private.v1.status_subscribe.endpoint"), {
             "type": "phone",
             "email": "",
-            "phone": "+12345678",
+            "phone": "00312345678",
             "endpoint": "",
             "auth_token": ""
         })