PMG/RuleDB/Notify.pm: allow to use wide UTF-8 characters

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

diff --git a/PMG/LDAPConfig.pm b/PMG/LDAPConfig.pm
index 3e92fc4c9a0134f32809ab5da21e552db68a41ae..9445205c6d18ad097141c5b7167d47f550c1ad09 100644 (file)
--- a/PMG/LDAPConfig.pm
+++ b/PMG/LDAPConfig.pm
@@ -12,6 +12,19 @@ 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';
 
@@ -25,6 +38,7 @@ my $defaultData = {
     },
 };
 
+
 sub properties {
     return {
        disable => {
@@ -82,15 +96,18 @@ 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",
        },
     };
 }
@@ -110,6 +127,7 @@ sub options {
        filter => { optional => 1 },
        accountattr => { optional => 1 },
        mailattr => { optional => 1 },
+       groupclass => { optional => 1 },
     };
 }