import simplejson as json
except ImportError:
import json
- if not '__author__' in json.__dict__:
+ if '__author__' not in json.__dict__:
sys.stderr.write("Warning: This is probably the wrong json module. We want python 2.6's json\n")
sys.stderr.write("module, or simplejson on pytyon 2.5. Let's see if/how stuff blows up.\n")
if account.is_allowed_by_hostacl(current_host): return True
# See if there are supplementary groups
- if not 'supplementaryGid' in account: return False
+ if 'supplementaryGid' not in account: return False
supgroups=[]
addGroups(supgroups, account['supplementaryGid'], account['uid'], current_host)
return False
def Die(File, F, Fdb):
- if F != None:
+ if F is not None:
F.close()
- if Fdb != None:
+ if Fdb is not None:
Fdb.close()
try:
os.remove(File + ".tmp")
pass
def Done(File, F, Fdb):
- if F != None:
+ if F is not None:
F.close()
os.rename(File + ".tmp", File)
- if Fdb != None:
+ if Fdb is not None:
Fdb.close()
os.rename(File + ".tdb.tmp", File + ".tdb")
if 'sudoPassword' in a:
for entry in a['sudoPassword']:
Match = re.compile('^('+UUID_FORMAT+') (confirmed:[0-9a-f]{40}|unconfirmed) ([a-z0-9.,*-]+) ([^ ]+)$').match(entry)
- if Match == None:
+ if Match is None:
continue
uuid = Match.group(1)
status = Match.group(2)
if not GitoliteSSHRestrictions is None and GitoliteSSHRestrictions != "":
for a in accounts:
- if not 'sshRSAAuthKey' in a: continue
+ if 'sshRSAAuthKey' not in a: continue
User = a['uid']
prefix = GitoliteSSHRestrictions
F.write(line)
for dn, attrs in hosts:
- if not 'sshRSAHostKey' in attrs: continue
+ if 'sshRSAHostKey' not in attrs: continue
hostname = "host-" + attrs['hostname'][0]
prefix = GitoliteSSHRestrictions
prefix = prefix.replace('@@COMMAND@@', sshcommand)
userkeys = {}
for a in accounts:
- if not 'sshRSAAuthKey' in a: continue
+ if 'sshRSAAuthKey' not in a: continue
contents = []
for I in a['sshRSAAuthKey']:
os.umask(OldMask)
for a in accounts:
- if not 'webPassword' in a: continue
+ if 'webPassword' not in a: continue
if not a.pw_active(): continue
Pass = str(a['webPassword'])
for a in accounts:
if a.is_guest_account(): continue
- if not 'rtcPassword' in a: continue
+ if 'rtcPassword' not in a: continue
if not a.pw_active(): continue
Line = "%s%s:%s:%s:AUTHORIZED" % (a['uid'], rtc_append, str(a['rtcPassword']), rtc_realm)
F.write("# Option User Prefix Seed\n")
for a in accounts:
if a.is_guest_account(): continue
- if not 'totpSeed' in a: continue
+ if 'totpSeed' not in a: continue
if not a.pw_active(): continue
Line = "HOTP/T30/6 %s - %s" % (a['uid'], a['totpSeed'])
# Sort them into a list of groups having a set of users
for a in accounts:
GroupHasPrimaryMembers[ a['gidNumber'] ] = True
- if not 'supplementaryGid' in a: continue
+ if 'supplementaryGid' not in a: continue
supgroups=[]
addGroups(supgroups, a['supplementaryGid'], a['uid'], current_host)
# Output the group file.
J = 0
for x in GroupMap.keys():
- if not x in GroupIDMap:
+ if x not in GroupIDMap:
continue
if len(GroupMap[x]) == 0 and GroupIDMap[x] not in GroupHasPrimaryMembers:
def CheckForward(accounts):
for a in accounts:
- if not 'emailForward' in a: continue
+ if 'emailForward' not in a: continue
delete = False
os.umask(OldMask)
for a in accounts:
- if not 'emailForward' in a: continue
+ if 'emailForward' not in a: continue
Line = "%s: %s" % (a['uid'], a['emailForward'])
Line = Sanitize(Line) + "\n"
F.write(Line)
Done(File, F, None)
def GenCDB(accounts, File, key):
- Fdb = None
+ prefix = ["/usr/bin/eatmydata"] if os.path.exists('/usr/bin/eatmydata') else []
+ # nothing else does the fsync stuff, so why do it here?
+ Fdb = subprocess.Popen(prefix + ["cdbmake", File, "%s.tmp" % File],
+ preexec_fn=lambda: os.umask(0022),
+ stdin=subprocess.PIPE)
try:
- OldMask = os.umask(0022)
- # nothing else does the fsync stuff, so why do it here?
- prefix = "/usr/bin/eatmydata " if os.path.exists('/usr/bin/eatmydata') else ''
- Fdb = os.popen("%scdbmake %s %s.tmp"%(prefix, File, File), "w")
- os.umask(OldMask)
-
# Write out the email address for each user
for a in accounts:
- if not key in a: continue
+ if key not in a: continue
value = a[key]
user = a['uid']
- Fdb.write("+%d,%d:%s->%s\n" % (len(user), len(value), user, value))
+ Fdb.stdin.write("+%d,%d:%s->%s\n" % (len(user), len(value), user, value))
- Fdb.write("\n")
- # Oops, something unspeakable happened.
- except:
- Fdb.close()
- raise
- if Fdb.close() != None:
- raise "cdbmake gave an error"
+ Fdb.stdin.write("\n")
+ finally:
+ Fdb.stdin.close()
+ if Fdb.wait() != 0:
+ raise Exception("cdbmake gave an error")
def GenDBM(accounts, File, key):
Fdb = None
# Write out the email address for each user
for a in accounts:
- if not key in a: continue
+ if key not in a: continue
value = a[key]
user = a['uid']
Fdb[user] = value
for a in accounts:
if not a.is_active_user(): continue
if a.is_guest_account(): continue
- if not 'privateSub' in a: continue
+ if 'privateSub' not in a: continue
try:
Line = "%s"%(a['privateSub'])
Line = Sanitize(Line) + "\n"
F = open(File + ".tmp", "w")
for a in accounts:
- if not 'mailDisableMessage' in a: continue
+ if 'mailDisableMessage' not in a: continue
Line = "%s: %s"%(a['uid'], a['mailDisableMessage'])
Line = Sanitize(Line) + "\n"
F.write(Line)
F = open(File + ".tmp", "w")
for a in accounts:
- if not key in a: continue
+ if key not in a: continue
if not a[key] == 'TRUE': continue
Line = "%s"%(a['uid'])
Line = Sanitize(Line) + "\n"
else: validregex = re.compile('^[-\w.]+$')
for a in accounts:
- if not key in a: continue
+ if key not in a: continue
filtered = filter(lambda z: validregex.match(z), a[key])
if len(filtered) == 0: continue
# Write out the zone file entry for each user
for a in accounts:
- if not 'dnsZoneEntry' in a: continue
+ if 'dnsZoneEntry' not in a: continue
if not a.is_active_user() and not isRoleAccount(a): continue
if a.is_guest_account(): continue
F.write(Line)
Host = Split[0] + DNSZone
- if BSMTPCheck.match(Line) != None:
+ if BSMTPCheck.match(Line) is not None:
F.write("; Has BSMTP\n")
# Write some identification information
return True
def ExtractDNSInfo(x):
+ hostname = GetAttr(x, "hostname")
TTLprefix="\t"
if 'dnsTTL' in x[1]:
if x[1].has_key("ipHostNumber"):
for I in x[1]["ipHostNumber"]:
if is_ipv6_addr(I):
- DNSInfo.append("%sIN\tAAAA\t%s" % (TTLprefix, I))
+ DNSInfo.append("%s.\t%sIN\tAAAA\t%s" % (hostname, TTLprefix, I))
else:
- DNSInfo.append("%sIN\tA\t%s" % (TTLprefix, I))
+ DNSInfo.append("%s.\t%sIN\tA\t%s" % (hostname, TTLprefix, I))
Algorithm = None
+ ssh_hostnames = [ hostname ]
+ if x[1].has_key("sshfpHostname"):
+ ssh_hostnames += [ h for h in x[1]["sshfpHostname"] ]
+
if 'sshRSAHostKey' in x[1]:
for I in x[1]["sshRSAHostKey"]:
Split = I.split()
- if Split[0] == 'ssh-rsa':
+ key_prefix = Split[0]
+ key = base64.decodestring(Split[1])
+
+ # RFC4255
+ # https://www.iana.org/assignments/dns-sshfp-rr-parameters/dns-sshfp-rr-parameters.xhtml
+ if key_prefix == 'ssh-rsa':
Algorithm = 1
- if Split[0] == 'ssh-dss':
+ if key_prefix == 'ssh-dss':
Algorithm = 2
- if Split[0] == 'ssh-ed25519':
+ if key_prefix == 'ssh-ed25519':
Algorithm = 4
- if Algorithm == None:
+ if Algorithm is None:
continue
- Fingerprint = hashlib.new('sha1', base64.decodestring(Split[1])).hexdigest()
- DNSInfo.append("%sIN\tSSHFP\t%u 1 %s" % (TTLprefix, Algorithm, Fingerprint))
- Fingerprint = hashlib.new('sha256', base64.decodestring(Split[1])).hexdigest()
- DNSInfo.append("%sIN\tSSHFP\t%u 2 %s" % (TTLprefix, Algorithm, Fingerprint))
+ # and more from the registry
+ sshfp_digest_codepoints = [ (1, 'sha1'), (2, 'sha256') ]
+
+ fingerprints = [ ( digest_codepoint, hashlib.new(algorithm, key).hexdigest() ) for digest_codepoint, algorithm in sshfp_digest_codepoints ]
+ for h in ssh_hostnames:
+ for digest_codepoint, fingerprint in fingerprints:
+ DNSInfo.append("%s.\t%sIN\tSSHFP\t%u %d %s" % (h, TTLprefix, Algorithm, digest_codepoint, fingerprint))
if 'architecture' in x[1]:
Arch = GetAttr(x, "architecture")
Mach = ""
if x[1].has_key("machine"):
Mach = " " + GetAttr(x, "machine")
- DNSInfo.append("%sIN\tHINFO\t\"%s%s\" \"%s\"" % (TTLprefix, Arch, Mach, "Debian"))
+ DNSInfo.append("%s.\t%sIN\tHINFO\t\"%s%s\" \"%s\"" % (hostname, TTLprefix, Arch, Mach, "Debian"))
if x[1].has_key("mXRecord"):
for I in x[1]["mXRecord"]:
if I in MX_remap:
for e in MX_remap[I]:
- DNSInfo.append("%sIN\tMX\t%s" % (TTLprefix, e))
+ DNSInfo.append("%s.\t%sIN\tMX\t%s" % (hostname, TTLprefix, e))
else:
- DNSInfo.append("%sIN\tMX\t%s" % (TTLprefix, I))
+ DNSInfo.append("%s.\t%sIN\tMX\t%s" % (hostname, TTLprefix, I))
return DNSInfo
if IsDebianHost.match(GetAttr(x, "hostname")) is None:
continue
- DNSInfo = ExtractDNSInfo(x)
- start = True
- for Line in DNSInfo:
- if start == True:
- Line = "%s.\t%s" % (GetAttr(x, "hostname"), Line)
- start = False
- else:
- Line = "\t\t\t%s" % (Line)
-
+ for Line in ExtractDNSInfo(x):
F.write(Line + "\n")
- # this would write sshfp lines for services on machines
- # but we can't yet, since some are cnames and we'll make
- # an invalid zonefile
- #
- # for i in x[1].get("purpose", []):
- # m = PurposeHostField.match(i)
- # if m:
- # m = m.group(1)
- # # we ignore [[*..]] entries
- # if m.startswith('*'):
- # continue
- # if m.startswith('-'):
- # m = m[1:]
- # if m:
- # if not m.endswith(HostDomain):
- # continue
- # if not m.endswith('.'):
- # m = m + "."
- # for Line in DNSInfo:
- # if isSSHFP.match(Line):
- # Line = "%s\t%s" % (m, Line)
- # F.write(Line + "\n")
-
# Oops, something unspeakable happened.
except:
Die(File, F, None)
# Write out the zone file entry for each user
for a in accounts:
- if not 'dnsZoneEntry' in a: continue
+ if 'dnsZoneEntry' not in a: continue
if not a.is_active_user(): continue
try:
Line = " ".join(Split) + "\n"
Host = Split[0] + DNSZone
- if BSMTPCheck.match(Line) != None:
+ if BSMTPCheck.match(Line) is not None:
F.write("%s: user=%s group=Debian file=%s%s/bsmtp/%s\n"%(Host,
a['uid'], HomePrefix, a['uid'], Host))
if IsDebianHost.match(GetAttr(x, "hostname")) is None:
continue
- if not 'ipHostNumber' in x[1]:
+ if 'ipHostNumber' not in x[1]:
continue
addrs = x[1]["ipHostNumber"]
"mailGreylisting", "mailCallout", "mailRBL", "mailRHSBL",\
"mailWhitelist", "sudoPassword", "objectClass", "accountStatus",\
"mailContentInspectionAction", "webPassword", "rtcPassword",\
- "bATVToken", "totpSeed"])
+ "bATVToken", "totpSeed", "mailDefaultOptions"])
if passwd_attrs is None:
raise UDEmptyList, "No Users"
# Fetch all the hosts
HostAttrs = ldap_conn.search_s(HostBaseDn, ldap.SCOPE_ONELEVEL, "objectClass=debianServer",\
["hostname", "sshRSAHostKey", "purpose", "allowedGroups", "exportOptions",\
- "mXRecord", "ipHostNumber", "dnsTTL", "machine", "architecture"])
+ "mXRecord", "ipHostNumber", "dnsTTL", "machine", "architecture",
+ "sshfpHostname"])
- if HostAttrs == None:
+ if HostAttrs is None:
raise UDEmptyList, "No Hosts"
HostAttrs.sort(lambda x, y: cmp((GetAttr(x, "hostname")).lower(), (GetAttr(y, "hostname")).lower()))
GenDBM(accounts, global_dir + "mail-forward.db", 'emailForward')
GenCDB(accounts, global_dir + "mail-contentinspectionaction.cdb", 'mailContentInspectionAction')
GenDBM(accounts, global_dir + "mail-contentinspectionaction.db", 'mailContentInspectionAction')
+ GenCDB(accounts, global_dir + "default-mail-options.cdb", 'mailDefaultOptions')
+ GenDBM(accounts, global_dir + "default-mail-options.db", 'mailDefaultOptions')
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")
GenForward(accounts, global_dir + "forward-alias")
GenAllUsers(accounts, global_dir + 'all-accounts.json')
- accounts = filter(lambda a: not a in accounts_disabled, accounts)
+ accounts = filter(lambda a: a not in accounts_disabled, accounts)
ssh_userkeys = GenSSHShadow(global_dir, accounts)
GenMarkers(accounts, global_dir + "markers")
setup_group_maps(ldap_conn)
for host in host_attrs:
- if not "hostname" in host[1]:
+ if "hostname" not in host[1]:
continue
generate_host(host, global_dir, accounts, host_attrs, ssh_userkeys)
# the relevant ssh keys
GenSSHtarballs(global_dir, userlist, ssh_userkeys, grouprevmap, os.path.join(OutDir, 'ssh-keys.tar.gz'), current_host)
- if not 'NOPASSWD' in ExtraList:
+ if 'NOPASSWD' not in ExtraList:
GenShadow(accounts, OutDir + "shadow")
# Link in global things
- if not 'NOMARKERS' in ExtraList:
+ if 'NOMARKERS' not in ExtraList:
DoLink(global_dir, OutDir, "markers")
DoLink(global_dir, OutDir, "mail-forward.cdb")
DoLink(global_dir, OutDir, "mail-forward.db")
DoLink(global_dir, OutDir, "mail-rhsbl")
DoLink(global_dir, OutDir, "mail-whitelist")
DoLink(global_dir, OutDir, "all-accounts.json")
+ DoLink(global_dir, Outdir, "default-mail-options.cdb")
+ DoLink(global_dir, Outdir, "default-mail-options.db")
GenCDB(accounts, OutDir + "user-forward.cdb", 'emailForward')
GenDBM(accounts, OutDir + "user-forward.db", 'emailForward')
GenCDB(accounts, OutDir + "batv-tokens.cdb", 'bATVToken')
GenDBM(accounts, OutDir + "batv-tokens.db", 'bATVToken')
- GenCDB(accounts, OutDir + "default-mail-options.cdb", 'mailDefaultOptions')
- GenDBM(accounts, OutDir + "default-mail-options.db", 'mailDefaultOptions')
# Compatibility.
DoLink(global_dir, OutDir, "forward-alias")
options = v[1].split(',')
group = options.pop(0);
gitolite_accounts = filter(lambda x: IsInGroup(x, [group], current_host), all_accounts)
- if not 'nohosts' in options:
+ if 'nohosts' not in options:
gitolite_hosts = filter(lambda x: GitoliteExportHosts.match(x[1]["hostname"][0]), all_hosts)
else:
gitolite_hosts = []