π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Scope public link cache by origin
Manav Rathicefdaad8dbba
diff --git a/server/pkg/middleware/collection_link.go b/server/pkg/middleware/collection_link.goindex 8be03bff9a..eb4e177be8 100644--- a/server/pkg/middleware/collection_link.go+++ b/server/pkg/middleware/collection_link.go@@ -69,7 +69,7 @@ func (m *CollectionLinkMiddleware) Authenticate(urlSanitizer func(_ *gin.ContextshouldCheckDeviceLimit := shouldCheckCollectionLinkDeviceLimit(reqPath)passwordValidated := false- cacheKey := computeHashKeyForList([]string{accessToken, clientIP, userAgent}, ":")+ cacheKey := computeHashKeyForList([]string{accessToken, clientIP, userAgent, c.GetHeader("Origin")}, ":")var cachedValue interface{}cacheHit := falseif !shouldCheckDeviceLimit {diff --git a/server/pkg/middleware/collection_link_test.go b/server/pkg/middleware/collection_link_test.goindex 496bc252f9..62b7aa56e5 100644--- a/server/pkg/middleware/collection_link_test.go+++ b/server/pkg/middleware/collection_link_test.go@@ -1,8 +1,15 @@package middlewareimport (+ "net/http"+ "net/http/httptest""testing"+ "time"+ "github.com/ente/museum/ente"+ "github.com/ente/museum/pkg/utils/auth"+ "github.com/gin-gonic/gin"+ "github.com/patrickmn/go-cache""github.com/stretchr/testify/require")@@ -14,3 +21,37 @@ func TestShouldCheckCollectionLinkDeviceLimit(t *testing.T) {require.False(t, shouldCheckCollectionLinkDeviceLimit("/public-collection/upload-url"))require.False(t, shouldCheckCollectionLinkDeviceLimit("/public-collection/verify-password"))}++func TestCollectionLinkCacheIsScopedToOrigin(t *testing.T) {+ const (+ accessToken = "access-token"+ clientIP = "192.0.2.1"+ userAgent = "test-agent"+ )+ origins := []string{"https://albums.example", "https://gallery.example"}+ linkCache := cache.New(time.Minute, time.Minute)+ for i, origin := range origins {+ key := computeHashKeyForList([]string{accessToken, clientIP, userAgent, origin}, ":")+ linkCache.Set(key, ente.PublicCollectionSummary{ID: int64(i + 1)}, cache.DefaultExpiration)+ }++ gin.SetMode(gin.TestMode)+ var ids []int64+ router := gin.New()+ middleware := (&CollectionLinkMiddleware{Cache: linkCache}).Authenticate(func(c *gin.Context) string { return c.FullPath() })+ router.GET("/public-collection/files/download/:fileID", middleware, func(c *gin.Context) {+ ids = append(ids, auth.MustGetPublicAccessContext(c).ID)+ c.Status(http.StatusNoContent)+ })+ for _, origin := range origins {+ req := httptest.NewRequest(http.MethodGet, "/public-collection/files/download/1", nil)+ req.RemoteAddr = clientIP + ":1234"+ req.Header.Set("Origin", origin)+ req.Header.Set("User-Agent", userAgent)+ req.Header.Set("X-Auth-Access-Token", accessToken)+ resp := httptest.NewRecorder()+ router.ServeHTTP(resp, req)+ require.Equal(t, http.StatusNoContent, resp.Code)+ }+ require.Equal(t, []int64{1, 2}, ids)+}