Changeset 445

Timestamp:

09/09/09 08:32:30 (15 years ago)

Author:

nanardon

Message:

• add onlyaddress object to create an address book in ldap for secondary address

Location:

LATMOS-Accounts

Files:

• lib/LATMOS/Accounts/Bases/Ldap/Onlyaddress.pm (copied) (copied from LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Ldap/User.pm) (8 diffs)
• lib/LATMOS/Accounts/Bases/Ldap/User.pm (modified) (1 diff)
• lib/LATMOS/Accounts/Bases/Sql/Onlyaddress.pm (added)
• t/12_bases_sql.t (modified) (2 diffs)
• t/13_bases_ldap.t (modified) (2 diffs)

LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Ldap/Onlyaddress.pm

@@ -1 @@
-package LATMOS::Accounts::Bases::Ldap::User;
+package LATMOS::Accounts::Bases::Ldap::Onlyaddress;
 
 use 5.010000;
@@ -37 +37 @@
 =cut
 
-sub _class_filter { '(&(ObjectClass=posixAccount))' }
+sub _class_filter { '(&(ObjectClass=inetOrgPerson))' }
 
 sub _key_attr { 'cn' } 
@@ -45 +45 @@
     inetOrgPerson
     organizationalPerson
-    posixAccount
-    shadowAccount
 ) }
 
@@ -57 +55 @@
     my ($self, $base, $mode) = @_;
     (
-        qw(displayName givenName homePhone homePostalAddress
+        qw(displayName givenName
         initials mail sn
-        mobile o uid manager facsimileTelephoneNumber), # inetOrgPerson
-        qw(cn uidNumber gidNumber homeDirectory
-        userPassword loginShell
-        gecos description), # posixAccount
-        qw(shadowLastChange
-        shadowMin shadowMax
-        shadowWarning
-        shadowInactive
-        shadowExpire
-        shadowFlag), # shadowAccount
+        mobile o uid facsimileTelephoneNumber), # inetOrgPerson
         qw(street postOfficeBox postalCode postalAddress streetAddress
         physicalDeliveryOfficeName ou st l telephoneNumber), # organizationalPerson
@@ -101 +90 @@
         return 0;
     }
-    return 1;;
+    return 1;
 }
 
@@ -108 +97 @@
 
     $field eq 'streetAddress' and $field = 'street';
-    $field eq 'memberOf' and do {
-        my @res;
-        $self->base->_unlimited_search(
-            base => $self->base->object_base_dn('group'),
-            filter => sprintf(
-                '(&(objectClass=group)(member=%s))',
-                escape_filter_value($self->{entry}->dn),
-            ),
-            callback => sub {
-                my ($mesg, $entry) = @_;
-                ref $entry eq 'Net::LDAP::Entry' or return;
-                push(@res, $entry->get_value('cn'));
-            },
-        );
-        return [ sort(@res) ];
-    };
-    $field eq 'manager' and do {
-        my $dn = $self->SUPER::get_field($field) or return;
-        return $self->base->_get_object_from_dn($dn)->get_value('cn');
-    };
     $self->SUPER::get_field($field);
 }
@@ -136 +105 @@
     for ($f) {
         /^sn$/ and $val ||= $entry->get_value('cn');
-        /^memberOf$/ and do {
-            my %users;
-            $users{$_}{e} = 1 foreach (ref $self
-                ? $self->get_attribute('memberOf')
-                : ());
-            $users{$_}{n} = 1 foreach (@{ $val || []});
-            foreach (keys %users) {
-                $users{$_}{e} && $users{$_}{n} and next;
-                my $group = $base->get_object('group', $_) or next;
-                if ($users{$_}{e}) {
-                    $group->{entry}->delete(member => $entry->get_vaue('dn'));
-                } elsif ($users{$_}{n}) {
-                    $group->{entry}->add(member => $entry->get_value('dn'));
-                } # else {} # can't happen
-                my $mesg = $group->{entry}->update($base->ldap);
-                if ($mesg->code) {
-                    $base->log(LA_ERR, "Cannot set attributes: %s", $mesg->error);
-                    return;
-                }
-            }
-            next;
-        };
-        /^userPassword$/ and do {
-            # openldap use prefix to identify encryption passwd
-            # {CRYPT} is system dependant, eg use crypt from system
-            # As we run openldap on UNIX, this should not be a problem
-            # as we use perl crypt() which does the same
-            # This code will have to be changed if we use openldap on other UNIX
-            $val = '{CRYPT}' . $val;
-            next;
-        };
-        /^manager$/ && $val and do {
-            my $user = $base->get_object('user', $val) or
-            next;
-            $val = $user->get_field('dn');
-            next;
-        };
     }
     $self->SUPER::_populate_entry($entry, $f, $val, $base);
@@ -195 +127 @@
 at your option, any later version of Perl 5 you may have available.
 
-
 =cut

LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Ldap/User.pm

@@ -101 +101 @@
         return 0;
     }
-    return 1;;
+    return 1;
 }
 

LATMOS-Accounts/t/12_bases_sql.t

@@ -1 +1 @@
 use strict;
 use warnings;
-use Test::More tests => 9;
+use Test::More tests => 10;
 
 use_ok('LATMOS::Accounts::Bases');
@@ -12 +12 @@
 use_ok('LATMOS::Accounts::Bases::Sql::Revaliases');
 use_ok('LATMOS::Accounts::Bases::Sql::Address');
+use_ok('LATMOS::Accounts::Bases::Sql::Onlyaddress');
 

LATMOS-Accounts/t/13_bases_ldap.t

@@ -1 +1 @@
 use strict;
 use warnings;
-use Test::More tests => 5;
+use Test::More tests => 6;
 
 use_ok('LATMOS::Accounts::Bases');
@@ -8 +8 @@
 use_ok('LATMOS::Accounts::Bases::Ldap::User');
 use_ok('LATMOS::Accounts::Bases::Ldap::Group');
+use_ok('LATMOS::Accounts::Bases::Ldap::Onlyaddress');