Give keyring-maint write access to keyFingerPrint

[mirror/userdir-ldap.git] / userdir-ldap-slapd.conf.in

diff --git a/userdir-ldap-slapd.conf.in b/userdir-ldap-slapd.conf.in
index ba858a9..4e4c92a 100644 (file)
--- a/userdir-ldap-slapd.conf.in
+++ b/userdir-ldap-slapd.conf.in
@@ -1,5 +1,5 @@
 # The backend type, ldbm, is the default standard
-database bdb
+database hdb
 
 # The base of your directory
 suffix          "@@DN@@"
@@ -9,7 +9,7 @@ directory       "/var/lib/ldap"
 
 # Indexing options
 index gecos,cn,sn,uid,ircNick,hostname,emailForward pres,eq,sub,approx
-index keyfingerprint,homeDirectory,objectClass,loginShell pres,eq
+index keyfingerprint,homeDirectory,objectClass,loginShell,supplementaryGid pres,eq
 index c,gender,dnsZoneEntry,birthDate,gidNumber,uidNumber pres,eq
 
 # Don't limit queries to the default of 500
@@ -18,50 +18,57 @@ sizelimit 10000
 # Save the time that the entry gets modified
 lastmod on
 
-# owner writeable
-access to attrs=userPassword,sudoPassword
+
+##
+## prefix some rules that only apply to certain clients
+## and grant them more privileges
+##
+
+# LDAP admins have full access, so has sshdist
+access to *
        by group="cn=LDAP Administrator,ou=users,@@DN@@" write
-       by dn="uid=sshdist,ou=users,@@DN@@"  write
+       by dn="uid=sshdist,ou=users,@@DN@@" write
+       by * break
+
+# allow keyring maint to write to the keyFingerPrint attribute
+# (make an exception for adm for security reasons)
+access to filter="(!(supplementaryGid=adm))" attrs=keyFingerPrint
+       by dn="cn=Keyring Maintainers,ou=users,@@DN@@" write
+       by * break
+
+# allow users write access to an explicit subset of their fields
+access to attrs=c,l,loginShell,ircNick,labeledURI,icqUIN,jabberJID,onVacation,birthDate,mailDisableMessage,gender,emailforward,mailCallout,mailGreylisting,mailRBL,mailRHSBL,mailWhitelist,mailContentInspectionAction,mailDefaultOptions,facsimileTelephoneNumber,telephoneNumber,postalAddress,postalCode,loginShell,onVacation,privateSub,latitude,longitude,VoIP,userPassword,sudoPassword,bATVToken
        by self write
+       by * break
+
+
+##
+## All ACLs from here on result in a decision.  no fall through to later.
+##
+
+# allow authn/z by anyone
+access to attrs=userPassword,sudoPassword,bATVToken
        by * compare
 
+# readable only by self
 access to attrs=sshrsaauthkey
-       by group="cn=LDAP Administrator,ou=users,@@DN@@" write
-       by dn="uid=sshdist,ou=users,@@DN@@"  write
        by self read
-       by * compare
+       by * none
 
-# debian readable
-access to attrs=activity-pgp,activity-from,dnsZoneEntry
-       by group="cn=LDAP Administrator,ou=users,@@DN@@" write
-       by dn="uid=sshdist,ou=users,@@DN@@" write
+# debian.org readable, authenticated user readable
+access to attrs=activity-pgp,activity-from,dnsZoneEntry,c,l,loginShell,onVacation,birthDate,mailDisableMessage,gender,emailforward,mailCallout,mailGreylisting,mailRBL,mailRHSBL,mailWhitelist,mailContentInspectionAction,mailDefaultOptions
        by peername.ip=127.0.0.1 read
        by domain=alioth.debian.org none
        by domain.subtree=@@DOMAIN@@ read
        by dn.regex="uid=.*,ou=users,@@DN@@" read
        by * none
 
-# owner writeable, debian readable, authenticated user readable
-access to attrs=c,l,loginShell,ircNick,labeledURI,icqUIN,jabberJID,onVacation,birthDate,mailDisableMessage,gender,emailforward,mailCallout,mailGreylisting,mailRBL,mailRHSBL,mailWhitelist
-       by group="cn=LDAP Administrator,ou=users,@@DN@@" write
-       by dn="uid=sshdist,ou=users,@@DN@@" write
-       by self write
+# authenticated user readable
+access to attrs=facsimileTelephoneNumber,telephoneNumber,postalAddress,postalCode,privateSub,latitude,longitude,VoIP
        by dn.regex="uid=.*,ou=users,@@DN@@" read
-       by peername.ip=127.0.0.1 read
-       by domain=alioth.debian.org none
-       by domain.subtree=@@DOMAIN@@ read
        by * none
 
-# owner writeable, authenticated user readable
-access to attrs=facsimileTelephoneNumber,telephoneNumber,postalAddress,postalCode,loginShell,onVacation,privateSub,latitude,longitude,VoIP
-       by group="cn=LDAP Administrator,ou=users,@@DN@@" write
-       by dn="uid=sshdist,ou=users,@@DN@@" write
-       by self write
-       by dn.regex="uid=.*,ou=users,@@DN@@" read
-       by * none
 
-# globally readable
+# rest is globally readable
 access to *
-       by group="cn=LDAP Administrator,ou=users,@@DN@@" write
-       by dn="uid=sshdist,ou=users,@@DN@@" write
        by * read