From e087a590eb6c20e4dbdf5ad1080ec573a2cd0229 Mon Sep 17 00:00:00 2001 From: Radovan Semancik Date: Wed, 2 Jul 2014 15:12:36 +0200 Subject: [PATCH] Support for password types --- .../infra/wsutil/AbstractWebServiceClient.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 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 index a15a5e93216..a1a31d87198 100644 --- 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");