Remove trustedProxies option (#1612)
This commit is contained in:
parent
5f800003fd
commit
8304a48073
|
@ -258,14 +258,6 @@ sub setDefault {
|
|||
$conf->{$k} //= $defaultValues->{$k};
|
||||
}
|
||||
|
||||
# Convert old option useXForwardedForIP into trustedProxies
|
||||
if ( defined $conf->{useXForwardedForIP}
|
||||
and $conf->{useXForwardedForIP} == 1 )
|
||||
{
|
||||
$conf->{trustedProxies} = '*';
|
||||
delete $conf->{useXForwardedForIP};
|
||||
}
|
||||
|
||||
# Some parameters expect key name (example), not variable ($example)
|
||||
if ( defined $conf->{whatToTrace} ) {
|
||||
$conf->{whatToTrace} =~ s/^\$//;
|
||||
|
|
|
@ -276,7 +276,6 @@ sub defaultValues {
|
|||
'totp2fRange' => 1,
|
||||
'totp2fSelfRegistration' => 0,
|
||||
'totp2fUserCanRemoveKey' => 1,
|
||||
'trustedProxies' => '',
|
||||
'twitterAuthnLevel' => 1,
|
||||
'twitterUserField' => 'screen_name',
|
||||
'u2fActivation' => 0,
|
||||
|
|
|
@ -3325,10 +3325,6 @@ qr/^(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-
|
|||
'trustedDomains' => {
|
||||
'type' => 'text'
|
||||
},
|
||||
'trustedProxies' => {
|
||||
'default' => '',
|
||||
'type' => 'text'
|
||||
},
|
||||
'twitterAppName' => {
|
||||
'type' => 'text'
|
||||
},
|
||||
|
|
|
@ -712,11 +712,6 @@ sub attributes {
|
|||
default => 60,
|
||||
documentation => 'Update session timeout interval on server side',
|
||||
},
|
||||
trustedProxies => {
|
||||
type => 'text',
|
||||
default => '',
|
||||
documentation => 'Trusted proxies',
|
||||
},
|
||||
userControl => {
|
||||
type => 'pcre',
|
||||
default => '^[\w\.\-@]+$',
|
||||
|
|
|
@ -499,7 +499,7 @@ sub tree {
|
|||
help => 'logs.html',
|
||||
form => 'simpleInputContainer',
|
||||
nodes =>
|
||||
[ 'trustedProxies', 'whatToTrace', 'hiddenAttributes' ]
|
||||
[ 'whatToTrace', 'hiddenAttributes' ]
|
||||
},
|
||||
{
|
||||
title => 'cookieParams',
|
||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -1004,10 +1004,6 @@
|
|||
"title": "issuerParams"
|
||||
}, {
|
||||
"_nodes": [{
|
||||
"default": "",
|
||||
"id": "trustedProxies",
|
||||
"title": "trustedProxies"
|
||||
}, {
|
||||
"default": "uid",
|
||||
"id": "whatToTrace",
|
||||
"title": "whatToTrace"
|
||||
|
|
|
@ -1146,11 +1146,6 @@
|
|||
"title": "logParams",
|
||||
"type": "simpleInputContainer",
|
||||
"nodes": [{
|
||||
"default": "",
|
||||
"id": "trustedProxies",
|
||||
"title": "trustedProxies",
|
||||
"data": ""
|
||||
}, {
|
||||
"default": "uid",
|
||||
"id": "whatToTrace",
|
||||
"title": "whatToTrace",
|
||||
|
|
|
@ -1157,11 +1157,6 @@
|
|||
"title": "logParams",
|
||||
"type": "simpleInputContainer",
|
||||
"nodes": [{
|
||||
"default": "",
|
||||
"id": "trustedProxies",
|
||||
"title": "trustedProxies",
|
||||
"data": ""
|
||||
}, {
|
||||
"default": "uid",
|
||||
"id": "whatToTrace",
|
||||
"title": "whatToTrace",
|
||||
|
|
|
@ -1157,11 +1157,6 @@
|
|||
"title": "logParams",
|
||||
"type": "simpleInputContainer",
|
||||
"nodes": [{
|
||||
"default": "",
|
||||
"id": "trustedProxies",
|
||||
"title": "trustedProxies",
|
||||
"data": ""
|
||||
}, {
|
||||
"default": "uid",
|
||||
"id": "whatToTrace",
|
||||
"title": "whatToTrace",
|
||||
|
|
|
@ -1146,11 +1146,6 @@
|
|||
"title": "logParams",
|
||||
"type": "simpleInputContainer",
|
||||
"nodes": [{
|
||||
"default": "",
|
||||
"id": "trustedProxies",
|
||||
"title": "trustedProxies",
|
||||
"data": ""
|
||||
}, {
|
||||
"default": "uid",
|
||||
"id": "whatToTrace",
|
||||
"title": "whatToTrace",
|
||||
|
|
|
@ -1640,10 +1640,6 @@
|
|||
},
|
||||
{
|
||||
"_nodes": [{
|
||||
"default": "",
|
||||
"id": "trustedProxies",
|
||||
"title": "trustedProxies"
|
||||
}, {
|
||||
"default": "uid",
|
||||
"id": "whatToTrace",
|
||||
"title": "whatToTrace"
|
||||
|
|
Loading…
Reference in New Issue
Block a user