From 4cbc7eb4b5f9a20bff8ae8dda57dde322d950474 Mon Sep 17 00:00:00 2001 From: Max Date: Mon, 12 Aug 2024 12:36:38 +0100 Subject: [PATCH] Change raw issuer to digest before passing to x509 (#6431) --- tests/infra/crypto.py | 9 ++- .../custom_authorization.py | 70 +++++++++---------- 2 files changed, 42 insertions(+), 37 deletions(-) diff --git a/tests/infra/crypto.py b/tests/infra/crypto.py index c762e28198ad..84abd6008a63 100644 --- a/tests/infra/crypto.py +++ b/tests/infra/crypto.py @@ -142,12 +142,17 @@ def generate_cert( ) subject = x509.Name( [ - x509.NameAttribute(NameOID.COMMON_NAME, cn), + x509.NameAttribute( + NameOID.COMMON_NAME, hashlib.sha256(cn.encode("ascii")).hexdigest() + ), ] ) issuer = x509.Name( [ - x509.NameAttribute(NameOID.COMMON_NAME, issuer_cn), + x509.NameAttribute( + NameOID.COMMON_NAME, + hashlib.sha256(issuer_cn.encode("ascii")).hexdigest(), + ), ] ) builder = ( diff --git a/tests/js-custom-authorization/custom_authorization.py b/tests/js-custom-authorization/custom_authorization.py index 36b5bf894e23..edcb03c13d48 100644 --- a/tests/js-custom-authorization/custom_authorization.py +++ b/tests/js-custom-authorization/custom_authorization.py @@ -1297,28 +1297,28 @@ def run_interpreter_reuse(args): if __name__ == "__main__": cr = ConcurrentRunner() - # cr.add( - # "authz", - # run, - # nodes=infra.e2e_args.nodes(cr.args, 1), - # js_app_bundle=os.path.join(cr.args.js_app_bundle, "js-custom-authorization"), - # ) - - # cr.add( - # "limits", - # run_limits, - # nodes=infra.e2e_args.nodes(cr.args, 1), - # js_app_bundle=os.path.join(cr.args.js_app_bundle, "js-limits"), - # ) - - # cr.add( - # "authn", - # run_authn, - # nodes=infra.e2e_args.nodes(cr.args, 1), - # js_app_bundle=os.path.join(cr.args.js_app_bundle, "js-authentication"), - # initial_user_count=4, - # initial_member_count=2, - # ) + cr.add( + "authz", + run, + nodes=infra.e2e_args.nodes(cr.args, 1), + js_app_bundle=os.path.join(cr.args.js_app_bundle, "js-custom-authorization"), + ) + + cr.add( + "limits", + run_limits, + nodes=infra.e2e_args.nodes(cr.args, 1), + js_app_bundle=os.path.join(cr.args.js_app_bundle, "js-limits"), + ) + + cr.add( + "authn", + run_authn, + nodes=infra.e2e_args.nodes(cr.args, 1), + js_app_bundle=os.path.join(cr.args.js_app_bundle, "js-authentication"), + initial_user_count=4, + initial_member_count=2, + ) cr.add( "content_types", @@ -1327,18 +1327,18 @@ def run_interpreter_reuse(args): js_app_bundle=os.path.join(cr.args.js_app_bundle, "js-content-types"), ) - # cr.add( - # "api", - # run_api, - # nodes=infra.e2e_args.nodes(cr.args, 1), - # js_app_bundle=os.path.join(cr.args.js_app_bundle, "js-api"), - # ) - - # cr.add( - # "interpreter_reuse", - # run_interpreter_reuse, - # nodes=infra.e2e_args.min_nodes(cr.args, f=1), - # js_app_bundle=os.path.join(cr.args.js_app_bundle, "js-interpreter-reuse"), - # ) + cr.add( + "api", + run_api, + nodes=infra.e2e_args.nodes(cr.args, 1), + js_app_bundle=os.path.join(cr.args.js_app_bundle, "js-api"), + ) + + cr.add( + "interpreter_reuse", + run_interpreter_reuse, + nodes=infra.e2e_args.min_nodes(cr.args, f=1), + js_app_bundle=os.path.join(cr.args.js_app_bundle, "js-interpreter-reuse"), + ) cr.run()