particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes

Browse source
This commit is contained in:
Tomas Kopecek 2023-01-11 12:32:00 +01:00
parent 067e294c6c
commit d387b4e243
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
koji/__init__.py
View file

@ -2773,8 +2773,8 @@ class ClientSession(object):
sinfo = None
if getattr(self, 'sinfo') is not None:
# session renewal (not logged in, but have session data)
# makes sense only for new method/server
# send sinfo in headers if we have it
# still needed if not logged in for renewal case
sinfo = self.sinfo.copy()
sinfo['callnum'] = self.callnum
self.callnum += 1
@ -2911,13 +2911,14 @@ class ClientSession(object):
self.logged_in = False
auth_method(*args, **kwargs)
@staticmethod
def renew_expired_session(func):
"""Decorator to renew expirated session or subsession."""
def _renew_expired_session(*args, **kwargs):
def _renew_expired_session(self, *args, **kwargs):
try:
return func(*args, **kwargs)
except AuthExpired:
args[0]._renew_session()
self._renew_session()
return func(*args, **kwargs)
return _renew_expired_session

4
koji/auth.py
View file

@ -436,6 +436,10 @@ class Session(object):
'exclusive = TRUE'],
values={'user_id': user_id}, opts={'rowlock': True})
excl_id = query.singleValue(strict=False)
# get lock for our session
query = QueryProcessor(tables=['sessions'], clauses=['id=%(sesions_id)s'],
values={'session_id': session_id}, opts={'rowlock': True})
query.execute()
if excl_id:
if force:
# close the previous exclusive sessions and try again