mirror of
https://github.com/caddyserver/caddy.git
synced 2024-12-23 22:27:38 -05: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.
82 lines
1.8 KiB
Go
82 lines
1.8 KiB
Go
package basicauth
|
|
|
|
import (
|
|
"strings"
|
|
|
|
"github.com/mholt/caddy"
|
|
"github.com/mholt/caddy/caddyhttp/httpserver"
|
|
)
|
|
|
|
func init() {
|
|
caddy.RegisterPlugin("basicauth", caddy.Plugin{
|
|
ServerType: "http",
|
|
Action: setup,
|
|
})
|
|
}
|
|
|
|
// setup configures a new BasicAuth middleware instance.
|
|
func setup(c *caddy.Controller) error {
|
|
cfg := httpserver.GetConfig(c)
|
|
root := cfg.Root
|
|
|
|
rules, err := basicAuthParse(c)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
basic := BasicAuth{Rules: rules}
|
|
|
|
cfg.AddMiddleware(func(next httpserver.Handler) httpserver.Handler {
|
|
basic.Next = next
|
|
basic.SiteRoot = root
|
|
return basic
|
|
})
|
|
|
|
return nil
|
|
}
|
|
|
|
func basicAuthParse(c *caddy.Controller) ([]Rule, error) {
|
|
var rules []Rule
|
|
cfg := httpserver.GetConfig(c)
|
|
|
|
var err error
|
|
for c.Next() {
|
|
var rule Rule
|
|
|
|
args := c.RemainingArgs()
|
|
|
|
switch len(args) {
|
|
case 2:
|
|
rule.Username = args[0]
|
|
if rule.Password, err = passwordMatcher(rule.Username, args[1], cfg.Root); err != nil {
|
|
return rules, c.Errf("Get password matcher from %s: %v", c.Val(), err)
|
|
}
|
|
|
|
for c.NextBlock() {
|
|
rule.Resources = append(rule.Resources, c.Val())
|
|
if c.NextArg() {
|
|
return rules, c.Errf("Expecting only one resource per line (extra '%s')", c.Val())
|
|
}
|
|
}
|
|
case 3:
|
|
rule.Resources = append(rule.Resources, args[0])
|
|
rule.Username = args[1]
|
|
if rule.Password, err = passwordMatcher(rule.Username, args[2], cfg.Root); err != nil {
|
|
return rules, c.Errf("Get password matcher from %s: %v", c.Val(), err)
|
|
}
|
|
default:
|
|
return rules, c.ArgErr()
|
|
}
|
|
|
|
rules = append(rules, rule)
|
|
}
|
|
|
|
return rules, nil
|
|
}
|
|
|
|
func passwordMatcher(username, passw, siteRoot string) (PasswordMatcher, error) {
|
|
if !strings.HasPrefix(passw, "htpasswd=") {
|
|
return PlainMatcher(passw), nil
|
|
}
|
|
return GetHtpasswdMatcher(passw[9:], username, siteRoot)
|
|
}
|