mirror of
https://github.com/caddyserver/caddy.git
synced 2024-12-23 22:27:38 -05:00
b471b7e835
- The mime middleware used filepath where it should arguably use path. - Changed the configuration to use a map instead of scanning an array during every request. The map is static (after configuration), so should be fine for concurrent access. - Catch duplicate extensions within a configuration and error out. - Add tests for new error case.
65 lines
1.3 KiB
Go
65 lines
1.3 KiB
Go
package setup
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/mholt/caddy/middleware"
|
|
"github.com/mholt/caddy/middleware/mime"
|
|
)
|
|
|
|
// Mime configures a new mime middleware instance.
|
|
func Mime(c *Controller) (middleware.Middleware, error) {
|
|
configs, err := mimeParse(c)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return func(next middleware.Handler) middleware.Handler {
|
|
return mime.Mime{Next: next, Configs: configs}
|
|
}, nil
|
|
}
|
|
|
|
func mimeParse(c *Controller) (mime.Config, error) {
|
|
configs := mime.Config{}
|
|
|
|
for c.Next() {
|
|
// At least one extension is required
|
|
|
|
args := c.RemainingArgs()
|
|
switch len(args) {
|
|
case 2:
|
|
if err := validateExt(configs, args[0]); err != nil {
|
|
return configs, err
|
|
}
|
|
configs[args[0]] = args[1]
|
|
case 1:
|
|
return configs, c.ArgErr()
|
|
case 0:
|
|
for c.NextBlock() {
|
|
ext := c.Val()
|
|
if err := validateExt(configs, ext); err != nil {
|
|
return configs, err
|
|
}
|
|
if !c.NextArg() {
|
|
return configs, c.ArgErr()
|
|
}
|
|
configs[ext] = c.Val()
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
return configs, nil
|
|
}
|
|
|
|
// validateExt checks for valid file name extension.
|
|
func validateExt(configs mime.Config, ext string) error {
|
|
if !strings.HasPrefix(ext, ".") {
|
|
return fmt.Errorf(`mime: invalid extension "%v" (must start with dot)`, ext)
|
|
}
|
|
if _, ok := configs[ext]; ok {
|
|
return fmt.Errorf(`mime: duplicate extension "%v" found`, ext)
|
|
}
|
|
return nil
|
|
}
|