X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=blobdiff_plain;f=userdir-ldap-slapd.conf.in;h=0bec1837246475913e17c6e92eb0318f58c3dea7;hp=f586e398498b0d74e160979536276d1110eca004;hb=HEAD;hpb=a3437bcd185d533199ebd7c3e0f69b816cc904af

diff --git a/userdir-ldap-slapd.conf.in b/userdir-ldap-slapd.conf.in
index f586e39..0bec183 100644
--- 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@@"
@@ -7,10 +7,21 @@ suffix          "@@DN@@"
 # Where the database file are physically stored
 directory       "/var/lib/ldap"
 
+moduleload      accesslog
+overlay accesslog
+logdb cn=log
+logops writes
+logold (objectclass=top)
+logpurge 90+00:00 1+00:00
+
+moduleload      constraint
+overlay constraint
+constraint_attribute keyfingerprint regex ^([0-9A-F]{40})$
+
 # Indexing options
 index gecos,cn,sn,uid,ircNick,hostname,emailForward pres,eq,sub,approx
 index keyfingerprint,homeDirectory,objectClass,loginShell,supplementaryGid pres,eq
-index c,gender,dnsZoneEntry,birthDate,gidNumber,uidNumber pres,eq
+index c,dnsZoneEntry,birthDate,gidNumber,uidNumber pres,eq
 
 # Don't limit queries to the default of 500
 sizelimit 10000
@@ -18,50 +29,82 @@ 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 group="cn=Keyring Maintainers,ou=users,@@DN@@" write
+	by * break
+
+# allow listmasters to write to the privateSub attribute
+access to attrs=privateSub
+	by group="cn=Listmasters,ou=users,@@DN@@" write
+	by self 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,emailforward,mailCallout,mailGreylisting,mailRBL,mailRHSBL,mailWhitelist,mailContentInspectionAction,mailDefaultOptions,facsimileTelephoneNumber,telephoneNumber,postalAddress,postalCode,loginShell,onVacation,latitude,longitude,VoIP,userPassword,sudoPassword,webPassword,rtcPassword,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,webPassword,rtcPassword,bATVToken
 	by * compare
 
+# inaccessible to everybody
+access to attrs=totpSeed
+	by * none
+
+# 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,c,l,loginShell,onVacation,birthDate,mailDisableMessage,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,mailContentInspectionAction
-	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
+# rest is globally readable
+access to attrs=access,accountComment,accountStatus,admin,allowedGroups,allowedHost,architecture,bandwidth,cn,comment,dc,description,disk,distribution,dnsTTL,dnsZoneEntry,exportOptions,gecos,gid,gidNumber,homeDirectory,host,hostname,icqUin,ipHostNumber,ircNick,jabberJID,keyFingerPrint,labeledURI,mXRecord,machine,member,memory,mn,objectClass,ou,physicalHost,purpose,shadowExpire,shadowLastChange,shadowMax,shadowMin,shadowWarning,sn,sponsor,sponsor-admin,sshRSAHostKey,status,subGroup,supplementaryGid,uid,uidNumber
+	by * read
+
+access to *
 	by * none
 
-# globally readable
+
+database hdb
+directory       "/var/lib/ldap-log"
+suffix cn=log
+#
+sizelimit 10000
+
+index reqStart eq
 access to *
 	by group="cn=LDAP Administrator,ou=users,@@DN@@" write
-	by dn="uid=sshdist,ou=users,@@DN@@" write
-	by * read
+	by dn="uid=sshdist,ou=users,@@DN@@" read
+	by * none
+