odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] openerp.service.http_server: unneeded indirection for logging. 

bzr revid: vmt@openerp.com-20120125125151-cxrsosvx9hefikeq
This commit is contained in:
Vo Minh Thu 2012-01-25 13:51:51 +01:00
parent f057f2afa5
commit 97b75ce3f5
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
openerp/service/http_server.py
View File

@ -125,9 +125,6 @@ class OpenERPAuthProvider(AuthProvider):
_logger.debug("Fail auth: %s" % e )
return False
def log(self, msg, lvl=logging.INFO):
_logger.log(lvl,msg)
def checkRequest(self,handler,path, db=False):
auth_str = handler.headers.get('Authorization',False)
try:
@ -141,21 +138,21 @@ class OpenERPAuthProvider(AuthProvider):
db = psp[0]
else:
#FIXME!
self.log("Wrong path: %s, failing auth" %path)
_logger.info("Wrong path: %s, failing auth" %path)
raise AuthRejectedExc("Authorization failed. Wrong sub-path.")
if self.auth_creds.get(db):
return True
if auth_str and auth_str.startswith('Basic '):
auth_str=auth_str[len('Basic '):]
(user,passwd) = base64.decodestring(auth_str).split(':')
self.log("Found user=\"%s\", passwd=\"***\" for db=\"%s\"" %(user,db))
_logger.info("Found user=\"%s\", passwd=\"***\" for db=\"%s\"", user, db)
acd = self.authenticate(db,user,passwd,handler.client_address)
if acd != False:
self.auth_creds[db] = acd
self.last_auth = db
return True
if self.auth_tries > 5:
self.log("Failing authorization after 5 requests w/o password")
_logger.info("Failing authorization after 5 requests w/o password")
raise AuthRejectedExc("Authorization failed.")
self.auth_tries += 1
raise AuthRequiredExc(atype='Basic', realm=self.realm)