# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+from dsa_mq.connection import Connection
+from dsa_mq.config import Config
+
import string, re, time, ldap, optparse, sys, os, pwd, posix, socket, base64, hashlib, shutil, errno, tarfile, grp, fcntl, dbm
from userdir_ldap import *
from userdir_exceptions import *
Die(File, None, F)
raise
-# Generate the voipPassword list
-def GenVoipPassword(accounts, File):
+# Generate the rtcPassword list
+def GenRtcPassword(accounts, File):
F = None
try:
OldMask = os.umask(0077)
F = open(File, "w", 0600)
os.umask(OldMask)
- root = Element('include')
-
for a in accounts:
- if not 'voipPassword' in a: continue
+ if not 'rtcPassword' in a: continue
if not a.pw_active(): continue
- Pass = str(a['voipPassword'])
- user = Element('user')
- user.attrib['id'] = "%s" % (a['uid'])
- root.append(user)
- params = Element('params')
- user.append(params)
- param = Element('param')
- params.append(param)
- param.attrib['name'] = "a1-hash"
- param.attrib['value'] = "%s" % (Pass)
- variables = Element('variables')
- user.append(variables)
- variable = Element('variable')
- variable.attrib['name'] = "toll_allow"
- variable.attrib['value'] = "domestic,international,local"
- variables.append(variable)
-
- F.write("%s" % (prettify(root)))
-
+ Line = "%s@debian.org:%s:rtc.debian.org:AUTHORIZED" % (a['uid'], str(a['rtcPassword']))
+ Line = Sanitize(Line) + "\n"
+ F.write("%s" % (Line))
except:
Die(File, None, F)
def GenDBM(accounts, File, key):
Fdb = None
+ OldMask = os.umask(0022)
+ fn = os.path.join(File).encode('ascii', 'ignore')
try:
- OldMask = os.umask(0022)
- # nothing else does the fsync stuff, so why do it here?
- fn = os.path.join(prefix,File).encode('ascii', 'ignore')
- fntmp = os.path.join(prefix,File + '.tmp').encode('ascii', 'ignore')
- try:
- posix.remove(fntmp)
- except:
- pass
+ posix.remove(fn)
+ except:
+ pass
- Fdb = dbm.open(fntmp, "c")
+ try:
+ Fdb = dbm.open(fn, "c")
os.umask(OldMask)
# Write out the email address for each user
Fdb[user] = value
Fdb.close()
- posix.rename(fntmp,fn)
- # Oops, something unspeakable happened.
except:
- Fdb.close()
+ # python-dbm names the files Fdb.db.db so we want to them to be Fdb.db
+ os.remove(File + ".db")
raise
+ # python-dbm names the files Fdb.db.db so we want to them to be Fdb.db
+ os.rename (File + ".db", File)
# Generate the anon XEarth marker file
def GenMarkers(accounts, File):
"keyFingerPrint", "privateSub", "mailDisableMessage",\
"mailGreylisting", "mailCallout", "mailRBL", "mailRHSBL",\
"mailWhitelist", "sudoPassword", "objectClass", "accountStatus",\
- "mailContentInspectionAction", "webPassword", "voipPassword"])
+ "mailContentInspectionAction", "webPassword", "rtcPassword"])
if passwd_attrs is None:
raise UDEmptyList, "No Users"
GenMailDisable(accounts, global_dir + "mail-disable")
GenCDB(accounts, global_dir + "mail-forward.cdb", 'emailForward')
- GenDBM(accounts, global_dir + "mail-forward.dbm", 'emailForward')
+ GenDBM(accounts, global_dir + "mail-forward.db", 'emailForward')
GenCDB(accounts, global_dir + "mail-contentinspectionaction.cdb", 'mailContentInspectionAction')
- GenDBM(accounts, global_dir + "mail-contentinspectionaction.dbm", 'mailContentInspectionAction')
+ GenDBM(accounts, global_dir + "mail-contentinspectionaction.db", 'mailContentInspectionAction')
GenPrivate(accounts, global_dir + "debian-private")
GenSSHKnown(host_attrs, global_dir+"authorized_keys", 'authorized_keys', global_dir+'ud-generate.lock')
GenMailBool(accounts, global_dir + "mail-greylist", "mailGreylisting")
GenMailList(accounts, global_dir + "mail-rhsbl", "mailRHSBL")
GenMailList(accounts, global_dir + "mail-whitelist", "mailWhitelist")
GenWebPassword(accounts, global_dir + "web-passwords")
- GenVoipPassword(accounts, global_dir + "voip-passwords")
+ GenRtcPassword(accounts, global_dir + "rtc-passwords")
GenKeyrings(global_dir)
# Compatibility.
if not 'NOMARKERS' in ExtraList:
DoLink(global_dir, OutDir, "markers")
DoLink(global_dir, OutDir, "mail-forward.cdb")
- DoLink(global_dir, OutDir, "mail-forward.dbm")
+ DoLink(global_dir, OutDir, "mail-forward.db")
DoLink(global_dir, OutDir, "mail-contentinspectionaction.cdb")
- DoLink(global_dir, OutDir, "mail-contentinspectionaction.dbm")
+ DoLink(global_dir, OutDir, "mail-contentinspectionaction.db")
DoLink(global_dir, OutDir, "mail-disable")
DoLink(global_dir, OutDir, "mail-greylist")
DoLink(global_dir, OutDir, "mail-callout")
DoLink(global_dir, OutDir, "mail-whitelist")
DoLink(global_dir, OutDir, "all-accounts.json")
GenCDB(accounts, OutDir + "user-forward.cdb", 'emailForward')
- GenDBM(accounts, OutDir + "user-forward.dbm", 'emailForward')
+ GenDBM(accounts, OutDir + "user-forward.db", 'emailForward')
GenCDB(accounts, OutDir + "batv-tokens.cdb", 'bATVToken')
- GenDBM(accounts, OutDir + "batv-tokens.dbm", 'bATVToken')
+ GenDBM(accounts, OutDir + "batv-tokens.db", 'bATVToken')
GenCDB(accounts, OutDir + "default-mail-options.cdb", 'mailDefaultOptions')
- GenDBM(accounts, OutDir + "default-mail-options.dbm", 'mailDefaultOptions')
+ GenDBM(accounts, OutDir + "default-mail-options.db", 'mailDefaultOptions')
# Compatibility.
DoLink(global_dir, OutDir, "forward-alias")
if 'WEB-PASSWORDS' in ExtraList:
DoLink(global_dir, OutDir, "web-passwords")
- if 'VOIP-PASSWORDS' in ExtraList:
- DoLink(global_dir, OutDir, "voip-passwords")
+ if 'RTC-PASSWORDS' in ExtraList:
+ DoLink(global_dir, OutDir, "rtc-passwords")
if 'KEYRING' in ExtraList:
for k in Keyrings:
return (cache_last_ldap_mod, cache_last_unix_mod, cache_last_run)
+def mq_notify(options):
+ options.section = 'dsa-udgenerate'
+ options.config = '/etc/dsa/pubsub.conf'
+
+ config = Config(options)
+ conf = {
+ 'rabbit_userid': config.username,
+ 'rabbit_password': config.password,
+ 'rabbit_virtual_host': config.vhost,
+ 'rabbit_hosts': ['pubsub02.debian.org', 'pubsub01.debian.org'],
+ 'use_ssl': False
+ }
+ conn = None
+ try:
+ conn = Connection(conf=conf)
+ conn.topic_send(config.topic,
+ 'update',
+ exchange_name=config.exchange,
+ timeout=5)
+ finally:
+ if conn:
+ conn.close()
+
def ud_generate():
parser = optparse.OptionParser()
parser.add_option("-g", "--generatedir", dest="generatedir", metavar="DIR",
help="Output directory.")
parser.add_option("-f", "--force", dest="force", action="store_true",
help="Force generation, even if no update to LDAP has happened.")
+ parser.add_option("-m", "--mq", action="store_true", default=False,
+ help="Send update trigger over MQ")
(options, args) = parser.parse_args()
if len(args) > 0:
generate_all(generate_dir, l)
tracefd.write("%s\n%s\n%s\n" % (ldap_last_mod, unix_last_mod, time_started))
tracefd.close()
+ if options.mq:
+ mq_notify(options)
if __name__ == "__main__":
projects / mirror / userdir-ldap.git / blobdiff