Skip to content

pkg/capabilities/v2/actions/confidentialrelay/types.go: relax validateExecutionID check #2194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cfal wants to merge 3 commits into
base: main
Choose a base branch
from
+15 −17
Open

pkg/capabilities/v2/actions/confidentialrelay/types.go: relax validateExecutionID check #2194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8eb9318
pkg/capabilities/v2/actions/confidentialrelay/types.go: relax validat…
cfal Jun 25, 2026
14dc1dc
capabilities/v2/actions/confidentialrelay/types_test.go: Allow non-he…
cfal Jun 26, 2026
22d2375
Merge branch 'main' into relax-exec-id-check
vreff Jul 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions pkg/capabilities/v2/actions/confidentialrelay/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,13 +249,10 @@ func validateOwnerAddress(s string) error {
return nil
}

// validateExecutionID enforces 32-byte hex with no prefix.
// validateExecutionID enforces a non-empty value.
func validateExecutionID(s string) error {
if len(s) != 64 {
return errors.New("execution_id must be 32 bytes hex-encoded (64 hex chars, no 0x prefix)")
}
if _, err := hex.DecodeString(s); err != nil {
return errors.New("execution_id must be 32 bytes hex-encoded (64 hex chars, no 0x prefix)")
if s == "" {
return errors.New("execution_id must be non-empty")
}
return nil
}
Expand Down
23 changes: 12 additions & 11 deletions pkg/capabilities/v2/actions/confidentialrelay/types_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,13 +204,6 @@ func TestSecretsRequestParams_Validate(t *testing.T) {
p.Owner = "0xZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
}, "owner must be a 0x-prefixed 20-byte hex address"},
{"missing execution_id", func(p *SecretsRequestParams) { p.ExecutionID = "" }, "execution_id is required"},
{"execution_id wrong length", func(p *SecretsRequestParams) { p.ExecutionID = "abcd" }, "execution_id must be 32 bytes hex-encoded"},
{"execution_id with 0x prefix", func(p *SecretsRequestParams) {
p.ExecutionID = "0x" + validExecutionID[:62]
}, "execution_id must be 32 bytes hex-encoded"},
{"execution_id non-hex digits", func(p *SecretsRequestParams) {
p.ExecutionID = "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
}, "execution_id must be 32 bytes hex-encoded"},
{"missing enclave_public_key", func(p *SecretsRequestParams) { p.EnclavePublicKey = "" }, "enclave_public_key is required"},
{"enclave_public_key non-hex digits", func(p *SecretsRequestParams) {
p.EnclavePublicKey = "not-hex"
Expand Down Expand Up @@ -243,6 +236,12 @@ func TestSecretsRequestParams_Validate(t *testing.T) {
require.NoError(t, validSecretsParams().Validate())
})

t.Run("non-empty execution_id accepted", func(t *testing.T) {
p := validSecretsParams()
p.ExecutionID = "not-a-hex-execution-id"
require.NoError(t, p.Validate())
})

t.Run("optional fields can be empty", func(t *testing.T) {
p := validSecretsParams()
p.OrgID = ""
Expand All @@ -264,10 +263,6 @@ func TestCapabilityRequestParams_Validate(t *testing.T) {
p.Owner = "1111111111111111111111111111111111111111"
}, "owner must be a 0x-prefixed 20-byte hex address"},
{"missing execution_id", func(p *CapabilityRequestParams) { p.ExecutionID = "" }, "execution_id is required"},
{"execution_id wrong length", func(p *CapabilityRequestParams) { p.ExecutionID = "abcd" }, "execution_id must be 32 bytes hex-encoded"},
{"execution_id non-hex digits", func(p *CapabilityRequestParams) {
p.ExecutionID = "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
}, "execution_id must be 32 bytes hex-encoded"},
{"missing reference_id", func(p *CapabilityRequestParams) { p.ReferenceID = "" }, "reference_id is required"},
{"missing capability_id", func(p *CapabilityRequestParams) { p.CapabilityID = "" }, "capability_id is required"},
{"missing payload", func(p *CapabilityRequestParams) { p.Payload = "" }, "payload is required"},
Expand All @@ -286,6 +281,12 @@ func TestCapabilityRequestParams_Validate(t *testing.T) {
require.NoError(t, validCapabilityParams().Validate())
})

t.Run("non-empty execution_id accepted", func(t *testing.T) {
p := validCapabilityParams()
p.ExecutionID = "not-a-hex-execution-id"
require.NoError(t, p.Validate())
})

t.Run("attestation can be empty", func(t *testing.T) {
p := validCapabilityParams()
p.Attestation = ""
Expand Down
Loading