mirror of
https://github.com/kataras/iris.git
synced 2025-01-23 10:41:03 +01:00
no need to default the Configuration.RemoteAddrHeaders to a list of 'dissalowed' header names, the ctx.RemoteAddr() made unnecessary checks if no X-header was passed, even if they defaulted to false, this will not give a crazy improvement but it's a good practise
Former-commit-id: ba9ed1475a76489df16cac0ed87275b5604f2ad0
This commit is contained in:
Gerasimos (Makis) Maropoulos
parent
bf13f7648a
commit
981322cfd2
|
|
@ -1,4 +1,4 @@
|
||||||
FROM golang:1.9-alpine
|
FROM golang:1.9.3-alpine
|
||||||
|
|
||||||
RUN apk update && apk upgrade && apk add --no-cache bash git
|
RUN apk update && apk upgrade && apk add --no-cache bash git
|
||||||
RUN go get github.com/iris-contrib/cloud-native-go
|
RUN go get github.com/iris-contrib/cloud-native-go
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
<img align="right" width="169px" src="https://iris-go.com/images/icon.svg?v=a" title="logo created by @merry.dii" />
|
<img align="right" width="169px" src="https://iris-go.com/images/icon.svg?v=a" title="logo created by @merry.dii" />
|
||||||
|
|
||||||
[](https://travis-ci.org/kataras/iris)<!-- [](https://github.com/kataras/iris/releases)--> [](http://goreportcard.com/report/kataras/iris) [](https://github.com/kataras/vscode-iris)<!--[](https://github.com/kataras/iris/issues?q=is%3Aissue+is%3Aclosed)--> [](https://kataras.rocket.chat/channel/iris) [](_examples/) [](https://github.com/kataras/iris/releases)
|
[](https://travis-ci.org/kataras/iris)<!-- [](https://github.com/kataras/iris/releases)--> [](http://goreportcard.com/report/kataras/iris) [](https://marketplace.visualstudio.com/items?itemName=kataras2006.iris)<!--[](https://github.com/kataras/iris/issues?q=is%3Aissue+is%3Aclosed)--> [](https://kataras.rocket.chat/channel/iris) [](_examples/) [](https://github.com/kataras/iris/releases)
|
||||||
|
|
||||||
Iris is a fast, simple yet fully featured and very efficient web framework for Go.
|
Iris is a fast, simple yet fully featured and very efficient web framework for Go.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
<img align="right" width="169px" src="https://iris-go.com/images/icon.svg?v=a" title="logo created by @merry.dii" />
|
<img align="right" width="169px" src="https://iris-go.com/images/icon.svg?v=a" title="logo created by @merry.dii" />
|
||||||
|
|
||||||
[](https://travis-ci.org/kataras/iris)<!-- [](https://github.com/kataras/iris/releases)--> [](http://goreportcard.com/report/kataras/iris) [](https://github.com/kataras/vscode-iris)<!--[](https://github.com/kataras/iris/issues?q=is%3Aissue+is%3Aclosed)--> [](https://kataras.rocket.chat/channel/iris) [](_examples/) [](https://github.com/kataras/iris/releases)
|
[](https://travis-ci.org/kataras/iris)<!-- [](https://github.com/kataras/iris/releases)--> [](http://goreportcard.com/report/kataras/iris) [](https://marketplace.visualstudio.com/items?itemName=kataras2006.iris)<!--[](https://github.com/kataras/iris/issues?q=is%3Aissue+is%3Aclosed)--> [](https://kataras.rocket.chat/channel/iris) [](_examples/) [](https://github.com/kataras/iris/releases)
|
||||||
|
|
||||||
Το Iris είναι ένα γρήγορο, απλό αλλά και πλήρως λειτουργικό και πολύ αποδοτικό web framework για τη Go.
|
Το Iris είναι ένα γρήγορο, απλό αλλά και πλήρως λειτουργικό και πολύ αποδοτικό web framework για τη Go.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
<img align="right" width="169px" src="https://iris-go.com/images/icon.svg?v=a" title="logo created by @merry.dii" />
|
<img align="right" width="169px" src="https://iris-go.com/images/icon.svg?v=a" title="logo created by @merry.dii" />
|
||||||
|
|
||||||
[](https://travis-ci.org/kataras/iris)<!-- [](https://github.com/kataras/iris/releases)--> [](http://goreportcard.com/report/kataras/iris) [](https://github.com/kataras/vscode-iris)<!--[](https://github.com/kataras/iris/issues?q=is%3Aissue+is%3Aclosed)--> [](https://kataras.rocket.chat/channel/iris) [](_examples/) [](https://github.com/kataras/iris/releases)
|
[](https://travis-ci.org/kataras/iris)<!-- [](https://github.com/kataras/iris/releases)--> [](http://goreportcard.com/report/kataras/iris) [](https://marketplace.visualstudio.com/items?itemName=kataras2006.iris)<!--[](https://github.com/kataras/iris/issues?q=is%3Aissue+is%3Aclosed)--> [](https://kataras.rocket.chat/channel/iris) [](_examples/) [](https://github.com/kataras/iris/releases)
|
||||||
|
|
||||||
Iris - это быстрая, простая, но полнофункциональная и очень эффективная веб-платформа для Go.
|
Iris - это быстрая, простая, но полнофункциональная и очень эффективная веб-платформа для Go.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
<img align="right" width="169px" src="https://iris-go.com/images/icon.svg?v=a" title="logo created by @merry.dii" />
|
<img align="right" width="169px" src="https://iris-go.com/images/icon.svg?v=a" title="logo created by @merry.dii" />
|
||||||
|
|
||||||
[](https://travis-ci.org/kataras/iris)<!-- [](https://github.com/kataras/iris/releases)--> [](http://goreportcard.com/report/kataras/iris) [](https://github.com/kataras/vscode-iris)<!--[](https://github.com/kataras/iris/issues?q=is%3Aissue+is%3Aclosed)--> [](https://kataras.rocket.chat/channel/iris) [](_examples/) [](https://github.com/kataras/iris/releases)
|
[](https://travis-ci.org/kataras/iris)<!-- [](https://github.com/kataras/iris/releases)--> [](http://goreportcard.com/report/kataras/iris) [](https://marketplace.visualstudio.com/items?itemName=kataras2006.iris)<!--[](https://github.com/kataras/iris/issues?q=is%3Aissue+is%3Aclosed)--> [](https://kataras.rocket.chat/channel/iris) [](_examples/) [](https://github.com/kataras/iris/releases)
|
||||||
|
|
||||||
Iris 是一款超快、简洁高效的 Go 语言 Web开发框架。
|
Iris 是一款超快、简洁高效的 Go 语言 Web开发框架。
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -47,7 +47,7 @@ func TestSubdomainWWW(t *testing.T) {
|
||||||
|
|
||||||
req := e.Request(test.method, test.path)
|
req := e.Request(test.method, test.path)
|
||||||
if subdomain := test.subdomain; subdomain != "" {
|
if subdomain := test.subdomain; subdomain != "" {
|
||||||
req = req.WithURL("http://" + subdomain + "." + host)
|
req.WithURL("http://" + subdomain + "." + host)
|
||||||
}
|
}
|
||||||
|
|
||||||
req.Expect().
|
req.Expect().
|
||||||
|
|
|
||||||
|
|
@ -330,10 +330,16 @@ func WithPostMaxMemory(limit int64) Configurator {
|
||||||
// WithRemoteAddrHeader enables or adds a new or existing request header name
|
// WithRemoteAddrHeader enables or adds a new or existing request header name
|
||||||
// that can be used to validate the client's real IP.
|
// that can be used to validate the client's real IP.
|
||||||
//
|
//
|
||||||
// Existing values are:
|
// By-default no "X-" header is consired safe to be used for retrieving the
|
||||||
// "X-Real-Ip": false,
|
// client's IP address, because those headers can manually change by
|
||||||
// "X-Forwarded-For": false,
|
// the client. But sometimes are useful e.g., when behind a proxy
|
||||||
// "CF-Connecting-IP": false
|
// you want to enable the "X-Forwarded-For" or when cloudflare
|
||||||
|
// you want to enable the "CF-Connecting-IP", inneed you
|
||||||
|
// can allow the `ctx.RemoteAddr()` to use any header
|
||||||
|
// that the client may sent.
|
||||||
|
//
|
||||||
|
// Defaults to an empty map but an example usage is:
|
||||||
|
// WithRemoteAddrHeader("X-Forwarded-For")
|
||||||
//
|
//
|
||||||
// Look `context.RemoteAddr()` for more.
|
// Look `context.RemoteAddr()` for more.
|
||||||
func WithRemoteAddrHeader(headerName string) Configurator {
|
func WithRemoteAddrHeader(headerName string) Configurator {
|
||||||
|
|
@ -346,12 +352,12 @@ func WithRemoteAddrHeader(headerName string) Configurator {
|
||||||
}
|
}
|
||||||
|
|
||||||
// WithoutRemoteAddrHeader disables an existing request header name
|
// WithoutRemoteAddrHeader disables an existing request header name
|
||||||
// that can be used to validate the client's real IP.
|
// that can be used to validate and parse the client's real IP.
|
||||||
//
|
//
|
||||||
// Existing values are:
|
//
|
||||||
// "X-Real-Ip": false,
|
// Keep note that RemoteAddrHeaders is already defaults to an empty map
|
||||||
// "X-Forwarded-For": false,
|
// so you don't have to call this Configurator if you didn't
|
||||||
// "CF-Connecting-IP": false
|
// add allowed headers via configuration or via `WithRemoteAddrHeader` before.
|
||||||
//
|
//
|
||||||
// Look `context.RemoteAddr()` for more.
|
// Look `context.RemoteAddr()` for more.
|
||||||
func WithoutRemoteAddrHeader(headerName string) Configurator {
|
func WithoutRemoteAddrHeader(headerName string) Configurator {
|
||||||
|
|
@ -511,13 +517,22 @@ type Configuration struct {
|
||||||
//
|
//
|
||||||
// Defaults to "iris.viewData"
|
// Defaults to "iris.viewData"
|
||||||
ViewDataContextKey string `json:"viewDataContextKey,omitempty" yaml:"ViewDataContextKey" toml:"ViewDataContextKey"`
|
ViewDataContextKey string `json:"viewDataContextKey,omitempty" yaml:"ViewDataContextKey" toml:"ViewDataContextKey"`
|
||||||
// RemoteAddrHeaders returns the allowed request headers names
|
// RemoteAddrHeaders are the allowed request headers names
|
||||||
// that can be valid to parse the client's IP based on.
|
// that can be valid to parse the client's IP based on.
|
||||||
|
// By-default no "X-" header is consired safe to be used for retrieving the
|
||||||
|
// client's IP address, because those headers can manually change by
|
||||||
|
// the client. But sometimes are useful e.g., when behind a proxy
|
||||||
|
// you want to enable the "X-Forwarded-For" or when cloudflare
|
||||||
|
// you want to enable the "CF-Connecting-IP", inneed you
|
||||||
|
// can allow the `ctx.RemoteAddr()` to use any header
|
||||||
|
// that the client may sent.
|
||||||
//
|
//
|
||||||
// Defaults to:
|
// Defaults to an empty map but an example usage is:
|
||||||
// "X-Real-Ip": false,
|
// RemoteAddrHeaders {
|
||||||
// "X-Forwarded-For": false,
|
// "X-Real-Ip": true,
|
||||||
// "CF-Connecting-IP": false
|
// "X-Forwarded-For": true,
|
||||||
|
// "CF-Connecting-IP": true,
|
||||||
|
// }
|
||||||
//
|
//
|
||||||
// Look `context.RemoteAddr()` for more.
|
// Look `context.RemoteAddr()` for more.
|
||||||
RemoteAddrHeaders map[string]bool `json:"remoteAddrHeaders,omitempty" yaml:"RemoteAddrHeaders" toml:"RemoteAddrHeaders"`
|
RemoteAddrHeaders map[string]bool `json:"remoteAddrHeaders,omitempty" yaml:"RemoteAddrHeaders" toml:"RemoteAddrHeaders"`
|
||||||
|
|
@ -637,11 +652,20 @@ func (c Configuration) GetViewDataContextKey() string {
|
||||||
|
|
||||||
// GetRemoteAddrHeaders returns the allowed request headers names
|
// GetRemoteAddrHeaders returns the allowed request headers names
|
||||||
// that can be valid to parse the client's IP based on.
|
// that can be valid to parse the client's IP based on.
|
||||||
|
// By-default no "X-" header is consired safe to be used for retrieving the
|
||||||
|
// client's IP address, because those headers can manually change by
|
||||||
|
// the client. But sometimes are useful e.g., when behind a proxy
|
||||||
|
// you want to enable the "X-Forwarded-For" or when cloudflare
|
||||||
|
// you want to enable the "CF-Connecting-IP", inneed you
|
||||||
|
// can allow the `ctx.RemoteAddr()` to use any header
|
||||||
|
// that the client may sent.
|
||||||
//
|
//
|
||||||
// Defaults to:
|
// Defaults to an empty map but an example usage is:
|
||||||
// "X-Real-Ip": false,
|
// RemoteAddrHeaders {
|
||||||
// "X-Forwarded-For": false,
|
// "X-Real-Ip": true,
|
||||||
// "CF-Connecting-IP": false
|
// "X-Forwarded-For": true,
|
||||||
|
// "CF-Connecting-IP": true,
|
||||||
|
// }
|
||||||
//
|
//
|
||||||
// Look `context.RemoteAddr()` for more.
|
// Look `context.RemoteAddr()` for more.
|
||||||
func (c Configuration) GetRemoteAddrHeaders() map[string]bool {
|
func (c Configuration) GetRemoteAddrHeaders() map[string]bool {
|
||||||
|
|
@ -777,12 +801,8 @@ func DefaultConfiguration() Configuration {
|
||||||
TranslateLanguageContextKey: "iris.language",
|
TranslateLanguageContextKey: "iris.language",
|
||||||
ViewLayoutContextKey: "iris.viewLayout",
|
ViewLayoutContextKey: "iris.viewLayout",
|
||||||
ViewDataContextKey: "iris.viewData",
|
ViewDataContextKey: "iris.viewData",
|
||||||
RemoteAddrHeaders: map[string]bool{
|
RemoteAddrHeaders: make(map[string]bool),
|
||||||
"X-Real-Ip": false,
|
EnableOptimizations: false,
|
||||||
"X-Forwarded-For": false,
|
Other: make(map[string]interface{}),
|
||||||
"CF-Connecting-IP": false,
|
|
||||||
},
|
|
||||||
EnableOptimizations: false,
|
|
||||||
Other: make(map[string]interface{}),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1366,6 +1366,8 @@ func (ctx *context) IsWWW() bool {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const xForwardedForHeaderKey = "X-Forwarded-For"
|
||||||
|
|
||||||
// RemoteAddr tries to parse and return the real client's request IP.
|
// RemoteAddr tries to parse and return the real client's request IP.
|
||||||
//
|
//
|
||||||
// Based on allowed headers names that can be modified from Configuration.RemoteAddrHeaders.
|
// Based on allowed headers names that can be modified from Configuration.RemoteAddrHeaders.
|
||||||
|
|
@ -1377,14 +1379,13 @@ func (ctx *context) IsWWW() bool {
|
||||||
// `Configuration.WithRemoteAddrHeader(...)`,
|
// `Configuration.WithRemoteAddrHeader(...)`,
|
||||||
// `Configuration.WithoutRemoteAddrHeader(...)` for more.
|
// `Configuration.WithoutRemoteAddrHeader(...)` for more.
|
||||||
func (ctx *context) RemoteAddr() string {
|
func (ctx *context) RemoteAddr() string {
|
||||||
|
|
||||||
remoteHeaders := ctx.Application().ConfigurationReadOnly().GetRemoteAddrHeaders()
|
remoteHeaders := ctx.Application().ConfigurationReadOnly().GetRemoteAddrHeaders()
|
||||||
|
|
||||||
for headerName, enabled := range remoteHeaders {
|
for headerName, enabled := range remoteHeaders {
|
||||||
if enabled {
|
if enabled {
|
||||||
headerValue := ctx.GetHeader(headerName)
|
headerValue := ctx.GetHeader(headerName)
|
||||||
// exception needed for 'X-Forwarded-For' only , if enabled.
|
// exception needed for 'X-Forwarded-For' only , if enabled.
|
||||||
if headerName == "X-Forwarded-For" {
|
if headerName == xForwardedForHeaderKey {
|
||||||
idx := strings.IndexByte(headerValue, ',')
|
idx := strings.IndexByte(headerValue, ',')
|
||||||
if idx >= 0 {
|
if idx >= 0 {
|
||||||
headerValue = headerValue[0:idx]
|
headerValue = headerValue[0:idx]
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user