Changeset 71

Timestamp:

05/05/09 02:24:50 (15 years ago)

Author:

nanardon

Message:

• make objects path configurable

Location:

LATMOS-Accounts/lib/LATMOS/Accounts/Bases

Files:

• Ad.pm (modified) (4 diffs)
• Ad/Group.pm (modified) (1 diff)
• Ad/User.pm (modified) (1 diff)
• Ad/objects.pm (modified) (2 diffs)
• Objects.pm (modified) (1 diff)

LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Ad.pm

@@ -39 +39 @@
 Create a new LATMOS::Ad object for windows AD $domain.
 
-domain / server: either the Ad domain or directly the server
-
-ldap_args is an optionnal list of arguments to pass to L<Net::LDAP>.
+options:
+
+=over 4
+
+=item domain
+
+The Active directory domain
+
+=item server (optional)
+
+If set, try to connect to this server, if not set, a dns query is performed
+to find AD server, first responding is used.
+
+=item ssl
+
+If set, try to connect using ssl
+
+=item OBJECT_container
+
+The sub path where to find object type of OBJECT and where they should
+be created
+
+=back
 
 =cut
@@ -56 +76 @@
         _password => $options{password},
         _ssl => $options{ssl},
+        _param => { %options },
     };
 
     bless($self, $class);
+}
+
+sub param {
+    my ($self, $var) = @_;
+    return $self->{_param}{$var}
+}
+
+sub object_base_dn {
+    my ($self, $otype) = @_;
+    warn $otype;
+    return join(',',
+        ($self->param($otype . '_container') || 'cn=Users'),
+        $self->top_dn,
+    );
 }
 
@@ -191 +226 @@
 }
 
-sub find_username {
-    my ($self, $lastname, $firstname) = @_;
-    if (!ref $self) { # if call w/o ldap connection
-        ($self, $lastname, $firstname) = (undef, $self, $lastname);
-    }
-
-    my $username = _username_format($lastname);
-    if (!$self) { return $username }
-
-    if (!$self->get_user($lastname, attrs => [ 'cn' ])) {
-        return $username;
-    }
-
-    foreach $username (map { _username_format($_) } (
-            $lastname . substr($firstname, 0, 1),
-            $lastname . $firstname,
-        )) {
-        !$self->get_user($username, attrs => [ 'cn' ]) and return $username;
-    }
-
-    undef
-}
-
-sub _defaults_user_attrs {
-    my ($self, $entry, $attrs) = @_;
-
-    foreach my $attr (keys %{ $attrs || {} }) {
-        my $val = $attrs->{$attr};
-
-        $attr =~ /^homeDirectory$/ and do {
-            $entry->replace('unixHomeDirectory', $val);
-        };
-
-        $attr =~ /^(givenName|sn)$/ and do {
-            $entry->replace('displayName',
-                join(' ', map { ucfirst($_ || '') } (
-                    ($attrs->{'givenName'} || $entry->get_value('givenName')), # first name
-                    ($attrs->{'sn'} || $entry->get_value('sn')),           # last name
-                ))
-            );
-            $entry->replace('gecos', # TODO reencode to aovid accents
-                join(' ', map { ucfirst($_ || '') } (
-                    ($attrs->{'givenName'} || $entry->get_value('givenName')), # first name
-                    ($attrs->{'sn'} || $entry->get_value('sn')),           # last name
-                ))
-            );
-            $attr eq 'sn' and do { # TODO generate clean login here / UNIX uid
-                $entry->add('sAMAccountName' => $val) unless ($entry->exists('sAMAccountName'));
-            };
-        };
-
-        # nothing special to do
-        $entry->replace($attr => $val);
-    }
-}
-
 sub _defaults_group_attrs {
     my ($self, $entry, $attrs) = @_;
@@ -253 +232 @@
         $entry->replace($attr => $val);
     }
-}
-
-=head2 get_user($username)
-
-Return the entry for user $username
-
-=cut
-
-sub get_user {
-    my ($self, $username, @search_args) = @_;
-
-    my $mesg = $self->search(
-        @search_args,
-        filter => "(&(ObjectClass=user) (!(ObjectClass=computer)) (cn=$username))",
-        base => $self->top_dn,
-    );
-
-    $mesg->code and return;
-
-    my ($entry, @others) = $mesg->entries;
-
-    return if(@others); # we cannot have multiple entries...
-    $entry
-}
-
-=head2 modify_user($username, $param)
-
-=cut
-
-sub modify_user {
-    my ($self, $username, $param) = @_;
-
-    my $mesg = $self->search(
-        base => $self->{_top_dn},
-        filter => "(&(ObjectClass=user) (!(ObjectClass=computer)) (cn=$username))",
-    );
-
-    $mesg->code and do {
-        warn $mesg->error;
-        return;
-    };
-
-    my ($entry) = $mesg->entries; # TODO hopefully only one...
-
-    $self->_defaults_user_attrs(
-        $entry,
-        $param,
-    );
-
-    $mesg = $entry->update($self);
-
-    if ($mesg->code) {
-        warn $mesg->error;
-        return;
-    } else { return 1 }
-}
-
-=head2 delete_user($username)
-
-=cut
-
-sub delete_user {
-    my ($self, $username) = @_;
-
-    my $mesg = $self->search(
-        base => $self->{_top_dn},
-        filter => "(&(ObjectClass=user) (!(ObjectClass=computer)) (cn=$username))",
-    );
-
-    $mesg->code and do {
-        warn $mesg->error;
-        return;
-    };
-
-    my ($entry) = $mesg->entries; # TODO hopefully one
-
-    $mesg = $self->delete($entry->dn);
-
-    if ($mesg->code) {
-        warn $mesg->error;
-        return;
-    } else { return 1 }
-}
-
-=head2 create_group
-
-=cut
-
-sub create_group {
-    my ($self, $param) = @_;
-
-    my $entry = Net::LDAP::Entry->new;
-
-    my $groupname = $param->{name};
-    $entry->dn("cn=$groupname,cn=Users," . $self->top_dn);
-
-    $param->{gidNumber} ||= $self->find_next_gid;
-
-    $self->_defaults_group_attrs($entry,
-        {
-            objectClass => [ qw(top group) ],
-            %{ $param || {} },
-        }
-    );
-
-    my $mesg = $self->add($entry);
-
-    if ($mesg->code) {
-        warn $mesg->error;
-        return;
-    } else { return 1 };
-}
-
-=head2 delete_group
-
-=cut
-
-sub delete_group {
-    my ($self, $groupname) = @_;
-    
-    my $mesg = $self->search(
-        base => $self->{_top_dn},
-        filter => "(&(ObjectClass=group) (cn=$groupname))",
-    );
-
-    $mesg->code and do {
-        warn $mesg->error;
-        return;
-    };
-
-    my ($entry) = $mesg->entries; # TODO hopefully one
-
-    $mesg = $self->delete($entry->dn);
-
-    if ($mesg->code) {
-        warn $mesg->error;
-        return;
-    } else { return 1 }
 }
 

LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Ad/Group.pm

@@ -57 +57 @@
     $entry->dn(join(',',
         sprintf('cn=%s', escape_filter_value($id)),
-        'cn=Users',
-        $base->top_dn
+        $base->object_base_dn($class->type),
     ));
     $entry->replace(objectClass => [ qw(top group)],);

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

@@ -76 +76 @@
     $entry->dn(join(',',
         sprintf('cn=%s', escape_filter_value($id)),
-        'cn=Users',
-        $base->top_dn
+        $base->object_base_dn($class->type),
     ));
     $entry->replace('sAMAccountName', $id);

LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Ad/objects.pm

@@ -42 +42 @@
     my $xx = $base->_unlimited_search(
         attrs => [ $class->_key_attr ],
-        base => $base->top_dn,
+        base => $base->object_base_dn($class->type),
         filter => $class->_class_filter,
         callback => sub {
@@ -76 +76 @@
             escape_filter_value($uid),
         ),
-        base => $base->top_dn,
+        base => $base->object_base_dn($class->type),
     );
 

LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Objects.pm

@@ -85 +85 @@
 sub type {
     my ($self) = @_;
-    return $self->{_type}
+    if (ref $self) {
+        return $self->{_type}
+    } else {
+        return lc(($self =~ /::([^:]+)$/)[0]);
+    }
 }