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

fix callnum lookup on hub

Browse source 
Fixes https://pagure.io/koji/issue/4149
This commit is contained in:
Mike McLean 2024-08-06 18:29:25 -04:00
parent 45c290dd74
commit 255eadcf2f
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
kojihub/auth.py
View file

@ -76,7 +76,7 @@ class Session(object):
self.message = ''
self.exclusive = False
self.lockerror = None
self.callnum = None
self.callnum = callnum = None
# we look up perms, groups, and host_id on demand, see __getattr__
self._perms = None
self._groups = None
@ -88,7 +88,13 @@ class Session(object):
self.id = int(environ['HTTP_KOJI_SESSION_ID'])
self.key = environ['HTTP_KOJI_SESSION_KEY']
try:
callnum = int(environ['HTTP_KOJI_CALLNUM'])
if 'HTTP_KOJI_SESSION_CALLNUM' in environ:
# this is the field that the koji client has sent since 1.31
callnum = int(environ['HTTP_KOJI_SESSION_CALLNUM'])
else:
# before 1.35, the hub was mistakenly checking this field
# we still accept it for backwards compatibility
callnum = int(environ['HTTP_KOJI_CALLNUM'])
except KeyError:
callnum = None
elif not context.opts['DisableURLSessions'] and args is not None: