π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Validate video preview object IDs
Neeraj Gupta1efb9cb8a784
diff --git a/server/ente/filedata/video.go b/server/ente/filedata/video.goindex 55500013ba..b561a4b21f 100644--- a/server/ente/filedata/video.go+++ b/server/ente/filedata/video.go@@ -1,6 +1,12 @@package filedata-import "github.com/ente/museum/ente"+import (+ "regexp"++ "github.com/ente/museum/ente"+)++var videoPreviewObjectIDPattern = regexp.MustCompile(`^pv_[0-9A-Za-z]{22}$`)type VidPreviewRequest struct {FileID int64 `json:"fileID" binding:"required"`@@ -15,5 +21,8 @@ func (r VidPreviewRequest) Validate() error {if r.Playlist == "" || r.PlayListHeader == "" {return ente.NewBadRequestWithMessage("playlist and playListHeader are required for preview video")}+ if !videoPreviewObjectIDPattern.MatchString(r.ObjectID) {+ return ente.NewBadRequestWithMessage("invalid video preview object ID")+ }return nil}diff --git a/server/ente/filedata/video_test.go b/server/ente/filedata/video_test.gonew file mode 100644index 0000000000..8247186ac2--- /dev/null+++ b/server/ente/filedata/video_test.go@@ -0,0 +1,37 @@+package filedata++import (+ "testing"++ "github.com/ente/museum/ente"+ "github.com/stretchr/testify/require"+)++func TestVideoPreviewObjectID(t *testing.T) {+ const id = "pv_0123456789ABCDEFGHIJkl"+ for _, tc := range []struct {+ name string+ id string+ valid bool+ }{+ {"issued", NewUploadID(ente.PreviewVideo), true},+ {"mixed case and digits", id, true},+ {"short", id[:len(id)-1], false},+ {"long", id + "0", false},+ {"traversal", "../../../../2/file-data/2/vid_preview/" + id, false},+ {"slash", id[:len(id)-1] + "/", false},+ {"space", id[:len(id)-1] + " ", false},+ } {+ t.Run(tc.name, func(t *testing.T) {+ req := VidPreviewRequest{ObjectID: tc.id, Playlist: "playlist", PlayListHeader: "header"}+ err := req.Validate()+ if tc.valid {+ require.NoError(t, err)+ } else {+ var apiErr *ente.ApiError+ require.ErrorAs(t, err, &apiErr)+ require.Equal(t, ente.BadRequest, apiErr.Code)+ }+ })+ }+}