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

builder: set OAuth token creation time before we fetch it

Browse source 
See the comment.
This commit is contained in:
Ondřej Budai 2022-06-29 10:25:38 +02:00 • committed by Christian Kellner
parent ab147208e9
commit 7a70cfd42e
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
plugins/builder/osbuild.py
View file

@ -272,13 +272,13 @@ class OAuth2(requests.auth.AuthBase):
""" """
class Token: class Token:
def __init__(self, data): def __init__(self, data, created):
self.data = data["access_token"] self.data = data["access_token"]
self.type = data["token_type"] self.type = data["token_type"]
self.expires_in = int(data["expires_in"]) self.expires_in = int(data["expires_in"])
self.scope = data.get("scope") self.scope = data.get("scope")
self.created = time.time() self.created = created
@property @property
def expired(self) -> bool: def expired(self) -> bool:
@ -299,6 +299,11 @@ class OAuth2(requests.auth.AuthBase):
return not self.token or self.token.expired return not self.token or self.token.expired
def fetch_token(self, http: requests.Session): def fetch_token(self, http: requests.Session):
# Set token creation time here. If we set it after the request was
# fulfilled, it would be offsetted by the time it took the token to
# get from the server here, which can result into us refreshing
# the token late.
token_created = time.time()
data = { data = {
"grant_type": "client_credentials", "grant_type": "client_credentials",
"client_id": self.id, "client_id": self.id,
@ -312,7 +317,7 @@ class OAuth2(requests.auth.AuthBase):
raise koji.GenericError(msg) from None raise koji.GenericError(msg) from None
token_data = res.json() token_data = res.json()
self.token = self.Token(token_data) self.token = self.Token(token_data, token_created)
def __call__(self, r: requests.Request): def __call__(self, r: requests.Request):
"""Called by requests to obtain authorization""" """Called by requests to obtain authorization"""