Don't reload portal if conf is already loaded

2018-06-05 23:13:18 +02:00 · 2018-06-05 23:13:18 +02:00 · 7f7d068646
commit 7f7d068646
parent 1669a6d482
38 changed files with 56 additions and 11 deletions
--- a/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Main/Reload.pm
+++ b/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Main/Reload.pm
@ -62,19 +62,20 @@ sub checkConf {
            return 0;
        }
        $class->configReload($conf);
-    }
-    $class->logger->debug("$class: configuration is up to date");
-    foreach (@_onReload) {
-        my ( $obj, $sub ) = @$_;
-        if ($obj) {
-            $class->logger->debug( 'Launching ' . ref($obj) . "->$sub(conf)" );
-            unless ( $obj->$sub($conf) ) {
-                $class->logger->error( "Underlying object can't load conf ("
-                      . ref($obj)
-                      . "->$sub)" );
+        foreach (@_onReload) {
+            my ( $obj, $sub ) = @$_;
+            if ($obj) {
+                $class->logger->debug(
+                    'Launching ' . ref($obj) . "->$sub(conf)" );
+                unless ( $obj->$sub($conf) ) {
+                    $class->logger->error( "Underlying object can't load conf ("
+                          . ref($obj)
+                          . "->$sub)" );
+                }
            }
        }
    }
+    $class->logger->debug("$class: configuration is up to date");
    return 1;
 }

--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/SOAPServer.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/SOAPServer.pm
@ -241,7 +241,10 @@ sub getAttributes {
            attributes => _buildSoapHash(
                $session->data,
                (
-                    $session->{_session_kind} eq 'SSO'
+                    (
+                              $session->{_session_kind}
+                          and $session->{_session_kind} eq 'SSO'
+                    )
                    ? ( @{ $self->exportedAttr } )
                    : ()
                )
--- a/lemonldap-ng-portal/t/24-AuthKerberos.t
+++ b/lemonldap-ng-portal/t/24-AuthKerberos.t
@ -31,6 +31,7 @@ SKIP: {
    ok( getHeader( $res, 'WWW-Authenticate' ) eq 'Negotiate',
        'Get negotiate header' )
      or explain( $res->[1], 'WWW-Authenticate => Negotiate' );
+    &Lemonldap::NG::Handler::Main::cfgNum( 0, 0 );
    $client = LLNG::Manager::Test->new(
        {
            ini => {
--- a/lemonldap-ng-portal/t/29-AuthSSL.t
+++ b/lemonldap-ng-portal/t/29-AuthSSL.t
@ -27,6 +27,7 @@ expectOK($res);
 expectCookie($res);
 count(1);

+&Lemonldap::NG::Handler::Main::cfgNum( 0, 0 );
 $client = LLNG::Manager::Test->new(
    {
        ini => {
--- a/lemonldap-ng-portal/t/30-Auth-and-issuer-SAML-Artifact-with-SOAP-SLO-IdP-initiated.t
+++ b/lemonldap-ng-portal/t/30-Auth-and-issuer-SAML-Artifact-with-SOAP-SLO-IdP-initiated.t
@ -52,6 +52,7 @@ SKIP: {
    ok( $issuer = issuer(), 'Issuer portal' );
    $handlerOR{issuer} = \@Lemonldap::NG::Handler::Main::_onReload;
    switch ('sp');
+    &Lemonldap::NG::Handler::Main::cfgNum(0,0);

    ok( $sp = sp(), 'SP portal' );
    $handlerOR{sp} = \@Lemonldap::NG::Handler::Main::_onReload;
--- a/lemonldap-ng-portal/t/30-Auth-and-issuer-SAML-Artifact-with-SOAP-SLO.t
+++ b/lemonldap-ng-portal/t/30-Auth-and-issuer-SAML-Artifact-with-SOAP-SLO.t
@ -51,6 +51,7 @@ SKIP: {
    ok( $issuer = issuer(), 'Issuer portal' );
    $handlerOR{issuer} = \@Lemonldap::NG::Handler::Main::_onReload;
    switch ('sp');
+    &Lemonldap::NG::Handler::Main::cfgNum(0,0);

    ok( $sp = sp(), 'SP portal' );
    $handlerOR{sp} = \@Lemonldap::NG::Handler::Main::_onReload;
--- a/lemonldap-ng-portal/t/30-Auth-and-issuer-SAML-POST-IdP-initiated.t
+++ b/lemonldap-ng-portal/t/30-Auth-and-issuer-SAML-POST-IdP-initiated.t
@ -35,6 +35,7 @@ SKIP: {
    ok( $issuer = issuer(), 'Issuer portal' );
    $handlerOR{issuer} = \@Lemonldap::NG::Handler::Main::_onReload;
    switch ('sp');
+    &Lemonldap::NG::Handler::Main::cfgNum(0,0);

    ok( $sp = sp(), 'SP portal' );
    $handlerOR{sp} = \@Lemonldap::NG::Handler::Main::_onReload;
--- a/lemonldap-ng-portal/t/30-Auth-and-issuer-SAML-POST.t
+++ b/lemonldap-ng-portal/t/30-Auth-and-issuer-SAML-POST.t
@ -35,6 +35,7 @@ SKIP: {
    ok( $issuer = issuer(), 'Issuer portal' );
    $handlerOR{issuer} = \@Lemonldap::NG::Handler::Main::_onReload;
    switch ('sp');
+    &Lemonldap::NG::Handler::Main::cfgNum(0,0);

    ok( $sp = sp(), 'SP portal' );
    $handlerOR{sp} = \@Lemonldap::NG::Handler::Main::_onReload;
--- a/lemonldap-ng-portal/t/30-Auth-and-issuer-SAML-Redirect-IdP-initiated.t
+++ b/lemonldap-ng-portal/t/30-Auth-and-issuer-SAML-Redirect-IdP-initiated.t
@ -35,6 +35,7 @@ SKIP: {
    ok( $issuer = issuer(), 'Issuer portal' );
    $handlerOR{issuer} = \@Lemonldap::NG::Handler::Main::_onReload;
    switch ('sp');
+    &Lemonldap::NG::Handler::Main::cfgNum(0,0);

    ok( $sp = sp(), 'SP portal' );
    $handlerOR{sp} = \@Lemonldap::NG::Handler::Main::_onReload;
--- a/lemonldap-ng-portal/t/30-Auth-and-issuer-SAML-Redirect.t
+++ b/lemonldap-ng-portal/t/30-Auth-and-issuer-SAML-Redirect.t
@ -35,6 +35,7 @@ SKIP: {
    ok( $issuer = issuer(), 'Issuer portal' );
    $handlerOR{issuer} = \@Lemonldap::NG::Handler::Main::_onReload;
    switch ('sp');
+    &Lemonldap::NG::Handler::Main::cfgNum(0,0);

    ok( $sp = sp(), 'SP portal' );
    $handlerOR{sp} = \@Lemonldap::NG::Handler::Main::_onReload;
--- a/lemonldap-ng-portal/t/30-SAML-ReAuth-with-choice.t
+++ b/lemonldap-ng-portal/t/30-SAML-ReAuth-with-choice.t
@ -47,6 +47,7 @@ SKIP: {
    ok( $issuer = issuer(), 'Issuer portal' );
    $handlerOR{issuer} = \@Lemonldap::NG::Handler::Main::_onReload;
    switch ('sp');
+    &Lemonldap::NG::Handler::Main::cfgNum(0,0);

    ok( $sp = sp(), 'SP portal' );
    $handlerOR{sp} = \@Lemonldap::NG::Handler::Main::_onReload;
--- a/lemonldap-ng-portal/t/30-SAML-ReAuth.t
+++ b/lemonldap-ng-portal/t/30-SAML-ReAuth.t
@ -35,6 +35,7 @@ SKIP: {
    ok( $issuer = issuer(), 'Issuer portal' );
    $handlerOR{issuer} = \@Lemonldap::NG::Handler::Main::_onReload;
    switch ('sp');
+    &Lemonldap::NG::Handler::Main::cfgNum(0,0);

    ok( $sp = sp(), 'SP portal' );
    $handlerOR{sp} = \@Lemonldap::NG::Handler::Main::_onReload;
--- a/lemonldap-ng-portal/t/30-SAML-SP-rule.t
+++ b/lemonldap-ng-portal/t/30-SAML-SP-rule.t
@ -35,6 +35,7 @@ SKIP: {
    ok( $issuer = issuer(), 'Issuer portal' );
    $handlerOR{issuer} = \@Lemonldap::NG::Handler::Main::_onReload;
    switch ('sp');
+    &Lemonldap::NG::Handler::Main::cfgNum(0,0);

    ok( $sp = sp(), 'SP portal' );
    $handlerOR{sp} = \@Lemonldap::NG::Handler::Main::_onReload;
--- a/lemonldap-ng-portal/t/31-Auth-and-issuer-CAS-declared-app.t
+++ b/lemonldap-ng-portal/t/31-Auth-and-issuer-CAS-declared-app.t
@ -58,6 +58,7 @@ ok( $issuer = issuer(), 'Issuer portal' );
 $handlerOR{issuer} = \@Lemonldap::NG::Handler::Main::_onReload;
 count(1);
 switch ('sp');
+&Lemonldap::NG::Handler::Main::cfgNum( 0, 0 );

 ok( $sp = sp(), 'SP portal' );
 count(1);
--- a/lemonldap-ng-portal/t/31-Auth-and-issuer-CAS-default.t
+++ b/lemonldap-ng-portal/t/31-Auth-and-issuer-CAS-default.t
@ -58,6 +58,7 @@ ok( $issuer = issuer(), 'Issuer portal' );
 $handlerOR{issuer} = \@Lemonldap::NG::Handler::Main::_onReload;
 count(1);
 switch ('sp');
+&Lemonldap::NG::Handler::Main::cfgNum(0,0);

 ok( $sp = sp(), 'SP portal' );
 count(1);
--- a/lemonldap-ng-portal/t/31-Auth-and-issuer-CAS-proxied.t
+++ b/lemonldap-ng-portal/t/31-Auth-and-issuer-CAS-proxied.t
@ -56,6 +56,7 @@ ok( $issuer = issuer(), 'Issuer portal' );
 $handlerOR{issuer} = \@Lemonldap::NG::Handler::Main::_onReload;
 count(1);
 switch ('sp');
+&Lemonldap::NG::Handler::Main::cfgNum(0,0);

 ok( $sp = sp(), 'SP portal' );
 count(1);
--- a/lemonldap-ng-portal/t/31-Auth-and-issuer-CAS-with-choice.t
+++ b/lemonldap-ng-portal/t/31-Auth-and-issuer-CAS-with-choice.t
@ -75,6 +75,7 @@ SKIP: {
    ok( $issuer = issuer(), 'Issuer portal' );
    $handlerOR{issuer} = \@Lemonldap::NG::Handler::Main::_onReload;
    switch ('sp');
+    &Lemonldap::NG::Handler::Main::cfgNum(0,0);

    # Build CAS app
    ok( $sp = sp(), 'SP portal' );
--- a/lemonldap-ng-portal/t/32-Auth-and-issuer-OIDC-authorization_code-OP-logout.t
+++ b/lemonldap-ng-portal/t/32-Auth-and-issuer-OIDC-authorization_code-OP-logout.t
@ -80,6 +80,7 @@ my $metadata = $res->[2]->[0];
 count(3);

 switch ('rp');
+&Lemonldap::NG::Handler::Main::cfgNum( 0, 0 );
 ok( $rp = rp( $jwks, $metadata ), 'RP portal' );
 count(1);

--- a/lemonldap-ng-portal/t/32-Auth-and-issuer-OIDC-authorization_code-with-authchoice.t
+++ b/lemonldap-ng-portal/t/32-Auth-and-issuer-OIDC-authorization_code-with-authchoice.t
@ -92,6 +92,7 @@ SKIP: {
    my $metadata = $res->[2]->[0];

    switch ('rp');
+    &Lemonldap::NG::Handler::Main::cfgNum( 0, 0 );
    ok( $rp = rp( $jwks, $metadata ), 'RP portal' );

    # Query RP for auth
--- a/lemonldap-ng-portal/t/32-Auth-and-issuer-OIDC-authorization_code.t
+++ b/lemonldap-ng-portal/t/32-Auth-and-issuer-OIDC-authorization_code.t
@ -87,6 +87,7 @@ my $metadata = $res->[2]->[0];
 count(3);

 switch ('rp');
+&Lemonldap::NG::Handler::Main::cfgNum( 0, 0 );
 ok( $rp = rp( $jwks, $metadata ), 'RP portal' );
 count(1);

--- a/lemonldap-ng-portal/t/32-Auth-and-issuer-OIDC-hybrid.t
+++ b/lemonldap-ng-portal/t/32-Auth-and-issuer-OIDC-hybrid.t
@ -80,6 +80,7 @@ my $metadata = $res->[2]->[0];
 count(3);

 switch ('rp');
+&Lemonldap::NG::Handler::Main::cfgNum( 0, 0 );
 ok( $rp = rp( $jwks, $metadata ), 'RP portal' );
 count(1);

--- a/lemonldap-ng-portal/t/32-Auth-and-issuer-OIDC-implicit.t
+++ b/lemonldap-ng-portal/t/32-Auth-and-issuer-OIDC-implicit.t
@ -80,6 +80,7 @@ my $metadata = $res->[2]->[0];
 count(3);

 switch ('rp');
+&Lemonldap::NG::Handler::Main::cfgNum( 0, 0 );
 ok( $rp = rp( $jwks, $metadata ), 'RP portal' );
 count(1);

--- a/lemonldap-ng-portal/t/32-OIDC-RP-rule.t
+++ b/lemonldap-ng-portal/t/32-OIDC-RP-rule.t
@ -80,6 +80,7 @@ my $metadata = $res->[2]->[0];
 count(3);

 switch ('rp');
+&Lemonldap::NG::Handler::Main::cfgNum( 0, 0 );
 ok( $rp = rp( $jwks, $metadata ), 'RP portal' );
 count(1);

--- a/lemonldap-ng-portal/t/33-Auth-and-issuer-OpenID2.t
+++ b/lemonldap-ng-portal/t/33-Auth-and-issuer-OpenID2.t
@ -52,6 +52,7 @@ SKIP: {
    ok( $issuer = issuer(), 'Issuer portal' );
    $handlerOR{issuer} = \@Lemonldap::NG::Handler::Main::_onReload;
    switch ('sp');
+    &Lemonldap::NG::Handler::Main::cfgNum(0,0);

    ok( $sp = sp(), 'SP portal' );
    $handlerOR{sp} = \@Lemonldap::NG::Handler::Main::_onReload;
--- a/lemonldap-ng-portal/t/34-Auth-Proxy-and-REST-Server.t
+++ b/lemonldap-ng-portal/t/34-Auth-Proxy-and-REST-Server.t
@ -64,6 +64,7 @@ LWP::Protocol::PSGI->register(
 ok( $issuer = issuer(), 'Issuer portal' );
 $handlerOR{issuer} = \@Lemonldap::NG::Handler::Main::_onReload;
 switch ('sp');
+&Lemonldap::NG::Handler::Main::cfgNum(0,0);

 ok( $sp = sp(), 'SP portal' );
 $handlerOR{sp} = \@Lemonldap::NG::Handler::Main::_onReload;
--- a/lemonldap-ng-portal/t/34-Auth-Proxy-and-SOAP-Server.t
+++ b/lemonldap-ng-portal/t/34-Auth-Proxy-and-SOAP-Server.t
@ -57,6 +57,7 @@ SKIP: {
    ok( $issuer = issuer(), 'Issuer portal' );
    $handlerOR{issuer} = \@Lemonldap::NG::Handler::Main::_onReload;
    switch ('sp');
+    &Lemonldap::NG::Handler::Main::cfgNum(0,0);

    ok( $sp = sp(), 'SP portal' );
    $handlerOR{sp} = \@Lemonldap::NG::Handler::Main::_onReload;
--- a/lemonldap-ng-portal/t/35-REST-config-backend.t
+++ b/lemonldap-ng-portal/t/35-REST-config-backend.t
@ -71,6 +71,7 @@ count(1);
 expectOK($res);

 switch ('sp');
+&Lemonldap::NG::Handler::Main::cfgNum(0,0);

 ok( $sp = sp(), 'SP portal' );
 $handlerOR{sp} = \@Lemonldap::NG::Handler::Main::_onReload;
--- a/lemonldap-ng-portal/t/35-REST-sessions-with-REST-server.t
+++ b/lemonldap-ng-portal/t/35-REST-sessions-with-REST-server.t
@ -65,6 +65,7 @@ LWP::Protocol::PSGI->register(
 ok( $issuer = issuer(), 'Issuer portal' );
 $handlerOR{issuer} = \@Lemonldap::NG::Handler::Main::_onReload;
 switch ('sp');
+&Lemonldap::NG::Handler::Main::cfgNum(0,0);

 ok( $sp = sp(), 'SP portal' );
 $handlerOR{sp} = \@Lemonldap::NG::Handler::Main::_onReload;
--- a/lemonldap-ng-portal/t/35-SOAP-config-backend.t
+++ b/lemonldap-ng-portal/t/35-SOAP-config-backend.t
@ -68,6 +68,7 @@ SKIP: {

    # Test SP access
    switch ('sp');
+    &Lemonldap::NG::Handler::Main::cfgNum(0,0);

    ok( $sp = sp(), 'SP portal' );
    $handlerOR{sp} = \@Lemonldap::NG::Handler::Main::_onReload;
--- a/lemonldap-ng-portal/t/35-SOAP-sessions-with-SOAP-server.t
+++ b/lemonldap-ng-portal/t/35-SOAP-sessions-with-SOAP-server.t
@ -55,6 +55,7 @@ SKIP: {
    ok( $issuer = issuer(), 'Issuer portal' );
    $handlerOR{issuer} = \@Lemonldap::NG::Handler::Main::_onReload;
    switch ('sp');
+    &Lemonldap::NG::Handler::Main::cfgNum(0,0);

    ok( $sp = sp(), 'SP portal' );
    $handlerOR{sp} = \@Lemonldap::NG::Handler::Main::_onReload;
--- a/lemonldap-ng-portal/t/36-Combination-with-token.t
+++ b/lemonldap-ng-portal/t/36-Combination-with-token.t
@ -67,6 +67,7 @@ sub try {

 sub iniCmb {
    my $expr = shift;
+    &Lemonldap::NG::Handler::Main::cfgNum( 0, 0 );
    if (
        my $res = LLNG::Manager::Test->new(
            {
--- a/lemonldap-ng-portal/t/36-Combination.t
+++ b/lemonldap-ng-portal/t/36-Combination.t
@ -62,6 +62,7 @@ sub try {

 sub iniCmb {
    my $expr = shift;
+    &Lemonldap::NG::Handler::Main::cfgNum( 0, 0 );
    if (
        my $res = LLNG::Manager::Test->new(
            {
--- a/lemonldap-ng-portal/t/37-Logout-from-OIDC-RP-to-SAML-SP.t
+++ b/lemonldap-ng-portal/t/37-Logout-from-OIDC-RP-to-SAML-SP.t
@ -91,10 +91,12 @@ SKIP: {
    my $metadata = $res->[2]->[0];

    switch ('sp');
+    &Lemonldap::NG::Handler::Main::cfgNum( 0, 0 );
    ok( $sp = sp(), 'SP portal' );
    $handlerOR{sp} = \@Lemonldap::NG::Handler::Main::_onReload;

    switch ('rp');
+    &Lemonldap::NG::Handler::Main::cfgNum(0,0);
    ok( $rp = rp( $jwks, $metadata ), 'RP portal' );
    $handlerOR{rp} = \@Lemonldap::NG::Handler::Main::_onReload;

--- a/lemonldap-ng-portal/t/37-OIDC-RP-to-SAML-IdP-GET.t
+++ b/lemonldap-ng-portal/t/37-OIDC-RP-to-SAML-IdP-GET.t
@ -78,6 +78,7 @@ SKIP: {
    $handlerOR{idp} = \@Lemonldap::NG::Handler::Main::_onReload;

    switch ('sp');
+    &Lemonldap::NG::Handler::Main::cfgNum(0,0);
    ok( $sp = sp(), 'Proxy portal' );
    $handlerOR{sp} = \@Lemonldap::NG::Handler::Main::_onReload;

@ -96,6 +97,7 @@ SKIP: {
    my $metadata = $res->[2]->[0];

    switch ('rp');
+    &Lemonldap::NG::Handler::Main::cfgNum( 0, 0 );
    ok( $rp = rp( $jwks, $metadata ), 'RP portal' );
    $handlerOR{rp} = \@Lemonldap::NG::Handler::Main::_onReload;

--- a/lemonldap-ng-portal/t/37-OIDC-RP-to-SAML-IdP-POST.t
+++ b/lemonldap-ng-portal/t/37-OIDC-RP-to-SAML-IdP-POST.t
@ -78,6 +78,7 @@ SKIP: {
    $handlerOR{idp} = \@Lemonldap::NG::Handler::Main::_onReload;

    switch ('sp');
+    &Lemonldap::NG::Handler::Main::cfgNum(0,0);
    ok( $sp = sp(), 'Proxy portal' );
    $handlerOR{sp} = \@Lemonldap::NG::Handler::Main::_onReload;

@ -96,6 +97,7 @@ SKIP: {
    my $metadata = $res->[2]->[0];

    switch ('rp');
+    &Lemonldap::NG::Handler::Main::cfgNum( 0, 0 );
    ok( $rp = rp( $jwks, $metadata ), 'RP portal' );
    $handlerOR{rp} = \@Lemonldap::NG::Handler::Main::_onReload;

--- a/lemonldap-ng-portal/t/37-SAML-SP-GET-to-OIDC-OP.t
+++ b/lemonldap-ng-portal/t/37-SAML-SP-GET-to-OIDC-OP.t
@ -91,10 +91,12 @@ SKIP: {
    my $metadata = $res->[2]->[0];

    switch ('sp');
+    &Lemonldap::NG::Handler::Main::cfgNum( 0, 0 );
    ok( $sp = sp(), 'SP portal' );
    $handlerOR{sp} = \@Lemonldap::NG::Handler::Main::_onReload;

    switch ('proxy');
+    &Lemonldap::NG::Handler::Main::cfgNum(0,0);
    ok( $proxy = proxy( $jwks, $metadata ), 'Proxy portal' );
    $handlerOR{proxy} = \@Lemonldap::NG::Handler::Main::_onReload;

--- a/lemonldap-ng-portal/t/37-SAML-SP-POST-to-OIDC-OP.t
+++ b/lemonldap-ng-portal/t/37-SAML-SP-POST-to-OIDC-OP.t
@ -91,10 +91,12 @@ SKIP: {
    my $metadata = $res->[2]->[0];

    switch ('sp');
+    &Lemonldap::NG::Handler::Main::cfgNum( 0, 0 );
    ok( $sp = sp(), 'SP portal' );
    $handlerOR{sp} = \@Lemonldap::NG::Handler::Main::_onReload;

    switch ('proxy');
+    &Lemonldap::NG::Handler::Main::cfgNum(0,0);
    ok( $proxy = proxy( $jwks, $metadata ), 'Proxy portal' );
    $handlerOR{proxy} = \@Lemonldap::NG::Handler::Main::_onReload;

--- a/lemonldap-ng-portal/t/61-GrantSession.t
+++ b/lemonldap-ng-portal/t/61-GrantSession.t
@ -31,6 +31,7 @@ ok(
 count(1);
 expectReject($res);

+&Lemonldap::NG::Handler::Main::cfgNum( 0, 0 );
 $client = LLNG::Manager::Test->new(
    {
        ini => {