Changeset 317 for LATMOS-Accounts/lib

Timestamp:

08/09/09 23:40:07 (15 years ago)

Author:

nanardon

Message:

• don't cache db connection at this level

Location:

LATMOS-Accounts/lib/LATMOS

Files:

• Accounts.pm (modified) (5 diffs)
• Accounts/Acls.pm (modified) (1 diff)
• Accounts/Bases.pm (modified) (2 diffs)
• Accounts/Bases/Ad/User.pm (modified) (1 diff)
• Accounts/Bases/Objects.pm (modified) (5 diffs)
• Accounts/Bases/Sql/User.pm (modified) (1 diff)
• Accounts/Synchro.pm (modified) (1 diff)

LATMOS-Accounts/lib/LATMOS/Accounts.pm

@@ -70 +70 @@
     my ($self, $section) = @_;
     # this method perform a cache
-    $self->{_bases}{$section} and return $self->{_bases}{$section};
-    $self->load_base($section) ? $self->{_bases}{$section} : undef;
+    $self->_load_base($section);
 }
 
@@ -99 +98 @@
 
 # load or a if need base
-sub load_base {
+sub _DEP_load_base {
     my ($self, $section) = @_;
     return ($self->{_bases}{$section} ||= $self->_load_base($section))
@@ -132 +131 @@
 }
 
-sub load_all_base {
+sub _DEP_load_all_base {
     my ($self) = @_;
     foreach ($self->list_bases) {
@@ -145 +144 @@
 sub default_synchro {
     my ($self, %options) = @_;
-    my $syncname = $self->default_synchro_name or return;
+    my $syncname = $self->default_synchro_name or do {
+        la_log(LA_ERR, 'Cannot find default synchro in config');
+        return;
+    };
     $self->create_synchro($syncname, %options);
 }
@@ -176 +178 @@
         map { $self->base($_) }
         @{ $options{to} || []}
-        or return;
+        or do {
+        la_log(LA_ERR, "No destination base load in this synchro");
+        return;
+    };
 
     my $sync = LATMOS::Accounts::Synchro->new(

LATMOS-Accounts/lib/LATMOS/Accounts/Acls.pm

@@ -185 +185 @@
         if (substr($u->{user}, 0, 1) eq '$') { # check attr content
             my $attribute = substr($u->{user}, 1);
-            my $val = $obj->get_c_field($attribute);
+            my $val = $obj->_get_c_field($attribute);
             my @vals = ref $val ? (@{ $val }) : ($val);
             return ($u->{$perm} || 0) if (grep { $_ eq $who } @vals);

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

@@ -374 +374 @@
     foreach (@fields) {
         $srcobj->get_field_name($_, 'r') or next;
-        $data{$_} = $srcobj->get_c_field($_);
+        $data{$_} = $srcobj->_get_c_field($_);
     }
     if (my $dstobj = $self->get_object($srcobj->type, $srcobj->id)) {
-        return 'SYNCHED' if ($dstobj->set_c_fields(%data));
+        return 'SYNCHED' if ($dstobj->_set_c_fields(%data));
     } elsif(!$options{nocreate}) {
         return 'CREATE' if ($self->create_c_object($srcobj->type, $srcobj->id, %data));
@@ -423 +423 @@
         return;
     };
-    my $password = $uobj->get_c_field('userPassword') or do {
+    my $password = $uobj->_get_c_field('userPassword') or do {
         la_log(LA_ERR, "Cannot authenticate user $username having no passwd");
         return;

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

@@ -219 +219 @@
     my $newUniPW = $charmap->tou('"'.$clear_pass.'"')->byteswap()->utf16();
     my $mesg = $self->base->ldap->modify(
-        $self->get_c_field('dn'),
+        $self->_get_c_field('dn'),
         changes => [
         #replace => [ userPassword => $clear_pass ],

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

@@ -192 +192 @@
 sub get_c_field {
     my ($self, $cfield) = @_;
+    $self->base->check_acl($self, $cfield, 'r') or return;
+    $self->_get_c_field($cfield);
+}
+
+sub _get_c_field {
+    my ($self, $cfield) = @_;
     my $field = $self->base->get_field_name($self->type, $cfield, 'r') or return;
-    $self->base->check_acl($self, $cfield, 'r') or return;
     $self->get_field($field);
 }
@@ -220 +225 @@
         $self->base->check_acl($self, $cfield, 'w') or return;
     }
+    $self->_set_c_fields(%cdata);
+}
+
+sub _set_c_fields {
+    my ($self, %cdata) = @_;
+    my %data;
     foreach my $cfield (keys %cdata) {
         my $field = $self->base->get_field_name($self->type, $cfield) or next;
@@ -280 +291 @@
             my $value = $field->{val};
             $base->get_field_name($class->type, $field->{attr}, 'r') or next;
-            my $fval = $obj->get_c_field($field->{attr}) || '';
+            my $fval = $obj->_get_c_field($field->{attr}) || '';
             if ($value eq '*') {
                 if ($fval eq '') {
@@ -314 +325 @@
     foreach my $id ($base->list_objects($class->type)) {
         my $obj = $base->get_object($class->type, $id);
-        my $value = $obj->get_c_field($attribute);
+        my $value = $obj->_get_c_field($attribute);
         if ($value) {
             if (ref $value) {
@@ -341 +352 @@
     foreach ($base->list_objects($class->type)) {
         my $obj = $base->get_object($class->type, $_) or next;
-        my $id = $obj->get_c_field($field) or next;
+        my $id = $obj->_get_c_field($field) or next;
         $existsid{$id} = 1;
     }

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

@@ -81 +81 @@
     if ($field eq 'gecos') {
         return to_ascii(
-            join(' ', grep { $_ } ($self->get_c_field('givenName'), ($self->get_c_field('sn'))))
-        ) || to_ascii($self->get_c_field('description'));
+            join(' ', grep { $_ } ($self->_get_c_field('givenName'), ($self->_get_c_field('sn'))))
+        ) || to_ascii($self->_get_c_field('description'));
     } elsif ($field eq 'displayName') {
-        return join(' ', grep { $_ } ($self->get_c_field('givenName'), ($self->get_c_field('sn'))))
+        return join(' ', grep { $_ } ($self->_get_c_field('givenName'), ($self->_get_c_field('sn'))))
             || $self->id;
     } elsif ($field eq 'sAMAccountName') {

LATMOS-Accounts/lib/LATMOS/Accounts/Synchro.pm

@@ -44 +44 @@
     if ($options{state_file} && ! -w $options{state_file}) {
         # don't exists, we have to create it
-        open(my $handle, '>', $options{state_file}) or return;
+        open(my $handle, '>', $options{state_file}) or do {
+            la_log(LA_ERR, "Cannot open status file %s", $options{state_file});
+            return;
+        };
         print $handle "[_default_]\n";
         close($handle);