Login
+ + {% else %} +Administrator of this wiki have not configured any authorization method. You can make edits anonymously.
+ + {% endif %} +^?!:#@><*|\"\\'&%")
default:
- if hop := hyphaData.RenameHypha(hyphaName, newName, recursive); len(hop.Errs) == 0 {
- http.Redirect(w, rq, "/page/"+newName, http.StatusSeeOther)
- } else {
+ if hop := RenameHypha(hyphaName, newName, recursive, u); len(hop.Errs) != 0 {
HttpErr(w, http.StatusInternalServerError, hyphaName,
"Error: could not rename hypha",
fmt.Sprintf("Could not rename this hypha due to an internal error. Server errors: %v", hop.Errs))
+ } else {
+ http.Redirect(w, rq, "/page/"+newName, http.StatusSeeOther)
}
}
}
@@ -71,7 +80,12 @@ func handlerDeleteAsk(w http.ResponseWriter, rq *http.Request) {
hyphaName = HyphaNameFromRq(rq, "delete-ask")
_, isOld = HyphaStorage[hyphaName]
)
- util.HTTP200Page(w, base("Delete "+hyphaName+"?", templates.DeleteAskHTML(hyphaName, isOld)))
+ if ok := user.CanProceed(rq, "delete-ask"); !ok {
+ HttpErr(w, http.StatusForbidden, hyphaName, "Not enough rights", "You must be a moderator to delete pages.")
+ log.Println("Rejected", rq.URL)
+ return
+ }
+ util.HTTP200Page(w, base("Delete "+hyphaName+"?", templates.DeleteAskHTML(rq, hyphaName, isOld)))
}
// handlerDeleteConfirm deletes a hypha for sure
@@ -80,22 +94,27 @@ func handlerDeleteConfirm(w http.ResponseWriter, rq *http.Request) {
var (
hyphaName = HyphaNameFromRq(rq, "delete-confirm")
hyphaData, isOld = HyphaStorage[hyphaName]
+ u = user.FromRequest(rq)
)
- if isOld {
- // If deleted successfully
- if hop := hyphaData.DeleteHypha(hyphaName); len(hop.Errs) == 0 {
- http.Redirect(w, rq, "/page/"+hyphaName, http.StatusSeeOther)
- } else {
- HttpErr(w, http.StatusInternalServerError, hyphaName,
- "Error: could not delete hypha",
- fmt.Sprintf("Could not delete this hypha due to an internal error. Server errors: %v", hop.Errs))
- }
- } else {
+ if !u.CanProceed("delete-confirm") {
+ HttpErr(w, http.StatusForbidden, hyphaName, "Not enough rights", "You must be a moderator to delete pages.")
+ log.Println("Rejected", rq.URL)
+ return
+ }
+ if !isOld {
// The precondition is to have the hypha in the first place.
HttpErr(w, http.StatusPreconditionFailed, hyphaName,
"Error: no such hypha",
"Could not delete this hypha because it does not exist.")
+ return
}
+ if hop := hyphaData.DeleteHypha(hyphaName, u); len(hop.Errs) != 0 {
+ HttpErr(w, http.StatusInternalServerError, hyphaName,
+ "Error: could not delete hypha",
+ fmt.Sprintf("Could not delete this hypha due to internal errors. Server errors: %v", hop.Errs))
+ return
+ }
+ http.Redirect(w, rq, "/page/"+hyphaName, http.StatusSeeOther)
}
// handlerEdit shows the edit form. It doesn't edit anything actually.
@@ -108,6 +127,11 @@ func handlerEdit(w http.ResponseWriter, rq *http.Request) {
textAreaFill string
err error
)
+ if ok := user.CanProceed(rq, "edit"); !ok {
+ HttpErr(w, http.StatusForbidden, hyphaName, "Not enough rights", "You must be an editor to edit pages.")
+ log.Println("Rejected", rq.URL)
+ return
+ }
if isOld {
textAreaFill, err = FetchTextPart(hyphaData)
if err != nil {
@@ -118,25 +142,27 @@ func handlerEdit(w http.ResponseWriter, rq *http.Request) {
} else {
warning = `You are creating a new hypha.
` } - util.HTTP200Page(w, base("Edit "+hyphaName, templates.EditHTML(hyphaName, textAreaFill, warning))) + util.HTTP200Page(w, base("Edit "+hyphaName, templates.EditHTML(rq, hyphaName, textAreaFill, warning))) } // handlerUploadText uploads a new text part for the hypha. func handlerUploadText(w http.ResponseWriter, rq *http.Request) { log.Println(rq.URL) var ( - hyphaName = HyphaNameFromRq(rq, "upload-text") - hyphaData, isOld = HyphaStorage[hyphaName] - textData = rq.PostFormValue("text") + hyphaName = HyphaNameFromRq(rq, "upload-text") + textData = rq.PostFormValue("text") + u = user.FromRequest(rq).OrAnon() ) - if !isOld { - hyphaData = &HyphaData{} + if ok := user.CanProceed(rq, "upload-text"); !ok { + HttpErr(w, http.StatusForbidden, hyphaName, "Not enough rights", "You must be an editor to edit pages.") + log.Println("Rejected", rq.URL) + return } if textData == "" { HttpErr(w, http.StatusBadRequest, hyphaName, "Error", "No text data passed") return } - if hop := hyphaData.UploadText(hyphaName, textData, isOld); len(hop.Errs) != 0 { + if hop := UploadText(hyphaName, textData, u); len(hop.Errs) != 0 { HttpErr(w, http.StatusInternalServerError, hyphaName, "Error", hop.Errs[0].Error()) } else { http.Redirect(w, rq, "/page/"+hyphaName, http.StatusSeeOther) @@ -146,31 +172,37 @@ func handlerUploadText(w http.ResponseWriter, rq *http.Request) { // handlerUploadBinary uploads a new binary part for the hypha. func handlerUploadBinary(w http.ResponseWriter, rq *http.Request) { log.Println(rq.URL) - hyphaName := HyphaNameFromRq(rq, "upload-binary") - rq.ParseMultipartForm(10 << 20) + var ( + hyphaName = HyphaNameFromRq(rq, "upload-binary") + u = user.FromRequest(rq) + ) + if !u.CanProceed("upload-binary") { + HttpErr(w, http.StatusForbidden, hyphaName, "Not enough rights", "You must be an editor to upload attachments.") + log.Println("Rejected", rq.URL) + return + } + rq.ParseMultipartForm(10 << 20) // Set upload limit file, handler, err := rq.FormFile("binary") if file != nil { defer file.Close() } + // If file is not passed: if err != nil { HttpErr(w, http.StatusBadRequest, hyphaName, "Error", "No binary data passed") return } + // If file is passed: var ( - hyphaData, isOld = HyphaStorage[hyphaName] - mime = handler.Header.Get("Content-Type") + mime = handler.Header.Get("Content-Type") + hop = UploadBinary(hyphaName, mime, file, u) ) - if !isOld { - hyphaData = &HyphaData{} - } - hop := hyphaData.UploadBinary(hyphaName, mime, file, isOld) if len(hop.Errs) != 0 { HttpErr(w, http.StatusInternalServerError, hyphaName, "Error", hop.Errs[0].Error()) - } else { - http.Redirect(w, rq, "/page/"+hyphaName, http.StatusSeeOther) + return } + http.Redirect(w, rq, "/page/"+hyphaName, http.StatusSeeOther) } diff --git a/http_readers.go b/http_readers.go index 7870d3e..b8887e9 100644 --- a/http_readers.go +++ b/http_readers.go @@ -40,6 +40,7 @@ func handlerRevision(w http.ResponseWriter, rq *http.Request) { contents = markup.ToHtml(hyphaName, textContents) } page := templates.RevisionHTML( + rq, hyphaName, naviTitle(hyphaName), contents, @@ -67,7 +68,7 @@ func handlerHistory(w http.ResponseWriter, rq *http.Request) { log.Println("Found", len(revs), "revisions for", hyphaName) util.HTTP200Page(w, - base(hyphaName, templates.HistoryHTML(hyphaName, tbody))) + base(hyphaName, templates.HistoryHTML(rq, hyphaName, tbody))) } // handlerText serves raw source text of the hypha. @@ -110,7 +111,7 @@ func handlerPage(w http.ResponseWriter, rq *http.Request) { contents = binaryHtmlBlock(hyphaName, data) + contents } } - util.HTTP200Page(w, base(hyphaName, templates.PageHTML(hyphaName, + util.HTTP200Page(w, base(hyphaName, templates.PageHTML(rq, hyphaName, naviTitle(hyphaName), contents, tree.TreeAsHtml(hyphaName, IterateHyphaNamesWith)))) diff --git a/hypha.go b/hypha.go index a49b785..e412c14 100644 --- a/hypha.go +++ b/hypha.go @@ -12,6 +12,7 @@ import ( "github.com/bouncepaw/mycorrhiza/history" "github.com/bouncepaw/mycorrhiza/markup" + "github.com/bouncepaw/mycorrhiza/user" "github.com/bouncepaw/mycorrhiza/util" ) @@ -31,6 +32,16 @@ func init() { } return } + markup.HyphaIterate = IterateHyphaNamesWith +} + +// GetHyphaData finds a hypha addressed by `hyphaName` and returns its `hyphaData`. `hyphaData` is set to a zero value if this hypha does not exist. `isOld` is false if this hypha does not exist. +func GetHyphaData(hyphaName string) (hyphaData *HyphaData, isOld bool) { + hyphaData, isOld = HyphaStorage[hyphaName] + if hyphaData == nil { + hyphaData = &HyphaData{} + } + return } // HyphaData represents a hypha's meta information: binary and text parts rooted paths and content types. @@ -40,10 +51,16 @@ type HyphaData struct { } // uploadHelp is a helper function for UploadText and UploadBinary -func (hd *HyphaData) uploadHelp(hop *history.HistoryOp, hyphaName, ext string, originalFullPath *string, isOld bool, data []byte) *history.HistoryOp { +func uploadHelp(hop *history.HistoryOp, hyphaName, ext string, data []byte, u *user.User) *history.HistoryOp { var ( - fullPath = filepath.Join(WikiDir, hyphaName+ext) + hyphaData, isOld = GetHyphaData(hyphaName) + fullPath = filepath.Join(WikiDir, hyphaName+ext) + originalFullPath = &hyphaData.textPath ) + if hop.Type == history.TypeEditBinary { + originalFullPath = &hyphaData.binaryPath + } + if err := os.MkdirAll(filepath.Dir(fullPath), 0777); err != nil { return hop.WithError(err) } @@ -51,30 +68,34 @@ func (hd *HyphaData) uploadHelp(hop *history.HistoryOp, hyphaName, ext string, o if err := ioutil.WriteFile(fullPath, data, 0644); err != nil { return hop.WithError(err) } + if isOld && *originalFullPath != fullPath && *originalFullPath != "" { if err := history.Rename(*originalFullPath, fullPath); err != nil { return hop.WithError(err) } log.Println("Move", *originalFullPath, "to", fullPath) } + // New hyphae must be added to the hypha storage if !isOld { - HyphaStorage[hyphaName] = hd + HyphaStorage[hyphaName] = hyphaData } *originalFullPath = fullPath - log.Printf("%v\n", *hd) return hop.WithFiles(fullPath). - WithSignature("anon"). + WithUser(u). Apply() } -// UploadText loads a new text part from `textData` for hypha `hyphaName` with `hd`. It must be marked if the hypha `isOld`. -func (hd *HyphaData) UploadText(hyphaName, textData string, isOld bool) *history.HistoryOp { - hop := history.Operation(history.TypeEditText).WithMsg(fmt.Sprintf("Edit ā%sā", hyphaName)) - return hd.uploadHelp(hop, hyphaName, ".myco", &hd.textPath, isOld, []byte(textData)) +// UploadText loads a new text part from `textData` for hypha `hyphaName`. +func UploadText(hyphaName, textData string, u *user.User) *history.HistoryOp { + return uploadHelp( + history. + Operation(history.TypeEditText). + WithMsg(fmt.Sprintf("Edit ā%sā", hyphaName)), + hyphaName, ".myco", []byte(textData), u) } // UploadBinary loads a new binary part from `file` for hypha `hyphaName` with `hd`. The contents have the specified `mime` type. It must be marked if the hypha `isOld`. -func (hd *HyphaData) UploadBinary(hyphaName, mime string, file multipart.File, isOld bool) *history.HistoryOp { +func UploadBinary(hyphaName, mime string, file multipart.File, u *user.User) *history.HistoryOp { var ( hop = history.Operation(history.TypeEditBinary).WithMsg(fmt.Sprintf("Upload binary part for ā%sā with type ā%sā", hyphaName, mime)) data, err = ioutil.ReadAll(file) @@ -82,16 +103,15 @@ func (hd *HyphaData) UploadBinary(hyphaName, mime string, file multipart.File, i if err != nil { return hop.WithError(err).Apply() } - - return hd.uploadHelp(hop, hyphaName, MimeToExtension(mime), &hd.binaryPath, isOld, data) + return uploadHelp(hop, hyphaName, MimeToExtension(mime), data, u) } // DeleteHypha deletes hypha and makes a history record about that. -func (hd *HyphaData) DeleteHypha(hyphaName string) *history.HistoryOp { +func (hd *HyphaData) DeleteHypha(hyphaName string, u *user.User) *history.HistoryOp { hop := history.Operation(history.TypeDeleteHypha). WithFilesRemoved(hd.textPath, hd.binaryPath). WithMsg(fmt.Sprintf("Delete ā%sā", hyphaName)). - WithSignature("anon"). + WithUser(u). Apply() if len(hop.Errs) == 0 { delete(HyphaStorage, hyphaName) @@ -138,7 +158,7 @@ func relocateHyphaData(hyphaNames []string, replaceName func(string) string) { } // RenameHypha renames hypha from old name `hyphaName` to `newName` and makes a history record about that. If `recursive` is `true`, its subhyphae will be renamed the same way. -func (hd *HyphaData) RenameHypha(hyphaName, newName string, recursive bool) *history.HistoryOp { +func RenameHypha(hyphaName, newName string, recursive bool, u *user.User) *history.HistoryOp { var ( replaceName = func(str string) string { return strings.Replace(str, hyphaName, newName, 1) @@ -157,7 +177,7 @@ func (hd *HyphaData) RenameHypha(hyphaName, newName string, recursive bool) *his } hop.WithFilesRenamed(renameMap). WithMsg(fmt.Sprintf(renameMsg, hyphaName, newName)). - WithSignature("anon"). + WithUser(u). Apply() if len(hop.Errs) == 0 { relocateHyphaData(hyphaNames, replaceName) @@ -171,7 +191,7 @@ func binaryHtmlBlock(hyphaName string, hd *HyphaData) string { case ".jpg", ".gif", ".png", ".webp", ".svg", ".ico": return fmt.Sprintf(`%s
", state.id, ParagraphToHtml(state.name, line))) } diff --git a/markup/lexer_test.go b/markup/lexer_test.go index 3298a36..b19bec2 100644 --- a/markup/lexer_test.go +++ b/markup/lexer_test.go @@ -41,7 +41,7 @@ func TestLex(t *testing.T) { `}, {6, "text
"}, {7, "more text
"}, - {8, ``}, + {8, ``}, {9, `mono"},
+ {"it has ~~strike~~", "it has Administrator of this wiki have not configured any authorization method. You can make edits anonymously.
+ + {% endif %} +Unknown username.
+ {% case "wrong password" %} +Wrong password.
+ {% default %} +{%s err %}
+ {% endswitch %} + +You cannot log out because you are not logged in.
+ + + {% endif %} +Administrator of this wiki have not configured any authorization method. You can make edits anonymously.
+ + `) +//line templates/auth.qtpl:25 + } +//line templates/auth.qtpl:25 + qw422016.N().S(` +Unknown username.
+ `) +//line templates/auth.qtpl:36 + case "wrong password": +//line templates/auth.qtpl:36 + qw422016.N().S(` +Wrong password.
+ `) +//line templates/auth.qtpl:38 + default: +//line templates/auth.qtpl:38 + qw422016.N().S(` +`) +//line templates/auth.qtpl:39 + qw422016.E().S(err) +//line templates/auth.qtpl:39 + qw422016.N().S(`
+ `) +//line templates/auth.qtpl:40 + } +//line templates/auth.qtpl:40 + qw422016.N().S(` + +You cannot log out because you are not logged in.
+ + + `) +//line templates/auth.qtpl:57 + } +//line templates/auth.qtpl:57 + qw422016.N().S(` +