Add custom token support

internal/server/delete.go

@@ -34,7 +34,7 @@ func (s *Server) handleDelete(w http.ResponseWriter, r *http.Request) {
 			"A delete token or an owning token is required.")
 		return
 	}
-	if !s.authorised(m, presented) {
+	if !s.authorised(r, m, presented) {
 		// Only failures are throttled, so a correct token is never delayed.
 		// The info page is publicly shareable and now carries a credential
 		// field, which is reason enough not to let it be hammered freely.
@@ -110,27 +110,25 @@ func (s *Server) deleteCredentials(w http.ResponseWriter, r *http.Request) []str
 }
 
 // authorised reports whether any of the presented secrets may delete m.
-func (s *Server) authorised(m *store.Meta, presented []string) bool {
+func (s *Server) authorised(r *http.Request, m *store.Meta, presented []string) bool {
 	for _, secret := range presented {
-		if s.mayDelete(m, secret) {
+		if s.mayDelete(r, m, secret) {
 			return true
 		}
 	}
 	return false
 }
 
-// mayDelete checks one secret against the object's delete token first, then
-// against the token file.
-func (s *Server) mayDelete(m *store.Meta, secret string) bool {
+// mayDelete checks one secret against the object's delete token first - which
+// is always a generated value, so that comparison is cheap - and only then
+// against the token file, which may cost a derivation.
+func (s *Server) mayDelete(r *http.Request, m *store.Meta, secret string) bool {
 	if auth.EqualHash(m.DeleteHash, auth.HashSecret(secret)) {
 		return true
 	}
-	if err := s.tokens.MaybeReload(); err != nil {
-		s.log.Error("reloading token file", "err", err)
-	}
-	t := s.tokens.Lookup(secret)
-	if t == nil {
+	lim, err := s.limitsFor(r, secret)
+	if err != nil {
 		return false
 	}
-	return t.Admin || (m.Owner != "" && t.Name == m.Owner)
+	return lim.Admin || (m.Owner != "" && lim.Name == m.Owner)
 }