Merge pull request #41 from michpetrov/ely1084

ELY-1084: show error when removing non-existent alias
wildfly-security · Apr 26, 2017 · fac1f30 · fac1f30
2 parents f2bbdd8 + 050fad3
commit fac1f30
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/src/main/java/org/wildfly/security/tool/CredentialStoreCommand.java b/src/main/java/org/wildfly/security/tool/CredentialStoreCommand.java
@@ -185,10 +185,16 @@ public void execute(String[] args) throws Exception {
             setStatus(ElytronTool.ElytronToolExitStatus_OK);
         } else if (cmdLine.hasOption(REMOVE_ALIAS_PARAM)) {
             String alias = cmdLine.getOptionValue(REMOVE_ALIAS_PARAM);
-            credentialStore.remove(alias, entryTypeToCredential(entryType));
-            credentialStore.flush();
-            System.out.println(ElytronToolMessages.msg.aliasRemoved(alias));
-            setStatus(ElytronTool.ElytronToolExitStatus_OK);
+            if (credentialStore.exists(alias, entryTypeToCredential(entryType))) {
+                credentialStore.remove(alias, entryTypeToCredential(entryType));
+                credentialStore.flush();
+                System.out.println(ElytronToolMessages.msg.aliasRemoved(alias));
+                setStatus(ElytronTool.ElytronToolExitStatus_OK);
+            } else {
+                System.out.println(ElytronToolMessages.msg.aliasDoesNotExist(alias));
+                setStatus(ALIAS_NOT_FOUND);
+            }
+
         } else if (cmdLine.hasOption(CHECK_ALIAS_PARAM)) {
             String alias = cmdLine.getOptionValue(CHECK_ALIAS_PARAM);
             if (credentialStore.exists(alias, entryTypeToCredential(entryType))) {
@@ -200,11 +206,15 @@ public void execute(String[] args) throws Exception {
             }
         } else if (cmdLine.hasOption(ALIASES_PARAM)) {
             Set<String> aliases = credentialStore.getAliases();
-            StringBuilder list = new StringBuilder();
-            for (String alias: aliases) {
-                list.append(alias).append(" ");
+            if (aliases.size() != 0) {
+                StringBuilder list = new StringBuilder();
+                for (String alias: aliases) {
+                    list.append(alias).append(" ");
+                }
+                System.out.println(ElytronToolMessages.msg.aliases(list.toString()));
+            } else {
+                System.out.println(ElytronToolMessages.msg.noAliases());
             }
-            System.out.println(ElytronToolMessages.msg.aliases(list.toString()));
             setStatus(ElytronTool.ElytronToolExitStatus_OK);
         } else {
             setStatus(ACTION_NOT_DEFINED);

diff --git a/src/main/java/org/wildfly/security/tool/ElytronToolMessages.java b/src/main/java/org/wildfly/security/tool/ElytronToolMessages.java
@@ -128,6 +128,9 @@ public interface ElytronToolMessages extends BasicLogger {
     @Message(id = NONE, value = "Credential store contains following aliases: %s")
     String aliases(String aliases);
 
+    @Message(id = NONE, value = "Credential store contains no aliases")
+    String noAliases();
+
     @Message(id = NONE, value = "Action to perform on the credential store is not defined")
     Exception actionToPerformNotDefined();