Merge lp:~maxiberta/canonical-identity-provider/conncheck-recaptcha-v2 into lp:canonical-identity-provider/release

[Maximiliano Bertacchini]

Upgrade recaptcha conn-check to reCaptchaV2.

Any calls to the v1 API will not work after March 31, 2018 (https://developers.google.com/recaptcha/docs/faq#what-happens-to-recaptcha-v1).

Additionally, update settings_base.py to be able to run `make conn-check` locally.

[Daniel Manrique (roadmr)]

LGTM, thanks!

review: Approve

=== modified file 'django_project/settings_base.py'
--- django_project/settings_base.py	2018-09-03 21:28:24 +0000
+++ django_project/settings_base.py	2018-10-11 19:44:52 +0000
@@ -51,7 +51,7 @@
 AUTH_USER_MODEL = 'auth.User'
 CACHES = {
     'default': {
-        'LOCATION': '127.0.0.1:11211',
+        'LOCATION': ['127.0.0.1:11211'],
         'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
     },
 }
@@ -89,7 +89,7 @@
         'HOST': 'localhost',
         'NAME': 'identityprovider',
         'PASSWORD': '',
-        'PORT': '',
+        'PORT': '5432',
         'TEST': {
             'CHARSET': None,
             'COLLATION': None,
 
=== modified file 'scripts/settings-to-conncheck.py'
--- scripts/settings-to-conncheck.py	2018-02-09 20:56:16 +0000
+++ scripts/settings-to-conncheck.py	2018-10-11 19:44:52 +0000
@@ -11,34 +11,25 @@
 STATSD_CHECK['expect'] = 'Matata'
 
 
-def make_recaptcha_check(settings, options):
-    checks = []
-    urls = (
-        settings['CAPTCHA_API_URL'] + '/challenge',
-        settings['CAPTCHA_VERIFY_URL'],
-    )
-    for url in urls:
-        check = {
-            'type': 'http',
-            'url': url,
-            'method': 'GET',
-            'expected_code': 200,
-        }
-        parsed = urlparse(url)
-        proxy = settings.get('CAPTCHA_PROXIES', {}).get(parsed.scheme)
-        if proxy:
-            proxy_host, proxy_port = urlparse(proxy).netloc.split(':')
-            if proxy_host:
-                check['proxy_host'] = proxy_host
-            if proxy_port:
-                check['proxy_port'] = int(proxy_port)
-
-        checks.append(check)
-
-    return checks
-
-
-EXTRA_CHECK_MAKERS.append(make_recaptcha_check)
+def make_recaptcha_v2_check(settings, options):
+    check = {
+        'type': 'https',
+        'url': settings['CAPTCHA_V2_VERIFY_URL'],
+        'method': 'GET',
+        'expected_code': 200,
+    }
+    proxy = settings.get('CAPTCHA_PROXIES', {}).get('https')
+    if proxy:
+        proxy_host, proxy_port = urlparse(proxy).netloc.split(':')
+        if proxy_host:
+            check['proxy_host'] = proxy_host
+        if proxy_port:
+            check['proxy_port'] = int(proxy_port)
+
+    return [check]
+
+
+EXTRA_CHECK_MAKERS.append(make_recaptcha_v2_check)
 
 
 if __name__ == '__main__':