π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Validate public link device limits
Neeraj Guptaa42e2474fabf
diff --git a/server/ente/public_collection.go b/server/ente/public_collection.goindex e3b9b7589c..7fb3637279 100644--- a/server/ente/public_collection.go+++ b/server/ente/public_collection.go@@ -18,6 +18,10 @@ type CreatePublicAccessTokenRequest struct {DeviceLimit int `json:"deviceLimit"`}+func (ct *CreatePublicAccessTokenRequest) Validate() error {+ return validatePublicLinkDeviceLimit(ct.DeviceLimit)+}+type UpdatePublicAccessTokenRequest struct {CollectionID int64 `json:"collectionID" binding:"required"`ValidTill *int64 `json:"validTill"`@@ -40,8 +44,10 @@ func (ut *UpdatePublicAccessTokenRequest) Validate() error {return NewBadRequestWithMessage("all parameters are missing")}- if ut.DeviceLimit != nil && (*ut.DeviceLimit < 0 || *ut.DeviceLimit > 50) {- return NewBadRequestWithMessage(fmt.Sprintf("device limit: %d out of range [0-50]", *ut.DeviceLimit))+ if ut.DeviceLimit != nil {+ if err := validatePublicLinkDeviceLimit(*ut.DeviceLimit); err != nil {+ return err+ }}if ut.ValidTill != nil && *ut.ValidTill != 0 && *ut.ValidTill < time.Microseconds() {@@ -65,6 +71,13 @@ func (ut *UpdatePublicAccessTokenRequest) Validate() error {return nil}+func validatePublicLinkDeviceLimit(deviceLimit int) error {+ if deviceLimit < 0 || deviceLimit > 50 {+ return NewBadRequestWithMessage(fmt.Sprintf("device limit: %d out of range [0-50]", deviceLimit))+ }+ return nil+}+type VerifyPasswordRequest struct {PassHash string `json:"passHash" binding:"required"`}diff --git a/server/ente/public_collection_test.go b/server/ente/public_collection_test.goindex 9b23424a03..0768a6dac7 100644--- a/server/ente/public_collection_test.go+++ b/server/ente/public_collection_test.go@@ -2,6 +2,26 @@ package enteimport "testing"+func TestCreatePublicAccessTokenRequestValidatesDeviceLimit(t *testing.T) {+ for _, test := range []struct {+ name string+ deviceLimit int+ wantError bool+ }{+ {name: "negative", deviceLimit: -1, wantError: true},+ {name: "unlimited", deviceLimit: 0},+ {name: "maximum", deviceLimit: 50},+ {name: "over maximum", deviceLimit: 51, wantError: true},+ } {+ t.Run(test.name, func(t *testing.T) {+ err := (&CreatePublicAccessTokenRequest{DeviceLimit: test.deviceLimit}).Validate()+ if (err != nil) != test.wantError {+ t.Fatalf("Validate() error = %v, wantError = %t", err, test.wantError)+ }+ })+ }+}+func TestFilterPublicURLsForRole(t *testing.T) {viewer := VIEWERcollaborator := COLLABORATORdiff --git a/server/pkg/controller/collections/share.go b/server/pkg/controller/collections/share.goindex d230fe5d6f..be579a50b6 100644--- a/server/pkg/controller/collections/share.go+++ b/server/pkg/controller/collections/share.go@@ -475,6 +475,9 @@ func (c *CollectionController) UpdateShareeMagicMetadata(ctx *gin.Context, req efunc (c *CollectionController) ShareURL(ctx *gin.Context, userID int64, req ente.CreatePublicAccessTokenRequest) (ente.PublicURL, error) {+ if err := req.Validate(); err != nil {+ return ente.PublicURL{}, stacktrace.Propagate(err, "")+ }collection, err := c.CollectionRepo.Get(req.CollectionID)if err != nil {return ente.PublicURL{}, stacktrace.Propagate(err, "")diff --git a/server/pkg/middleware/collection_link.go b/server/pkg/middleware/collection_link.goindex 5edea3995b..4416d84307 100644--- a/server/pkg/middleware/collection_link.go+++ b/server/pkg/middleware/collection_link.go@@ -173,7 +173,7 @@ func (m *CollectionLinkMiddleware) Authenticate(urlSanitizer func(_ *gin.Context}func capFreeUserDeviceLimit(deviceLimit int) int {- if deviceLimit == 0 || deviceLimit > public2.FreeUserDeviceLimit {+ if deviceLimit <= 0 || deviceLimit > public2.FreeUserDeviceLimit {return public2.FreeUserDeviceLimit}return deviceLimitdiff --git a/server/pkg/middleware/collection_link_test.go b/server/pkg/middleware/collection_link_test.goindex 4980e61967..04ecf4b181 100644--- a/server/pkg/middleware/collection_link_test.go+++ b/server/pkg/middleware/collection_link_test.go@@ -28,6 +28,7 @@ func TestCapFreeUserDeviceLimit(t *testing.T) {deviceLimit intwant int}{+ {name: "invalid negative limit", deviceLimit: -1, want: 10},{name: "unlimited", deviceLimit: 0, want: 10},{name: "legacy free limit", deviceLimit: 5, want: 5},{name: "current free limit", deviceLimit: 10, want: 10},