move open_ruledb() out of the loop

[pmg-api.git] / PMG / LDAPConfig.pm

diff --git a/PMG/LDAPConfig.pm b/PMG/LDAPConfig.pm
index d6df614522e6a92c54e05ad2eb8ac5aab6dd1403..9445205c6d18ad097141c5b7167d47f550c1ad09 100644 (file)
--- a/PMG/LDAPConfig.pm
+++ b/PMG/LDAPConfig.pm
@@ -12,16 +12,33 @@ use PVE::SectionConfig;
 
 use base qw(PVE::SectionConfig);
 
+PVE::JSONSchema::register_format('ldap-simple-attr', \&verify_ldap_simple_attr);
+sub verify_ldap_simple_attr {
+    my ($attr, $noerr) = @_;
+
+    if ($attr =~ m/^[a-zA-Z0-9]+$/) {
+       return $attr;
+    }
+
+    die "value '$attr' does not look like a simple ldap attribute name\n" if !$noerr;
+
+    return undef;
+}
+
+my $inotify_file_id = 'pmg-ldap.conf';
+my $config_filename = '/etc/pmg/ldap.conf';
+
 my $defaultData = {
     propertyList => {
        type => { description => "Section type." },
-       section => {
-           description => "Secion ID.",
+       profile => {
+           description => "Profile ID.",
            type => 'string', format => 'pve-configid',
        },
     },
 };
 
+
 sub properties {
     return {
        disable => {
@@ -79,21 +96,25 @@ sub properties {
        },
        accountattr => {
            description => "Account attribute name name.",
-           type => 'string',
-           pattern => '[a-zA-Z0-9]+',
-           default => 'sAMAccountName',
+           type => 'string', format => 'ldap-simple-attr-list',
+           default => 'sAMAccountName, uid',
        },
        mailattr => {
            description => "List of mail attribute names.",
-           type => 'string', format => 'string-list',
-           pattern => '[a-zA-Z0-9]+',
-           default => "mail, userPrincipalName, proxyAddresses, othermailbox",
+           type => 'string', format => 'ldap-simple-attr-list',
+           default => "mail, userPrincipalName, proxyAddresses, othermailbox, mailAlternativeAddress",
+       },
+       groupclass => {
+           description => "List of objectclasses for groups.",
+           type => 'string', format => 'ldap-simple-attr-list',
+           default => "group, univentionGroup, ipausergroup",
        },
     };
 }
 
 sub options {
     return {
+       disable => { optional => 1 },
        comment => { optional => 1 },
        server1 => {  optional => 0 },
        server2 => {  optional => 1 },
@@ -106,6 +127,7 @@ sub options {
        filter => { optional => 1 },
        accountattr => { optional => 1 },
        mailattr => { optional => 1 },
+       groupclass => { optional => 1 },
     };
 }
 
@@ -121,12 +143,12 @@ sub parse_section_header {
     my ($class, $line) = @_;
 
     if ($line =~ m/^(\S+):\s*(\S+)\s*$/) {
-       my ($type, $sectionId) = ($1, $2);
+       my ($type, $profileId) = ($1, $2);
        my $errmsg = undef; # set if you want to skip whole section
-       eval { PVE::JSONSchema::pve_verify_configid($sectionId); };
+       eval { PVE::JSONSchema::pve_verify_configid($profileId); };
        $errmsg = $@ if $@;
        my $config = {}; # to return additional attributes
-       return ($type, $sectionId, $errmsg, $config);
+       return ($type, $profileId, $errmsg, $config);
     }
     return undef;
 }
@@ -136,8 +158,8 @@ sub parse_config {
 
     my $cfg = $class->SUPER::parse_config($filename, $raw);
 
-    foreach my $section (keys %{$cfg->{ids}}) {
-       my $data = $cfg->{ids}->{$section};
+    foreach my $profile (keys %{$cfg->{ids}}) {
+       my $data = $cfg->{ids}->{$profile};
 
        $data->{comment} = PVE::Tools::decode_text($data->{comment})
            if defined($data->{comment});
@@ -152,8 +174,8 @@ sub parse_config {
 sub write_config {
     my ($class, $filename, $cfg) = @_;
 
-    foreach my $section (keys %{$cfg->{ids}}) {
-       my $data = $cfg->{ids}->{$section};
+    foreach my $profile (keys %{$cfg->{ids}}) {
+       my $data = $cfg->{ids}->{$profile};
 
        $data->{comment} = PVE::Tools::encode_text($data->{comment})
            if defined($data->{comment});
@@ -165,6 +187,22 @@ sub write_config {
     $class->SUPER::write_config($filename, $cfg);
 }
 
+sub new {
+    my ($type) = @_;
+
+    my $class = ref($type) || $type;
+
+    my $cfg = PVE::INotify::read_file($inotify_file_id);
+
+    return bless $cfg, $class;
+}
+
+sub write {
+    my ($self) = @_;
+
+    PVE::INotify::write_file($inotify_file_id, $self);
+}
+
 my $lockfile = "/var/lock/pmgldapconfig.lck";
 
 sub lock_config {
@@ -185,7 +223,7 @@ sub read_pmg_ldap_conf {
 
     local $/ = undef; # slurp mode
 
-    my $raw = <$fh>;
+    my $raw = defined($fh) ? <$fh> : '';
 
     return __PACKAGE__->parse_config($filename, $raw);
 }
@@ -195,14 +233,18 @@ sub write_pmg_ldap_conf {
 
     my $raw = __PACKAGE__->write_config($filename, $cfg);
 
-    chmod(0600, $fh);
+    my $gid = getgrnam('www-data');
+    chown(0, $gid, $fh);
+    chmod(0640, $fh);
 
     PVE::Tools::safe_print($filename, $fh, $raw);
 }
 
-PVE::INotify::register_file('pmg-ldap.conf', "/etc/pmg/ldap.conf",
+PVE::INotify::register_file($inotify_file_id, $config_filename,
                            \&read_pmg_ldap_conf,
-                           \&write_pmg_ldap_conf);
+                           \&write_pmg_ldap_conf,
+                           undef,
+                           always_call_parser => 1);
 
 
 1;