X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/3984f952b1741671c30fc6746f5a51fb3a0cf8d0..63621a81d16ab743de6b57d47578a9a2c670ad22:/uip/mhlogin.c

diff --git a/uip/mhlogin.c b/uip/mhlogin.c
index 093c4f0a..e78ae68f 100644
--- a/uip/mhlogin.c
+++ b/uip/mhlogin.c
@@ -1,18 +1,21 @@
-/*
- * mhlogin.c -- login to external (OAuth) services
+/* mhlogin.c -- login to external (OAuth) services
  *
  * This code is Copyright (c) 2014, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
  */
 
+#include <errno.h>
 #include <stdio.h>
 #include <string.h>
 
 #include <h/mh.h>
+#include <h/utils.h>
 #include <h/oauth.h>
+#include "sbr/lock_file.h"
 
 #define MHLOGIN_SWITCHES \
+    X("user username", 0, USERSW) \
     X("saslmech", 0, SASLMECHSW) \
     X("authservice", 0, AUTHSERVICESW) \
     X("browser", 0, BROWSERSW) \
@@ -33,18 +36,17 @@ DEFINE_SWITCH_ARRAY(MHLOGIN, switches);
 static char *
 geta (void)
 {
-    char *cp;
     static char line[BUFSIZ];
 
     if (fgets(line, sizeof(line), stdin) == NULL)
 	done (1);
-    if ((cp = strchr(line, '\n')))
-	*cp = 0;
+    trim_suffix_c(line, '\n');
+
     return line;
 }
 
 static int
-do_login(const char *svc, const char *browser, int snoop)
+do_login(const char *svc, const char *user, const char *browser, int snoop)
 {
     char *fn, *code;
     mh_oauth_ctx *ctx;
@@ -57,18 +59,22 @@ do_login(const char *svc, const char *browser, int snoop)
         adios(NULL, "missing -authservice switch");
     }
 
+    if (user == NULL) {
+        adios(NULL, "missing -user switch");
+    }
+
     if (!mh_oauth_new(&ctx, svc)) {
-        adios(NULL, mh_oauth_get_err_string(ctx));
+        adios(NULL, "%s", mh_oauth_get_err_string(ctx));
     }
 
     if (snoop) {
         mh_oauth_log_to(stderr, ctx);
     }
 
-    fn = getcpy(mh_oauth_cred_fn(ctx));
+    fn = mh_xstrdup(mh_oauth_cred_fn(svc));
 
     if ((url = mh_oauth_get_authorize_url(ctx)) == NULL) {
-      adios(NULL, mh_oauth_get_err_string(ctx));
+      adios(NULL, "%s", mh_oauth_get_err_string(ctx));
     }
 
     if (browser) {
@@ -95,23 +101,27 @@ do_login(const char *svc, const char *browser, int snoop)
     fflush(stdout);
     code = geta();
 
-    while ((cred = mh_oauth_authorize(code, ctx)) == NULL
-           && mh_oauth_get_err_code(ctx) == MH_OAUTH_BAD_GRANT) {
-      printf("Code rejected; try again? ");
+    while (!*code ||
+           ((cred = mh_oauth_authorize(code, ctx)) == NULL
+            && mh_oauth_get_err_code(ctx) == MH_OAUTH_BAD_GRANT)) {
+      printf(!*code  ?  "Empty code; try again? "  :  "Code rejected; try again? ");
       fflush(stdout);
       code = geta();
     }
     if (cred == NULL) {
-      advise(NULL, "error exchanging code for OAuth2 token");
-      adios(NULL, mh_oauth_get_err_string(ctx));
+      inform("error exchanging code for OAuth2 token");
+      adios(NULL, "%s", mh_oauth_get_err_string(ctx));
     }
 
-    cred_file = lkfopendata(fn, "w", &failed_to_lock);
+    cred_file = lkfopendata(fn, "r+", &failed_to_lock);
+    if (cred_file == NULL && errno == ENOENT) {
+        cred_file = lkfopendata(fn, "w+", &failed_to_lock);
+    }
     if (cred_file == NULL || failed_to_lock) {
       adios(fn, "oops");
     }
-    if (!mh_oauth_cred_save(cred_file, cred)) {
-      adios(NULL, mh_oauth_get_err_string(ctx));
+    if (!mh_oauth_cred_save(cred_file, cred, user)) {
+      adios(NULL, "%s", mh_oauth_get_err_string(ctx));
     }
     if (lkfclosedata(cred_file, fn) != 0) {
       adios (fn, "oops");
@@ -129,7 +139,7 @@ int
 main(int argc, char **argv)
 {
     char *cp, **argp, **arguments;
-    const char *saslmech = NULL, *svc = NULL, *browser = NULL;
+    const char *user = NULL, *saslmech = NULL, *svc = NULL, *browser = NULL;
     int snoop = 0;
 
     if (nmh_init(argv[0], 1)) { return 1; }
@@ -156,6 +166,11 @@ main(int argc, char **argv)
 		print_version(invo_name);
 		done (0);
 
+	    case USERSW:
+		if (!(user = *argp++) || *user == '-')
+		    adios (NULL, "missing argument to %s", argp[-2]);
+		continue;
+
 	    case SASLMECHSW:
 		if (!(saslmech = *argp++) || *saslmech == '-')
 		    adios (NULL, "missing argument to %s", argp[-2]);
@@ -186,7 +201,7 @@ main(int argc, char **argv)
     free(arguments);
 
 #ifdef OAUTH_SUPPORT
-    return do_login(svc, browser, snoop);
+    return do_login(svc, user, browser, snoop);
 #else
     NMH_UNUSED(svc);
     NMH_UNUSED(browser);