fix(revisions): connect safe restore UI and readable change history
This commit is contained in:
1 parent
2cbaa9342d
commit
96065d1e89
11 files changed
+166
-96
No files matched your search
@@ -1,63 +1,61 @@
|
||||
package server
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"net/http"
|
||||
"pageswiki/internal/store"
|
||||
"strings"
|
||||
)
|
||||
|
||||
func (s *Server) handleRestoreRevisionAPI(
|
||||
w http.ResponseWriter,
|
||||
r *http.Request,
|
||||
) {
|
||||
func (s *Server) handleRestoreRevisionAPI(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Method != http.MethodPost {
|
||||
w.Header().Set("Allow", "POST")
|
||||
http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
|
||||
http.Error(w, "method not allowed", 405)
|
||||
return
|
||||
}
|
||||
|
||||
revisionUUID :=
|
||||
r.URL.Query().Get("revision")
|
||||
|
||||
metadata, err :=
|
||||
s.store.GetRevisionMetadata(
|
||||
revisionUUID,
|
||||
)
|
||||
|
||||
var input struct {
|
||||
Revision string `json:"revision_uuid"`
|
||||
Expected string `json:"base_revision_uuid"`
|
||||
Message string `json:"message"`
|
||||
}
|
||||
if !taskJSON(w, r, &input) {
|
||||
return
|
||||
}
|
||||
if input.Expected == "" {
|
||||
http.Error(w, "base revision required", 428)
|
||||
return
|
||||
}
|
||||
if len(input.Message) > 4096 {
|
||||
http.Error(w, "message too long", 422)
|
||||
return
|
||||
}
|
||||
metadata, err := s.store.GetRevisionMetadata(input.Revision)
|
||||
if err != nil {
|
||||
http.Error(
|
||||
w,
|
||||
err.Error(),
|
||||
500,
|
||||
)
|
||||
http.NotFound(w, r)
|
||||
return
|
||||
}
|
||||
if s.authorizeObjectForRequest(r, "write", metadata.ObjectUUID) != nil {
|
||||
http.Error(w, "forbidden", http.StatusForbidden)
|
||||
if s.authorizeObjectForRequest(r, "read", metadata.ObjectUUID) != nil || s.authorizeObjectForRequest(r, "write", metadata.ObjectUUID) != nil {
|
||||
http.Error(w, "forbidden", 403)
|
||||
return
|
||||
}
|
||||
// Authorize metadata before hydrating the potentially large source body.
|
||||
revision, err := s.store.GetRevision(revisionUUID)
|
||||
revision, err := s.store.GetRevision(input.Revision)
|
||||
if err != nil {
|
||||
http.Error(w, "revision unavailable", http.StatusInternalServerError)
|
||||
http.Error(w, "revision unavailable", 500)
|
||||
return
|
||||
}
|
||||
message := strings.TrimSpace(input.Message)
|
||||
if message == "" {
|
||||
message = "Restore revision " + revision.UUID
|
||||
}
|
||||
saved, err := s.store.SaveRevisionContentIfHead(revision.ObjectUUID, []byte(revision.Body), message, revision.Language, revision.ContentType, revision.Filename, input.Expected)
|
||||
if errors.Is(err, store.ErrRevisionConflict) {
|
||||
http.Error(w, "revision changed; reload history", 412)
|
||||
return
|
||||
}
|
||||
|
||||
_, err = s.store.SaveRevisionContent(
|
||||
revision.ObjectUUID,
|
||||
[]byte(revision.Body),
|
||||
"restore revision",
|
||||
revision.Language,
|
||||
revision.ContentType,
|
||||
revision.Filename,
|
||||
)
|
||||
|
||||
if err != nil {
|
||||
http.Error(
|
||||
w,
|
||||
err.Error(),
|
||||
500,
|
||||
)
|
||||
http.Error(w, "restore failed", 500)
|
||||
return
|
||||
}
|
||||
|
||||
_, _ = w.Write([]byte("ok"))
|
||||
w.Header().Set("Cache-Control", "no-store")
|
||||
writeEventJSON(w, 200, map[string]string{"revision_uuid": saved.UUID, "object_uuid": revision.ObjectUUID})
|
||||
}
|
||||
Reference in new issue
Block a user