Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Xavier Bachelot
lemonldap-ng
Commits
2580a21f
Commit
2580a21f
authored
Mar 31, 2017
by
Yadd
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove old UA exported var (#1044)
parent
9b9116cf
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
9 additions
and
70 deletions
+9
-70
_example/conf/lmConf-1.json
_example/conf/lmConf-1.json
+0
-1
e2e-tests/lmConf-1.json
e2e-tests/lmConf-1.json
+0
-1
lemonldap-ng-handler/t/lmConf-1.json
lemonldap-ng-handler/t/lmConf-1.json
+0
-1
lemonldap-ng-manager/t/12-save-changed-conf.t
lemonldap-ng-manager/t/12-save-changed-conf.t
+1
-9
lemonldap-ng-manager/t/conf/lmConf-1.json
lemonldap-ng-manager/t/conf/lmConf-1.json
+0
-1
lemonldap-ng-manager/t/jsonfiles/01-base-tree.json
lemonldap-ng-manager/t/jsonfiles/01-base-tree.json
+1
-6
lemonldap-ng-manager/t/jsonfiles/02-base-tree-all-nodes-opened.json
...ng-manager/t/jsonfiles/02-base-tree-all-nodes-opened.json
+2
-12
lemonldap-ng-manager/t/jsonfiles/12-modified.json
lemonldap-ng-manager/t/jsonfiles/12-modified.json
+1
-11
lemonldap-ng-manager/t/jsonfiles/14-bad.json
lemonldap-ng-manager/t/jsonfiles/14-bad.json
+2
-12
lemonldap-ng-manager/t/jsonfiles/15-combination.json
lemonldap-ng-manager/t/jsonfiles/15-combination.json
+1
-6
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Process.pm
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Process.pm
+0
-9
lemonldap-ng-portal/t/31-Auth-and-issuer-CAS.t
lemonldap-ng-portal/t/31-Auth-and-issuer-CAS.t
+1
-1
No files found.
_example/conf/lmConf-1.json
View file @
2580a21f
...
...
@@ -103,7 +103,6 @@
}
},
"exportedVars"
:
{
"UA"
:
"HTTP_USER_AGENT"
},
"globalStorage"
:
"Apache::Session::File"
,
"globalStorageOptions"
:
{
...
...
e2e-tests/lmConf-1.json
View file @
2580a21f
...
...
@@ -112,7 +112,6 @@
}
},
"exportedVars"
:
{
"UA"
:
"HTTP_USER_AGENT"
},
"globalStorage"
:
"Apache::Session::File"
,
"globalStorageOptions"
:
{
...
...
lemonldap-ng-handler/t/lmConf-1.json
View file @
2580a21f
...
...
@@ -21,7 +21,6 @@
}
},
"exportedVars"
:
{
"UA"
:
"HTTP_USER_AGENT"
},
"globalStorage"
:
"Apache::Session::File"
,
"globalStorageOptions"
:
{
...
...
lemonldap-ng-manager/t/12-save-changed-conf.t
View file @
2580a21f
...
...
@@ -69,7 +69,7 @@ ok( $res = &client->jsonResponse('/diff/1/2'), 'Diff called' );
my
(
@c1
,
@c2
);
ok
(
(
@c1
=
sort
keys
%
{
$res
->
[
0
]
}
),
'
diff() detects changes in conf 1
'
);
ok
(
(
@c2
=
sort
keys
%
{
$res
->
[
1
]
}
),
'
diff() detects changes in conf 2
'
);
ok
(
@c1
==
1
2
,
'
1
2
keys changed in conf 1
'
)
ok
(
@c1
==
1
1
,
'
1
1
keys changed in conf 1
'
)
or
print
STDERR
"
Expect: 11 keys, get:
"
.
join
(
'
,
',
@c1
)
.
"
\n
";
ok
(
@c2
==
14
,
'
14 keys changed or created in conf 2
'
)
or
print
STDERR
"
Expect: 14 keys, get:
"
.
join
(
'
,
',
@c2
)
.
"
\n
";
...
...
@@ -120,18 +120,10 @@ sub changes {
'
key
'
=>
'
openIdSPList
',
'
new
'
=>
'
1;bad.com
'
},
{
'
key
'
=>
'
exportedVars
',
'
new
'
=>
'
User-Agent
'
},
{
'
new
'
=>
'
Uid
',
'
key
'
=>
'
exportedVars
'
},
{
'
key
'
=>
'
exportedVars
',
'
old
'
=>
'
UA
'
},
{
'
key
'
=>
'
locationRules, test1.example.com, (?#Logout comment)^/logout
',
...
...
lemonldap-ng-manager/t/conf/lmConf-1.json
View file @
2580a21f
...
...
@@ -105,7 +105,6 @@
}
},
"exportedVars"
:
{
"UA"
:
"HTTP_USER_AGENT"
},
"globalStorage"
:
"Apache::Session::File"
,
"globalStorageOptions"
:
{
...
...
lemonldap-ng-manager/t/jsonfiles/01-base-tree.json
View file @
2580a21f
...
...
@@ -1469,12 +1469,7 @@
},
{
"_nodes"
:
[{
"cnodes"
:
"exportedVars"
,
"default"
:
[{
"data"
:
"HTTP_USER_AGENT"
,
"id"
:
"exportedVars/UA"
,
"title"
:
"UA"
,
"type"
:
"keyText"
}],
"default"
:
[],
"id"
:
"exportedVars"
,
"title"
:
"exportedVars"
,
"type"
:
"keyTextContainer"
...
...
lemonldap-ng-manager/t/jsonfiles/02-base-tree-all-nodes-opened.json
View file @
2580a21f
...
...
@@ -1639,21 +1639,11 @@
"id"
:
"variables"
,
"title"
:
"variables"
,
"nodes"
:
[{
"default"
:
[{
"data"
:
"HTTP_USER_AGENT"
,
"id"
:
"exportedVars/UA"
,
"title"
:
"UA"
,
"type"
:
"keyText"
}],
"default"
:
[],
"id"
:
"exportedVars"
,
"title"
:
"exportedVars"
,
"type"
:
"keyTextContainer"
,
"nodes"
:
[{
"data"
:
"HTTP_USER_AGENT"
,
"type"
:
"keyText"
,
"id"
:
"exportedVars/UA"
,
"title"
:
"UA"
}]
"nodes"
:
[]
},
{
"default"
:
[],
"id"
:
"macros"
,
...
...
lemonldap-ng-manager/t/jsonfiles/12-modified.json
View file @
2580a21f
...
...
@@ -1650,21 +1650,11 @@
"id"
:
"variables"
,
"title"
:
"variables"
,
"nodes"
:
[{
"default"
:
[{
"data"
:
"HTTP_USER_AGENT"
,
"id"
:
"exportedVars/UA"
,
"title"
:
"UA"
,
"type"
:
"keyText"
}],
"default"
:
[],
"id"
:
"exportedVars"
,
"title"
:
"exportedVars"
,
"type"
:
"keyTextContainer"
,
"nodes"
:
[{
"data"
:
"HTTP_USER_AGENT"
,
"type"
:
"keyText"
,
"id"
:
"exportedVars/UA"
,
"title"
:
"UserAgent"
},
{
"data"
:
"uid"
,
"type"
:
"keyText"
,
"id"
:
"exportedVars/n3"
,
...
...
lemonldap-ng-manager/t/jsonfiles/14-bad.json
View file @
2580a21f
...
...
@@ -1639,21 +1639,11 @@
"id"
:
"variables"
,
"title"
:
"variables"
,
"nodes"
:
[{
"default"
:
[{
"data"
:
"HTTP_USER_AGENT"
,
"id"
:
"exportedVars/UA"
,
"title"
:
"UA"
,
"type"
:
"keyText"
}],
"default"
:
[],
"id"
:
"exportedVars"
,
"title"
:
"exportedVars"
,
"type"
:
"keyTextContainer"
,
"nodes"
:
[{
"data"
:
"HTTP_USER_AGENT"
,
"type"
:
"keyText"
,
"id"
:
"exportedVars/UA"
,
"title"
:
"UA"
}]
"nodes"
:
[]
},
{
"default"
:
[],
"id"
:
"macros"
,
...
...
lemonldap-ng-manager/t/jsonfiles/15-combination.json
View file @
2580a21f
...
...
@@ -2380,12 +2380,7 @@
{
"_nodes"
:
[{
"cnodes"
:
"exportedVars"
,
"default"
:
[{
"data"
:
"HTTP_USER_AGENT"
,
"id"
:
"exportedVars/UA"
,
"title"
:
"UA"
,
"type"
:
"keyText"
}],
"default"
:
[],
"help"
:
"exportedvars.html"
,
"id"
:
"exportedVars"
,
"title"
:
"exportedVars"
,
...
...
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Process.pm
View file @
2580a21f
...
...
@@ -319,15 +319,6 @@ sub setSessionInfo {
if
$self
->
conf
->
{
timeoutActivity
};
}
# Get environment variables matching exportedVars (works only with HTTP_*
# and SSL_*: see Main/Request.pm)
foreach
(
keys
%
{
$self
->
conf
->
{
exportedVars
}
}
)
{
if
(
my
$tmp
=
$req
->
{
$self
->
conf
->
{
exportedVars
}
->
{
$_
}
}
)
{
$tmp
=~
s/[\r\n]/ /gs
;
$req
->
{
sessionInfo
}
->
{
$_
}
=
$tmp
;
}
}
# Store URL origin in session
$req
->
{
sessionInfo
}
->
{
_url
}
=
$req
->
{
urldc
};
...
...
lemonldap-ng-portal/t/31-Auth-and-issuer-CAS.t
View file @
2580a21f
...
...
@@ -7,7 +7,7 @@ BEGIN {
require
'
t/test-lib.pm
';
}
my
$debug
=
'
debug
';
my
$debug
=
'
error
';
my
(
$issuer
,
$sp
,
$res
);
my
%handlerOR
=
(
issuer
=>
[]
,
sp
=>
[]
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment