Skip to content

Commit d937b6d

Browse files
russell-sternrussell-stern
committed
Fixed linting
1 parent b608b07 commit d937b6d

7 files changed

Lines changed: 43 additions & 53 deletions

File tree

‎core/capabilities/vault/authorizer_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ func TestAuthorizer_JWTPath_RejectsOwnerMismatch(t *testing.T) {
313313
req := jsonrpc.Request[json.RawMessage]{
314314
ID: "1",
315315
Method: tt.method,
316-
Params: (*json.RawMessage)(&params),
316+
Params: &params,
317317
Auth: "jwt-token",
318318
}
319319

@@ -394,7 +394,7 @@ func TestAuthorizer_RejectsOwnerBindingOnMalformedBatches(t *testing.T) {
394394
req := jsonrpc.Request[json.RawMessage]{
395395
ID: "1",
396396
Method: tt.method,
397-
Params: (*json.RawMessage)(&params),
397+
Params: &params,
398398
}
399399

400400
allowListBasedAuth := vaultmocks.NewAuthorizer(t)

‎core/capabilities/vault/gw_handler.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ type GatewayHandler struct {
6363
services.Service
6464
eng *services.Engine
6565

66-
secretsService vaulttypes.SecretsService
67-
gatewayConnector gatewayConnector
68-
authorizer Authorizer
69-
requestValidator *RequestValidator
70-
jwtAuthService services.Service
71-
lggr logger.Logger
72-
metrics *metrics
66+
secretsService vaulttypes.SecretsService
67+
gatewayConnector gatewayConnector
68+
authorizer Authorizer
69+
requestValidator *RequestValidator
70+
jwtAuthService services.Service
71+
lggr logger.Logger
72+
metrics *metrics
7373

7474
// TODO add org resolver? https://smartcontract-it.atlassian.net/browse/CRE-1707
7575
}

‎core/capabilities/vault/user_jsonrpc.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ type InvalidVaultParamsError struct {
2323
func (e InvalidVaultParamsError) Error() string {
2424
switch e.Method {
2525
case vaulttypes.MethodSecretsCreate:
26-
return fmt.Sprintf("failed to validate create secrets request: %s", e.Err.Error())
26+
return "failed to validate create secrets request: " + e.Err.Error()
2727
case vaulttypes.MethodSecretsUpdate:
28-
return fmt.Sprintf("failed to validate update secrets request: %s", e.Err.Error())
28+
return "failed to validate update secrets request: " + e.Err.Error()
2929
case vaulttypes.MethodSecretsDelete:
30-
return fmt.Sprintf("failed to validate delete secrets request: %s", e.Err.Error())
30+
return "failed to validate delete secrets request: " + e.Err.Error()
3131
case vaulttypes.MethodSecretsList:
32-
return fmt.Sprintf("failed to validate list secret identifiers request: %s", e.Err.Error())
32+
return "failed to validate list secret identifiers request: " + e.Err.Error()
3333
default:
3434
return e.Err.Error()
3535
}
@@ -129,11 +129,11 @@ func stripOwnerPrefixForNodeAuth(req *jsonrpc.Request[json.RawMessage]) error {
129129
}
130130

131131
func stripPrefixedVaultRequestID(requestID string) (originalRequestID, prefixedOwner string) {
132-
idx := strings.Index(requestID, vaulttypes.RequestIDSeparator)
133-
if idx == -1 {
132+
prefixedOwner, originalRequestID, ok := strings.Cut(requestID, vaulttypes.RequestIDSeparator)
133+
if !ok {
134134
return requestID, ""
135135
}
136-
return requestID[idx+len(vaulttypes.RequestIDSeparator):], requestID[:idx]
136+
return originalRequestID, prefixedOwner
137137
}
138138

139139
func normalizeUserJSONRPCParams(method string, params *json.RawMessage, requestID string) (*json.RawMessage, error) {

‎core/capabilities/vault/validate_user_request_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ func userSecretsMethodParamsForStripPrefixDigest(t *testing.T, method, owner, re
435435
case vaulttypes.MethodSecretsDelete:
436436
payload = vaultcommon.DeleteSecretsRequest{
437437
RequestId: requestID,
438-
Ids: []*vaultcommon.SecretIdentifier{{Owner: owner, Key: "k", Namespace: "main"}},
438+
Ids: []*vaultcommon.SecretIdentifier{{Owner: owner, Key: "k", Namespace: "main"}},
439439
}
440440
case vaulttypes.MethodSecretsList:
441441
payload = vaultcommon.ListSecretIdentifiersRequest{

‎core/services/gateway/handlers/vault/handler.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ func (h *handler) HandleJSONRPCUserMessage(ctx context.Context, req jsonrpc.Requ
430430
// Prefix request id with authorizedOwner, to ensure uniqueness across different owners
431431
// We do this ourselves to ensure the ID is unique and can't be tampered with by the user.
432432
req.ID = authorizedOwner + vaulttypes.RequestIDSeparator + req.ID
433-
if err := h.RequestValidator.FinalizeAuthorizedJSONRPCRequest(&req, req.ID); err != nil {
433+
if err := h.FinalizeAuthorizedJSONRPCRequest(&req, req.ID); err != nil {
434434
h.lggr.Errorw("failed to stamp prefixed request ID in params", "method", req.Method, "requestID", req.ID, "error", err)
435435
return fmt.Errorf("failed to stamp prefixed request ID in params: %w", err)
436436
}
@@ -644,7 +644,7 @@ func (h *handler) handleSecretsList(ctx context.Context, ar *activeRequest) erro
644644

645645
func (h *handler) prepareUserVaultRequest(ctx context.Context, req *jsonrpc.Request[json.RawMessage]) error {
646646
_, cachedPublicKey := h.getCachedPublicKey()
647-
return h.RequestValidator.PrepareUserJSONRPCRequest(ctx, req, vaultcap.UserJSONRPCValidationOptions{
647+
return h.PrepareUserJSONRPCRequest(ctx, req, vaultcap.UserJSONRPCValidationOptions{
648648
PublicKey: cachedPublicKey,
649649
SkipLabelValidation: cachedPublicKey == nil,
650650
}, false)
@@ -662,6 +662,7 @@ func (h *handler) sendImmediateUserResponse(
662662
h.metrics.requestUserError.Add(ctx, 1, metric.WithAttributes(
663663
attribute.String("don_id", h.donConfig.DonId),
664664
))
665+
default:
665666
}
666667
return callback.SendResponse(h.errorResponse(req, errorCode, err, nil))
667668
}

‎core/services/gateway/handlers/vault/handler_test.go‎

Lines changed: 22 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -888,7 +888,6 @@ func TestVaultHandler_HandleJSONRPCUserMessage(t *testing.T) {
888888
})
889889

890890
t.Run("empty delete batch", func(t *testing.T) {
891-
var wg sync.WaitGroup
892891
h, callback, don, _ := setupHandler(t)
893892
don.AssertNotCalled(t, "SendToNode")
894893

@@ -899,22 +898,16 @@ func TestVaultHandler_HandleJSONRPCUserMessage(t *testing.T) {
899898
Params: &invalidParams,
900899
}
901900

902-
wg.Add(1)
903-
go func() {
904-
defer wg.Done()
905-
resp, err := callback.Wait(t.Context())
906-
assert.NoError(t, err)
907-
var secretsResponse jsonrpc.Response[vaultcommon.DeleteSecretsResponse]
908-
err = json.Unmarshal(resp.RawResponse, &secretsResponse)
909-
assert.NoError(t, err)
910-
assert.Equal(t, invalidParamsRequest.ID, secretsResponse.ID, "Request ID should match")
911-
assert.Equal(t, "invalid params error: failed to validate delete secrets request: request batch must contain at least 1 item", secretsResponse.Error.Message, "Error message should match")
912-
assert.Equal(t, api.ToJSONRPCErrorCode(api.InvalidParamsError), secretsResponse.Error.Code, "Error code should match")
913-
}()
914-
915901
err := h.HandleJSONRPCUserMessage(t.Context(), invalidParamsRequest, callback)
916902
require.NoError(t, err)
917-
wg.Wait()
903+
904+
resp, err := callback.Wait(t.Context())
905+
require.NoError(t, err)
906+
var secretsResponse jsonrpc.Response[vaultcommon.DeleteSecretsResponse]
907+
require.NoError(t, json.Unmarshal(resp.RawResponse, &secretsResponse))
908+
assert.Equal(t, invalidParamsRequest.ID, secretsResponse.ID, "Request ID should match")
909+
assert.Equal(t, "invalid params error: failed to validate delete secrets request: request batch must contain at least 1 item", secretsResponse.Error.Message, "Error message should match")
910+
assert.Equal(t, api.ToJSONRPCErrorCode(api.InvalidParamsError), secretsResponse.Error.Code, "Error code should match")
918911
})
919912

920913
t.Run("invalid params error", func(t *testing.T) {
@@ -1191,17 +1184,15 @@ func TestVaultHandler_PreAuthValidationSkipsAuthorization(t *testing.T) {
11911184
Method: vaulttypes.MethodSecretsCreate,
11921185
}
11931186

1194-
wg.Add(1)
1195-
go func() {
1196-
defer wg.Done()
1187+
wg.Go(func() {
11971188
resp, waitErr := callback.Wait(t.Context())
1198-
require.NoError(t, waitErr)
1189+
assert.NoError(t, waitErr)
11991190
var secretsResponse jsonrpc.Response[vaultcommon.CreateSecretsResponse]
1200-
require.NoError(t, json.Unmarshal(resp.RawResponse, &secretsResponse))
1201-
require.Equal(t, req.ID, secretsResponse.ID)
1202-
require.Equal(t, api.ToJSONRPCErrorCode(api.InvalidParamsError), secretsResponse.Error.Code)
1203-
require.Contains(t, secretsResponse.Error.Message, "request params must not be nil")
1204-
}()
1191+
assert.NoError(t, json.Unmarshal(resp.RawResponse, &secretsResponse))
1192+
assert.Equal(t, req.ID, secretsResponse.ID)
1193+
assert.Equal(t, api.ToJSONRPCErrorCode(api.InvalidParamsError), secretsResponse.Error.Code)
1194+
assert.Contains(t, secretsResponse.Error.Message, "request params must not be nil")
1195+
})
12051196

12061197
require.NoError(t, h.HandleJSONRPCUserMessage(t.Context(), req, callback))
12071198
wg.Wait()
@@ -1219,17 +1210,15 @@ func TestVaultHandler_PreAuthValidationSkipsAuthorization(t *testing.T) {
12191210
Params: &invalidParams,
12201211
}
12211212

1222-
wg.Add(1)
1223-
go func() {
1224-
defer wg.Done()
1213+
wg.Go(func() {
12251214
resp, waitErr := callback.Wait(t.Context())
1226-
require.NoError(t, waitErr)
1215+
assert.NoError(t, waitErr)
12271216
var secretsResponse jsonrpc.Response[vaultcommon.DeleteSecretsResponse]
1228-
require.NoError(t, json.Unmarshal(resp.RawResponse, &secretsResponse))
1229-
require.Equal(t, req.ID, secretsResponse.ID)
1230-
require.Equal(t, api.ToJSONRPCErrorCode(api.InvalidParamsError), secretsResponse.Error.Code)
1231-
require.Contains(t, secretsResponse.Error.Message, "request batch must contain at least 1 item")
1232-
}()
1217+
assert.NoError(t, json.Unmarshal(resp.RawResponse, &secretsResponse))
1218+
assert.Equal(t, req.ID, secretsResponse.ID)
1219+
assert.Equal(t, api.ToJSONRPCErrorCode(api.InvalidParamsError), secretsResponse.Error.Code)
1220+
assert.Contains(t, secretsResponse.Error.Message, "request batch must contain at least 1 item")
1221+
})
12331222

12341223
require.NoError(t, h.HandleJSONRPCUserMessage(t.Context(), req, callback))
12351224
wg.Wait()

‎system-tests/tests/smoke/cre/vault_don_test_helpers.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -951,7 +951,7 @@ func executeVaultSecretsUpdateOwnerMismatchRejectedTest(
951951

952952
uniqueRequestID := uuid.New().String()
953953
secretsUpdateRequest := vault_helpers.UpdateSecretsRequest{
954-
RequestId: uniqueRequestID,
954+
RequestId: uniqueRequestID,
955955
EncryptedSecrets: buildEncryptedSecrets(secretID, mismatchedIdentifierOwner, encryptedSecret, []string{namespace}),
956956
}
957957
jsonRequest := newVaultJSONRequest(t, uniqueRequestID, vaulttypes.MethodSecretsUpdate, &secretsUpdateRequest)

0 commit comments

Comments
 (0)