Fix #217: don't query card if only -V used

Author: martinpaljak

tool/src/main/java/pro/javacard/gp/GPCommandLineInterface.java

@@ -62,9 +62,7 @@ abstract class GPCommandLineInterface {
     protected static OptionSpec<String> OPT_DELETE = parser.accepts("delete", "Delete applet/package").withOptionalArg().describedAs("AID");
 
     protected static OptionSpec<Void> OPT_DEFAULT = parser.accepts("default", "Indicate Default Selected privilege");
-    protected static OptionSpec<Void> OPT_TERMINATE = parser.accepts("terminate", "Indicate Card Lock+Terminate privilege");
     protected static OptionSpec<String> OPT_DOMAIN = parser.accepts("domain", "Create supplementary security domain").withRequiredArg().describedAs("AID");
-    protected static OptionSpec<Void> OPT_LIST_PRIVS = parser.accepts("list-privs", "List known privileges");
 
     // Card an applet lifecycle management
     protected static OptionSpec<String> OPT_LOCK_APPLET = parser.accepts("lock-applet", "Lock applet").withRequiredArg().describedAs("AID");

tool/src/main/java/pro/javacard/gp/GPTool.java

@@ -83,9 +83,9 @@ public static void main(String[] argv) {
             OptionSet args = parseArguments(argv);
             setupLogging(args);
 
-            if (isVerbose) {
+            if (args.has(OPT_VERBOSE) || args.has(OPT_VERSION)) {
                 System.out.println("# " + String.join(" ", System.getenv().entrySet().stream().filter(e -> e.getKey().startsWith("GP_")).map(e -> String.format("%s=%s", e.getKey(), e.getValue())).collect(Collectors.toList())));
-                System.out.println("# " + String.join(" ", argv));
+                System.out.println("# gp " + String.join(" ", argv));
             }
             TerminalFactory tf = TerminalManager.getTerminalFactory();
             String reader = args.valueOf(OPT_READER);
@@ -105,7 +105,7 @@ public static void main(String[] argv) {
             System.err.println("Error: " + e.getMessage());
             e.printStackTrace();
         } finally {
-            if (c!= null) {
+            if (c != null) {
                 try {
                     c.disconnect(true);
                 } catch (CardException e) {
@@ -116,6 +116,12 @@ public static void main(String[] argv) {
         System.exit(ret);
     }
 
+    static boolean onlyHasArg(OptionSet args, OptionSpec<?> s) {
+        long needle = args.specs().stream().filter(e -> args.has(e)).count();
+        long hay = args.specs().stream().filter(e -> args.has(e) && e != s).count();
+        return needle == 1 && hay == 0;
+    }
+
     // For running in apdu4j mode
     public int run(BIBO bibo, String[] argv) {
         try {
@@ -136,6 +142,8 @@ public int run(BIBO bibo, String[] argv) {
                 if (Cipher.getMaxAllowedKeyLength("AES") == 128) {
                     System.err.println("Unlimited crypto policy is NOT installed!");
                 }
+                if (onlyHasArg(args, OPT_VERSION))
+                    return 0;
             }
 
             // Load a CAP file, if specified
@@ -155,11 +163,6 @@ public int run(BIBO bibo, String[] argv) {
                 }
             }
 
-            if (args.has(OPT_LIST_PRIVS)) {
-                System.out.println("# Known privileges:");
-                System.out.println(Arrays.asList(Privilege.values()).stream().map(i -> i.toString()).collect(Collectors.joining("\n")));
-            }
-
             // Now actually talk to possible terminals
             APDUBIBO channel = new APDUBIBO(bibo);
             // Send all raw APDU-s to the default-selected application of the card
@@ -764,7 +767,7 @@ private static Privileges getInstPrivs(OptionSet args) {
         Privileges privs = new Privileges();
         if (args.has(OPT_PRIVS)) {
             for (String s : args.valueOf(OPT_PRIVS).split(","))
-                privs.add(Privilege.lookup(s.trim()).orElseThrow(() -> new IllegalArgumentException("Unknown privilege: " + s.trim())));
+                privs.add(Privilege.lookup(s.trim()).orElseThrow(() -> new IllegalArgumentException("Unknown privilege: " + s.trim() + "\nValid values are: " + Arrays.asList(Privilege.values()).stream().map(i -> i.toString()).collect(Collectors.joining(", ")))));
         }
         return privs;
     }
@@ -806,6 +809,7 @@ private static boolean needsAuthentication(OptionSet args) {
         return Arrays.stream(yes).anyMatch(args::has);
     }
 
+    // FIXME: replace with IllegalArgumentException
     public static void fail(String msg) {
         System.err.println(msg);
         System.exit(1);