Infrastructure/caddy
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-23 22:27:38 -05:00
Code Issues Activity

Little bit of cleanup

Browse source
This commit is contained in:
Matthew Holt 2015-03-21 15:18:50 -06:00
parent e62b222372
commit 284ab11c7f
1 changed files with 11 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
middleware/extensionless/extensionless.go
View file

@ -7,11 +7,19 @@ package extensionless
import ( import (
"net/http" "net/http"
"os" "os"
"strings" "path"
"github.com/mholt/caddy/middleware" "github.com/mholt/caddy/middleware"
) )
// Extensionless is an http.Handler that can assume an extension from clean URLs.
// It tries extensions in the order listed in Extensions.
type Extensionless struct {
Next http.HandlerFunc
Root string
Extensions []string
}
// New creates a new instance of middleware that assumes extensions // New creates a new instance of middleware that assumes extensions
// so the site can use cleaner, extensionless URLs // so the site can use cleaner, extensionless URLs
func New(c middleware.Controller) (middleware.Middleware, error) { func New(c middleware.Controller) (middleware.Middleware, error) {
@ -31,17 +39,9 @@ func New(c middleware.Controller) (middleware.Middleware, error) {
}, nil }, nil
} }
// Extensionless is an http.Handler that can assume an extension from clean URLs.
// It tries extensions in the order listed in Extensions.
type Extensionless struct {
Next http.HandlerFunc
Extensions []string
Root string
}
// ServeHTTP implements the http.Handler interface. // ServeHTTP implements the http.Handler interface.
func (e Extensionless) ServeHTTP(w http.ResponseWriter, r *http.Request) { func (e Extensionless) ServeHTTP(w http.ResponseWriter, r *http.Request) {
if !hasExt(r) { if path.Ext(r.URL.Path) == "" {
for _, ext := range e.Extensions { for _, ext := range e.Extensions {
if resourceExists(e.Root, r.URL.Path+ext) { if resourceExists(e.Root, r.URL.Path+ext) {
r.URL.Path = r.URL.Path + ext r.URL.Path = r.URL.Path + ext
@ -65,9 +65,7 @@ func parse(c middleware.Controller) ([]string, error) {
extensions = append(extensions, c.Val()) extensions = append(extensions, c.Val())
// Tack on any other extensions that may have been listed // Tack on any other extensions that may have been listed
for c.NextArg() { extensions = append(extensions, c.RemainingArgs()...)
extensions = append(extensions, c.Val())
}
} }
return extensions, nil return extensions, nil
@ -81,15 +79,3 @@ func resourceExists(root, path string) bool {
// but we don't handle any other kinds of errors anyway // but we don't handle any other kinds of errors anyway
return err == nil return err == nil
} }
// hasExt returns true if the HTTP request r has an extension,
// false otherwise.
func hasExt(r *http.Request) bool {
if r.URL.Path[len(r.URL.Path)-1] == '/' {
// directory
return true
}
lastSep := strings.LastIndex(r.URL.Path, "/")
lastDot := strings.LastIndex(r.URL.Path, ".")
return lastDot > lastSep
}