Changeset 4559 for TI12-security/trunk/python

Timestamp:

08/12/08 10:02:52 (12 years ago)

Author:

pjkersha

Message:

Moved BasicAuthNInterface from OpenID Provider __init.py module to it's own module in the authninterface package.

Location:

TI12-security/trunk/python/ndg.security.server/ndg/security/server/wsgi/openid/provider

Files:

• __init__.py (modified) (2 diffs)
• authninterface/basic.py (added)

TI12-security/trunk/python/ndg.security.server/ndg/security/server/wsgi/openid/provider/__init__.py

@@ -135 +135 @@
         other specific exception types.
         """
-        raise NotImplementedError(self.logon.__doc__.replace('\n       ',''))
+        raise NotImplementedError()
     
     def username2UserIdentifiers(self, environ, username):
@@ -162 +162 @@
         other specific exception types.
         """
-        raise NotImplementedError(
-                self.username2UserIdentifiers.__doc__.replace('\n       ',''))
-    
-    
-class BasicAuthNInterface(AbstractAuthNInterface):
-    '''Basic Authentication interface class for OpenIDProviderMiddleware 
-    
-    it uses username/password details retrieved from config file / keyword
-    entry.  This class is for testing only.  NOT for production use'''
-    
-    def __init__(self, **prop):
-        """Make any initial settings
-        
-        Settings are held in a dictionary which can be set from **prop,
-        a call to setProperties() or by passing settings in an XML file
-        given by propFilePath
-        
-        @type **prop: dict
-        @param **prop: set properties via keywords 
-        @raise AuthNInterfaceConfigError: error with configuration
-        """
-        # Test/Admin username/password set from ini/kw args
-        userCreds = prop.get('userCreds')
-        if userCreds:
-            self._userCreds = dict([i.strip().split(':')
-                                    for i in userCreds.split(',')])
-        else:
-            raise AuthNInterfaceConfigError('No "userCreds" config option '
-                                            "found")
-            
-        user2Identifier = prop.get('username2UserIdentifiers')
-        if user2Identifier:
-            self._username2Identifier = {}
-            for i in user2Identifier.split():
-                username, identifierStr = i.strip().split(':')
-                identifiers = tuple(identifierStr.split(','))
-                self._username2Identifier[username] = identifiers
-        else:
-            raise AuthNInterfaceConfigError('No "user2Identifier" config '
-                                            'option found')
-        
-        userCredNames = self._userCreds.keys()
-        userCredNames.sort()
-        username2IdentifierNames = self._username2Identifier.keys()
-        username2IdentifierNames.sort()
-        if userCredNames != username2IdentifierNames:
-            raise AuthNInterfaceConfigError('Mismatch between usernames in '
-                                            '"userCreds" and '
-                                            '"username2UserIdentifiers" options')   
-    
-    def logon(self, environ, userIdentifier, username, password):
-        """Interface login method
-        
-        @type environ: dict
-        @param environ: standard WSGI environ parameter
-
-        @type username: basestring
-        @param username: user identifier
-        
-        @type password: basestring
-        @param password: corresponding password for username givens
-        
-        @raise AuthNInterfaceInvalidCredentials: invalid username/password
-        """
-        if self._userCreds.get(username) != password:
-            raise AuthNInterfaceInvalidCredentials()
-        
-        if userIdentifier is not None and \
-           userIdentifier not in self._username2Identifier.get(username):
-            raise AuthNInterfaceUsername2IdentifierMismatch()
-    
-    def username2UserIdentifiers(self, environ, username):
-        """Map the login username to an identifier which will become the
-        unique path suffix to the user's OpenID identifier.  The 
-        OpenIDProviderMiddleware takes self.urls['id_url'] and adds it to this
-        identifier:
-        
-            identifier = self._authN.username2UserIdentifiers(environ,username)
-            identityURL = self.urls['url_id'] + '/' + identifier
-        
-        @type environ: dict
-        @param environ: standard WSGI environ parameter
-
-        @type username: basestring
-        @param username: user identifier
-        
-        @rtype: tuple
-        @return: identifiers to be used to make OpenID user identity URLs. 
-        
-        @raise AuthNInterfaceRetrieveError: error with retrieval of information
-        to identifier e.g. error with database look-up.
-        """
-        try:
-            return self._username2Identifier[username]
-        except KeyError:
-            raise AuthNInterfaceRetrieveError('No entries for "%s" user' % 
-                                              username)
+        raise NotImplementedError()