Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Validate public link KDF parameters

Neeraj Gupta9776b000e1de
diff --git a/server/ente/file_link.go b/server/ente/file_link.go
index a244bba81a..14a5135051 100644
--- a/server/ente/file_link.go
+++ b/server/ente/file_link.go
@@ -16,6 +16,10 @@ type CreateFileUrl struct {
EncryptedShareKey *string `json:"encryptedShareKey,omitempty"`
}
+func (r *CreateFileUrl) Validate() error {
+ return validatePublicLinkKDFParams(r.KdfMemLimit, r.KdfOpsLimit)
+}
+
type UpdateFileUrl struct {
LinkID string `json:"linkID" binding:"required"`
FileID int64 `json:"fileID" binding:"required"`
diff --git a/server/ente/public_collection.go b/server/ente/public_collection.go
index 7fb3637279..1b977db3f3 100644
--- a/server/ente/public_collection.go
+++ b/server/ente/public_collection.go
@@ -60,6 +60,9 @@ func (ut *UpdatePublicAccessTokenRequest) Validate() error {
if !(allPassParamsMissing || allPassParamsPresent) {
return NewBadRequestWithMessage("all password params should be either present or missing")
}
+ if err := validatePublicLinkKDFParams(ut.MemLimit, ut.OpsLimit); err != nil {
+ return err
+ }
if allPassParamsPresent && ut.DisablePassword != nil && *ut.DisablePassword {
return NewBadRequestWithMessage("can not set and disable password in same request")
@@ -78,6 +81,16 @@ func validatePublicLinkDeviceLimit(deviceLimit int) error {
return nil
}
+func validatePublicLinkKDFParams(memLimit, opsLimit *int64) error {
+ if memLimit == nil && opsLimit == nil {
+ return nil
+ }
+ if memLimit == nil || opsLimit == nil || *memLimit != 67108864 || *opsLimit != 2 {
+ return NewBadRequestWithMessage("invalid KDF parameters")
+ }
+ return nil
+}
+
type VerifyPasswordRequest struct {
PassHash string `json:"passHash" binding:"required"`
}
diff --git a/server/pkg/controller/public/file_link.go b/server/pkg/controller/public/file_link.go
index 5f366af9b4..bc76564d62 100644
--- a/server/pkg/controller/public/file_link.go
+++ b/server/pkg/controller/public/file_link.go
@@ -22,6 +22,9 @@ type FileLinkController struct {
}
func (c *FileLinkController) CreateLink(ctx *gin.Context, req ente.CreateFileUrl) (*ente.FileUrl, error) {
+ if err := req.Validate(); err != nil {
+ return nil, stacktrace.Propagate(err, "invalid request")
+ }
actorUserID := auth.GetUserID(ctx.Request.Header)
app := auth.GetApp(ctx)
if req.App != app {