From: Julien Cristau Date: Fri, 11 Oct 2019 15:28:37 +0000 (+0200) Subject: ud-host: kill trailing semicolons X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=e3c433d3029b26dde383911ff58dcaa794c19492 ud-host: kill trailing semicolons --- diff --git a/ud-host b/ud-host index 438e272..30d6c36 100755 --- a/ud-host +++ b/ud-host @@ -33,12 +33,12 @@ # -l list all hosts and their status # -f list all SSH fingerprints -import time, os, pwd, sys, getopt, ldap, crypt, readline, copy; +import time, os, pwd, sys, getopt, ldap, crypt, readline, copy from tempfile import mktemp from os import O_CREAT, O_EXCL, O_WRONLY -from userdir_ldap import *; +from userdir_ldap import * -RootMode = 0; +RootMode = 0 AttrInfo = {"description": ["Machine Descr.", 1], "hostname": ["Host names", 2], "status": ["Status", 3], @@ -85,34 +85,34 @@ AttrPrompt = {"description": ["Purpose of the machine"], "mXRecord": ["Mail Exchanger for this machine"], "dnsTTL": ["dns TTL value"], "sshdistAuthKeysHost": ["additional hosts for sshdist's authkeys file"], - }; + } # Create a map of IDs to desc,value,attr -OrderedIndex = {}; +OrderedIndex = {} for at in AttrInfo.keys(): if (AttrInfo[at][1] != 0): - OrderedIndex[AttrInfo[at][1]] = [AttrInfo[at][0], "", at]; -OrigOrderedIndex = copy.deepcopy(OrderedIndex); + OrderedIndex[AttrInfo[at][1]] = [AttrInfo[at][0], "", at] +OrigOrderedIndex = copy.deepcopy(OrderedIndex) # Print out the automatic time stamp information def PrintModTime(Attrs): - Stamp = GetAttr(Attrs,"modifyTimestamp",""); + Stamp = GetAttr(Attrs,"modifyTimestamp","") if len(Stamp) >= 13: Time = (int(Stamp[0:4]),int(Stamp[4:6]),int(Stamp[6:8]), - int(Stamp[8:10]),int(Stamp[10:12]),int(Stamp[12:14]),0,0,-1); + int(Stamp[8:10]),int(Stamp[10:12]),int(Stamp[12:14]),0,0,-1) print "%-24s:" % ("Record last modified on"), time.strftime("%a %d/%m/%Y %X UTC",Time), - print "by",ldap.explode_dn(GetAttr(Attrs,"modifiersName"),1)[0]; + print "by",ldap.explode_dn(GetAttr(Attrs,"modifiersName"),1)[0] - Stamp = GetAttr(Attrs,"createTimestamp",""); + Stamp = GetAttr(Attrs,"createTimestamp","") if len(Stamp) >= 13: Time = (int(Stamp[0:4]),int(Stamp[4:6]),int(Stamp[6:8]), - int(Stamp[8:10]),int(Stamp[10:12]),int(Stamp[12:14]),0,0,-1); - print "%-24s:" % ("Record created on"), time.strftime("%a %d/%m/%Y %X UTC",Time); + int(Stamp[8:10]),int(Stamp[10:12]),int(Stamp[12:14]),0,0,-1) + print "%-24s:" % ("Record created on"), time.strftime("%a %d/%m/%Y %X UTC",Time) # Display all of the attributes in a numbered list def ShowAttrs(Attrs): - print; - PrintModTime(Attrs); + print + PrintModTime(Attrs) for at in Attrs[1].keys(): if AttrInfo.has_key(at): @@ -120,18 +120,18 @@ def ShowAttrs(Attrs): print " %-18s:" % (AttrInfo[at][0]), for x in Attrs[1][at]: print "'%s'" % (x), - print; + print else: - OrderedIndex[AttrInfo[at][1]][1] = Attrs[1][at]; + OrderedIndex[AttrInfo[at][1]][1] = Attrs[1][at] - Keys = OrderedIndex.keys(); - Keys.sort(); + Keys = OrderedIndex.keys() + Keys.sort() for at in Keys: if at < 100 or RootMode != 0: print " %3u) %-18s: " % (at,OrderedIndex[at][0]), for x in OrderedIndex[at][1]: print "'%s'" % (re.sub('[\n\r]','?',x)), - print; + print def Overview(Attrs): """Display a one-line overview for a given host""" @@ -148,70 +148,70 @@ def Overview(Attrs): # Change a single attribute def ChangeAttr(Attrs,Attr): if (Attr in ["sponsor", "sshRSAHostKey", "purpose", "allowedGroups", "exportOptions", "ipHostNumber", "mXRecord", "sshdistAuthKeysHost"]): - return MultiChangeAttr(Attrs,Attr); + return MultiChangeAttr(Attrs,Attr) - print "Old value: '%s'" % (GetAttr(Attrs,Attr,"")); - print "Press enter to leave unchanged and a single space to set to empty"; - NewValue = raw_input("New? "); + print "Old value: '%s'" % (GetAttr(Attrs,Attr,"")) + print "Press enter to leave unchanged and a single space to set to empty" + NewValue = raw_input("New? ") # Empty string if (NewValue == ""): - print "Leaving unchanged."; - return; + print "Leaving unchanged." + return # Single space designates delete, trap the delete error if (NewValue == " "): - print "Deleting.",; + print "Deleting.", try: - l.modify_s(HostDn,[(ldap.MOD_DELETE,Attr,None)]); + l.modify_s(HostDn,[(ldap.MOD_DELETE,Attr,None)]) except ldap.NO_SUCH_ATTRIBUTE: - pass; + pass - print; - Attrs[1][Attr] = [""]; - return; + print + Attrs[1][Attr] = [""] + return # Set a new value - print "Setting.",; - l.modify_s(HostDn,[(ldap.MOD_REPLACE,Attr,NewValue)]); - Attrs[1][Attr] = [NewValue]; - print; + print "Setting.", + l.modify_s(HostDn,[(ldap.MOD_REPLACE,Attr,NewValue)]) + Attrs[1][Attr] = [NewValue] + print def MultiChangeAttr(Attrs,Attr): # Make sure that we have an entry if not Attrs[1].has_key(Attr): - Attrs[1][Attr] = []; + Attrs[1][Attr] = [] - Attrs[1][Attr].sort(); - print "Old values: ",Attrs[1][Attr]; + Attrs[1][Attr].sort() + print "Old values: ",Attrs[1][Attr] Mode = raw_input("[D]elete or [A]dd? ").upper() if (Mode != 'D' and Mode != 'A'): - return; + return - NewValue = raw_input("Value? "); + NewValue = raw_input("Value? ") # Empty string if (NewValue == ""): - print "Leaving unchanged."; - return; + print "Leaving unchanged." + return # Delete if (Mode == "D"): - print "Deleting.",; + print "Deleting.", try: - l.modify_s(HostDn,[(ldap.MOD_DELETE,Attr,NewValue)]); + l.modify_s(HostDn,[(ldap.MOD_DELETE,Attr,NewValue)]) except ldap.NO_SUCH_ATTRIBUTE: - print "Failed"; + print "Failed" - print; - Attrs[1][Attr].remove(NewValue); - return; + print + Attrs[1][Attr].remove(NewValue) + return # Set a new value - print "Setting.",; - l.modify_s(HostDn,[(ldap.MOD_ADD,Attr,NewValue)]); - Attrs[1][Attr].append(NewValue); - print; + print "Setting.", + l.modify_s(HostDn,[(ldap.MOD_ADD,Attr,NewValue)]) + Attrs[1][Attr].append(NewValue) + print def CalcTempFile(): unique = 0 @@ -227,8 +227,8 @@ def CalcTempFile(): # Main program starts here -User = pwd.getpwuid(os.getuid())[0]; -BindUser = User; +User = pwd.getpwuid(os.getuid())[0] +BindUser = User ListMode = 0 FingerPrints = 0 Host = None @@ -241,18 +241,18 @@ except getopt.GetoptError, data: for (switch, val) in options: if (switch == '-h'): - Host = val; + Host = val elif (switch == '-a'): - BindUser = val; + BindUser = val elif (switch == '-r'): - RootMode = 1; + RootMode = 1 elif (switch == '-n'): - BindUser = ""; + BindUser = "" elif (switch == '-l'): - BindUser = ""; + BindUser = "" ListMode = 1 elif (switch == '-f'): - BindUser = ""; + BindUser = "" FingerPrints = 1 if (BindUser != ""): @@ -302,100 +302,100 @@ elif FingerPrints == 1: os.unlink(tmpfile) sys.exit(0) -HostDn = "host=" + Host + "," + HostBaseDn; +HostDn = "host=" + Host + "," + HostBaseDn # Query the server for all of the attributes -Attrs = l.search_s(HostBaseDn,ldap.SCOPE_ONELEVEL,"host=" + Host); +Attrs = l.search_s(HostBaseDn,ldap.SCOPE_ONELEVEL,"host=" + Host) if len(Attrs) == 0: - print "Host",Host,"was not found."; - sys.exit(0); + print "Host",Host,"was not found." + sys.exit(0) # repeatedly show the account configuration while(1): - ShowAttrs(Attrs[0]); + ShowAttrs(Attrs[0]) if (BindUser == ""): - sys.exit(0); + sys.exit(0) if RootMode == 1: - print " a) Arbitary Change"; - print " n) New Host"; - print " d) Delete Host"; - print " u) Switch Hosts"; - print " x) Exit"; + print " a) Arbitary Change" + print " n) New Host" + print " d) Delete Host" + print " u) Switch Hosts" + print " x) Exit" # Prompt - Response = raw_input("Change? "); + Response = raw_input("Change? ") if (Response == "x" or Response == "X" or Response == "q" or Response == "quit" or Response == "exit"): - break; + break # Change who we are looking at if (Response == 'u' or Response == 'U'): - NewHost = raw_input("Host? "); + NewHost = raw_input("Host? ") if NewHost == "": - continue; - NAttrs = l.search_s(HostBaseDn,ldap.SCOPE_ONELEVEL,"host=" + NewHost); + continue + NAttrs = l.search_s(HostBaseDn,ldap.SCOPE_ONELEVEL,"host=" + NewHost) if len(NAttrs) == 0: - print "Host",NewHost,"was not found."; - continue; - Attrs = NAttrs; - Host = NewHost; - HostDn = "host=" + Host + "," + HostBaseDn; - OrderedIndex = copy.deepcopy(OrigOrderedIndex); - continue; + print "Host",NewHost,"was not found." + continue + Attrs = NAttrs + Host = NewHost + HostDn = "host=" + Host + "," + HostBaseDn + OrderedIndex = copy.deepcopy(OrigOrderedIndex) + continue # Create a new entry and change to it Change who we are looking at if (Response == 'n' or Response == 'N'): - NewHost = raw_input("Host? "); + NewHost = raw_input("Host? ") if NewHost == "": - continue; - NAttrs = l.search_s(HostBaseDn,ldap.SCOPE_ONELEVEL,"host=" + NewHost); + continue + NAttrs = l.search_s(HostBaseDn,ldap.SCOPE_ONELEVEL,"host=" + NewHost) if len(NAttrs) != 0: - print "Host",NewHost,"already exists."; - continue; - NewHostName = raw_input("Hostname? "); + print "Host",NewHost,"already exists." + continue + NewHostName = raw_input("Hostname? ") if NewHost == "": - continue; - Dn = "host=" + NewHost + "," + HostBaseDn; + continue + Dn = "host=" + NewHost + "," + HostBaseDn l.add_s(Dn,[("host", NewHost), ("hostname", NewHostName), - ("objectClass", ("top", "debianServer"))]); + ("objectClass", ("top", "debianServer"))]) # Switch - NAttrs = l.search_s(HostBaseDn,ldap.SCOPE_ONELEVEL,"host=" + NewHost); + NAttrs = l.search_s(HostBaseDn,ldap.SCOPE_ONELEVEL,"host=" + NewHost) if len(NAttrs) == 0: - print "Host",NewHost,"was not found."; - continue; - Attrs = NAttrs; - Host = NewHost; - HostDn = "host=" + Host + "," + HostBaseDn; - OrderedIndex = copy.deepcopy(OrigOrderedIndex); - continue; + print "Host",NewHost,"was not found." + continue + Attrs = NAttrs + Host = NewHost + HostDn = "host=" + Host + "," + HostBaseDn + OrderedIndex = copy.deepcopy(OrigOrderedIndex) + continue # Handle changing an arbitary value if (Response == "a"): - Attr = raw_input("Attr? "); - ChangeAttr(Attrs[0],Attr); - continue; + Attr = raw_input("Attr? ") + ChangeAttr(Attrs[0],Attr) + continue if (Response == 'd'): - Really = raw_input("Really (type yes)? "); + Really = raw_input("Really (type yes)? ") if Really != 'yes': - continue; - print "Deleting",HostDn; - l.delete_s(HostDn); - continue; + continue + print "Deleting",HostDn + l.delete_s(HostDn) + continue # Convert the integer response try: - ID = int(Response); + ID = int(Response) if (not OrderedIndex.has_key(ID) or (ID > 100 and RootMode == 0)): - raise ValueError; + raise ValueError except ValueError: - print "Invalid"; - continue; + print "Invalid" + continue # Print the what to do prompt - print "Changing LDAP entry '%s' (%s)" % (OrderedIndex[ID][0],OrderedIndex[ID][2]); - print AttrPrompt[OrderedIndex[ID][2]][0]; - ChangeAttr(Attrs[0],OrderedIndex[ID][2]); + print "Changing LDAP entry '%s' (%s)" % (OrderedIndex[ID][0],OrderedIndex[ID][2]) + print AttrPrompt[OrderedIndex[ID][2]][0] + ChangeAttr(Attrs[0],OrderedIndex[ID][2])