use warnings;
use File::Path;
use LockFile::Simple;
+use Data::Dumper;
use Net::LDAP;
use Net::LDAP::Control::Paged;
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;
$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};
scope => "subtree",
filter => $filter,
control => [ $page ],
- attrs => [ @{$self->{mailattr}}, $self->{accountattr}, 'memberOf' ]
+ attrs => [ @{$self->{mailattr}}, @{$self->{accountattr}}, 'memberOf' ]
);
my $cookie;
$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);
}
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);
# open ldap connection
- syslog('info', "syncing ldap database '$self->{id}'");
-
my $ldap;
eval { $ldap = $self->ldap_connect_and_bind(); };
$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 {
}
}
-sub groups {
+sub list_groups {
my ($self) = @_;
+ my $res = [];
+
my $dbh = $self->{dbstat}->{groups}->{dbh};
- return [] if !$dbh;
+
+ return $res if !$dbh;
my $key = 0 ;
my $value = "" ;
my $keys;
while ($status == 0) {
- push @$keys, $key;
+ push @$res, {
+ dn => $key,
+ };
$status = $dbh->seq($key, $value, R_NEXT());
}
- return $keys;
+ return $res;
+}
+
+sub list_users {
+ my ($self) = @_;
+
+ my $res = [];
+
+ my $dbh = $self->{dbstat}->{users}->{dbh};
+
+ return $res if !$dbh;
+
+ my $key = 0 ;
+ my $value = "" ;
+ my $status = $dbh->seq($key, $value, R_FIRST());
+ my $keys;
+
+ while ($status == 0) {
+ my ($pmail, $account, $dn) = unpack('n/a* n/a* n/a*', $value);
+ push @$res, {
+ pmail => $pmail,
+ account => $account,
+ dn => $dn,
+ };
+ $status = $dbh->seq($key, $value, R_NEXT());
+ }
+
+ return $res;
+}
+
+sub list_addresses {
+ my ($self, $mail) = @_;
+
+ my $dbhmails = $self->{dbstat}->{mails}->{dbh};
+ my $dbhusers = $self->{dbstat}->{users}->{dbh};
+
+ return undef if !$dbhmails || !$dbhusers;
+
+ $mail = lc($mail);
+
+ my $res = [];
+
+ my $cuid;
+ $dbhmails->get($mail, $cuid);
+ return undef if !$cuid;
+
+ my $rdata;
+ $dbhusers->get($cuid, $rdata);
+ return undef if !$rdata;
+
+ my ($pmail, $account, $dn) = unpack('n/a* n/a* n/a*', $rdata);
+
+ push @$res, { primary => 1, email => $pmail };
+
+ my $key = 0 ;
+ my $value = "" ;
+ my $status = $dbhmails->seq($key, $value, R_FIRST());
+
+ while ($status == 0) {
+ if ($value == $cuid && $key ne $pmail) {
+ push @$res, { primary => 0, email => $key };
+ }
+ $status = $dbhmails->seq($key, $value, R_NEXT());
+ }
+
+ return $res;
}
sub mail_exists {
return $res;
}
+sub group_exists {
+ my ($self, $group) = @_;
+
+ my $dbh = $self->{dbstat}->{groups}->{dbh};
+ return 0 if !$dbh;
+
+ my $res;
+ $dbh->get($group, $res);
+ return $res;
+}
+
sub account_has_address {
my ($self, $account, $mail) = @_;