X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-info;h=282d6a432bcff96e9a9ff35cc12b990b65156d67;hb=80085a3c2d7e2f3243d62588022c1b93a85eb6f3;hp=e05cb86e47bb0cfd736577bab588093c57e21798;hpb=595923978a9ad55f4ec55b1aabef44683b111911;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-info b/ud-info
index e05cb86..282d6a4 100755
--- a/ud-info
+++ b/ud-info
@@ -75,10 +75,13 @@ AttrInfo = {"cn": ["First Name", 101],
             "mailRBL": ["Mail RBLs",22],
             "mailRHSBL": ["Mail RHSBLs",23],
             "mailWhitelist": ["Mail Whitelist",24],
+	    "VoIP": ["VoIP Address",25],
 	    "comment": ["Comment",116],
 	    "userPassword": ["Crypted Password",117],
             "dnsZoneEntry": ["d.net Entry",118],
-            "VoIP": ["VoIP Address",119]}; 
+            "accountStatus": ["DD status",301],
+            "accountComment": ["DD status comment",302],
+	    };
 
 AttrPrompt = {"cn": ["Common name or first name"],
               "mn": ["Middle name (or initial if it ends in a dot)"],
@@ -113,7 +116,10 @@ AttrPrompt = {"cn": ["Common name or first name"],
               "labeledURI": ["Web home page"],
               "jabberJID": ["Jabber ID"],
               "icqUin": ["ICQ UIN Number"],
-              "VoIP": ["VoIP Address"]};
+              "VoIP": ["VoIP Address"],
+              "accountStatus": ["DD status"],
+              "accountComment": ["DD status comment"],
+              };
 
 # Create a map of IDs to desc,value,attr
 OrderedIndex = {};
@@ -122,6 +128,10 @@ for at in AttrInfo.keys():
       OrderedIndex[AttrInfo[at][1]] = [AttrInfo[at][0], "", at];
 OrigOrderedIndex = copy.deepcopy(OrderedIndex);
 
+for id in OrderedIndex:
+   if not AttrPrompt.has_key( OrderedIndex[id][2] ):
+      print "Warning: no AttrPrompt for %s"%(id)
+
 # Show shadow information
 def PrintShadow(Attrs):
    Changed = int(GetAttr(Attrs,"shadowLastChange","0"));
@@ -281,6 +291,20 @@ def MultiChangeAttr(Attrs,Attr):
    Attrs[1][Attr].append(NewValue);
    print;
 
+def Lock(UserDn, Attrs, DisableMail=True):
+   shadowLast = str(int(time.time()/24/60/60));
+   recs = [
+      (ldap.MOD_REPLACE,"userPassword","{crypt}*LK*"),
+      (ldap.MOD_REPLACE,"shadowLastChange",shadowLast),
+      (ldap.MOD_REPLACE,"shadowExpire","1")];
+   if DisableMail:
+      recs.append( (ldap.MOD_REPLACE,"mailDisableMessage","account locked") )
+      Attrs[0][1]["mailDisableMessage"] = ["account locked"];
+   l.modify_s(UserDn,recs);
+   Attrs[0][1]["userPassword"] = ["{crypt}*LK*"];
+   Attrs[0][1]["shadowLastChange"] = [shadowLast];
+   Attrs[0][1]["shadowExpire"] = ["1"];
+
 # Main program starts here
 User = pwd.getpwuid(os.getuid())[0];
 BindUser = User;
@@ -348,9 +372,10 @@ while(1):
 
    if RootMode == 1:
       print "   a) Arbitary Change";
+      print "   r) retire developer";
       print "   R) Randomize Password";
+      print "   L) Lock account and disable mail";
    print "   p) Change Password";
-   print "   L) Lock account";
    print "   u) Switch Users";
    print "   x) Exit";
    
@@ -404,6 +429,53 @@ while(1):
       Attrs[0][1]["shadowLastChange"] = [shadowLast];
       continue;
 
+   # retire DD
+   if Response == 'r' and RootMode == 1:
+      if Attrs[0][1].has_key("accountStatus") == 0:
+        curStatus = "<not set>"
+      else:
+        curStatus = Attrs[0][1]["accountStatus"][0]
+      if Attrs[0][1].has_key("accountComment") == 0:
+        curComment = "<not set>"
+      else:
+        curComment = Attrs[0][1]["accountComment"][0]
+      print "\n\nCurrent status is %s"%curStatus
+      print "Current comment is %s\n"%curComment
+
+      print "Set account to:"
+      print "  1) retiring (lock account but do not disable mail):"
+      print "  2) inactive (removed/emeritus/... - lock account and disable mail):"
+      print "  3) memorial (lock account and disable mail):"
+      print "  4) active (do not change other settings, you will have to deal with them)"
+      print "  q) return (no change)"
+      Resp = raw_input("Action? ")
+      if Resp == "1" or Resp == "2":
+         Lock(UserDn, Attrs, Resp == "2")
+         if Resp == "1":
+           newstatus = "retiring %s"%(time.strftime("%Y-%m-%d"))
+         else:
+           newstatus = "inactive %s"%(time.strftime("%Y-%m-%d"))
+         l.modify_s(UserDn,[(ldap.MOD_REPLACE,"accountStatus",newstatus)])
+         Attrs[0][1]["accountStatus"] = [newstatus]
+
+         Resp2 = raw_input("Optional RT ticket number? ")
+         if (Resp2 != ''):
+           comment = "RT#%s"%(Resp2)
+           l.modify_s(UserDn,[(ldap.MOD_REPLACE,"accountComment",comment)])
+           Attrs[0][1]["accountComment"] = [comment]
+      elif Resp == "3":
+         Lock(UserDn, Attrs)
+         newstatus = "memorial"
+         l.modify_s(UserDn,[(ldap.MOD_REPLACE,"accountStatus",newstatus)])
+         Attrs[0][1]["accountStatus"] = [newstatus]
+      elif Resp == "4":
+         newstatus = "active"
+         l.modify_s(UserDn,[(ldap.MOD_REPLACE,"accountStatus",newstatus)])
+         Attrs[0][1]["accountStatus"] = [newstatus]
+
+      continue;
+
+
    # Randomize password
    if Response == 'R' and RootMode == 1:
       Resp = raw_input("Randomize Users Password? [no/yes]");
@@ -435,16 +507,7 @@ while(1):
          continue;
 
       print "Setting password..";
-      shadowLast = str(int(time.time()/24/60/60));
-      l.modify_s(UserDn,[
-         (ldap.MOD_REPLACE,"userPassword","{crypt}*LK*"),
-         (ldap.MOD_REPLACE,"mailDisableMessage","account locked"),
-         (ldap.MOD_REPLACE,"shadowLastChange",shadowLast),
-         (ldap.MOD_REPLACE,"shadowExpire","1")]);
-      Attrs[0][1]["userPassword"] = ["{crypt}*LK*"];
-      Attrs[0][1]["mailDisableMessage"] = ["account locked"];
-      Attrs[0][1]["shadowLastChange"] = [shadowLast];
-      Attrs[0][1]["shadowExpire"] = ["1"];
+      Lock(UserDn, Attrs)
       continue;
 
    # Handle changing an arbitary value