Changeset 289 for LATMOS-Accounts/lib/LATMOS/Accounts

Timestamp:

07/27/09 18:05:53 (15 years ago)

Author:

nanardon

Message:

• reuse code from Ldap, Ad is a ldap

Location:

LATMOS-Accounts/lib/LATMOS/Accounts/Bases

Files:

• Ad.pm (modified) (6 diffs)
• Ad/objects.pm (modified) (2 diffs)

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

@@ -5 +5 @@
 use warnings;
 
-use base qw(LATMOS::Accounts::Bases);
+use base qw(LATMOS::Accounts::Bases::Ldap);
 use Net::LDAP;
 use Net::LDAP::Entry;
@@ -85 +85 @@
 }
 
-sub param {
-    my ($self, $var) = @_;
-    return $self->{_param}{$var}
-}
-
-sub object_base_dn {
-    my ($self, $otype) = @_;
-    return join(',',
-        ($self->param($otype . '_container') || 'cn=Users'),
-        $self->top_dn,
-    );
-}
-
 sub load {
     my ($self) = @_;
@@ -137 +124 @@
 }
 
-sub _ldap_url {
-    my ($self, $host, $port) = @_;
-
-    sprintf(
-        '%s://%s%s/',
-        $self->{_ssl} ? 'ldaps' : 'ldap',
-        $host,
-        $port ? ":$port" : '',
-    )
-}
-
 sub _query_zone_ads {
     my ($self) = @_;
@@ -154 +130 @@
 
     my $resolver = Net::DNS::Resolver->new;
-    my $query = $resolver->query("_ldap._tcp.dc._msdcs." . $self->ad_domain, "SRV");
+    my $query = $resolver->query("_ldap._tcp.dc._msdcs." . $self->ad_domain,
+        "SRV") or return;
     foreach my $rr (
         sort { $a->priority <=> $b->priority || $a->weight <=> $b->weight }
@@ -162 +139 @@
 
     @urllist
-}
-
-sub ldap {
-    return $_[0]->{_ldap};
-}
-
-=head2 top_dn
-
-Return the TOP DN of the AD zone.
-
-=cut
-
-sub top_dn {
-    return $_[0]->{_top_dn}
 }
 
@@ -186 +149 @@
 sub ad_domain {
     return $_[0]->{_ad_domain}
-}
-
-# _unlimited_search
-
-# By default, ldap servers limit results to avoid deni of services.
-# LDAP protocol provide a paging feature to fetch all results.
-
-#This function works like Net::LDAP::search functions, but return nothing,
-#use "callback" option to get entries.
-
-sub _unlimited_search {
-    my $self = shift;
-    my @args = @_;
-
-    my ($page, $cookie) = (Net::LDAP::Control::Paged->new( size => 100 ));
-
-    while (1) {
-        my $search = $self->ldap->search(
-            @args,
-            control => [ $page ],
-        );
-        if ($search->code) {
-            return $search;
-        }
-
-        ### After foreach loops ends, client checks LDAP server reponse of how many search results total.
-        ### This is a control to end the infinite while loop if there are no search results to go through 
-        ### If there are search results, this control will always return the total number of results. It is
-        ### never decremented
-        my ($resp) = $search->control( LDAP_CONTROL_PAGED ) or last;
-
-
-        ### Obtaining the cookie from the search result. When no more results, cookie will be NULL
-        ### and infinite while loop will terminate.
-        $cookie = $resp->cookie or last;
-
-        ### Sets cookie so server knows the next search result to send 
-        $page->cookie($cookie);
-    }
-    ### This is a control to check for abnormal exit of the while loop.
-    ### If this occurs ### we need to tell the LDAP server that remaining
-    ### search results are no longer needed ### by sending a search request with a page size of 0
-    if ($cookie)    {
-        $page->cookie($cookie);
-        $page->size(0);
-        $self->ldap->search(@args, control => [ $page ]);
-    }
-    return 1;
-}
-
-# _get_object_from_dn($dn)
-#
-# Return Net::LDAP::Entry for $dn
-
-sub _get_object_from_dn {
-    my ($self, $dn) = @_;
-
-    my $mesg = $self->ldap->search(
-        base => $dn,
-        scope => 'base',
-        filter => '(objectClass=*)',
-    );
-    if ($mesg->code) {
-        $self->log(LA_ERR, "Cannot get object: %s", $mesg->error);
-        return;
-    }
-
-    return ($mesg->entries)[0];
 }
 

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

@@ -5 +5 @@
 use warnings;
 
-use base qw(LATMOS::Accounts::Bases::Objects);
+use base qw(LATMOS::Accounts::Bases::Ldap::objects);
 use Net::LDAP;
 use Net::LDAP::Entry;
@@ -36 +36 @@
 =cut
 
-sub list {
-    my ($class, $base) = @_;
-    
-    my @uids;
-    eval {
-    my $xx = $base->_unlimited_search(
-        attrs => [ $class->_key_attr ],
-        base => $base->object_base_dn($class->type),
-        filter => $class->_class_filter,
-        callback => sub {
-            my ($mesg, $entry) = @_;
-            #$mesg->code and die $mesg->error;
-            $entry or return;
-            ref $entry eq 'Net::LDAP::Entry' or return;
-            push(@uids, $entry->get_value( $class->_key_attr ));
-        },
-    );
-    };
-
-    return @uids;
-
-}
-
-sub _get_field_name {
-    my ($self, $field, $base, $for) = @_;
-
-    my %fields = map { $_ => 1 } $self->_canonical_fields($base, $for);
-
-    return $fields{$field} ? $field : undef;
-}
-
-sub new {
-    my ($class, $base, $uid) = @_;
-    
-    my $mesg = $base->ldap->search(
-        filter => sprintf(
-            '(&%s (%s=%s))',
-            $class->_class_filter,
-            $class->_key_attr,
-            escape_filter_value($uid),
-        ),
-        base => $base->object_base_dn($class->type),
-    );
-
-    $mesg->code and return;
-
-    my ($entry, @others) = $mesg->entries;
-
-    return if(@others); # we cannot have multiple entries...
-    return if (!$entry);
-    bless({ entry => $entry, _base => $base, _id => $uid }, $class);
-}
-
-sub _delete {
-    my ($class, $base, $uid) = @_;
-    my $obj = $class->new($base, $uid) or return;
-
-    my $mesg = $base->ldap->delete($obj->{entry}->dn);
-
-    if ($mesg->code) {
-        $base->log(LA_ERR, "Cannot delete object %s: %s", $uid, $mesg->error);
-        return;
-    } else {
-        $base->log(LA_INFO, "Object (%s) %s delete", $class->type, $uid);
-        return 1
-    }
-}
-
-sub ldap {
-    return $_[0]->base->{_ldap};
-}
-
-sub get_field {
-    my ($self, $field) = @_;
-
-    $field eq 'dn' and return $self->{entry}->dn;
-    my ($first, @others) = $self->{entry}->get_value($field);
-    return @others ? [ sort($first, @others) ] : $first;
-}
-
-sub _populate_entry {
-    my ($self, $entry, $field, $value) = @_;
-    my $val = $entry->get_value($field);
-    my $tr =  join(', ', map { $_ || '' } ($field, $val, $value));
-    if ($value) {
-        if ((!$val) || $val ne $value) {
-            $entry->replace($field, $value);
-        }
-    } elsif($val) {
-        $entry->delete($field);
-    }
-}
-
-sub set_fields {
-    my ($self, %fields) = @_;
-
-    foreach (keys %fields) {
-        $self->get_field_name($_, 'w') or next;
-        $self->_populate_entry($self->{entry}, $_, $fields{$_});
-    }
-    
-    my $mesg = $self->{entry}->update($self->base->ldap);
-
-    if ($mesg->code && $mesg->code != 82) {
-        $self->base(LA_ERR, "Cannot set attribute: %s", $mesg->error);
-        return;
-    } else { return 1 }
-}
-
 1;