dbauthz

sreya · sreya · commit a8e7140affab · 2024-09-24T01:21:16.000Z
diff --git a/coderd/cryptokeys/keycache.go b/coderd/cryptokeys/keycache.go
@@ -4,6 +4,8 @@ import (
 	"context"
 
 	"golang.org/x/xerrors"
+
+	"github.com/coder/coder/v2/coderd/database"
 )
 
 var ErrKeyNotFound = xerrors.New("key not found")
@@ -12,6 +14,6 @@ var ErrKeyInvalid = xerrors.New("key is invalid for use")
 
 // Keycache provides an abstraction for fetching signing keys.
 type Keycache interface {
-	Latest(ctx context.Context) ([]byte, error)
-	Version(ctx context.Context, sequence int32) ([]byte, error)
+	Latest(ctx context.Context) (database.CryptoKey, error)
+	Version(ctx context.Context, sequence int32) (database.CryptoKey, error)
 }
diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
@@ -2302,6 +2302,10 @@ func (s *MethodTestSuite) TestCryptoKeys() {
 			DeletesAt: sql.NullTime{Time: time.Now(), Valid: true},
 		}).Asserts(rbac.ResourceCryptoKey, policy.ActionUpdate)
 	}))
+	s.Run("GetCryptoKeysByFeature", s.Subtest(func(db database.Store, check *expects) {
+		check.Args(database.CryptoKeyFeatureWorkspaceApps).
+			Asserts(rbac.ResourceCryptoKey, policy.ActionRead)
+	}))
 }
 
 func (s *MethodTestSuite) TestSystemFunctions() {

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@ import (`
`4`	`4`	`"context"`
`5`	`5`
`6`	`6`	`"golang.org/x/xerrors"`
	`7`	`+`
	`8`	`+ "github.com/coder/coder/v2/coderd/database"`
`7`	`9`	`)`
`8`	`10`
`9`	`11`	`var ErrKeyNotFound = xerrors.New("key not found")`
`@@ -12,6 +14,6 @@ var ErrKeyInvalid = xerrors.New("key is invalid for use")`
`12`	`14`
`13`	`15`	`// Keycache provides an abstraction for fetching signing keys.`
`14`	`16`	`type Keycache interface {`
`15`		`- Latest(ctx context.Context) ([]byte, error)`
`16`		`- Version(ctx context.Context, sequence int32) ([]byte, error)`
	`17`	`+ Latest(ctx context.Context) (database.CryptoKey, error)`
	`18`	`+ Version(ctx context.Context, sequence int32) (database.CryptoKey, error)`
`17`	`19`	`}`