GT-3640 added support for specifying user password for server add/reset

commands

Ghidra/RuntimeScripts/Common/server/server.conf

@@ -128,7 +128,7 @@ ghidra.repositories.dir=./repositories
 #         
 #   -d<ad_domain> : the Active Directory domain name.  Example: "-dmydomain.com"
 # 
-#   -e<days> : specifies default password expiration time in days (-a0 mode only, default is 1-day)
+#   -e<days> : specifies initial/reset password expiration time in days (-a0 mode only, default is 1-day, 0 = no expiration)
 #
 #   -jaas <config_file> : specifies the path to the JAAS config file (when using -a4), relative
 #                         to the ghidra/server directory (if not absolute).

Ghidra/RuntimeScripts/Common/server/svrREADME.html

@@ -363,7 +363,7 @@ public key files may be made without restarting the Ghidra Server.
 			Example: "-dmydomain.com"</LI>
 			<br>
 			<LI><typewriter>-e#</typewriter><br>Allows the reset password expiration to be set to a 
-			specified number of days (default is 1-day).</LI>
+			specified number of days (default is 1-day).  A value of 0 prevents expiration.</LI>
 			<br>
 			<LI><typewriter>-jaas &lt;config_file&gt;</typewriter><br>Specifies the path to the JAAS
 			config file (when using -a4), relative to the ghidra/server directory (if not absolute).
@@ -581,9 +581,9 @@ to run as <i>root</i> and monitor/manage the Java process.
 
     <PRE>
     svrAdmin [&lt;server-root-path&gt;]
-             [-add &lt;user_sid&gt;] 
+             [-add &lt;user_sid&gt; [--p]] 
              [-remove &lt;user_sid&gt;] 
-             [-reset &lt;user_sid&gt;] 
+             [-reset &lt;user_sid&gt; [--p]] 
              [-dn &lt;user_sid&gt; &quot;&lt;user_dn&gt;&quot;]
              [-admin &lt;user_sid&gt; &quot;&lt;repository_name&gt;&quot;]
              [-list]
@@ -605,11 +605,14 @@ to run as <i>root</i> and monitor/manage the Java process.
     be permitted.  If Ghidra password authentication is used [<typewriter>-a0</typewriter>], the 
     initial password is set to <typewriter>changeme</typewriter>. This password must be changed by 
     the user within 24-hours to avoid its expiration (password expiration period can be extended as 
-    a server option, see <typewriter>-e</typewriter> <a href="#serverOptions">server option</a>).
+    a server option, see <typewriter>-e</typewriter> <a href="#serverOptions">server option</a>).  
+    Alternatively, the initial password may be specified by including the optional <typewriter>--p</typewriter>
+    parameter which will prompt for an initial password.
     <br><br>
-    Example:
+    Examples:
     <PRE>
         svrAdmin -add mySID
+        svrAdmin -add mySID --p
     </PRE>
     </LI>
     <LI><typewriter>-remove</typewriter>&nbsp;&nbsp;<b>(Removing a User)</b><br>
@@ -627,10 +630,13 @@ to run as <i>root</i> and monitor/manage the Java process.
     If a user&apos;s password has expired, or has simply been forgotten, the password may be reset 
     to <typewriter>changeme</typewriter>.  After resetting, this password must be changed by the user within 
     24-hours to avoid its expiration (password expiration period can be extended as a server option).
+    Alternatively, the new password may be specified by including the optional <typewriter>--p</typewriter>
+    parameter which will prompt for an initial password.
     <br><br>
     Example:
     <PRE>
         svrAdmin -reset mySID
+        svrAdmin -reset mySID --p
     </PRE>
     </LI>
     <LI><typewriter>-dn</typewriter>&nbsp;&nbsp;<b>(Assign User&apos;s Distinguished Name)</b><br>

Ghidra/RuntimeScripts/Linux/server/svrAdmin

@@ -1,17 +1,18 @@
 #!/usr/bin/env bash
 # ***********************************************************
 # ** Arguments (each -argument option may be repeated):
-# **   [-add <sid>] [-dn <sid> "<x500_distinguished_name>"]
+# **   [-add <sid> [--p]] 
+# **   [-dn <sid> "<x500_distinguished_name>"]
 # **   [-remove <sid>] 
-# **   [-reset <sid>]
+# **   [-reset <sid> [--p]]
 # **   [-admin <sid> "<repository-name>"] 
 # **   [-list] [-users] 
 # **   [-migrate "<repository-name>"] [-migrate-all]
 # **
-# **   add - add a new user to the server with the default password 'changeme'
+# **   add - add a new user to the server with the default password 'changeme' [--p prompt for password]
 # **   dn - set a user's distinguished name for PKI authentication
 # **   remove - remove an existing user from the server
-# **   reset - reset an existing user's password to 'changeme'
+# **   reset - reset an existing user's password to 'changeme' [--p prompt for password]
 # **   admin - set the specified existing user as an admin of the specified repository
 # **   list - list all existing named repositories
 # **   users - list all users or those associated with each listed repository

Ghidra/RuntimeScripts/Windows/server/svrAdmin.bat

@@ -2,17 +2,18 @@
 
 :: ***********************************************************
 :: ** Arguments (each -argument option may be repeated):
-:: **   [-add <sid>] [-dn <sid> "<x500_distinguished_name>"]
+:: **   [-add <sid> [--p]] 
+:: **   [-dn <sid> "<x500_distinguished_name>"]
 :: **   [-remove <sid>] 
-:: **   [-reset <sid>]
+:: **   [-reset <sid> [--p]]
 :: **   [-admin <sid> "<repository-name>"] 
 :: **   [-list] [-users] 
 :: **   [-migrate "<repository-name>"] [-migrate-all]
 :: **
-:: **   add - add a new user to the server with the default password 'changeme'
+:: **   add - add a new user to the server with the default password 'changeme' [--p prompt for password]
 :: **   dn - set a user's distinguished name for PKI authentication
 :: **   remove - remove an existing user from the server
-:: **   reset - reset an existing user's password to 'changeme'
+:: **   reset - reset an existing user's password to 'changeme' [--p prompt for password]
 :: **   admin - set the specified existing user as an admin of the specified repository
 :: **   list - list all existing named repositories
 :: **   users - list all users or those associated with each listed repository