Remove old UA exported var (#1044)

environments/ppa-mbqj77/deployments/1
Xavier Guimard 8 years ago
parent 9b9116cf70
commit 2580a21f7a
  1. 1
      _example/conf/lmConf-1.json
  2. 1
      e2e-tests/lmConf-1.json
  3. 1
      lemonldap-ng-handler/t/lmConf-1.json
  4. 10
      lemonldap-ng-manager/t/12-save-changed-conf.t
  5. 1
      lemonldap-ng-manager/t/conf/lmConf-1.json
  6. 7
      lemonldap-ng-manager/t/jsonfiles/01-base-tree.json
  7. 14
      lemonldap-ng-manager/t/jsonfiles/02-base-tree-all-nodes-opened.json
  8. 12
      lemonldap-ng-manager/t/jsonfiles/12-modified.json
  9. 14
      lemonldap-ng-manager/t/jsonfiles/14-bad.json
  10. 7
      lemonldap-ng-manager/t/jsonfiles/15-combination.json
  11. 9
      lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Process.pm
  12. 2
      lemonldap-ng-portal/t/31-Auth-and-issuer-CAS.t

@ -103,7 +103,6 @@
}
},
"exportedVars" : {
"UA" : "HTTP_USER_AGENT"
},
"globalStorage" : "Apache::Session::File",
"globalStorageOptions" : {

@ -112,7 +112,6 @@
}
},
"exportedVars": {
"UA": "HTTP_USER_AGENT"
},
"globalStorage": "Apache::Session::File",
"globalStorageOptions": {

@ -21,7 +21,6 @@
}
},
"exportedVars": {
"UA": "HTTP_USER_AGENT"
},
"globalStorage": "Apache::Session::File",
"globalStorageOptions": {

@ -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 == 12, '12 keys changed in conf 1' )
ok( @c1 == 11, '11 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',

@ -105,7 +105,6 @@
}
},
"exportedVars": {
"UA": "HTTP_USER_AGENT"
},
"globalStorage": "Apache::Session::File",
"globalStorageOptions": {

@ -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"

@ -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",

@ -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",

@ -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",

@ -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",

@ -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};

@ -7,7 +7,7 @@ BEGIN {
require 't/test-lib.pm';
}
my $debug = 'debug';
my $debug = 'error';
my ( $issuer, $sp, $res );
my %handlerOR = ( issuer => [], sp => [] );

Loading…
Cancel
Save