Add CacheKeyPrefix to webhook client options

yorkie-team · Feb 3, 2025 · 538f59d · 538f59d
1 parent ff9ff34
commit 538f59d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/pkg/webhook/client.go b/pkg/webhook/client.go
@@ -46,6 +46,7 @@ var (
 
 // Options are the options for the webhook client.
 type Options struct {
+	CacheKeyPrefix string
 	CacheTTL time.Duration
 
 	MaxRetries      uint64
@@ -54,8 +55,8 @@ type Options struct {
 
 // Client is a client for the webhook.
 type Client[Req any, Res any] struct {
-	url     string
 	cache   *cache.LRUExpireCache[string, types.Pair[int, *Res]]
+	url     string
 	options Options
 }
 
@@ -79,7 +80,7 @@ func (c *Client[Req, Res]) Send(ctx context.Context, req Req) (*Res, int, error)
 		return nil, 0, fmt.Errorf("marshal webhook request: %w", err)
 	}
 
-	cacheKey := string(body)
+	cacheKey := c.options.CacheKeyPrefix + ":" + string(body)
 	if entry, ok := c.cache.Get(cacheKey); ok {
 		return entry.Second, entry.First, nil
 	}

diff --git a/server/rpc/auth/auth.go b/server/rpc/auth/auth.go
@@ -45,16 +45,16 @@ func AccessAttributes(pack *change.Pack) []types.AccessAttribute {
 // VerifyAccess verifies the given access.
 func VerifyAccess(ctx context.Context, be *backend.Backend, accessInfo *types.AccessInfo) error {
 	md := metadata.From(ctx)
-	project := projects.From(ctx)
+	prj := projects.From(ctx)
 
-	if !project.RequireAuth(accessInfo.Method) {
+	if !prj.RequireAuth(accessInfo.Method) {
 		return nil
 	}
 
 	return verifyAccess(
 		ctx,
 		be,
-		project.AuthWebhookURL,
+		prj,
 		md.Authorization,
 		accessInfo,
 	)

diff --git a/server/rpc/auth/webhook.go b/server/rpc/auth/webhook.go
@@ -40,14 +40,15 @@ var (
 func verifyAccess(
 	ctx context.Context,
 	be *backend.Backend,
-	authWebhookURL string,
+	prj *types.Project,
 	token string,
 	accessInfo *types.AccessInfo,
 ) error {
-	cli := webhook.NewClient[types.AuthWebhookRequest, types.AuthWebhookResponse](
-		authWebhookURL,
+	cli := webhook.NewClient[types.AuthWebhookRequest](
+		prj.AuthWebhookURL,
 		be.WebhookCache,
 		webhook.Options{
+			CacheKeyPrefix:  prj.PublicKey + ":auth",
 			CacheTTL:        be.Config.ParseAuthWebhookCacheTTL(),
 			MaxRetries:      be.Config.AuthWebhookMaxRetries,
 			MaxWaitInterval: be.Config.ParseAuthWebhookMaxWaitInterval(),

diff --git a/test/integration/auth_webhook_test.go b/test/integration/auth_webhook_test.go
@@ -312,7 +312,6 @@ func TestAuthWebhookErrorHandling(t *testing.T) {
 	})
 
 	t.Run("unexpected webhook response test", func(t *testing.T) {
-		t.Skip()
 		ctx := context.Background()
 		authServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			_, err := types.NewAuthWebhookRequest(r.Body)