GitoliteSSHCommand = getattr(ConfModule, "gitolitesshcommand", None)
GitoliteExportHosts = re.compile(getattr(ConfModule, "gitoliteexporthosts", "."))
MX_remap = json.loads(ConfModule.MX_remap)
+use_mq = getattr(ConfModule, "use_mq", True)
rtc_realm = getattr(ConfModule, "rtc_realm", None)
rtc_append = getattr(ConfModule, "rtc_append", None)
os.umask(OldMask)
for a in accounts:
+ if a.is_guest_account(): continue
if not 'rtcPassword' in a: continue
if not a.pw_active(): continue
Die(File, None, F)
raise
+# Generate the TOTP auth file
+def GenTOTPSeed(accounts, File):
+ F = None
+ try:
+ OldMask = os.umask(0077)
+ F = open(File, "w", 0600)
+ os.umask(OldMask)
+
+ F.write("# Option User Prefix Seed\n")
+ for a in accounts:
+ if a.is_guest_account(): continue
+ if not 'totpSeed' in a: continue
+ if not a.pw_active(): continue
+
+ Line = "HOTP/T30/6 %s - %s" % (a['uid'], a['totpSeed'])
+ Line = Sanitize(Line) + "\n"
+ F.write("%s" % (Line))
+ except:
+ Die(File, None, F)
+ raise
+
+
def GenSSHtarballs(global_dir, userlist, ssh_userkeys, grouprevmap, target, current_host):
OldMask = os.umask(0077)
tf = tarfile.open(name=os.path.join(global_dir, 'ssh-keys-%s.tar.gz' % current_host), mode='w:gz')
Mach = ""
if x[1].has_key("machine"):
Mach = " " + GetAttr(x, "machine")
- DNSInfo.append("%sIN\tHINFO\t\"%s%s\" \"%s\"" % (TTLprefix, Arch, Mach, "Debian GNU/Linux"))
+ DNSInfo.append("%sIN\tHINFO\t\"%s%s\" \"%s\"" % (TTLprefix, Arch, Mach, "Debian"))
if x[1].has_key("mXRecord"):
for I in x[1]["mXRecord"]:
"mailGreylisting", "mailCallout", "mailRBL", "mailRHSBL",\
"mailWhitelist", "sudoPassword", "objectClass", "accountStatus",\
"mailContentInspectionAction", "webPassword", "rtcPassword",\
- "bATVToken"])
+ "bATVToken", "totpSeed"])
if passwd_attrs is None:
raise UDEmptyList, "No Users"
GenMailList(accounts, global_dir + "mail-whitelist", "mailWhitelist")
GenWebPassword(accounts, global_dir + "web-passwords")
GenRtcPassword(accounts, global_dir + "rtc-passwords")
+ GenTOTPSeed(accounts, global_dir + "users.oath")
GenKeyrings(global_dir)
# Compatibility.
GenMarkers(accounts, global_dir + "markers")
GenSSHKnown(host_attrs, global_dir + "ssh_known_hosts")
GenHosts(host_attrs, global_dir + "debianhosts")
- GenSSHGitolite(accounts, host_attrs, global_dir + "ssh-gitolite")
GenDNS(accounts, global_dir + "dns-zone")
GenZoneRecords(host_attrs, global_dir + "dns-sshfp")
DoLink(global_dir, OutDir, "debian-private")
if 'GITOLITE' in ExtraList:
- DoLink(global_dir, OutDir, "ssh-gitolite")
+ GenSSHGitolite(all_accounts, all_hosts, OutDir + "ssh-gitolite", current_host=current_host)
if 'exportOptions' in host[1]:
for entry in host[1]['exportOptions']:
v = entry.split('=',1)
if 'RTC-PASSWORDS' in ExtraList:
DoLink(global_dir, OutDir, "rtc-passwords")
+ if 'TOTP' in ExtraList:
+ DoLink(global_dir, OutDir, "users.oath")
+
if 'KEYRING' in ExtraList:
for k in Keyrings:
bn = os.path.basename(k)
if need_update or options.force:
msg = 'Update forced' if options.force else 'Update needed'
generate_all(generate_dir, l)
- mq_notify(options, msg)
+ if use_mq:
+ mq_notify(options, msg)
last_run = int(time.time())
fd.write("%s\n%s\n%s\n" % (ldap_last_mod, unix_last_mod, last_run))
fd.close()