Mirrors/kararas_iris
1
0
Fork 0
mirror of https://github.com/kataras/iris.git synced 2025-12-18 10:27:06 +00:00
Code Releases Activity

General Improvements (UseRouter per Party, fix AutoTLS). Read HISTORY.md

Browse Source 
relative to: https://github.com/kataras/iris/issues/1577 and https://github.com/kataras/iris/issues/1578
This commit is contained in:
Gerasimos (Makis) Maropoulos
2020-08-12 07:20:07 +03:00
parent da029d6f37
commit 0761bc35ee
15 changed files with 639 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/router/handler.go
View File

@@ -118,6 +118,10 @@ func (h *routerHandler) AddRoute(r *Route) error {
type RoutesProvider interface { // api builder
GetRoutes() []*Route
GetRoute(routeName string) *Route
// GetRouterFilters returns the app's router filters.
// Read `UseRouter` for more.
// The map can be altered before router built.
GetRouterFilters() map[Party]*Filter
}
func (h *routerHandler) Build(provider RoutesProvider) error {
@@ -318,12 +322,12 @@ func bindMultiParamTypesHandler(r *Route) {
r.topLink.beginHandlers = append(context.Handlers{decisionHandler}, r.topLink.beginHandlers...)
}
func (h *routerHandler) canHandleSubdomain(ctx *context.Context, subdomain string) bool {
func canHandleSubdomain(ctx *context.Context, subdomain string) bool {
if subdomain == "" {
return true
}
requestHost := ctx.Host()
requestHost := ctx.Request().URL.Host
if netutil.IsLoopbackSubdomain(requestHost) {
// this fixes a bug when listening on
// 127.0.0.1:8080 for example
@@ -349,7 +353,7 @@ func (h *routerHandler) canHandleSubdomain(ctx *context.Context, subdomain strin
return false
}
// continue to that, any subdomain is valid.
} else if !strings.HasPrefix(requestHost, subdomain) { // subdomain contains the dot.
} else if !strings.HasPrefix(requestHost, subdomain) { // subdomain contains the dot, e.g. "admin."
return false
}
@@ -396,7 +400,7 @@ func (h *routerHandler) HandleRequest(ctx *context.Context) {
continue
}
if h.hosts && !h.canHandleSubdomain(ctx, t.subdomain) {
if h.hosts && !canHandleSubdomain(ctx, t.subdomain) {
continue
}
@@ -499,7 +503,7 @@ func (h *routerHandler) FireErrorCode(ctx *context.Context) {
continue
}
if h.errorHosts && !h.canHandleSubdomain(ctx, t.subdomain) {
if h.errorHosts && !canHandleSubdomain(ctx, t.subdomain) {
continue
}