Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
caddy
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
caddy
Commits
284ab11c
Commit
284ab11c
authored
Mar 21, 2015
by
Matthew Holt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Little bit of cleanup
parent
e62b2223
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
25 deletions
+11
-25
middleware/extensionless/extensionless.go
middleware/extensionless/extensionless.go
+11
-25
No files found.
middleware/extensionless/extensionless.go
View file @
284ab11c
...
...
@@ -7,11 +7,19 @@ package extensionless
import
(
"net/http"
"os"
"
strings
"
"
path
"
"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
// so the site can use cleaner, extensionless URLs
func
New
(
c
middleware
.
Controller
)
(
middleware
.
Middleware
,
error
)
{
...
...
@@ -31,17 +39,9 @@ func New(c middleware.Controller) (middleware.Middleware, error) {
},
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.
func
(
e
Extensionless
)
ServeHTTP
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
if
!
hasExt
(
r
)
{
if
path
.
Ext
(
r
.
URL
.
Path
)
==
""
{
for
_
,
ext
:=
range
e
.
Extensions
{
if
resourceExists
(
e
.
Root
,
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
())
// Tack on any other extensions that may have been listed
for
c
.
NextArg
()
{
extensions
=
append
(
extensions
,
c
.
Val
())
}
extensions
=
append
(
extensions
,
c
.
RemainingArgs
()
...
)
}
return
extensions
,
nil
...
...
@@ -81,15 +79,3 @@ func resourceExists(root, path string) bool {
// but we don't handle any other kinds of errors anyway
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
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment