From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E9B1442D31 for ; Fri, 23 Jun 2023 16:15:15 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 023F740ED7; Fri, 23 Jun 2023 16:15:15 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 41CFA406B8 for ; Fri, 23 Jun 2023 16:15:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687529713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=VqXkppvYtz7HZvtJ3XSaIfRzts3L774icxpcWhmFNME=; b=B5gcOAOPnF0nbpzOTvYZp4O9FOsGdEFwuNE5NVAJM36JTXgMRFV+v86iKTFVvpSP65WQbT 4N3oLpqdko1nymWc5c6B1EmO9Hl2sonSKQRBWii12oFlI1GjZAv5mxDfUUcvrBsvbopqPf 7KokJ+ssHTT2wv0oQbFNHxKBZ2xd90o= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-660-lh3X0K6RMBW8aQuXbhrftA-1; Fri, 23 Jun 2023 10:15:11 -0400 X-MC-Unique: lh3X0K6RMBW8aQuXbhrftA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 246508E451C; Fri, 23 Jun 2023 14:14:55 +0000 (UTC) Received: from RHTPC1VM0NT (unknown [10.22.32.232]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EBF06200C0DA; Fri, 23 Jun 2023 14:14:54 +0000 (UTC) From: Aaron Conole To: jspewock@iol.unh.edu Cc: ci@dpdk.org Subject: Re: [PATCH v1] tools: add jwt renewal function to acvp_tool References: <20230621195342.5035-2-jspewock@iol.unh.edu> Date: Fri, 23 Jun 2023 10:14:54 -0400 In-Reply-To: <20230621195342.5035-2-jspewock@iol.unh.edu> (jspewock@iol.unh.edu's message of "Wed, 21 Jun 2023 15:53:21 -0400") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-BeenThere: ci@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK CI discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ci-bounces@dpdk.org jspewock@iol.unh.edu writes: > From: Jeremy Spewock > > Adds a method that follows the process for renewing your jwt according > to NIST API documentation. This way, if there are load issues and it > takes too long to get vectors back with multi-algorithm testing, you can > still get restuls and the script will not error. > > Also, added a maximum number of renewals so that the script cannot run > infinitely. > > Signed-off-by: Jeremy Spewock > --- Just some nits - I haven't run this through black / flake8. > tools/acvp/acvp_tool.py | 73 +++++++++++++++++++++++++++++++++++------ > 1 file changed, 63 insertions(+), 10 deletions(-) > > diff --git a/tools/acvp/acvp_tool.py b/tools/acvp/acvp_tool.py > index 40d2f2f..8d50a58 100755 > --- a/tools/acvp/acvp_tool.py > +++ b/tools/acvp/acvp_tool.py > @@ -1,7 +1,7 @@ > #!/usr/bin/env python3 > > # SPDX-License-Identifier: BSD-3-Clause > -# Copyright 2022 The University of New Hampshire > +# Copyright 2023 The University of New Hampshire > > import hashlib > import sys > @@ -36,6 +36,8 @@ class ACVPProxy: > self.totp_path: str = totp_path > self.login_data: Optional[Dict[str, Any]] = None > self.session_data: Optional[Dict[str, Any]] = None > + self.retries: int = 0 > + self.max_retries: int = 2 > > with open(config_path, 'r') as f: > self.config: Any = json.load(f) > @@ -70,7 +72,13 @@ class ACVPProxy: > cert=self.cert, > headers={'Authorization': f'Bearer {token}'} > ) > - if not response.ok: > + if response.status_code == 401: > + if self.__renew_jwt(): > + token = self.session_data['jwt'] > + continue > + logging.error("Failed to renew expired jwt") > + return None > + elif not response.ok: > logging.error(f'Failed to fetch vector set {url}') > logging.error(json.dumps(response.json(), indent=4)) > return None > @@ -85,6 +93,35 @@ class ACVPProxy: > logging.info(f'Downloaded vector set {url}') > return vector_set_json > > + def __renew_jwt(self) -> bool: > + """Renews the jwt in session_data. > + > + JWTs provided by the NIST API last 30 minutes which can cause this > + script to fail even with good data. This method renews the jwt using > + the login endpoint. > + > + @return: True if successfully renewed token > + """ > + if self.retries >= self.max_retries: > + logging.error("Maximum number of jwt renewals has been reached.") > + return False > + response = requests.post( > + url=f'{self.config["url"]}/acvp/v1/login', > + json=[ > + {'acvVersion': '1.0'}, > + { > + 'password': self.__get_totp(), > + 'accessToken': self.session_data["jwt"] > + } > + ], > + cert=self.cert, > + ) > + if response.ok: > + self.retries += 1 > + self.session_data["jwt"] = response.json()[1].pop("accessToken") > + return True > + return False > + > def login(self) -> bool: > """Log into the API server. > > @@ -141,7 +178,6 @@ class ACVPProxy: > cert=self.cert, > headers={'Authorization': f'Bearer {self.login_data["jwt"]}'} > ) > - Why this line changed? > if not response.ok: > logging.error('Unable to register.') > logging.error(json.dumps(response.json(), indent=4)) > @@ -178,6 +214,12 @@ class ACVPProxy: > 'Authorization': f'Bearer {self.session_data["jwt"]}' > } > ) > + if result.status_code == 401: > + if self.__renew_jwt(): > + write_data[0]["jwt"] = self.session_data["jwt"] > + continue > + logging.error("Failed to renew jwt") > + return None > version, result_json = result.json() > if 'retry' in result_json: > duration = result_json['retry'] > @@ -207,8 +249,19 @@ class ACVPProxy: > cert=self.cert, > headers={'Authorization': f'Bearer {self.session_data["jwt"]}'} > ) > - > - if not response.ok: You also dropped a line spacing here as well. > + if response.status_code == 401: > + if self.__renew_jwt(): > + response = requests.post( > + f'{self.config["url"]}{session_url}/vectorSets/' > + f'{vector_set["vsId"]}/results', > + json=[version, vector_set], > + cert=self.cert, > + headers={'Authorization': f'Bearer {self.session_data["jwt"]}'} > + ) > + else: > + logging.error("Failed to renew jwt") > + return False > + elif not response.ok: > has_error = True > logging.error(f'Could not upload vector set response for ' > f'vector set ID {vector_set["vsId"]}.') > @@ -239,13 +292,13 @@ def main(request_path: Optional[str], > config_path=config_path, > ) > > - logging.info('Attempting to log in...') > - if not proxy.login(): > - logging.error('Could not log in.') > - sys.exit(1) > - logging.info('Successfully logged in.') > > if request_path: > + logging.info('Attempting to log in...') > + if not proxy.login(): > + logging.error('Could not log in.') > + sys.exit(1) > + logging.info('Successfully logged in.') > logging.info('Creating a new test session and downloading vectors...') > test_session = proxy.register() > if not test_session: