fix: SSO user management

UPC · Sep 29, 2023 · 125b2dc · 125b2dc
1 parent 5fe0f05
commit 125b2dc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/lib/Ravada/Auth.pm b/lib/Ravada/Auth.pm
@@ -6,6 +6,7 @@ use strict;
 our $LDAP_OK;
 our $SSO_OK;
 
+use Data::Dumper;
 use Ravada::Auth::SQL;
 
 =head1 NAME

diff --git a/lib/Ravada/Auth/SSO.pm b/lib/Ravada/Auth/SSO.pm
@@ -72,6 +72,7 @@ sub _get_session_userid_by_ticket
     my ($cookie) = @_;
     my $result;
     die 'Can\'t read pubkey file (sso->cookie->pub_key value at ravada.conf file)' if (! -r $$CONFIG->{sso}->{cookie}->{pub_key});
+
     eval { $result = Authen::ModAuthPubTkt::pubtkt_verify(publickey => $$CONFIG->{sso}->{cookie}->{pub_key}, keytype => $$CONFIG->{sso}->{cookie}->{type}, ticket => $cookie); };
     die $@ ? $@ : 'Cannot validate ticket' if ((! $result) || ($@));
     my %data = Authen::ModAuthPubTkt::pubtkt_parse($cookie);
@@ -123,6 +124,11 @@ sub init {
                 return 0;
             }
         }
+        if (!$$CONFIG->{sso}->{cookie}->{type}) {
+            $ERR = "Error: missing sso / cookie / type in config file\n";
+            warn $ERR unless $warn++;
+            return 0;
+        }
         for my $field (qw(priv_key pub_key)) {
             if ( !exists $$CONFIG->{sso}->{cookie}->{$field}
             || ! $$CONFIG->{sso}->{cookie}->{$field}) {

diff --git a/templates/main/manage_user.html.ep b/templates/main/manage_user.html.ep
@@ -13,7 +13,7 @@
                     (<%= ($user->external_auth or $origin) %>)
 %               }
                 </h2>
-%               if ($user->external_auth && $user->ldap_entry ) {
+%               if ($user->external_auth && $user->external_auth eq 'ldap' && $user->ldap_entry ) {
                     <%= $user->ldap_entry->dn %>
 %               }
              </div> <!-- del panel heading-->