Support for password types

Evolveum · Jul 2, 2014 · e087a59 · e087a59
1 parent 58a5be6
commit e087a59
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/infra/ws-util/src/main/java/com/evolveum/midpoint/infra/wsutil/AbstractWebServiceClient.java b/infra/ws-util/src/main/java/com/evolveum/midpoint/infra/wsutil/AbstractWebServiceClient.java
@@ -61,7 +61,18 @@ public void setVerbose(boolean verbose) {
 	protected abstract String getDefaultUsername();
 
 	protected String getPasswordType() {
-		return WSConstants.PW_DIGEST;
+		if (commandLine.hasOption('P')) {
+			String optionValue = commandLine.getOptionValue('P');
+			if ("text".equals(optionValue)) {
+				return WSConstants.PW_TEXT;
+			} else if ("digest".equals(optionValue)) {
+				return WSConstants.PW_DIGEST;
+			} else {
+				throw new IllegalArgumentException("Unknown password type "+optionValue);
+			}
+		} else {
+			return WSConstants.PW_TEXT;
+		}
 	}
 
 	protected abstract String getDefaultPassword();
@@ -85,6 +96,7 @@ public void main(String[] args) {
 	protected void init(String[] args) throws ParseException {
 		options.addOption("u", "user", true, "Username");
 		options.addOption("p", "password", true, "Password");
+		options.addOption("P", "password-type", true, "Password type (text or digest)");
 		options.addOption("e", "endpoint", true, "Endpoint URL");
 		options.addOption("v", "verbose", false, "Verbose mode");
 		options.addOption("m", "messages", false, "Log SOAP messages");