add groupclass as parameter in LDAPConfig

[pmg-api.git] / PMG / LDAPCache.pm

diff --git a/PMG/LDAPCache.pm b/PMG/LDAPCache.pm
index 4ddb43da153045e5f38efe87f2a5902dd5847a8e..f45d61b87f0250bfacc4226bccaaada8d5cf30e1 100755 (executable)
--- a/PMG/LDAPCache.pm
+++ b/PMG/LDAPCache.pm
@@ -11,8 +11,10 @@ use Net::LDAP::Constant qw (LDAP_CONTROL_PAGED);
 use DB_File;
 
 use PVE::SafeSyslog;
+use PVE::Tools qw(split_list);
 
 use PMG::Utils;
+use PMG::LDAPConfig;
 
 $DB_HASH->{'cachesize'} = 10000;
 $DB_RECNO->{'cachesize'} = 10000;
@@ -51,20 +53,20 @@ sub new {
        $self->{id} = $id;
     }
 
-    if (!$args{mailattr}) {
-       $args{mailattr} = "mail, userPrincipalName, proxyAddresses, othermailbox";
-    }
-    $args{mailattr} =~ s/[\,\;]/ /g;
-    $args{mailattr} =~ s/\s+/,/g;
+    my $config_properties = PMG::LDAPConfig::properties();
 
-    if ($args{mode} && ($args{mode} eq 'ldap' ||  $args{mode} eq 'ldaps')) {
-       $self->{mode} = $args{mode};
-    } else {
-       $self->{mode} = 'ldap';
+    # set defaults for the fields that have one
+    foreach my $property (keys %$config_properties) {
+       my $d = $config_properties->{$property};
+       next if !defined($d->{default});
+       $self->{$property} = $args{$property} || $d->{default};
     }
 
-    $self->{accountattr} = $args{accountattr} || 'sAMAccountName';
-    @{$self->{mailattr}} = split(/,/, $args{mailattr});
+    # split list returns an array not a reference
+    $self->{accountattr} = [split_list($self->{accountattr})];
+    $self->{mailattr} = [split_list($self->{mailattr})];
+    $self->{groupclass} = [split_list($self->{groupclass})];
+
     $self->{server1} = $args{server1};
     $self->{server2} = $args{server2};
     $self->{binddn} = $args{binddn};
@@ -156,7 +158,7 @@ sub queryusers {
        scope    => "subtree",
        filter   => $filter,
        control  => [ $page ],
-       attrs  => [ @{$self->{mailattr}}, $self->{accountattr}, 'memberOf' ]
+       attrs  => [ @{$self->{mailattr}}, @{$self->{accountattr}}, 'memberOf' ]
        );
 
     my $cookie;
@@ -207,17 +209,16 @@ sub queryusers {
                $self->{dbstat}->{dnames}->{dbh}->put($dn, $cuid);
            }
 
-           my $account = $entry->get_value($self->{accountattr});
-           if ($account && ($account =~ m/^\S+$/s)) {
-               $account = lc($account);
-               $self->{dbstat}->{accounts}->{dbh}->put($account, $cuid);
-           } else {
-               $account = '';
+           foreach my $attr (@{$self->{accountattr}}) {
+               my $account = $entry->get_value($attr);
+               if ($account && ($account =~ m/^\S+$/s)) {
+                   $account = lc($account);
+                   $self->{dbstat}->{accounts}->{dbh}->put($account, $cuid);
+                   my $data = pack('n/a* n/a* n/a*', $pmail, $account, $dn);
+                   $self->{dbstat}->{users}->{dbh}->put($cuid, $data);
+               }
            }
 
-           my $data = pack('n/a* n/a* n/a*', $pmail, $account, $dn);
-           $self->{dbstat}->{users}->{dbh}->put($cuid, $data);
-
            foreach my $mail (@$addresses) {
                $self->{dbstat}->{mails}->{dbh}->put($mail, $cuid);
            }
@@ -261,7 +262,13 @@ sub querygroups {
 
     return undef if !$self->{groupbasedn};
 
-    my $filter = "(|(objectclass=group)(objectclass=univentionGroup))";
+    my $filter = "(|";
+
+    for my $class (@{$self->{groupclass}}) {
+       $filter .= "(objectclass=$class)";
+    }
+
+    $filter .= ")";
 
     my $page = Net::LDAP::Control::Paged->new(size => 100);
 
@@ -377,8 +384,6 @@ sub sync_database {
 
     # open ldap connection
 
-    syslog('info', "syncing ldap database '$self->{id}'");
-
     my $ldap;
 
     eval { $ldap = $self->ldap_connect_and_bind(); };
@@ -468,8 +473,6 @@ sub sync_database {
     $self->{gcount} = $self->{dbstat}->{groups}->{idcount};
     $self->{ucount} = __count_entries($self->{dbstat}->{accounts}->{dbh});
     $self->{mcount} = __count_entries($self->{dbstat}->{mails}->{dbh});
-
-    syslog('info', "ldap sync '$self->{id}' successful ($self->{mcount})");
 }
 
 sub __count_entries {