Fix and templatize the logic for external JWT AuthN and registry v2 Auth.

Make it explicit that the registry-v2 stuff is not ready for prime time.

util/config/validator.py

@@ -7,7 +7,7 @@ import OpenSSL
 import logging
 
 from fnmatch import fnmatch
-from data.users import LDAPConnection, JWTAuthUsers, LDAPUsers
+from data.users import LDAPConnection, ExternalJWTAuthN, LDAPUsers
 from flask import Flask
 from flask.ext.mail import Mail, Message
 from data.database import validate_database_url, User
@@ -340,7 +340,8 @@ def _validate_jwt(config, password):
 
   # Try to instatiate the JWT authentication mechanism. This will raise an exception if
   # the key cannot be found.
-  users = JWTAuthUsers(verify_endpoint, issuer, OVERRIDE_CONFIG_DIRECTORY, app.config['HTTPCLIENT'])
+  users = ExternalJWTAuthN(verify_endpoint, issuer, OVERRIDE_CONFIG_DIRECTORY,
+                           app.config['HTTPCLIENT'])
 
   # Verify that the superuser exists. If not, raise an exception.
   username = get_authenticated_user().username