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
@@ -330,6 +330,8 @@ var translations = map[string]map[string]string{
|
||||
"viewer.metadata_unavailable": "The metadata queue is unavailable. Download is still available.",
|
||||
"viewer.archive_truncated": "The listing limit was reached. Download the archive for the complete contents.",
|
||||
"history.title": "Revision History",
|
||||
"history.message": "Change message",
|
||||
"history.message_optional": "Optional summary of changes",
|
||||
"history.older": "Older revisions",
|
||||
"history.newest": "Newest revisions",
|
||||
"history.view": "View",
|
||||
@@ -1120,6 +1122,8 @@ var translations = map[string]map[string]string{
|
||||
"viewer.metadata_unavailable": "メタデータの待ち行列を利用できません。ダウンロードは利用できます。",
|
||||
"viewer.archive_truncated": "表示件数の上限に達しました。全内容はダウンロードして確認してください。",
|
||||
"history.title": "リビジョン履歴",
|
||||
"history.message": "更新メッセージ",
|
||||
"history.message_optional": "変更内容(任意)",
|
||||
"history.older": "以前のリビジョン",
|
||||
"history.newest": "最新のリビジョン",
|
||||
"history.view": "表示",
|
||||
|
||||
@@ -50,6 +50,18 @@ func (s *Server) handleRevisionBrowser(
|
||||
}
|
||||
|
||||
next := ""
|
||||
heads := map[string]string{}
|
||||
canRestore := s.authorizeObjectForRequest(r, "write", objectUUID) == nil
|
||||
if canRestore {
|
||||
for _, revision := range page.Items {
|
||||
if _, ok := heads[revision.Language]; ok {
|
||||
continue
|
||||
}
|
||||
if head, e := s.store.GetRevisionMetadataForExactLanguage(objectUUID, revision.Language); e == nil {
|
||||
heads[revision.Language] = head.UUID
|
||||
}
|
||||
}
|
||||
}
|
||||
if page.Next != "" {
|
||||
next = revisionPageURL(r, page.Next)
|
||||
}
|
||||
@@ -62,12 +74,14 @@ func (s *Server) handleRevisionBrowser(
|
||||
s.getSystemNavItems(s.domainUUIDForRequest(r)),
|
||||
NavContext{},
|
||||
),
|
||||
"Title": "Revision History",
|
||||
"ObjectUUID": objectUUID,
|
||||
"Revisions": page.Items,
|
||||
"NextURL": next,
|
||||
"NewestURL": revisionPageURL(r, ""),
|
||||
"HasPrevious": before != "",
|
||||
"Title": "Revision History",
|
||||
"ObjectUUID": objectUUID,
|
||||
"CanRestore": canRestore,
|
||||
"RevisionHeads": heads,
|
||||
"Revisions": page.Items,
|
||||
"NextURL": next,
|
||||
"NewestURL": revisionPageURL(r, ""),
|
||||
"HasPrevious": before != "",
|
||||
},
|
||||
)
|
||||
}
|
||||
@@ -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})
|
||||
}
|
||||
@@ -0,0 +1,61 @@
|
||||
package server
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"net/http/httptest"
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestRevisionRestoreAppendAndConflict(t *testing.T) {
|
||||
s, token, domain := configFixture(t)
|
||||
object, err := s.store.CreatePageAtPathInDomain(domain, "/restore-ui")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
old, err := s.store.SaveRevisionContent(object, []byte("<p>Old</p>"), "first", "ja", "text/html", "note.html")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
head, err := s.store.SaveRevisionContent(object, []byte("<p>New</p>"), "second", "ja", "text/html", "note.html")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
s.mux.HandleFunc("/_/api/v1/revisions/restore", s.handleRestoreRevisionAPI)
|
||||
s.mux.HandleFunc("/r/history/", s.handleRevisionBrowser)
|
||||
post := func(payload map[string]string) *httptest.ResponseRecorder {
|
||||
body, _ := json.Marshal(payload)
|
||||
r := httptest.NewRequest("POST", "http://localhost/_/api/v1/revisions/restore", bytes.NewReader(body))
|
||||
r.Header.Set("Authorization", "Bearer "+token)
|
||||
r.Header.Set("Content-Type", "application/json")
|
||||
w := httptest.NewRecorder()
|
||||
s.withAuthorization(s.mux).ServeHTTP(w, r)
|
||||
return w
|
||||
}
|
||||
page := configRequest(s, token, "GET", "/r/history/"+object, nil)
|
||||
if page.Code != 200 || !strings.Contains(page.Body.String(), `data-restore-revision="`+old.UUID+`"`) || !strings.Contains(page.Body.String(), "data-revision-time") {
|
||||
t.Fatal(page.Code, page.Body)
|
||||
}
|
||||
payload := map[string]string{"revision_uuid": old.UUID, "base_revision_uuid": head.UUID, "message": "元の内容へ復元"}
|
||||
w := post(payload)
|
||||
if w.Code != 200 {
|
||||
t.Fatal(w.Code, w.Body)
|
||||
}
|
||||
restored, err := s.store.GetRevisionForExactLanguage(object, "ja")
|
||||
if err != nil || restored.UUID == old.UUID || restored.UUID == head.UUID || restored.Body != old.Body || restored.Message != payload["message"] {
|
||||
t.Fatal(restored, err)
|
||||
}
|
||||
if _, err = s.store.GetRevision(head.UUID); err != nil {
|
||||
t.Fatal("previous head lost", err)
|
||||
}
|
||||
w = post(payload)
|
||||
if w.Code != 412 {
|
||||
t.Fatal("stale restore", w.Code, w.Body)
|
||||
}
|
||||
delete(payload, "base_revision_uuid")
|
||||
w = post(payload)
|
||||
if w.Code != 428 {
|
||||
t.Fatal("missing precondition", w.Code, w.Body)
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user