[Checkins] SVN: Products.PluggableAuthService/branches/maurits-login-transform/Products/PluggableAuthService/plugins/ Revert r128929.
Maurits van Rees
cvs-admin at zope.org
Thu Jan 3 09:54:06 UTC 2013
Log message for revision 128987:
Revert r128929.
Changed:
U Products.PluggableAuthService/branches/maurits-login-transform/Products/PluggableAuthService/plugins/DelegatingMultiPlugin.py
U Products.PluggableAuthService/branches/maurits-login-transform/Products/PluggableAuthService/plugins/DomainAuthHelper.py
U Products.PluggableAuthService/branches/maurits-login-transform/Products/PluggableAuthService/plugins/HTTPBasicAuthHelper.py
U Products.PluggableAuthService/branches/maurits-login-transform/Products/PluggableAuthService/plugins/InlineAuthHelper.py
U Products.PluggableAuthService/branches/maurits-login-transform/Products/PluggableAuthService/plugins/SessionAuthHelper.py
-=-
Modified: Products.PluggableAuthService/branches/maurits-login-transform/Products/PluggableAuthService/plugins/DelegatingMultiPlugin.py
===================================================================
--- Products.PluggableAuthService/branches/maurits-login-transform/Products/PluggableAuthService/plugins/DelegatingMultiPlugin.py 2013-01-03 09:51:26 UTC (rev 128986)
+++ Products.PluggableAuthService/branches/maurits-login-transform/Products/PluggableAuthService/plugins/DelegatingMultiPlugin.py 2013-01-03 09:54:05 UTC (rev 128987)
@@ -19,7 +19,8 @@
__version__ = '$Revision$'[11:-2]
# General Python imports
-import copy
+import copy, os
+from urllib import quote_plus
# Zope imports
from Acquisition import aq_base
@@ -127,7 +128,6 @@
AuthEncoding.pw_validate(emergency_user._getPassword(), password):
return ( login, login )
- login = self.applyTransform(login)
user = acl.getUser(login)
if user is None:
@@ -205,8 +205,6 @@
if acl is None:
return ()
- if login:
- login = self.applyTransform(login)
if exact_match:
if id:
user = acl.getUserById(id)
@@ -223,8 +221,8 @@
, 'editurl' : '%s' % edit_url
} )
else:
- l_results = [] # never used
- seen = [] # never used
+ l_results = []
+ seen = []
# XXX WAAAAA!!!!
all_users = acl.getUsers()
Modified: Products.PluggableAuthService/branches/maurits-login-transform/Products/PluggableAuthService/plugins/DomainAuthHelper.py
===================================================================
--- Products.PluggableAuthService/branches/maurits-login-transform/Products/PluggableAuthService/plugins/DomainAuthHelper.py 2013-01-03 09:51:26 UTC (rev 128986)
+++ Products.PluggableAuthService/branches/maurits-login-transform/Products/PluggableAuthService/plugins/DomainAuthHelper.py 2013-01-03 09:54:05 UTC (rev 128987)
@@ -19,12 +19,13 @@
# General Python imports
import socket
+import os
import time
+import copy
import re
try:
from IPy import IP
- IP # pyflakes
except ImportError:
IP = None
@@ -179,7 +180,6 @@
login = credentials.get('login', '')
r_host = credentials.get('remote_host', '')
r_address = credentials.get('remote_address', '')
- login = self.applyTransform(login)
matches = self._findMatches(login, r_host, r_address)
if len(matches) > 0:
@@ -229,7 +229,6 @@
if not r_host and not r_address:
return tuple(matches)
- login = self.applyTransform(login)
all_info = list(self._domain_map.get(login, []))
all_info.extend(self._domain_map.get('', []))
@@ -251,7 +250,7 @@
candidates = [r_host, r_address]
for match_info in all_info:
- m = [] # XXX never used
+ m = []
m_type = match_info['match_type']
m_string = match_info['match_string']
filter = match_info.get('match_filter')
Modified: Products.PluggableAuthService/branches/maurits-login-transform/Products/PluggableAuthService/plugins/HTTPBasicAuthHelper.py
===================================================================
--- Products.PluggableAuthService/branches/maurits-login-transform/Products/PluggableAuthService/plugins/HTTPBasicAuthHelper.py 2013-01-03 09:51:26 UTC (rev 128986)
+++ Products.PluggableAuthService/branches/maurits-login-transform/Products/PluggableAuthService/plugins/HTTPBasicAuthHelper.py 2013-01-03 09:54:05 UTC (rev 128987)
@@ -78,7 +78,7 @@
if login_pw is not None:
name, password = login_pw
- creds[ 'login' ] = self.applyTransform(name)
+ creds[ 'login' ] = name
creds[ 'password' ] = password
creds[ 'remote_host' ] = request.get('REMOTE_HOST', '')
Modified: Products.PluggableAuthService/branches/maurits-login-transform/Products/PluggableAuthService/plugins/InlineAuthHelper.py
===================================================================
--- Products.PluggableAuthService/branches/maurits-login-transform/Products/PluggableAuthService/plugins/InlineAuthHelper.py 2013-01-03 09:51:26 UTC (rev 128986)
+++ Products.PluggableAuthService/branches/maurits-login-transform/Products/PluggableAuthService/plugins/InlineAuthHelper.py 2013-01-03 09:54:05 UTC (rev 128987)
@@ -16,6 +16,9 @@
$Id$
"""
+from base64 import encodestring, decodestring
+from urllib import quote
+
from AccessControl.SecurityInfo import ClassSecurityInfo
from OFS.Folder import Folder
from App.class_init import default__class_init__ as InitializeClass
@@ -23,15 +26,19 @@
from zope.interface import Interface
from Products.PageTemplates.PageTemplateFile import PageTemplateFile
+from Products.PageTemplates.ZopePageTemplate import manage_addPageTemplate
from Products.PluggableAuthService.interfaces.plugins import \
ILoginPasswordHostExtractionPlugin
from Products.PluggableAuthService.interfaces.plugins import \
IChallengePlugin
+from Products.PluggableAuthService.interfaces.plugins import \
+ ICredentialsUpdatePlugin
+from Products.PluggableAuthService.interfaces.plugins import \
+ ICredentialsResetPlugin
from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
from Products.PluggableAuthService.utils import classImplements
-
class IInlineAuthHelper(Interface):
""" Marker interface.
"""
@@ -89,7 +96,7 @@
password = request.get('__ac_password', '')
if login:
- creds['login'] = self.applyTransform(login)
+ creds['login'] = login
creds['password'] = password
if creds:
Modified: Products.PluggableAuthService/branches/maurits-login-transform/Products/PluggableAuthService/plugins/SessionAuthHelper.py
===================================================================
--- Products.PluggableAuthService/branches/maurits-login-transform/Products/PluggableAuthService/plugins/SessionAuthHelper.py 2013-01-03 09:51:26 UTC (rev 128986)
+++ Products.PluggableAuthService/branches/maurits-login-transform/Products/PluggableAuthService/plugins/SessionAuthHelper.py 2013-01-03 09:54:05 UTC (rev 128987)
@@ -73,7 +73,7 @@
password = request.SESSION.get('__ac_password', '')
if name:
- creds[ 'login' ] = self.applyTransform(name)
+ creds[ 'login' ] = name
creds[ 'password' ] = password
else:
# Look into the request now
@@ -81,7 +81,6 @@
if login_pw is not None:
name, password = login_pw
- name = self.applyTransform(name)
creds[ 'login' ] = name
creds[ 'password' ] = password
request.SESSION.set('__ac_name', name)
@@ -100,7 +99,7 @@
security.declarePrivate('updateCredentials')
def updateCredentials(self, request, response, login, new_password):
""" Respond to change of credentials. """
- request.SESSION.set('__ac_name', self.applyTransform(login))
+ request.SESSION.set('__ac_name', login)
request.SESSION.set('__ac_password', new_password)
security.declarePrivate('resetCredentials')
More information about the checkins
mailing list