Mirrors/kararas_iris
1
0
Fork 0
mirror of https://github.com/kataras/iris.git synced 2025-12-17 09:57:01 +00:00
Code Releases Activity

Add Configuration.RemoteAddrHeadersForce as requested at #1567 and change RemoteAddrHeaders from map to string slice

Browse Source 
Read HISTORY.md entry
This commit is contained in:
Gerasimos (Makis) Maropoulos
2020-07-26 14:37:30 +03:00
parent a50f0ed5ba
commit 22a89c12cb
7 changed files with 101 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
configuration_test.go
View File

@@ -154,9 +154,9 @@ DisableBodyConsumptionOnUnmarshal: true
TimeFormat: "Mon, 02 Jan 2006 15:04:05 GMT"
Charset: "utf-8"
RemoteAddrHeaders:
X-Real-Ip: true
X-Forwarded-For: true
CF-Connecting-IP: true
- X-Real-Ip
- X-Forwarded-For
- CF-Connecting-IP
HostProxyHeaders:
X-Host: true
SSLProxyHeaders:
@@ -210,19 +210,19 @@ Other:
t.Fatalf("error on TestConfigurationYAML: Expected RemoteAddrHeaders to be filled")
}
expectedRemoteAddrHeaders := map[string]bool{
"X-Real-Ip": true,
"X-Forwarded-For": true,
"CF-Connecting-IP": true,
expectedRemoteAddrHeaders := []string{
"X-Real-Ip",
"X-Forwarded-For",
"CF-Connecting-IP",
}
if expected, got := len(c.RemoteAddrHeaders), len(expectedRemoteAddrHeaders); expected != got {
t.Fatalf("error on TestConfigurationYAML: Expected RemoteAddrHeaders' len(%d) and got(%d), len is not the same", expected, got)
}
for k, v := range c.RemoteAddrHeaders {
if expected, got := expectedRemoteAddrHeaders[k], v; expected != got {
t.Fatalf("error on TestConfigurationYAML: Expected RemoteAddrHeaders[%s] = %t but got %t", k, expected, got)
for i, v := range c.RemoteAddrHeaders {
if expected, got := expectedRemoteAddrHeaders[i], v; expected != got {
t.Fatalf("error on TestConfigurationYAML: Expected RemoteAddrHeaders[%d] = %s but got %s", i, expected, got)
}
}
@@ -285,10 +285,7 @@ DisableBodyConsumptionOnUnmarshal = true
TimeFormat = "Mon, 02 Jan 2006 15:04:05 GMT"
Charset = "utf-8"
[RemoteAddrHeaders]
X-Real-Ip = true
X-Forwarded-For = true
CF-Connecting-IP = true
RemoteAddrHeaders = ["X-Real-Ip", "X-Forwarded-For", "CF-Connecting-IP"]
[Other]
# Indentation (tabs and/or spaces) is allowed but not required
@@ -337,19 +334,19 @@ Charset = "utf-8"
t.Fatalf("error on TestConfigurationTOML: Expected RemoteAddrHeaders to be filled")
}
expectedRemoteAddrHeaders := map[string]bool{
"X-Real-Ip": true,
"X-Forwarded-For": true,
"CF-Connecting-IP": true,
expectedRemoteAddrHeaders := []string{
"X-Real-Ip",
"X-Forwarded-For",
"CF-Connecting-IP",
}
if expected, got := len(c.RemoteAddrHeaders), len(expectedRemoteAddrHeaders); expected != got {
t.Fatalf("error on TestConfigurationTOML: Expected RemoteAddrHeaders' len(%d) and got(%d), len is not the same", expected, got)
}
for k, v := range c.RemoteAddrHeaders {
if expected, got := expectedRemoteAddrHeaders[k], v; expected != got {
t.Fatalf("error on TestConfigurationTOML: Expected RemoteAddrHeaders[%s] = %t but got %t", k, expected, got)
for i, got := range c.RemoteAddrHeaders {
if expected := expectedRemoteAddrHeaders[i]; expected != got {
t.Fatalf("error on TestConfigurationTOML: Expected RemoteAddrHeaders[%d] = %s but got %s", i, expected, got)
}
}