Changeset 1042 for trunk/LATMOS-Accounts

Timestamp:

05/31/12 19:50:39 (12 years ago)

Author:

nanardon

Message:

• load acl and allowed values automatically if config exists

Location:

trunk/LATMOS-Accounts

Files:

• lib/LATMOS/Accounts.pm (modified) (4 diffs)
• man/man5/latmos-accounts.ini.pod (modified) (1 diff)
• sample/latmos-accounts.ini (modified) (1 diff)

trunk/LATMOS-Accounts/lib/LATMOS/Accounts.pm

@@ -21 +21 @@
 =cut
 
-####
 # Return the configuration directory according settings:
 #
@@ -33 +32 @@
 =head1 FUNCTION
 
-=head2 new($configdir)
+=head2 new($configdir, %options)
 
 Instanciate a new LATMOS::Accounts object.
 
-$configdir if defined is the directory containing files to use,
+C<$configdir> if defined is the directory containing files to use,
 default to F</etc/latmos-accounts/>.
+
+C<%options> can contains:
+
+=over 4
+
+=item noacl
+
+If true, acls configuration are not load and code act like everything is
+allowed.
+
+This flag is usefull for administrative tools, for which no acl must apply.
+
+=back
 
 =cut
@@ -60 +72 @@
     bless($self, $class);
 
-    if (!$options{noacl}) {
-        if ($self->val('_default_', 'acls')) {
-            $self->{_acls} = LATMOS::Accounts::Acls->new(
-                $self->val('_default_', 'acls')
-            ) or do {
-                la_log(LA_ERR,
-                    'Cannot load ACL file %s', $self->val('_default_', 'acls')
-                );
-                return;
-            };
-        } elsif (-f (my $aclf = join('/', $self->_configdir, 'la-acls.ini'))) {
+    unless ($options{noacl}) {
+        if (-f (my $aclf = join('/', $self->_configdir, 'la-acls.ini'))) {
             $self->{_acls} = LATMOS::Accounts::Acls->new($aclf) or do {
                 la_log(LA_ERR, 'Cannot load ACL file %s', $aclf);
@@ -78 +81 @@
     }
 
-    if ($self->val('_default_', 'allowed_values')) {
-        $self->{_allowed_values} = Config::IniFiles->new(
-            -file => $self->val('_default_', 'allowed_values'),
-        ) or do {
-            la_log(LA_ERR, 'Cannot load ALLOWED VALUES %s',
-                $self->val('_default_', 'allowed_values'));
-            return;
-        };
-    } elsif (-f (my $allowf = join('/', $self->_configdir,
-                'la-allowed-values.ini'))) {
+    if (-f (my $allowf = join('/', $self->_configdir, 'la-allowed-values.ini'))) {
         $self->{_allowed_values} = Config::IniFiles->new(
             -file => $allowf,

trunk/LATMOS-Accounts/man/man5/latmos-accounts.ini.pod

@@ -41 +41 @@
 
 The identity to use in FROM field when sending mail
-
-=head3 acls
-
-The configuration file to use as ACL list
-
-=head3 allowed_values
-
-The configuration file containing attributes restriction
 
 =head3 expire_summary_to

trunk/LATMOS-Accounts/sample/latmos-accounts.ini

@@ -7 +7 @@
 # Default synchro to apply
 sync = name
-# The acls file to use to limit access
-#acls =
-# An inifile containing per attributes values restriction
-# allowed_values =
 # smtp: the server used to send mail
 smtp = localhost