Add --port

internal/server/pages.go

@@ -49,23 +49,39 @@ type indexPage struct {
 	MaxExpiry     string
 	DefaultExpiry string
 	AbsBase       string
+	TokenName     string // the remembered token's name, if there is one
+	AllowVanity   bool
+	Stale         bool // a remembered token that no longer exists
 }
 
 func (s *Server) handleIndex(w http.ResponseWriter, r *http.Request) {
-	// The page always renders the anonymous tier; the script refreshes it from
-	// /api/limits once a token is entered.
-	lim := auth.Anonymous(s.cfg)
+	// A remembered token is resolved server-side, so the page can show the real
+	// limits without the cookie ever being readable by a script.
+	remembered := cookieCredential(r)
+	lim, err := s.limitsFor(remembered)
+	stale := false
+	if err != nil {
+		// The token was revoked or the file was edited; drop the cookie rather
+		// than leave the caller wondering why uploads fail.
+		s.forget(w, r)
+		lim, stale = auth.Anonymous(s.cfg), true
+	}
+
 	s.render(w, http.StatusOK, "index.html", indexPage{
 		page:          s.page("Upload", true),
 		MaxSize:       config.FormatSize(lim.MaxSize),
 		MaxExpiry:     config.FormatDuration(lim.MaxExpiry),
 		DefaultExpiry: config.FormatDuration(lim.DefaultExpiry),
 		AbsBase:       s.absBase(r),
+		TokenName:     lim.Name,
+		AllowVanity:   lim.AllowVanity,
+		Stale:         stale,
 	})
 }
 
 type limitsJSON struct {
 	Name          string `json:"name"`
+	Remembered    bool   `json:"remembered"`
 	MaxSize       *int64 `json:"max_size"` // null means unlimited
 	MaxExpiry     string `json:"max_expiry"`
 	DefaultExpiry string `json:"default_expiry"`
@@ -81,13 +97,14 @@ func (s *Server) handleLimits(w http.ResponseWriter, r *http.Request) {
 		s.fail(w, r, http.StatusTooManyRequests, "Too many requests; try again shortly.")
 		return
 	}
-	lim, err := s.limitsFor(bearer(r))
+	lim, err := s.limitsFor(credential(r))
 	if err != nil {
 		s.fail(w, r, http.StatusUnauthorized, "Unrecognised token.")
 		return
 	}
 	out := limitsJSON{
 		Name:          lim.Name,
+		Remembered:    lim.Name != "" && bearer(r) == "",
 		MaxExpiry:     config.FormatDuration(lim.MaxExpiry),
 		DefaultExpiry: config.FormatDuration(lim.DefaultExpiry),
 		AllowVanity:   lim.AllowVanity,