make file expiry for guest links configurable when creating guest links

handlers/guest_links.go

@@ -67,7 +67,8 @@ func (s Server) guestLinksDelete() http.HandlerFunc {
 func guestLinkFromRequest(r *http.Request) (picoshare.GuestLink, error) {
 	var payload struct {
 		Label          string  `json:"label"`
-		Expiration     string  `json:"expirationTime"`
+		UrlExpiration  string  `json:"urlExpirationTime"`
+		FileExpiration string  `json:"fileLifetime"`
 		MaxFileBytes   *uint64 `json:"maxFileBytes"`
 		MaxFileUploads *int    `json:"maxFileUploads"`
 	}
@@ -82,7 +83,12 @@ func guestLinkFromRequest(r *http.Request) (picoshare.GuestLink, error) {
 		return picoshare.GuestLink{}, err
 	}
 
-	expiration, err := parse.Expiration(payload.Expiration)
+	urlExpiration, err := parse.Expiration(payload.UrlExpiration)
+	if err != nil {
+		return picoshare.GuestLink{}, err
+	}
+
+	fileExpiration, err := parse.GuestFileLifeTime(payload.FileExpiration)
 	if err != nil {
 		return picoshare.GuestLink{}, err
 	}
@@ -99,7 +105,8 @@ func guestLinkFromRequest(r *http.Request) (picoshare.GuestLink, error) {
 
 	return picoshare.GuestLink{
 		Label:          label,
-		Expires:        expiration,
+		UrlExpires:     urlExpiration,
+		FileLifetime:   fileExpiration,
 		MaxFileBytes:   maxFileBytes,
 		MaxFileUploads: maxFileUploads,
 	}, nil

handlers/guest_links_test.go

@@ -27,13 +27,15 @@ func TestGuestLinksPostAcceptsValidRequest(t *testing.T) {
 			description: "minimally populated request",
 			payload: `{
 					"label": null,
-					"expirationTime":"2030-01-02T03:04:25Z",
+					"urlExpirationTime":"2030-01-02T03:04:25Z",
+					"fileLifetime":"876000h0m0s",
 					"maxFileBytes": null,
 					"maxFileUploads": null
 				}`,
 			expected: picoshare.GuestLink{
 				Label:          picoshare.GuestLinkLabel(""),
-				Expires:        mustParseExpirationTime("2030-01-02T03:04:25Z"),
+				UrlExpires:     mustParseExpirationTime("2030-01-02T03:04:25Z"),
+				FileLifetime:   picoshare.FileLifetimeInfinite,
 				MaxFileBytes:   picoshare.GuestUploadUnlimitedFileSize,
 				MaxFileUploads: picoshare.GuestUploadUnlimitedFileUploads,
 			},
@@ -42,13 +44,49 @@ func TestGuestLinksPostAcceptsValidRequest(t *testing.T) {
 			description: "fully populated request",
 			payload: `{
 					"label": "For my good pal, Maurice",
-					"expirationTime":"2030-01-02T03:04:25Z",
+					"urlExpirationTime":"2030-01-02T03:04:25Z",
+					"fileLifetime":"876000h0m0s",
 					"maxFileBytes": 1048576,
 					"maxFileUploads": 1
 				}`,
 			expected: picoshare.GuestLink{
 				Label:          picoshare.GuestLinkLabel("For my good pal, Maurice"),
-				Expires:        mustParseExpirationTime("2030-01-02T03:04:25Z"),
+				UrlExpires:     mustParseExpirationTime("2030-01-02T03:04:25Z"),
+				FileLifetime:   picoshare.FileLifetimeInfinite,
+				MaxFileBytes:   makeGuestUploadMaxFileBytes(1048576),
+				MaxFileUploads: makeGuestUploadCountLimit(1),
+			},
+		},
+		{
+			description: "guest file expires in 1 day",
+			payload: `{
+					"label": "For my good pal, Maurice",
+					"urlExpirationTime":"2030-01-02T03:04:25Z",
+					"fileLifetime":"24h0m0s",
+					"maxFileBytes": 1048576,
+					"maxFileUploads": 1
+				}`,
+			expected: picoshare.GuestLink{
+				Label:          picoshare.GuestLinkLabel("For my good pal, Maurice"),
+				UrlExpires:     mustParseExpirationTime("2030-01-02T03:04:25Z"),
+				FileLifetime:   picoshare.NewFileLifetimeInDays(1),
+				MaxFileBytes:   makeGuestUploadMaxFileBytes(1048576),
+				MaxFileUploads: makeGuestUploadCountLimit(1),
+			},
+		},
+		{
+			description: "guest file expires in 30 day",
+			payload: `{
+					"label": "For my good pal, Maurice",
+					"urlExpirationTime":"2030-01-02T03:04:25Z",
+					"fileLifetime":"720h0m0s",
+					"maxFileBytes": 1048576,
+					"maxFileUploads": 1
+				}`,
+			expected: picoshare.GuestLink{
+				Label:          picoshare.GuestLinkLabel("For my good pal, Maurice"),
+				UrlExpires:     mustParseExpirationTime("2030-01-02T03:04:25Z"),
+				FileLifetime:   picoshare.NewFileLifetimeInDays(30),
 				MaxFileBytes:   makeGuestUploadMaxFileBytes(1048576),
 				MaxFileUploads: makeGuestUploadCountLimit(1),
 			},
@@ -117,7 +155,7 @@ func TestGuestLinksPostRejectsInvalidRequest(t *testing.T) {
 			description: "invalid label field (non-string)",
 			payload: `{
 					"label": 5,
-					"expirationTime":"2025-01-01T00:00:00Z",
+					"urlExpirationTime":"2025-01-01T00:00:00Z",
 					"maxFileBytes": null,
 					"maxFileUploads": null
 				}`,
@@ -126,13 +164,13 @@ func TestGuestLinksPostRejectsInvalidRequest(t *testing.T) {
 			description: "invalid label field (too long)",
 			payload: fmt.Sprintf(`{
 					"label": "%s",
-					"expirationTime":"2025-01-01T00:00:00Z",
+					"urlExpirationTime":"2025-01-01T00:00:00Z",
 					"maxFileBytes": null,
 					"maxFileUploads": null
 				}`, strings.Repeat("A", 201)),
 		},
 		{
-			description: "missing expirationTime field",
+			description: "missing urlExpirationTime field",
 			payload: `{
 					"label": null,
 					"maxFileBytes": null,
@@ -143,7 +181,7 @@ func TestGuestLinksPostRejectsInvalidRequest(t *testing.T) {
 			description: "invalid expirationTime field",
 			payload: `{
 					"label": null,
-					"expirationTime": 25,
+					"urlExpirationTime": 25,
 					"maxFileBytes": null,
 					"maxFileUploads": null
 				}`,
@@ -152,7 +190,7 @@ func TestGuestLinksPostRejectsInvalidRequest(t *testing.T) {
 			description: "negative maxFileBytes field",
 			payload: `{
 					"label": null,
-					"expirationTime":"2025-01-01T00:00:00Z",
+					"urlExpirationTime":"2025-01-01T00:00:00Z",
 					"maxFileBytes": -5,
 					"maxFileUploads": null
 				}`,
@@ -161,7 +199,7 @@ func TestGuestLinksPostRejectsInvalidRequest(t *testing.T) {
 			description: "decimal maxFileBytes field",
 			payload: `{
 					"label": null,
-					"expirationTime":"2025-01-01T00:00:00Z",
+					"urlExpirationTime":"2025-01-01T00:00:00Z",
 					"maxFileBytes": 1.5,
 					"maxFileUploads": null
 				}`,
@@ -170,7 +208,7 @@ func TestGuestLinksPostRejectsInvalidRequest(t *testing.T) {
 			description: "too low a maxFileBytes field",
 			payload: `{
 					"label": null,
-					"expirationTime":"2025-01-01T00:00:00Z",
+					"urlExpirationTime":"2025-01-01T00:00:00Z",
 					"maxFileBytes": 1,
 					"maxFileUploads": null
 				}`,
@@ -179,7 +217,7 @@ func TestGuestLinksPostRejectsInvalidRequest(t *testing.T) {
 			description: "zero maxFileBytes field",
 			payload: `{
 					"label": null,
-					"expirationTime":"2025-01-01T00:00:00Z",
+					"urlExpirationTime":"2025-01-01T00:00:00Z",
 					"maxFileBytes": 0,
 					"maxFileUploads": null
 				}`,
@@ -188,7 +226,7 @@ func TestGuestLinksPostRejectsInvalidRequest(t *testing.T) {
 			description: "negative maxFileUploads field",
 			payload: `{
 					"label": null,
-					"expirationTime":"2025-01-01T00:00:00Z",
+					"urlExpirationTime":"2025-01-01T00:00:00Z",
 					"maxFileBytes": null,
 					"maxFileUploads": -5
 				}`,
@@ -197,7 +235,7 @@ func TestGuestLinksPostRejectsInvalidRequest(t *testing.T) {
 			description: "decimal maxFileUploads field",
 			payload: `{
 					"label": null,
-					"expirationTime":"2025-01-01T00:00:00Z",
+					"urlExpirationTime":"2025-01-01T00:00:00Z",
 					"maxFileBytes": null,
 					"maxFileUploads": 1.5
 				}`,
@@ -206,7 +244,7 @@ func TestGuestLinksPostRejectsInvalidRequest(t *testing.T) {
 			description: "zero maxFileUploads field",
 			payload: `{
 					"label": null,
-					"expirationTime":"2025-01-01T00:00:00Z",
+					"urlExpirationTime":"2025-01-01T00:00:00Z",
 					"maxFileBytes": null,
 					"maxFileUploads": 0
 				}`,
@@ -245,9 +283,9 @@ func makeGuestUploadCountLimit(i int) picoshare.GuestUploadCountLimit {
 func TestDeleteExistingGuestLink(t *testing.T) {
 	dataStore := test_sqlite.New()
 	dataStore.InsertGuestLink(picoshare.GuestLink{
-		ID:      picoshare.GuestLinkID("abcdefgh23456789"),
-		Created: time.Now(),
-		Expires: mustParseExpirationTime("2030-01-02T03:04:25Z"),
+		ID:         picoshare.GuestLinkID("abcdefgh23456789"),
+		Created:    time.Now(),
+		UrlExpires: mustParseExpirationTime("2030-01-02T03:04:25Z"),
 	})
 
 	s := handlers.New(mockAuthenticator{}, &dataStore, nilSpaceChecker, nilGarbageCollector)

handlers/parse/guest_link.go

@@ -1,15 +1,20 @@
 package parse
 
 import (
+	"errors"
 	"fmt"
+	"time"
 
 	"github.com/mtlynch/picoshare/v2/picoshare"
 )
 
 // Arbitrary limit to prevent too-long labels in the UI.
 const MaxGuestLinkLabelLength = 200
+const validTimeUnits = "1ns, 1us (or 1µs), 1ms, 1s, 1m, 1h"
 
 var ErrGuestLinkLabelTooLong = fmt.Errorf("label too long - limit %d characters", MaxGuestLinkLabelLength)
+var ErrFileLifeTimeUnrecognizedFormat = fmt.Errorf("unrecognized format for file life time, must be in %s format", validTimeUnits)
+var ErrFileLifeTimeTooShort = errors.New("file life time must be at least one hour in the future")
 
 func GuestLinkLabel(label string) (picoshare.GuestLinkLabel, error) {
 	if len(label) > MaxGuestLinkLabelLength {
@@ -18,3 +23,20 @@ func GuestLinkLabel(label string) (picoshare.GuestLinkLabel, error) {
 
 	return picoshare.GuestLinkLabel(label), nil
 }
+
+func GuestFileLifeTime(fileLifetimeRaw string) (picoshare.FileLifetime, error) {
+	dur, err := time.ParseDuration(fileLifetimeRaw)
+	if err != nil {
+		return picoshare.FileLifetime{}, ErrFileLifeTimeUnrecognizedFormat
+	}
+
+	if picoshare.NewFileLifetimeFromDuration(dur) == picoshare.FileLifetimeInfinite {
+		return picoshare.FileLifetimeInfinite, nil
+	}
+
+	if dur < (time.Hour * 1) {
+		return picoshare.FileLifetime{}, ErrFileLifeTimeTooShort
+	}
+
+	return picoshare.NewFileLifetimeFromDuration(dur), nil
+}

handlers/static/js/controllers/guestLinks.js

@@ -2,7 +2,8 @@
 
 export async function guestLinkNew(
   label,
-  expirationTime,
+  urlExpirationTime,
+  fileLifetime,
   maxFileBytes,
   maxFileUploads
 ) {
@@ -11,7 +12,8 @@ export async function guestLinkNew(
     credentials: "include",
     body: JSON.stringify({
       label,
-      expirationTime,
+      urlExpirationTime,
+      fileLifetime,
       maxFileBytes,
       maxFileUploads,
     }),

handlers/templates/pages/guest-link-create.html

@@ -6,6 +6,9 @@
 
     const labelInput = document.getElementById("label");
     const expirationSelect = document.getElementById("expiration-select");
+    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");
@@ -22,7 +25,8 @@
     function guestLinkFromInputs() {
       return {
         label: labelInput.value || null,
-        expirationTime: expirationSelect.value,
+        urlExpirationTime: expirationSelect.value,
+        fileLifetime: expirationSelectFile.value,
         maxFileBytes: maxFileBytesInput.valueAsNumber
           ? megabytesToBytes(maxFileBytesInput.valueAsNumber)
           : null,
@@ -42,7 +46,8 @@
       const guestLink = guestLinkFromInputs();
       guestLinkNew(
         guestLink.label,
-        guestLink.expirationTime,
+        guestLink.urlExpirationTime,
+        guestLink.fileLifetime,
         guestLink.maxFileBytes,
         guestLink.maxFileUploads
       )
@@ -102,6 +107,24 @@ <h1 class="title">Create Guest Link</h1>
       </div>
     </div>
 
+    <div class="field my-5">
+      <label class="label">Guest Files Expire</label>
+      <div class="control">
+        <div class="select">
+          <select id="expiration-select-file">
+            {{ range .FileLifetimeOptions }}
+              <option
+                value="{{ formatLifetime .FileLifetime }}"
+                {{ if .IsDefault }}selected{{ end }}
+              >
+                {{ .FileLifetime.FriendlyName }}
+              </option>
+            {{ end }}
+          </select>
+        </div>
+      </div>
+    </div>
+
     <div class="field my-5">
       <label class="label">Max file size <i>(optional)</i></label>
       <div class="control">

handlers/templates/pages/guest-link-index.html

@@ -120,7 +120,8 @@ <h1 class="title">Guest Links</h1>
         <tr>
           <th>Label</th>
           <th>Created</th>
-          <th>Expiration</th>
+          <th>URL Expiration</th>
+          <th>File Expiration</th>
           <th>Max Upload Size</th>
           <th>Uploads</th>
           <th class="has-text-right">Actions</th>
@@ -140,7 +141,10 @@ <h1 class="title">Guest Links</h1>
             </td>
             <td class="is-vcentered">{{ formatDate .Created }}</td>
             <td class="is-vcentered expiration">
-              {{ formatExpiration .Expires }}
+              {{ formatExpiration .UrlExpires }}
+            </td>
+            <td class="is-vcentered expiration">
+              {{ .FileLifetime.FriendlyName }}
             </td>
             <td class="is-vcentered">
               {{ formatSizeLimit .MaxFileBytes }}

handlers/upload.go

@@ -132,7 +132,9 @@ func (s Server) guestEntryPost() http.HandlerFunc {
 			r.Body = http.MaxBytesReader(w, r.Body, int64(*gl.MaxFileBytes))
 		}
 
-		id, err := s.insertFileFromRequest(r, picoshare.NeverExpire, guestLinkID)
+		t := picoshare.ExpirationTime(time.Now().Add(gl.FileLifetime.Duration()))
+
+		id, err := s.insertFileFromRequest(r, t, guestLinkID)
 		if err != nil {
 			var de *dbError
 			if errors.As(err, &de) {