mirror of
https://github.com/caddyserver/caddy.git
synced 2024-11-30 04:33:48 +08:00
a798e0c951
- Server types no longer need to store their own contexts; they are stored on the caddy.Instance, which means each context will be properly GC'ed when the instance is stopped. Server types should use type assertions to convert from caddy.Context to their concrete context type when they need to use it. - Pass the entire context into httpserver.GetConfig instead of only the Key field. - caddy.NewTestController now requires a server type string so it can create a controller with the proper concrete context associated with that server type. Tests still need more attention so that we can test the proper creation of startup functions, etc.
141 lines
2.9 KiB
Go
141 lines
2.9 KiB
Go
package markdown
|
|
|
|
import (
|
|
"net/http"
|
|
"path/filepath"
|
|
|
|
"github.com/mholt/caddy"
|
|
"github.com/mholt/caddy/caddyhttp/httpserver"
|
|
"github.com/russross/blackfriday"
|
|
)
|
|
|
|
func init() {
|
|
caddy.RegisterPlugin("markdown", caddy.Plugin{
|
|
ServerType: "http",
|
|
Action: setup,
|
|
})
|
|
}
|
|
|
|
// setup configures a new Markdown middleware instance.
|
|
func setup(c *caddy.Controller) error {
|
|
mdconfigs, err := markdownParse(c)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
cfg := httpserver.GetConfig(c)
|
|
|
|
md := Markdown{
|
|
Root: cfg.Root,
|
|
FileSys: http.Dir(cfg.Root),
|
|
Configs: mdconfigs,
|
|
IndexFiles: []string{"index.md"},
|
|
}
|
|
|
|
cfg.AddMiddleware(func(next httpserver.Handler) httpserver.Handler {
|
|
md.Next = next
|
|
return md
|
|
})
|
|
|
|
return nil
|
|
}
|
|
|
|
func markdownParse(c *caddy.Controller) ([]*Config, error) {
|
|
var mdconfigs []*Config
|
|
|
|
for c.Next() {
|
|
md := &Config{
|
|
Renderer: blackfriday.HtmlRenderer(0, "", ""),
|
|
Extensions: make(map[string]struct{}),
|
|
Template: GetDefaultTemplate(),
|
|
}
|
|
|
|
// Get the path scope
|
|
args := c.RemainingArgs()
|
|
switch len(args) {
|
|
case 0:
|
|
md.PathScope = "/"
|
|
case 1:
|
|
md.PathScope = args[0]
|
|
default:
|
|
return mdconfigs, c.ArgErr()
|
|
}
|
|
|
|
// Load any other configuration parameters
|
|
for c.NextBlock() {
|
|
if err := loadParams(c, md); err != nil {
|
|
return mdconfigs, err
|
|
}
|
|
}
|
|
|
|
// If no extensions were specified, assume some defaults
|
|
if len(md.Extensions) == 0 {
|
|
md.Extensions[".md"] = struct{}{}
|
|
md.Extensions[".markdown"] = struct{}{}
|
|
md.Extensions[".mdown"] = struct{}{}
|
|
}
|
|
|
|
mdconfigs = append(mdconfigs, md)
|
|
}
|
|
|
|
return mdconfigs, nil
|
|
}
|
|
|
|
func loadParams(c *caddy.Controller, mdc *Config) error {
|
|
cfg := httpserver.GetConfig(c)
|
|
|
|
switch c.Val() {
|
|
case "ext":
|
|
for _, ext := range c.RemainingArgs() {
|
|
mdc.Extensions[ext] = struct{}{}
|
|
}
|
|
return nil
|
|
case "css":
|
|
if !c.NextArg() {
|
|
return c.ArgErr()
|
|
}
|
|
mdc.Styles = append(mdc.Styles, c.Val())
|
|
return nil
|
|
case "js":
|
|
if !c.NextArg() {
|
|
return c.ArgErr()
|
|
}
|
|
mdc.Scripts = append(mdc.Scripts, c.Val())
|
|
return nil
|
|
case "template":
|
|
tArgs := c.RemainingArgs()
|
|
switch len(tArgs) {
|
|
default:
|
|
return c.ArgErr()
|
|
case 1:
|
|
fpath := filepath.ToSlash(filepath.Clean(cfg.Root + string(filepath.Separator) + tArgs[0]))
|
|
|
|
if err := SetTemplate(mdc.Template, "", fpath); err != nil {
|
|
c.Errf("default template parse error: %v", err)
|
|
}
|
|
return nil
|
|
case 2:
|
|
fpath := filepath.ToSlash(filepath.Clean(cfg.Root + string(filepath.Separator) + tArgs[1]))
|
|
|
|
if err := SetTemplate(mdc.Template, tArgs[0], fpath); err != nil {
|
|
c.Errf("template parse error: %v", err)
|
|
}
|
|
return nil
|
|
}
|
|
case "templatedir":
|
|
if !c.NextArg() {
|
|
return c.ArgErr()
|
|
}
|
|
_, err := mdc.Template.ParseGlob(c.Val())
|
|
if err != nil {
|
|
c.Errf("template load error: %v", err)
|
|
}
|
|
if c.NextArg() {
|
|
return c.ArgErr()
|
|
}
|
|
return nil
|
|
default:
|
|
return c.Err("Expected valid markdown configuration property")
|
|
}
|
|
}
|