-
Notifications
You must be signed in to change notification settings - Fork 80
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Simplify router - Single routes onfiguration file - Improve HTTP logger
- Loading branch information
Showing
8 changed files
with
149 additions
and
69 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,36 +1,67 @@ | ||
package api | ||
|
||
import ( | ||
"net/http" | ||
|
||
"github.com/ncarlier/webhookd/pkg/auth" | ||
"github.com/ncarlier/webhookd/pkg/config" | ||
"github.com/ncarlier/webhookd/pkg/logger" | ||
"github.com/ncarlier/webhookd/pkg/middleware" | ||
"github.com/ncarlier/webhookd/pkg/pubkey" | ||
) | ||
|
||
// HandlerFunc custom function handler | ||
type HandlerFunc func(conf *config.Config) http.Handler | ||
|
||
// Route is the structure of an HTTP route definition | ||
type Route struct { | ||
Path string | ||
HandlerFunc HandlerFunc | ||
Middlewares []middleware.Middleware | ||
var commonMiddlewares = middleware.Middlewares{ | ||
middleware.Cors, | ||
middleware.Logger, | ||
middleware.Tracing(nextRequestID), | ||
} | ||
|
||
func route(path string, handler HandlerFunc, middlewares ...middleware.Middleware) Route { | ||
return Route{ | ||
Path: path, | ||
HandlerFunc: handler, | ||
Middlewares: middlewares, | ||
func buildMiddlewares(conf *config.Config) middleware.Middlewares { | ||
var middlewares = commonMiddlewares | ||
if conf.TLS { | ||
middlewares = middlewares.UseAfter(middleware.HSTS) | ||
} | ||
|
||
// Load trust store... | ||
trustStore, err := pubkey.NewTrustStore(conf.TrustStoreFile) | ||
if err != nil { | ||
logger.Warning.Printf("unable to load trust store (\"%s\"): %s\n", conf.TrustStoreFile, err) | ||
} | ||
if trustStore != nil { | ||
middlewares = middlewares.UseAfter(middleware.HTTPSignature(trustStore)) | ||
} | ||
} | ||
|
||
// Routes is a list of Route | ||
type Routes []Route | ||
// Load authenticator... | ||
authenticator, err := auth.NewHtpasswdFromFile(conf.PasswdFile) | ||
if err != nil { | ||
logger.Debug.Printf("unable to load htpasswd file (\"%s\"): %s\n", conf.PasswdFile, err) | ||
} | ||
if authenticator != nil { | ||
middlewares = middlewares.UseAfter(middleware.AuthN(authenticator)) | ||
} | ||
return middlewares | ||
} | ||
|
||
var routes = Routes{ | ||
route("/", index, middleware.Methods("GET", "POST")), | ||
route("/static/", static("/static/"), middleware.Methods("GET")), | ||
route("/healthz", healthz, middleware.Methods("GET")), | ||
route("/varz", varz, middleware.Methods("GET")), | ||
func routes(conf *config.Config) Routes { | ||
middlewares := buildMiddlewares(conf) | ||
return Routes{ | ||
route( | ||
"/", | ||
index, | ||
middlewares.UseBefore(middleware.Methods("GET", "POST"))..., | ||
), | ||
route( | ||
"/static/", | ||
static("/static/"), | ||
middlewares.UseBefore(middleware.Methods("GET"))..., | ||
), | ||
route( | ||
"/healthz", | ||
healthz, | ||
commonMiddlewares.UseBefore(middleware.Methods("GET"))..., | ||
), | ||
route( | ||
"/varz", | ||
varz, | ||
middlewares.UseBefore(middleware.Methods("GET"))..., | ||
), | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
package api | ||
|
||
import ( | ||
"net/http" | ||
|
||
"github.com/ncarlier/webhookd/pkg/config" | ||
"github.com/ncarlier/webhookd/pkg/middleware" | ||
) | ||
|
||
// HandlerFunc custom function handler | ||
type HandlerFunc func(conf *config.Config) http.Handler | ||
|
||
// Route is the structure of an HTTP route definition | ||
type Route struct { | ||
Path string | ||
HandlerFunc HandlerFunc | ||
Middlewares middleware.Middlewares | ||
} | ||
|
||
// Routes is a list of Route | ||
type Routes []Route | ||
|
||
func route(path string, handler HandlerFunc, middlewares ...middleware.Middleware) Route { | ||
return Route{ | ||
Path: path, | ||
HandlerFunc: handler, | ||
Middlewares: middlewares, | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,6 +14,5 @@ func Cors(inner http.Handler) http.Handler { | |
if r.Method != "OPTIONS" { | ||
inner.ServeHTTP(w, r) | ||
} | ||
return | ||
}) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters