escape_addresses.c: Move interface to own file.

[nmh] / sbr / oauth_prof.c

diff --git a/sbr/oauth_prof.c b/sbr/oauth_prof.c
index 4f9e2a2ffa33b9b03aa5251a911fcc140c1892aa..5bedadcbeacf7f4cb36132342c549a84687dfc5f 100644 (file)
--- a/sbr/oauth_prof.c
+++ b/sbr/oauth_prof.c
@@ -1,10 +1,12 @@
-/*
+/* oauth_prof.c -- OAuth 2.0 implementation for XOAUTH2 in SMTP and POP3.
+ *

  * 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.
  */
 
  * 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 <h/mh.h>
+#include "h/mh.h"
+#include "context_find.h"

 
 #ifdef OAUTH_SUPPORT
 
 
 #ifdef OAUTH_SUPPORT
 


@@ -17,8 +19,9 @@
 #include <strings.h>
 #include <unistd.h>
 
 #include <strings.h>
 #include <unistd.h>
 

-#include <h/oauth.h>
-#include <h/utils.h>
+#include "h/oauth.h"
+#include "h/utils.h"
+#include "m_maildir.h"

 
 static const struct mh_oauth_service_info SERVICES[] = {
     /* https://developers.google.com/accounts/docs/OAuth2InstalledApp */
 
 static const struct mh_oauth_service_info SERVICES[] = {
     /* https://developers.google.com/accounts/docs/OAuth2InstalledApp */


@@ -56,14 +59,8 @@ copy_svc(mh_oauth_service_info *to, const mh_oauth_service_info *from)
 char *
 mh_oauth_node_name_for_svc(const char *base_name, const char *svc)
 {
 char *
 mh_oauth_node_name_for_svc(const char *base_name, const char *svc)
 {

-    char *result = mh_xmalloc(sizeof "oauth-" - 1
-                              + strlen(svc)
-                              + 1            /* '-' */
-                              + strlen(base_name)
-                              + 1            /* '\0' */);
-    sprintf(result, "oauth-%s-%s", svc, base_name);

     /* TODO: s/_/-/g ? */
     /* TODO: s/_/-/g ? */

-    return result;
+    return concat("oauth-", svc, "-", base_name, NULL);

 }
 
 /* Update one service_info field if overridden in profile. */
 }
 
 /* Update one service_info field if overridden in profile. */


@@ -74,13 +71,13 @@ update_svc_field(char **field, const char *base_name, const char *svc)
     const char *value = context_find(name);
     if (value != NULL) {
         free(*field);
     const char *value = context_find(name);
     if (value != NULL) {
         free(*field);

-        *field = getcpy(value);
+        *field = mh_xstrdup(value);

     }
     free(name);
 }
 
 /* Update all service_info fields that are overridden in profile. */
     }
     free(name);
 }
 
 /* Update all service_info fields that are overridden in profile. */

-static boolean
+static bool

 update_svc(mh_oauth_service_info *svc, const char *svc_name, char *errbuf,
           size_t errbuflen)
 {
 update_svc(mh_oauth_service_info *svc, const char *svc_name, char *errbuf,
           size_t errbuflen)
 {


@@ -89,7 +86,7 @@ update_svc(mh_oauth_service_info *svc, const char *svc_name, char *errbuf,
     if (svc->name == NULL) {                                             \
        snprintf(errbuf, errbuflen, "%s", #name " is missing");          \
        errbuf[errbuflen - 1] = '\0';                                    \
     if (svc->name == NULL) {                                             \
        snprintf(errbuf, errbuflen, "%s", #name " is missing");          \
        errbuf[errbuflen - 1] = '\0';                                    \

-        return FALSE;                                                    \
+        return false;                                                    \

     }
     update(scope);
     update(client_id);
     }
     update(scope);
     update(client_id);


@@ -107,10 +104,10 @@ update_svc(mh_oauth_service_info *svc, const char *svc_name, char *errbuf,
         svc->display_name = svc->name;
     }
 
         svc->display_name = svc->name;
     }
 

-    return TRUE;
+    return true;

 }
 
 }
 

-boolean
+bool

 mh_oauth_get_service_info(const char *svc_name, mh_oauth_service_info *svcinfo,
                          char *errbuf, size_t errbuflen)
 {
 mh_oauth_get_service_info(const char *svc_name, mh_oauth_service_info *svcinfo,
                          char *errbuf, size_t errbuflen)
 {


@@ -121,17 +118,35 @@ mh_oauth_get_service_info(const char *svc_name, mh_oauth_service_info *svcinfo,
     svcinfo->client_secret = svcinfo->auth_endpoint = NULL;
     svcinfo->token_endpoint = svcinfo->redirect_uri = NULL;
 
     svcinfo->client_secret = svcinfo->auth_endpoint = NULL;
     svcinfo->token_endpoint = svcinfo->redirect_uri = NULL;
 

-    for (i = 0; i < (int) (sizeof SERVICES / sizeof SERVICES[0]); i++) {
+    for (i = 0; i < (int)DIM(SERVICES); i++) {

         if (strcmp(SERVICES[i].name, svc_name) == 0) {
             copy_svc(svcinfo, &SERVICES[i]);
             break;
         }
     }
 
         if (strcmp(SERVICES[i].name, svc_name) == 0) {
             copy_svc(svcinfo, &SERVICES[i]);
             break;
         }
     }
 

-    if (!update_svc(svcinfo, svc_name, errbuf, errbuflen)) {
-        return FALSE;
-    }
+    return update_svc(svcinfo, svc_name, errbuf, errbuflen);
+}

 
 

-    return TRUE;
+/* Return value must be free(3)'d. */
+char *
+mh_oauth_cred_fn(const char *svc)
+{
+    char *key = mh_oauth_node_name_for_svc("credential-file", svc);
+    char *value = context_find(key);
+    free(key);
+
+    bool found = value;
+    if (found) {
+        if (*value == '/')
+            return mh_xstrdup(value);
+    } else
+        value = concat("oauth-", svc, NULL);
+
+    const char *md = m_maildir(value);
+    if (!found)
+        free(value);
+
+    return mh_xstrdup(md);

 }
 #endif
 }
 #endif