Commit a0e544ff authored by Hanno Schlichting's avatar Hanno Schlichting

PEP8

parent dbc1449f
...@@ -55,7 +55,7 @@ class BasicUser(Implicit): ...@@ -55,7 +55,7 @@ class BasicUser(Implicit):
return 0 return 0
return 1 return 1
def __init__(self,name,password,roles,domains): def __init__(self, name, password, roles, domains):
raise NotImplementedError raise NotImplementedError
def getUserName(self): def getUserName(self):
...@@ -125,21 +125,25 @@ class BasicUser(Implicit): ...@@ -125,21 +125,25 @@ class BasicUser(Implicit):
def _shared_roles(self, parent): def _shared_roles(self, parent):
r=[] r=[]
while 1: while 1:
if hasattr(parent,'__roles__'): if hasattr(parent, '__roles__'):
roles=parent.__roles__ roles = parent.__roles__
if roles is None: return 'Anonymous', if roles is None:
return 'Anonymous',
if 'Shared' in roles: if 'Shared' in roles:
roles=list(roles) roles=list(roles)
roles.remove('Shared') roles.remove('Shared')
r=r+roles r = r + roles
else: else:
try: return r+list(roles) try:
except: return r return r + list(roles)
except:
return r
if getattr(parent, '__parent__', None) is not None: if getattr(parent, '__parent__', None) is not None:
while hasattr(parent.aq_self,'aq_self'): while hasattr(parent.aq_self, 'aq_self'):
parent = parent.aq_self parent = parent.aq_self
parent = aq_parent(parent) parent = aq_parent(parent)
else: return r else:
return r
def _check_context(self, object): def _check_context(self, object):
# Check that 'object' exists in the acquisition context of # Check that 'object' exists in the acquisition context of
...@@ -154,7 +158,7 @@ class BasicUser(Implicit): ...@@ -154,7 +158,7 @@ class BasicUser(Implicit):
return 1 return 1
if hasattr(object, 'im_self'): if hasattr(object, 'im_self'):
# This is a method. Grab its self. # This is a method. Grab its self.
object=object.im_self object = object.im_self
return aq_inContextOf(object, context, 1) return aq_inContextOf(object, context, 1)
# This is lame, but required to keep existing behavior. # This is lame, but required to keep existing behavior.
...@@ -164,7 +168,8 @@ class BasicUser(Implicit): ...@@ -164,7 +168,8 @@ class BasicUser(Implicit):
"""Check whether the user has access to object. The user must """Check whether the user has access to object. The user must
have one of the roles in object_roles to allow access.""" have one of the roles in object_roles to allow access."""
if object_roles is _what_not_even_god_should_do: return 0 if object_roles is _what_not_even_god_should_do:
return 0
# Short-circuit the common case of anonymous access. # Short-circuit the common case of anonymous access.
if object_roles is None or 'Anonymous' in object_roles: if object_roles is None or 'Anonymous' in object_roles:
...@@ -247,8 +252,12 @@ class BasicUser(Implicit): ...@@ -247,8 +252,12 @@ class BasicUser(Implicit):
roles=[roles] roles=[roles]
return self.allowed(object, roles) return self.allowed(object, roles)
def __len__(self): return 1 def __len__(self):
def __str__(self): return self.getUserName() return 1
def __str__(self):
return self.getUserName()
def __repr__(self): def __repr__(self):
return '<%s %r>' % (self.__class__.__name__, self.getUserName()) return '<%s %r>' % (self.__class__.__name__, self.getUserName())
...@@ -258,11 +267,11 @@ class SimpleUser(BasicUser): ...@@ -258,11 +267,11 @@ class SimpleUser(BasicUser):
that doesn't make a database commitment""" that doesn't make a database commitment"""
def __init__(self,name,password,roles,domains): def __init__(self, name, password, roles, domains):
self.name =name self.name = name
self.__ =password self.__ = password
self.roles =roles self.roles = roles
self.domains=domains self.domains = domains
def getUserName(self): def getUserName(self):
"""Return the username of a user""" """Return the username of a user"""
...@@ -274,8 +283,10 @@ class SimpleUser(BasicUser): ...@@ -274,8 +283,10 @@ class SimpleUser(BasicUser):
def getRoles(self): def getRoles(self):
"""Return the list of roles assigned to a user.""" """Return the list of roles assigned to a user."""
if self.name == 'Anonymous User': return tuple(self.roles) if self.name == 'Anonymous User':
else: return tuple(self.roles) + ('Authenticated',) return tuple(self.roles)
else:
return tuple(self.roles) + ('Authenticated', )
def getDomains(self): def getDomains(self):
"""Return the list of domain restrictions for a user""" """Return the list of domain restrictions for a user"""
...@@ -284,7 +295,9 @@ class SimpleUser(BasicUser): ...@@ -284,7 +295,9 @@ class SimpleUser(BasicUser):
class SpecialUser(SimpleUser): class SpecialUser(SimpleUser):
"""Class for special users, like emergency user and nobody""" """Class for special users, like emergency user and nobody"""
def getId(self): pass
def getId(self):
pass
class User(SimpleUser, Persistent): class User(SimpleUser, Persistent):
...@@ -296,7 +309,7 @@ class UnrestrictedUser(SpecialUser): ...@@ -296,7 +309,7 @@ class UnrestrictedUser(SpecialUser):
like Owner.py can still impose restrictions. like Owner.py can still impose restrictions.
""" """
def allowed(self,parent,roles=None): def allowed(self, parent, roles=None):
return roles is not _what_not_even_god_should_do return roles is not _what_not_even_god_should_do
def has_role(self, roles, object=None): def has_role(self, roles, object=None):
...@@ -384,32 +397,31 @@ _remote_user_mode = 0 ...@@ -384,32 +397,31 @@ _remote_user_mode = 0
info = readUserAccessFile('access') info = readUserAccessFile('access')
if info: if info:
_remote_user_mode = info[3] _remote_user_mode = info[3]
emergency_user = UnrestrictedUser( emergency_user = UnrestrictedUser(info[0], info[1], ('manage', ), info[2])
info[0], info[1], ('manage',), info[2])
else: else:
emergency_user = NullUnrestrictedUser() emergency_user = NullUnrestrictedUser()
del info del info
nobody=SpecialUser('Anonymous User','',('Anonymous',), []) nobody = SpecialUser('Anonymous User', '', ('Anonymous', ), [])
system=UnrestrictedUser('System Processes','',('manage',), []) system = UnrestrictedUser('System Processes', '', ('manage', ), [])
# stuff these in a handier place for importing # stuff these in a handier place for importing
SpecialUsers.nobody=nobody SpecialUsers.nobody = nobody
SpecialUsers.system=system SpecialUsers.system = system
SpecialUsers.emergency_user=emergency_user SpecialUsers.emergency_user = emergency_user
# Note: use of the 'super' name is deprecated. # Note: use of the 'super' name is deprecated.
SpecialUsers.super=emergency_user SpecialUsers.super = emergency_user
def rolejoin(roles, other): def rolejoin(roles, other):
dict={} dict = {}
for role in roles: for role in roles:
dict[role]=1 dict[role] = 1
for role in other: for role in other:
dict[role]=1 dict[role] = 1
roles=dict.keys() roles = dict.keys()
roles.sort() roles.sort()
return roles return roles
...@@ -418,47 +430,45 @@ host_match=re.compile(r'(([\_0-9a-zA-Z\-]*\.)*[0-9a-zA-Z\-]*)').match ...@@ -418,47 +430,45 @@ host_match=re.compile(r'(([\_0-9a-zA-Z\-]*\.)*[0-9a-zA-Z\-]*)').match
def domainSpecMatch(spec, request): def domainSpecMatch(spec, request):
host=''
addr=''
# Fast exit for the match-all case # Fast exit for the match-all case
if len(spec) == 1 and spec[0] == '*': if len(spec) == 1 and spec[0] == '*':
return 1 return 1
if request.has_key('REMOTE_HOST'): host = request.get('REMOTE_HOST', '')
host=request['REMOTE_HOST'] addr = request.getClientAddr()
addr=request.getClientAddr()
if not host and not addr: if not host and not addr:
return 0 return 0
if not host: if not host:
try: host=socket.gethostbyaddr(addr)[0] try:
except: pass host=socket.gethostbyaddr(addr)[0]
except:
pass
if not addr: if not addr:
try: addr=socket.gethostbyname(host) try:
except: pass addr=socket.gethostbyname(host)
except:
pass
_host=host.split('.') _host = host.split('.')
_addr=addr.split('.') _addr = addr.split('.')
_hlen=len(_host) _hlen = len(_host)
for ob in spec: for ob in spec:
sz=len(ob) sz = len(ob)
_ob=ob.split('.') _ob = ob.split('.')
_sz=len(_ob) _sz = len(_ob)
mo = addr_match(ob) mo = addr_match(ob)
if mo is not None: if mo is not None:
if mo.end(0)==sz: if mo.end(0)==sz:
fail=0 fail=0
for i in range(_sz): for i in range(_sz):
a=_addr[i] a = _addr[i]
o=_ob[i] o = _ob[i]
if (o != a) and (o != '*'): if (o != a) and (o != '*'):
fail=1 fail = 1
break break
if fail: if fail:
continue continue
...@@ -470,15 +480,15 @@ def domainSpecMatch(spec, request): ...@@ -470,15 +480,15 @@ def domainSpecMatch(spec, request):
if _hlen < _sz: if _hlen < _sz:
continue continue
elif _hlen > _sz: elif _hlen > _sz:
_item=_host[-_sz:] _item = _host[-_sz:]
else: else:
_item=_host _item = _host
fail=0 fail = 0
for i in range(_sz): for i in range(_sz):
h=_item[i] h = _item[i]
o=_ob[i] o = _ob[i]
if (o != h) and (o != '*'): if (o != h) and (o != '*'):
fail=1 fail = 1
break break
if fail: if fail:
continue continue
...@@ -487,10 +497,13 @@ def domainSpecMatch(spec, request): ...@@ -487,10 +497,13 @@ def domainSpecMatch(spec, request):
def absattr(attr): def absattr(attr):
if callable(attr): return attr() if callable(attr):
return attr()
return attr return attr
def reqattr(request, attr): def reqattr(request, attr):
try: return request[attr] try:
except: return None return request[attr]
except:
return None
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment