Skip to content

Commit 23296a2

Browse files
committed
fix: do not fallback to any verifier on empty provider
Signed-off-by: Árpád Csepi <csepi.arpad@outlook.com>
1 parent 48b757c commit 23296a2

2 files changed

Lines changed: 7 additions & 4 deletions

File tree

dir-sdk-python/agntcy/dir_sdk/client/dirctl/verification.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ def _run_verify(config: Config, req: sign_v1.VerifyRequest, output_path: str) ->
5050
elif provider.HasField("any"):
5151
_verify_with_any(config, req.record_ref, provider.any, effective_output_path, extra_mounts=extra_mounts)
5252
else:
53-
_verify_with_any(config, req.record_ref, provider.any, effective_output_path, extra_mounts=extra_mounts)
53+
msg = "Unsupported verification provider in request"
54+
raise RuntimeError(msg)
5455

5556

5657
def _verify_with_key(

dir-sdk-python/agntcy/dir_sdk/tests/test_client.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -282,14 +282,16 @@ def test_sign_and_verify(self) -> None:
282282
provider_url = shell_env.get("OIDC_PROVIDER_URL", "")
283283
client_id = shell_env.get("OIDC_CLIENT_ID", "sigstore")
284284

285-
oidc_options = sign_v1.SignOptionsOIDC(oidc_provider_url=provider_url, oidc_client_id=client_id)
286-
oidc_provider = sign_v1.SignWithOIDC(id_token=token, options=oidc_options)
285+
sign_oidc_options = sign_v1.SignOptionsOIDC(oidc_provider_url=provider_url, oidc_client_id=client_id)
286+
oidc_provider = sign_v1.SignWithOIDC(id_token=token, options=sign_oidc_options)
287287
request_oidc_provider = sign_v1.SignRequestProvider(oidc=oidc_provider)
288288
oidc_request = sign_v1.SignRequest(
289289
record_ref=record_refs[1],
290290
provider=request_oidc_provider,
291291
)
292292

293+
verify_oidc_options = sign_v1.VerifyOptionsOIDC()
294+
293295
try:
294296
# Sign and verify using Key signing
295297
self.client.sign(key_request)
@@ -305,7 +307,7 @@ def test_sign_and_verify(self) -> None:
305307

306308
verify_index = 0
307309
for ref in record_refs:
308-
response = self.client.verify(sign_v1.VerifyRequest(record_ref=ref))
310+
response = self.client.verify(sign_v1.VerifyRequest(record_ref=ref, provider=sign_v1.VerifyRequestProvider(any=sign_v1.VerifyWithAny(oidc_options=verify_oidc_options))))
309311

310312
assert response.success is True
311313

0 commit comments

Comments
 (0)