Changeset 818 in openpam

Timestamp:

Oct 8, 2014, 11:02:44 AM (7 years ago)

Author:

Dag-Erling Smørgrav

Message:

• Set the sameuser flag when a non-root user manipulates their own key.
• Rename the uri command to geturi (but retain backward compatibility).
• Add a getkey command that prints the key in hexadecimal.

Location:

trunk/bin/oathkey

Files:

• oathkey.1 (modified) (3 diffs)
• oathkey.c (modified) (9 diffs)

trunk/bin/oathkey/oathkey.1

@@ -29 +29 @@
 .\" $Id$
 .\"
-.Dd March 9, 2014
+.Dd October 8, 2014
 .Dt OATHKEY 1
 .Os
@@ -72 +72 @@
 If writeback mode is enabled, the user's key is set; otherwise, it is
 printed to standard output.
+.It Cm getkey
+Print the user's key.
+.It Cm geturi
+Print the user's key in otpauth URI form.
 .It Cm setkey Ar uri
 Set the user's key to the given otpauth URI.
-.It Cm uri
-Print the user's key in otpauth URI form.
 .It Cm verify Ar code
 Verify that the given code is the correct current response for the
@@ -81 +83 @@
 If writeback mode is enabled and the response matched, the user's
 keyfile is updated to prevent reuse.
+.It Cm uri
+Deprecated synonym for
+.Cm geturi .
 .El
 .Sh SEE ALSO

trunk/bin/oathkey/oathkey.c

@@ -62 +62 @@
 
 /*
+ * Print key in hexadecimal form
+ */
+static int
+oathkey_print_hex(struct oath_key *key)
+{
+        unsigned int i;
+
+        for (i = 0; i < key->keylen; ++i)
+                printf("%02x", key->key[i]);
+        printf("\n");
+        return (RET_SUCCESS);
+}
+
+/*
  * Print key in otpauth URI form
  */
 static int
-oathkey_print(struct oath_key *key)
+oathkey_print_uri(struct oath_key *key)
 {
         char *keyuri;
@@ -88 +102 @@
         int fd, len, ret;
 
+        if (verbose)
+                warnx("saving key to %s", keyfile);
         keyuri = NULL;
         len = 0;
@@ -127 +143 @@
         if ((key = oath_key_create(user, om_totp, oh_undef, NULL, 0)) == NULL)
                 return (RET_ERROR);
-        ret = writeback ? oathkey_save(key) : oathkey_print(key);
+        ret = writeback ? oathkey_save(key) : oathkey_print_uri(key);
         oath_key_free(key);
         return (ret);
@@ -155 +171 @@
 
 /*
- * Print the otpauth URI for a key
- */
-static int
-oathkey_uri(int argc, char *argv[])
+ * Print raw key in hexadecimal
+ */
+static int
+oathkey_getkey(int argc, char *argv[])
 {
         struct oath_key *key;
@@ -168 +184 @@
         if (!isroot && !issameuser)
                 return (RET_UNAUTH);
+        if (verbose)
+                warnx("loading key from %s", keyfile);
         if ((key = oath_key_from_file(keyfile)) == NULL)
                 return (RET_ERROR);
-        ret = oathkey_print(key);
+        ret = oathkey_print_hex(key);
+        oath_key_free(key);
+        return (ret);
+}
+
+/*
+ * Print the otpauth URI for a key
+ */
+static int
+oathkey_geturi(int argc, char *argv[])
+{
+        struct oath_key *key;
+        int ret;
+
+        if (argc != 0)
+                return (RET_USAGE);
+        (void)argv;
+        if (!isroot && !issameuser)
+                return (RET_UNAUTH);
+        if (verbose)
+                warnx("loading key from %s", keyfile);
+        if ((key = oath_key_from_file(keyfile)) == NULL)
+                return (RET_ERROR);
+        ret = oathkey_print_uri(key);
         oath_key_free(key);
         return (ret);
@@ -188 +229 @@
         if (argc < 1)
                 return (RET_USAGE);
+        if (verbose)
+                warnx("loading key from %s", keyfile);
         if ((key = oath_key_from_file(keyfile)) == NULL)
                 return (RET_ERROR);
@@ -225 +268 @@
             "Commands:\n"
             "    genkey      Generate a new key\n"
+            "    getkey      Print the key in hexadecimal form\n"
+            "    geturi      Print the key in otpauth URI form\n"
             "    setkey      Generate a new key\n"
-            "    uri         Print the key in otpauth URI form\n"
             "    verify <response>\n"
             "                Verify a response\n");
@@ -294 +338 @@
                 if (asprintf(&user, "%s", pw->pw_name) < 0)
                         err(1, "asprintf()");
+                issameuser = 1;
         }
 
@@ -312 +357 @@
         else if (strcmp(cmd, "genkey") == 0)
                 ret = oathkey_genkey(argc, argv);
+        else if (strcmp(cmd, "getkey") == 0)
+                ret = oathkey_getkey(argc, argv);       
+        else if (strcmp(cmd, "geturi") == 0 || strcmp(cmd, "uri") == 0)
+                ret = oathkey_geturi(argc, argv);
         else if (strcmp(cmd, "setkey") == 0)
                 ret = oathkey_setkey(argc, argv);
-        else if (strcmp(cmd, "uri") == 0)
-                ret = oathkey_uri(argc, argv);
         else if (strcmp(cmd, "verify") == 0)
                 ret = oathkey_verify(argc, argv);