make guest file expiration fixed so that persisting of file doesn't d…

…ecrease with time (example guest with expiration limit of 30 for URL and file can still upload a file after 29 days which will be persisted for 30 days)
Balk-Z · Dec 6, 2024 · cc0bcad · cc0bcad
1 parent 2c3d594
commit cc0bcad
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 28 deletions.
diff --git a/handlers/guest_links.go b/handlers/guest_links.go
@@ -88,11 +88,6 @@ func guestLinkFromRequest(r *http.Request) (picoshare.GuestLink, error) {
 		return picoshare.GuestLink{}, err
 	}
 
-	fileExpiration, err := parse.Expiration(payload.FileExpiration)
-	if err != nil {
-		return picoshare.GuestLink{}, err
-	}
-
 	maxFileBytes, err := parseMaxFileBytes(payload.MaxFileBytes)
 	if err != nil {
 		return picoshare.GuestLink{}, err
@@ -106,7 +101,7 @@ func guestLinkFromRequest(r *http.Request) (picoshare.GuestLink, error) {
 	return picoshare.GuestLink{
 		Label:          label,
 		UrlExpires:     urlExpiration,
-		FileExpires:    fileExpiration,
+		FileExpires:    payload.FileExpiration,
 		MaxFileBytes:   maxFileBytes,
 		MaxFileUploads: maxFileUploads,
 	}, nil

diff --git a/handlers/guest_links_test.go b/handlers/guest_links_test.go
@@ -28,14 +28,14 @@ func TestGuestLinksPostAcceptsValidRequest(t *testing.T) {
 			payload: `{
 					"label": null,
 					"urlExpirationTime":"2030-01-02T03:04:25Z",
-					"fileExpirationTime":"2030-01-02T03:04:25Z",
+					"fileExpirationTime":"Never",
 					"maxFileBytes": null,
 					"maxFileUploads": null
 				}`,
 			expected: picoshare.GuestLink{
 				Label:          picoshare.GuestLinkLabel(""),
 				UrlExpires:     mustParseExpirationTime("2030-01-02T03:04:25Z"),
-				FileExpires:    mustParseExpirationTime("2030-01-02T03:04:25Z"),
+				FileExpires:    "Never",
 				MaxFileBytes:   picoshare.GuestUploadUnlimitedFileSize,
 				MaxFileUploads: picoshare.GuestUploadUnlimitedFileUploads,
 			},
@@ -45,14 +45,14 @@ func TestGuestLinksPostAcceptsValidRequest(t *testing.T) {
 			payload: `{
 					"label": "For my good pal, Maurice",
 					"urlExpirationTime":"2030-01-02T03:04:25Z",
-					"fileExpirationTime":"2030-01-02T03:04:25Z",
+					"fileExpirationTime":"Never",
 					"maxFileBytes": 1048576,
 					"maxFileUploads": 1
 				}`,
 			expected: picoshare.GuestLink{
 				Label:          picoshare.GuestLinkLabel("For my good pal, Maurice"),
 				UrlExpires:     mustParseExpirationTime("2030-01-02T03:04:25Z"),
-				FileExpires:    mustParseExpirationTime("2030-01-02T03:04:25Z"),
+				FileExpires:    "Never",
 				MaxFileBytes:   makeGuestUploadMaxFileBytes(1048576),
 				MaxFileUploads: makeGuestUploadCountLimit(1),
 			},

diff --git a/handlers/templates/pages/guest-link-create.html b/handlers/templates/pages/guest-link-create.html
@@ -6,7 +6,9 @@
 
     const labelInput = document.getElementById("label");
     const expirationSelect = document.getElementById("expiration-select");
-    const expirationSelectFile = document.getElementById("expiration-select-file");
+    const expirationSelectFile = document.getElementById(
+      "expiration-select-file"
+    );
     const maxFileBytesInput = document.getElementById("max-file-size");
     const fileUploadLimitInput = document.getElementById("file-upload-limit");
     const createLinkForm = document.getElementById("create-guest-link-form");
@@ -112,7 +114,7 @@ <h1 class="title">Create Guest Link</h1>
           <select id="expiration-select-file">
             {{ range .ExpirationOptions }}
               <option
-                value="{{ formatExpiration .Expiration }}"
+                value="{{ .FriendlyName }}"
                 {{ if .IsDefault }}selected{{ end }}
               >
                 {{ .FriendlyName }}

diff --git a/handlers/templates/pages/guest-link-index.html b/handlers/templates/pages/guest-link-index.html
@@ -144,7 +144,7 @@ <h1 class="title">Guest Links</h1>
               {{ formatExpiration .UrlExpires }}
             </td>
             <td class="is-vcentered expiration">
-              {{ formatFileExpiration .FileExpires }}
+              {{ .FileExpires }}
             </td>
             <td class="is-vcentered">
               {{ formatSizeLimit .MaxFileBytes }}

diff --git a/handlers/upload.go b/handlers/upload.go
@@ -132,7 +132,22 @@ func (s Server) guestEntryPost() http.HandlerFunc {
 			r.Body = http.MaxBytesReader(w, r.Body, int64(*gl.MaxFileBytes))
 		}
 
-		id, err := s.insertFileFromRequest(r, gl.FileExpires, guestLinkID)
+		m := map[string]time.Time{
+			"1 day":   time.Now().AddDate(0, 0, 1),
+			"7 days":  time.Now().AddDate(0, 0, 7),
+			"30 days": time.Now().AddDate(0, 0, 30),
+			"1 year":  time.Now().AddDate(1, 0, 0),
+			"Never":   time.Time(picoshare.NeverExpire),
+		}
+
+		fileExpiry, err := parse.Expiration(m[gl.FileExpires].Format(time.RFC3339))
+		if err != nil {
+			log.Printf("error calculating file expiration for guest upload %v: %v", guestLinkID, err)
+			http.Error(w, "Failed to calculate file expiration", http.StatusInternalServerError)
+			return
+		}
+
+		id, err := s.insertFileFromRequest(r, fileExpiry, guestLinkID)
 		if err != nil {
 			var de *dbError
 			if errors.As(err, &de) {

diff --git a/handlers/upload_test.go b/handlers/upload_test.go
@@ -280,9 +280,10 @@ func TestGuestUpload(t *testing.T) {
 		{
 			description: "valid upload to guest link",
 			guestLinkInStore: picoshare.GuestLink{
-				ID:         picoshare.GuestLinkID("abcdefgh23456789"),
-				Created:    mustParseTime("2022-01-01T00:00:00Z"),
-				UrlExpires: mustParseExpirationTime("2030-01-02T03:04:25Z"),
+				ID:          picoshare.GuestLinkID("abcdefgh23456789"),
+				Created:     mustParseTime("2022-01-01T00:00:00Z"),
+				UrlExpires:  mustParseExpirationTime("2030-01-02T03:04:25Z"),
+				FileExpires: "Never",
 			},
 			guestLinkID: "abcdefgh23456789",
 			status:      http.StatusOK,
@@ -330,9 +331,10 @@ func TestGuestUpload(t *testing.T) {
 		{
 			description: "reject upload that includes a note",
 			guestLinkInStore: picoshare.GuestLink{
-				ID:         picoshare.GuestLinkID("abcdefgh23456789"),
-				Created:    mustParseTime("2022-01-01T00:00:00Z"),
-				UrlExpires: mustParseExpirationTime("2030-01-02T03:04:25Z"),
+				ID:          picoshare.GuestLinkID("abcdefgh23456789"),
+				Created:     mustParseTime("2022-01-01T00:00:00Z"),
+				UrlExpires:  mustParseExpirationTime("2030-01-02T03:04:25Z"),
+				FileExpires: "Never",
 			},
 			guestLinkID: "abcdefgh23456789",
 			note:        "I'm a disallowed note",
@@ -374,6 +376,7 @@ func TestGuestUpload(t *testing.T) {
 				Created:      mustParseTime("2000-01-01T00:00:00Z"),
 				UrlExpires:   mustParseExpirationTime("2030-01-02T03:04:25Z"),
 				MaxFileBytes: makeGuestUploadMaxFileBytes(1),
+				FileExpires:  "Never",
 			},
 			guestLinkID: "abcdefgh23456789",
 			status:      http.StatusBadRequest,

diff --git a/picoshare/guest_link.go b/picoshare/guest_link.go
@@ -15,7 +15,7 @@ type (
 		Label          GuestLinkLabel
 		Created        time.Time
 		UrlExpires     ExpirationTime
-		FileExpires    ExpirationTime
+		FileExpires    string
 		MaxFileBytes   GuestUploadMaxFileBytes
 		MaxFileUploads GuestUploadCountLimit
 		FilesUploaded  int

diff --git a/store/sqlite/guest_links.go b/store/sqlite/guest_links.go
@@ -89,7 +89,7 @@ func (s *Store) InsertGuestLink(guestLink picoshare.GuestLink) error {
 		sql.Named("max_file_uploads", guestLink.MaxFileUploads),
 		sql.Named("creation_time", formatTime(time.Now())),
 		sql.Named("url_expiration_time", formatExpirationTime(guestLink.UrlExpires)),
-		sql.Named("file_expiration_time", formatExpirationTime(guestLink.FileExpires))); err != nil {
+		sql.Named("file_expiration_time", guestLink.FileExpires)); err != nil {
 		return err
 	}
 
@@ -154,11 +154,6 @@ func guestLinkFromRow(row rowScanner) (picoshare.GuestLink, error) {
 		return picoshare.GuestLink{}, err
 	}
 
-	fet, err := parseDatetime(fileExpirationTimeRaw)
-	if err != nil {
-		return picoshare.GuestLink{}, err
-	}
-
 	return picoshare.GuestLink{
 		ID:             id,
 		Label:          label,
@@ -167,6 +162,6 @@ func guestLinkFromRow(row rowScanner) (picoshare.GuestLink, error) {
 		FilesUploaded:  filesUploaded,
 		Created:        ct,
 		UrlExpires:     picoshare.ExpirationTime(uet),
-		FileExpires:    picoshare.ExpirationTime(fet),
+		FileExpires:    fileExpirationTimeRaw,
 	}, nil
 }