committing changes from who knows when

caddyhugo.go

@@ -2,7 +2,9 @@ package caddyhugo
 
 import (
 	"html/template"
+	"log"
 	"net/http"
+	"path"
 	"path/filepath"
 	"strings"
 	"sync"
@@ -11,24 +13,74 @@ import (
 	"git.stephensearles.com/stephen/caddy-hugo2/comments"
 	"git.stephensearles.com/stephen/caddy-hugo2/media"
 
-	"github.com/caddyserver/caddy"
+	"github.com/caddyserver/caddy/v2"
-	"github.com/caddyserver/caddy/caddyhttp/httpserver"
+	"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
+	"github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile"
+	"github.com/caddyserver/caddy/v2/modules/caddyhttp"
 	"github.com/gohugoio/hugo/deps"
 	"github.com/gohugoio/hugo/hugolib"
 	"github.com/spf13/afero"
 )
 
 func init() {
-	caddy.RegisterPlugin("hugo", caddy.Plugin{
+	caddy.RegisterModule(&CaddyHugo{})
-		ServerType: "http",
+	httpcaddyfile.RegisterHandlerDirective("hugo", parseCaddyfile)
-		Action:     SetupCaddy,
+}
+
+type SiteConfig struct {
+	Hosts            []string
+	Root             string
+	CommentsEnabled  bool
+	CommentsPassword string
+}
+
+func (m *CaddyHugo) CaddyModule() caddy.ModuleInfo {
+	return caddy.ModuleInfo{
+		ID:  "http.handlers.hugo",
+		New: func() caddy.Module { return new(CaddyHugo) },
+	}
+}
+
+func (m *CaddyHugo) Provision(ctx caddy.Context) error {
+	if m.Site.CommentsEnabled {
+		m.Comments = comments.WithStorage(comments.NewDiskv(path.Join(m.Site.Root, "comments")))
+	}
+
+	root, err := filepath.Abs(m.Site.Root)
+	if err != nil {
+		return err
+	}
+	log.Println("SETTING UP")
+	err = m.Setup(root)
+	log.Println("SET UP; err:", err)
+	if err != nil {
+		return err
+	}
+
+	ctx.OnCancel(func() {
+		m.persistAllEdits()
 	})
+
+	m.commentsSetting()
+	return nil
+}
+
+// UnmarshalCaddyfile implements caddyfile.Unmarshaler.
+func (s *SiteConfig) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
+	for d.NextBlock(0) {
+		if d.Val() == "comments" {
+			if d.NextArg() {
+				s.CommentsPassword = d.Val()
+			}
+		}
+	}
+	return nil
 }
 
-// CaddyHugo implements the plugin
+// CaddyHugo implements the plugin for a single site
 type CaddyHugo struct {
 	ServerType string
-	Site       *httpserver.SiteConfig
+	Site       SiteConfig
 	HugoSites  *hugolib.HugoSites
 	HugoCfg    *deps.DepsCfg
 
@@ -78,3 +130,14 @@ func (ch *CaddyHugo) TmplData(r *http.Request, docref *editSession) interface{}
 	}
 	return &tmplData{ch.Site, r, ch, doc, docref}
 }
+
+// parseCaddyfile unmarshals tokens from h into a new Middleware.
+func parseCaddyfile(h httpcaddyfile.Helper) (caddyhttp.MiddlewareHandler, error) {
+	var m CaddyHugo
+	err := m.Site.UnmarshalCaddyfile(h.Dispenser)
+	return &m, err
+}
+
+var (
+	_ caddy.Provisioner = (*CaddyHugo)(nil)
+)

deltas.go

@@ -90,7 +90,7 @@ func (ch *CaddyHugo) ClearConfirmed(lowestPending uint64) {
 	}
 }
 
-func (ch *CaddyHugo) DeltaWebsocket(w http.ResponseWriter, r *http.Request) (int, error) {
+func (ch *CaddyHugo) DeltaWebsocket(w http.ResponseWriter, r *http.Request) error {
 	var upgrader = websocket.Upgrader{
 		ReadBufferSize:  1024,
 		WriteBufferSize: 1024,
@@ -99,7 +99,7 @@ func (ch *CaddyHugo) DeltaWebsocket(w http.ResponseWriter, r *http.Request) (int
 	conn, err := upgrader.Upgrade(w, r, nil)
 	if err != nil {
 		fmt.Println(err)
-		return http.StatusBadRequest, err
+		return err
 	}
 
 	conn.SetReadDeadline(time.Time{})
@@ -107,7 +107,7 @@ func (ch *CaddyHugo) DeltaWebsocket(w http.ResponseWriter, r *http.Request) (int
 	doc, err := ch.editSession(docNameFromEditRequest(r))
 	if err != nil {
 		fmt.Println(err)
-		return http.StatusBadRequest, err
+		return err
 	}
 
 	return ch.handleDeltaConn(conn, doc)
@@ -122,7 +122,7 @@ func (ch *CaddyHugo) Message(deltas ...acedoc.Delta) Message {
 	}
 }
 
-func (ch *CaddyHugo) handleDeltaConn(conn DeltaConn, doc *editSession) (int, error) {
+func (ch *CaddyHugo) handleDeltaConn(conn DeltaConn, doc *editSession) error {
 	const idlePing = 15 * time.Second
 	const idlePingShort = 1 * time.Millisecond
 
@@ -210,7 +210,7 @@ func (ch *CaddyHugo) handleDeltaConn(conn DeltaConn, doc *editSession) (int, err
 		select {
 		case err := <-errCh:
 			fmt.Println("error handling websocket connection:", err)
-			return 500, err
+			return err
 		default:
 		}
 
@@ -223,7 +223,7 @@ func (ch *CaddyHugo) handleDeltaConn(conn DeltaConn, doc *editSession) (int, err
 		case <-wroteMessagesCh:
 			resetTimer(idlePing)
 		case <-doneCh:
-			return 200, nil
+			return nil
 		}
 	}
 }

go.mod

@@ -6,13 +6,17 @@ require (
 	git.stephensearles.com/stephen/acedoc v0.0.0-20170928122432-96da2793a59d
 	git.stephensearles.com/stephen/idleshut v0.0.0-20180107224249-cde7779f51c8
 	github.com/PuerkitoBio/goquery v1.5.0
-	github.com/caddyserver/caddy v1.0.3
+	github.com/caddyserver/caddy v1.0.5
+	github.com/caddyserver/caddy/v2 v2.1.1
 	github.com/gobuffalo/envy v1.7.0 // indirect
-	github.com/gohugoio/hugo v0.58.1
+	github.com/gohugoio/hugo v0.74.4-0.20200822075643-d39636a5fc6b
 	github.com/gorilla/websocket v1.4.1
+	github.com/lucas-clemente/quic-go v0.18.0 // indirect
+	github.com/miekg/dns v1.1.30 // indirect
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
 	github.com/peterbourgon/diskv v2.0.1+incompatible
 	github.com/spf13/afero v1.2.2
-	github.com/spf13/viper v1.4.0
+	github.com/spf13/viper v1.6.1
 	github.com/tajtiattila/metadata v0.0.0-20180130123038-1ef25f4c37ea
+	golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de // indirect
 )

http.go

@@ -2,9 +2,9 @@ package caddyhugo
 
 import (
 	"encoding/base64"
+	"errors"
 	"fmt"
 	"io"
-	"net"
 	"net/http"
 	"os"
 	"path"
@@ -12,26 +12,25 @@ import (
 	"strings"
 
 	"git.stephensearles.com/stephen/caddy-hugo2/assets"
-	"github.com/caddyserver/caddy"
+	"github.com/caddyserver/caddy/v2/modules/caddyhttp"
-	"github.com/caddyserver/caddy/caddyhttp/httpserver"
 	"github.com/spf13/afero"
 )
 
-func (ch *CaddyHugo) ServeHTTPWithNext(next httpserver.Handler, w http.ResponseWriter, r *http.Request) (int, error) {
+func (ch *CaddyHugo) ServeHTTP(w http.ResponseWriter, r *http.Request, next caddyhttp.Handler) error {
 	if !ch.Match(r) {
 		p := path.Join(ch.Dir, "public", r.URL.Path)
 		http.ServeFile(w, r, p)
-		return 200, nil
+		return nil
 	}
 
 	if ch.Comments != nil && strings.HasSuffix(r.URL.Path, "/comments") {
 		docName := docNameFromCommentRequest(r)
 		err := ch.Comments.ServeComments(docName, w, r)
 		if err != nil {
-			return 500, fmt.Errorf("couldn't load comments:", err)
+			return fmt.Errorf("couldn't load comments:", err)
 		}
 
-		return 200, nil
+		return nil
 	}
 
 	if r.URL.Path == "/login" {
@@ -41,32 +40,31 @@ func (ch *CaddyHugo) ServeHTTPWithNext(next httpserver.Handler, w http.ResponseW
 	if strings.HasPrefix(r.URL.Path, "/hugo/publish") {
 		err := ch.Publish()
 		if err != nil {
-			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return err
-			return http.StatusInternalServerError, nil
 		}
 
 		http.Redirect(w, r, "/", http.StatusFound)
-		return http.StatusFound, nil
+		return nil
 	}
 	if strings.HasPrefix(r.URL.Path, "/hugo/simplemde.css") {
 		w.Write(assets.MustAsset("simplemde/dist/simplemde.min.css"))
-		return http.StatusOK, nil
+		return nil
 	}
 	if strings.HasPrefix(r.URL.Path, "/hugo/simplemde.js") {
 		w.Write(assets.MustAsset("simplemde/debug/simplemde.js"))
-		return http.StatusOK, nil
+		return nil
 	}
 	if strings.HasPrefix(r.URL.Path, "/hugo/vue.js") {
 		w.Write(assets.MustAsset("js/vue.js"))
-		return http.StatusOK, nil
+		return nil
 	}
 	if strings.HasPrefix(r.URL.Path, "/hugo/moment.js") {
 		w.Write(assets.MustAsset("js/moment.js"))
-		return http.StatusOK, nil
+		return nil
 	}
 	if strings.HasPrefix(r.URL.Path, "/hugo/font-awesome.css") {
 		w.Write(assets.MustAsset("css/font-awesome.min.css"))
-		return http.StatusOK, nil
+		return nil
 	}
 	if strings.HasPrefix(r.URL.Path, "/hugo/admin") {
 		return ch.Admin().ServeHTTP(w, r)
@@ -91,38 +89,25 @@ func (ch *CaddyHugo) ServeHTTPWithNext(next httpserver.Handler, w http.ResponseW
 	}
 	if strings.HasPrefix(r.URL.Path, "/hugo/fs/") {
 		printTree(afero.NewOsFs(), w, ch.Dir)
-		return 200, nil
+		return nil
 	}
 
 	return next.ServeHTTP(w, r)
 }
 
-func (ch *CaddyHugo) ServeNewContent(w http.ResponseWriter, r *http.Request) (int, error) {
+func (ch *CaddyHugo) ServeNewContent(w http.ResponseWriter, r *http.Request) error {
 	name := r.FormValue("name")
 	ctype := r.FormValue("type")
 
 	filename, err := ch.NewContent(name, ctype)
 	if err != nil {
 		fmt.Println("error creating new content:", err)
-		return http.StatusInternalServerError, err
+		return err
 	}
 
 	// serve redirect
 	http.Redirect(w, r, filepath.Join("/hugo/edit/", "content", filename), http.StatusFound)
-	return http.StatusFound, nil
+	return nil
-}
-
-func (ch *CaddyHugo) Middleware(c *caddy.Controller) httpserver.Middleware {
-	return func(next httpserver.Handler) httpserver.Handler {
-		host := ch.Site.Addr.Host
-		hostport := net.JoinHostPort(ch.Site.Addr.Host, ch.Site.Addr.Port)
-		return httpserver.HandlerFunc(func(w http.ResponseWriter, r *http.Request) (int, error) {
-			if r.Host != host && r.Host != hostport {
-				return next.ServeHTTP(w, r)
-			}
-			return ch.ServeHTTPWithNext(next, w, r)
-		})
-	}
 }
 
 func (ch *CaddyHugo) Auth(r *http.Request) bool {
@@ -131,11 +116,6 @@ func (ch *CaddyHugo) Auth(r *http.Request) bool {
 }
 
 func (ch *CaddyHugo) Match(r *http.Request) bool {
-	host := ch.Site.Addr.Host
-	hostport := net.JoinHostPort(ch.Site.Addr.Host, ch.Site.Addr.Port)
-	if r.Host != host && r.Host != hostport {
-		return false
-	}
 	if strings.HasPrefix(r.URL.Path, "/media/") {
 		return true
 	}
@@ -155,34 +135,34 @@ func (ch *CaddyHugo) Match(r *http.Request) bool {
 	return strings.HasPrefix(r.URL.Path, "/hugo/")
 }
 
-func (ch *CaddyHugo) Admin() httpserver.Handler {
+func (ch *CaddyHugo) Admin() caddyhttp.Handler {
-	return httpserver.HandlerFunc(func(w http.ResponseWriter, r *http.Request) (int, error) {
+	return caddyhttp.HandlerFunc(func(w http.ResponseWriter, r *http.Request) error {
 		err := ch.adminTmpl.Execute(w, ch.TmplData(r, nil))
 		if err != nil {
 			fmt.Println(err)
-			return http.StatusInternalServerError, err
+			return err
 		}
 
-		return http.StatusOK, nil
+		return nil
 
 	})
 }
 
-func (ch *CaddyHugo) AuthorHome() httpserver.Handler {
+func (ch *CaddyHugo) AuthorHome() caddyhttp.Handler {
-	return httpserver.HandlerFunc(func(w http.ResponseWriter, r *http.Request) (int, error) {
+	return caddyhttp.HandlerFunc(func(w http.ResponseWriter, r *http.Request) error {
 		td := ch.TmplData(r, nil)
 		err := ch.authorTmpl.Execute(w, td)
 		if err != nil {
 			fmt.Println(err)
-			return http.StatusInternalServerError, err
+			return err
 		}
 
-		return http.StatusOK, nil
+		return nil
 	})
 }
 
-func (ch *CaddyHugo) Edit() httpserver.Handler {
+func (ch *CaddyHugo) Edit() caddyhttp.Handler {
-	return httpserver.HandlerFunc(func(w http.ResponseWriter, r *http.Request) (int, error) {
+	return caddyhttp.HandlerFunc(func(w http.ResponseWriter, r *http.Request) error {
 		if r.URL.Path == "/hugo/edit/new" {
 			return ch.ServeNewContent(w, r)
 		}
@@ -194,32 +174,31 @@ func (ch *CaddyHugo) Edit() httpserver.Handler {
 		doc, err := ch.editSession(docNameFromEditRequest(r))
 		if err != nil {
 			fmt.Println(err)
-			return http.StatusNotFound, err
+			http.Error(w, err.Error(), http.StatusNotFound)
+			return err
 		}
 
 		err = ch.editTmpl.Execute(w, ch.TmplData(r, doc))
 		if err != nil {
-
 			fmt.Println(err)
-			return http.StatusInternalServerError, err
+			return err
 		}
 
-		return http.StatusOK, nil
+		return nil
 	})
 }
 
-func (ch *CaddyHugo) serveDraft(w http.ResponseWriter, r *http.Request) (int, error) {
+func (ch *CaddyHugo) serveDraft(w http.ResponseWriter, r *http.Request) error {
 	pathSegments := strings.SplitN(r.URL.Path, "/", 5)
 	if len(pathSegments) < 4 {
-
+		return errors.New("not found")
-		return http.StatusNotFound, nil
 	}
 
 	encoded := pathSegments[3]
 
 	nameBytes, err := base64.RawURLEncoding.DecodeString(encoded)
 	if err != nil {
-		return http.StatusNotFound, err
+		return errors.New("not found")
 	}
 
 	name := string(nameBytes)
@@ -229,7 +208,7 @@ func (ch *CaddyHugo) serveDraft(w http.ResponseWriter, r *http.Request) (int, er
 
 	docref, ok := ch.docs[ch.docFilename(name)]
 	if !ok {
-		return http.StatusNotFound, fmt.Errorf("draft not found")
+		return fmt.Errorf("draft not found")
 	}
 
 	r.URL.Path = strings.ToLower(r.URL.Path)
@@ -240,13 +219,13 @@ func (ch *CaddyHugo) serveDraft(w http.ResponseWriter, r *http.Request) (int, er
 	page := ch.HugoSites.GetContentPage(ch.docFilename(name))
 	if page == nil {
 		fmt.Fprintf(w, "can't find %q to display a draft", name)
-		return 404, nil
+		return fmt.Errorf("draft not found")
 	}
 
 	r.URL.Path = page.RelPermalink()
 	http.FileServer(aferoHTTP{afero.NewBasePathFs(docref.tmpfs, path.Join(ch.Dir, "public"))}).ServeHTTP(w, r)
 
-	return 200, nil
+	return nil
 }
 
 func printTree(fs afero.Fs, w io.Writer, dir string) {
@@ -328,9 +307,9 @@ func (a aferoHTTP) Open(name string) (http.File, error) {
 	return af, err
 }
 
-func (ch *CaddyHugo) commentsLogin(r *http.Request, w http.ResponseWriter) (int, error) {
+func (ch *CaddyHugo) commentsLogin(r *http.Request, w http.ResponseWriter) error {
 	if ch.Comments == nil {
-		return 200, nil
+		return nil
 	}
 
 	_, ok := ch.Comments.User(r)
@@ -338,10 +317,10 @@ func (ch *CaddyHugo) commentsLogin(r *http.Request, w http.ResponseWriter) (int,
 		w.Header().Set("WWW-Authenticate", `Basic realm="Log in with your name and the password. Ask Dan or Stephen for the password."`)
 		w.WriteHeader(401)
 		fmt.Fprintf(w, "<html><body>Log in with your name and the password. Ask Dan or Stephen for the password. <a href=%q>go back</a></body></html>", r.Referer())
-		return 200, nil
+		return nil
 	}
 
 	http.Redirect(w, r, r.Referer(), http.StatusFound)
 
-	return 200, nil
+	return nil
 }

media.go

@@ -18,7 +18,12 @@ func (ch *CaddyHugo) ReferencedMedia() map[string]map[page.Page]struct{} {
 	found := map[string]map[page.Page]struct{}{}
 
 	for _, pg := range ch.HugoSites.Pages() {
-		r := bytes.NewBufferString(string(pg.Render()))
+		renderOutput, err := pg.Render()
+		if err != nil {
+			continue
+		}
+
+		r := bytes.NewBufferString(string(renderOutput))
 		doc, err := goquery.NewDocumentFromReader(r)
 		if err != nil {
 			continue
@@ -43,16 +48,16 @@ func (ch *CaddyHugo) ReferencedMedia() map[string]map[page.Page]struct{} {
 	return found
 }
 
-func (ch *CaddyHugo) uploadMedia(w http.ResponseWriter, r *http.Request) (int, error) {
+func (ch *CaddyHugo) uploadMedia(w http.ResponseWriter, r *http.Request) error {
 	if ch.Media == nil {
 		http.NotFound(w, r)
-		return 404, nil
+		return nil
 	}
 
 	mr, err := r.MultipartReader()
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusBadRequest)
-		return 400, nil
+		return nil
 	}
 
 	for {
@@ -62,7 +67,7 @@ func (ch *CaddyHugo) uploadMedia(w http.ResponseWriter, r *http.Request) (int, e
 		}
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusBadRequest)
-			return 400, nil
+			return err
 		}
 
 		name := part.FileName()
@@ -70,18 +75,18 @@ func (ch *CaddyHugo) uploadMedia(w http.ResponseWriter, r *http.Request) (int, e
 			err = ch.Media.ReceiveNewMedia(name, part)
 			if err != nil {
 				http.Error(w, err.Error(), http.StatusInternalServerError)
-				return 500, nil
+				return nil
 			}
 		}
 	}
 
-	return 200, nil
+	return nil
 }
 
-func (ch *CaddyHugo) serveMediaPage(w http.ResponseWriter, r *http.Request) (int, error) {
+func (ch *CaddyHugo) serveMediaPage(w http.ResponseWriter, r *http.Request) error {
 	if ch.Media == nil {
 		http.NotFound(w, r)
-		return 404, nil
+		return nil
 	}
 
 	referenced := ch.ReferencedMedia()
@@ -114,7 +119,7 @@ func (ch *CaddyHugo) serveMediaPage(w http.ResponseWriter, r *http.Request) (int
 		mm, err := ch.Media.Walk()
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return 500, nil
+			return err
 		}
 
 		for _, m := range media.Set(mm).ByDate() {
@@ -167,15 +172,15 @@ func (ch *CaddyHugo) serveMediaPage(w http.ResponseWriter, r *http.Request) (int
 		}
 	}
 	</script></body><html>`)
-	return 200, nil
+	return nil
 }
 
-func (ch *CaddyHugo) serveMedia(w http.ResponseWriter, r *http.Request) (int, error) {
+func (ch *CaddyHugo) serveMedia(w http.ResponseWriter, r *http.Request) error {
 	if ch.Media == nil {
 		http.NotFound(w, r)
-		return 404, nil
+		return nil
 	}
 
 	ch.Media.ServeHTTP(w, r)
-	return 200, nil
+	return nil
 }

setup.go

@@ -3,20 +3,19 @@ package caddyhugo
 import (
 	"fmt"
 	"html/template"
+	"log"
 	"os"
 	"path"
-	"path/filepath"
 
 	"git.stephensearles.com/stephen/caddy-hugo2/comments"
 	"git.stephensearles.com/stephen/caddy-hugo2/media"
 
-	"github.com/caddyserver/caddy"
-	"github.com/caddyserver/caddy/caddyhttp/httpserver"
 	"github.com/gohugoio/hugo/hugofs"
 )
 
 var eventHookCounter uint64
 
+/*
 func SetupCaddy(c *caddy.Controller) error {
 	ch := &CaddyHugo{}
 
@@ -36,18 +35,13 @@ func SetupCaddy(c *caddy.Controller) error {
 
 	return err
 }
+*/
 
-func (ch *CaddyHugo) commentsSetting(c *caddy.Controller) {
+func (ch *CaddyHugo) commentsSetting() {
-	for c.NextLine() {
+	if ch.Site.CommentsEnabled {
-		if c.Val() == "hugo" {
+		ch.Comments = comments.WithStorage(comments.NewDiskv(path.Join(ch.Site.Root, "comments")))
-			for c.NextBlock() {
+		if ch.Site.CommentsPassword != "" {
-				if c.Val() == "comments" {
+			ch.Comments.Password = ch.Site.CommentsPassword
-					ch.Comments = comments.WithStorage(comments.NewDiskv(path.Join(ch.Site.Root, "comments")))
-					if c.NextArg() {
-						ch.Comments.Password = c.Val()
-					}
-				}
-			}
 		}
 	}
 }
@@ -55,6 +49,7 @@ func (ch *CaddyHugo) commentsSetting(c *caddy.Controller) {
 func (ch *CaddyHugo) Setup(dir string) error {
 	var err error
 
+	log.Println("setting up caddy-hugo in", dir)
 	ch.Dir = dir
 	ch.docs = make(map[string]*editSession)
 	ch.confirmingToClient = make(map[uint64]struct{})

templates.go

@@ -10,8 +10,6 @@ import (
 	"strings"
 
 	"git.stephensearles.com/stephen/acedoc"
-
-	"github.com/caddyserver/caddy/caddyhttp/httpserver"
 )
 
 func (t *tmplData) Content() ([]Content, error) {
@@ -63,7 +61,7 @@ func (t *tmplData) contentTypes(dir string) ([]string, error) {
 }
 
 type tmplData struct {
-	Site *httpserver.SiteConfig
+	Site SiteConfig
 	R    *http.Request
 	*CaddyHugo
 	Doc    *acedoc.Document

testdir/caddyfile

@@ -1,14 +1,17 @@
-localhost:8080 {
+{
+	order hugo last
+}
+
+http://localhost:8080 {
 	hugo {
 		comments test
 	}
-	root ./testsite
+	root ./testdir/testsite
-	errors { * }
+	log
-	pprof
 }
 
-localhost:8081, localhost:8082 {
+http://localhost:8081, http://localhost:8082 {
-	root ./testsite2
+	root ./testdir/testsite2
 	hugo
-	errors { * }
+	log
 }