seq_del.c: Move interface to own file.

[nmh] / sbr / oauth.c

diff --git a/sbr/oauth.c b/sbr/oauth.c
index a792729f4af237570bcbf2a04f4784b8963b4c8d..718a688478ec358067807d1df109e3ce28108009 100755 (executable)
--- a/sbr/oauth.c
+++ b/sbr/oauth.c
@@ -5,7 +5,8 @@
  * complete copyright information.
  */
 
  * complete copyright information.
  */
 

-#include <h/mh.h>
+#include "h/mh.h"
+#include "error.h"

 
 #ifdef OAUTH_SUPPORT
 
 
 #ifdef OAUTH_SUPPORT
 


@@ -20,10 +21,10 @@
 #include <unistd.h>
 
 #include <curl/curl.h>
 #include <unistd.h>
 
 #include <curl/curl.h>

-#include <thirdparty/jsmn/jsmn.h>
+#include "thirdparty/jsmn/jsmn.h"

 
 

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

 #include "lock_file.h"
 
 #define JSON_TYPE "application/json"
 #include "lock_file.h"
 
 #define JSON_TYPE "application/json"


@@ -141,15 +142,15 @@ mh_oauth_do_xoauth(const char *user, const char *svc, unsigned char **oauth_res,
     char *client_res;
 
     if (!mh_oauth_new (&ctx, svc))
     char *client_res;
 
     if (!mh_oauth_new (&ctx, svc))

-        adios(NULL, "%s", mh_oauth_get_err_string(ctx));
+        die("%s", mh_oauth_get_err_string(ctx));

 
     if (log != NULL) mh_oauth_log_to(stderr, ctx);
 
 
     if (log != NULL) mh_oauth_log_to(stderr, ctx);
 

-    fn = mh_xstrdup(mh_oauth_cred_fn(svc));
+    fn = mh_oauth_cred_fn(svc);

     fp = lkfopendata(fn, "r+", &failed_to_lock);
     if (fp == NULL) {
         if (errno == ENOENT) {
     fp = lkfopendata(fn, "r+", &failed_to_lock);
     if (fp == NULL) {
         if (errno == ENOENT) {

-            adios(NULL, "no credentials -- run mhlogin -saslmech xoauth2 -authservice %s", svc);
+            die("no credentials -- run mhlogin -saslmech xoauth2 -authservice %s", svc);

         }
         adios(fn, "failed to open");
     }
         }
         adios(fn, "failed to open");
     }


@@ -158,24 +159,24 @@ mh_oauth_do_xoauth(const char *user, const char *svc, unsigned char **oauth_res,
     }
 
     if ((cred = mh_oauth_cred_load(fp, ctx, user)) == NULL) {
     }
 
     if ((cred = mh_oauth_cred_load(fp, ctx, user)) == NULL) {

-        adios(NULL, "%s", mh_oauth_get_err_string(ctx));
+        die("%s", mh_oauth_get_err_string(ctx));

     }
 
     if (!mh_oauth_access_token_valid(time(NULL), cred)) {
         if (!mh_oauth_refresh(cred)) {
             if (mh_oauth_get_err_code(ctx) == MH_OAUTH_NO_REFRESH) {
     }
 
     if (!mh_oauth_access_token_valid(time(NULL), cred)) {
         if (!mh_oauth_refresh(cred)) {
             if (mh_oauth_get_err_code(ctx) == MH_OAUTH_NO_REFRESH) {

-                adios(NULL, "no valid credentials -- run mhlogin -saslmech xoauth2 -authservice %s", svc);
+                die("no valid credentials -- run mhlogin -saslmech xoauth2 -authservice %s", svc);

             }
             if (mh_oauth_get_err_code(ctx) == MH_OAUTH_BAD_GRANT) {
             }
             if (mh_oauth_get_err_code(ctx) == MH_OAUTH_BAD_GRANT) {

-                adios(NULL, "credentials rejected -- run mhlogin -saslmech xoauth2 -authservice %s", svc);
+                die("credentials rejected -- run mhlogin -saslmech xoauth2 -authservice %s", svc);

             }
             inform("error refreshing OAuth2 token");
             }
             inform("error refreshing OAuth2 token");

-            adios(NULL, "%s", mh_oauth_get_err_string(ctx));
+            die("%s", mh_oauth_get_err_string(ctx));

         }
 
         fseek(fp, 0, SEEK_SET);
         if (!mh_oauth_cred_save(fp, cred, user)) {
         }
 
         fseek(fp, 0, SEEK_SET);
         if (!mh_oauth_cred_save(fp, cred, user)) {

-            adios(NULL, "%s", mh_oauth_get_err_string(ctx));
+            die("%s", mh_oauth_get_err_string(ctx));

         }
     }
 
         }
     }
 


@@ -226,7 +227,7 @@ set_err_http(mh_oauth_ctx *ctx, const struct curl_ctx *curl_ctx)
     if (curl_ctx->res_len > 0
         && is_json(curl_ctx->content_type)
         && get_json_strings(curl_ctx->res_body, curl_ctx->res_len, ctx->log,
     if (curl_ctx->res_len > 0
         && is_json(curl_ctx->content_type)
         && get_json_strings(curl_ctx->res_body, curl_ctx->res_len, ctx->log,

-                            "error", &error, (void *)NULL)
+                            "error", &error, NULL)

         && error != NULL) {
         if (strcmp(error, "invalid_grant") == 0) {
             code = MH_OAUTH_BAD_GRANT;
         && error != NULL) {
         if (strcmp(error, "invalid_grant") == 0) {
             code = MH_OAUTH_BAD_GRANT;


@@ -263,13 +264,13 @@ mh_oauth_new(mh_oauth_ctx **result, const char *svc_name)
     if (!mh_oauth_get_service_info(svc_name, &ctx->svc, ctx->err_buf,
                                   sizeof(ctx->err_buf))) {
        set_err_details(ctx, MH_OAUTH_BAD_PROFILE, ctx->err_buf);
     if (!mh_oauth_get_service_info(svc_name, &ctx->svc, ctx->err_buf,
                                   sizeof(ctx->err_buf))) {
        set_err_details(ctx, MH_OAUTH_BAD_PROFILE, ctx->err_buf);

-        return FALSE;
+        return false;

     }
 
     ctx->curl = curl_easy_init();
     if (ctx->curl == NULL) {
         set_err(ctx, MH_OAUTH_CURL_INIT);
     }
 
     ctx->curl = curl_easy_init();
     if (ctx->curl == NULL) {
         set_err(ctx, MH_OAUTH_CURL_INIT);

-        return FALSE;
+        return false;

     }
     curl_easy_setopt(ctx->curl, CURLOPT_ERRORBUFFER, ctx->err_buf);
 
     }
     curl_easy_setopt(ctx->curl, CURLOPT_ERRORBUFFER, ctx->err_buf);
 


@@ -278,10 +279,10 @@ mh_oauth_new(mh_oauth_ctx **result, const char *svc_name)
     if (curl_easy_setopt(ctx->curl, CURLOPT_USERAGENT,
                          ctx->user_agent) != CURLE_OK) {
         set_err_details(ctx, MH_OAUTH_CURL_INIT, ctx->err_buf);
     if (curl_easy_setopt(ctx->curl, CURLOPT_USERAGENT,
                          ctx->user_agent) != CURLE_OK) {
         set_err_details(ctx, MH_OAUTH_CURL_INIT, ctx->err_buf);

-        return FALSE;
+        return false;

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 void
 }
 
 void


@@ -386,7 +387,7 @@ mh_oauth_get_authorize_url(mh_oauth_ctx *ctx)
                         "client_id", ctx->svc.client_id,
                         "redirect_uri", ctx->svc.redirect_uri,
                         "scope", ctx->svc.scope,
                         "client_id", ctx->svc.client_id,
                         "redirect_uri", ctx->svc.redirect_uri,
                         "scope", ctx->svc.scope,

-                        (void *)NULL)) {
+                        NULL)) {

         set_err(ctx, MH_OAUTH_REQUEST_INIT);
         return NULL;
     }
         set_err(ctx, MH_OAUTH_REQUEST_INIT);
         return NULL;
     }


@@ -397,12 +398,12 @@ static bool
 cred_from_response(mh_oauth_cred *cred, const char *content_type,
                    const char *input, size_t input_len)
 {
 cred_from_response(mh_oauth_cred *cred, const char *content_type,
                    const char *input, size_t input_len)
 {

-    bool result = FALSE;
+    bool result = false;

     char *access_token, *expires_in, *refresh_token;
     const mh_oauth_ctx *ctx = cred->ctx;
 
     if (!is_json(content_type)) {
     char *access_token, *expires_in, *refresh_token;
     const mh_oauth_ctx *ctx = cred->ctx;
 
     if (!is_json(content_type)) {

-        return FALSE;
+        return false;

     }
 
     access_token = expires_in = refresh_token = NULL;
     }
 
     access_token = expires_in = refresh_token = NULL;


@@ -410,7 +411,7 @@ cred_from_response(mh_oauth_cred *cred, const char *content_type,
                           "access_token", &access_token,
                           "expires_in", &expires_in,
                           "refresh_token", &refresh_token,
                           "access_token", &access_token,
                           "expires_in", &expires_in,
                           "refresh_token", &refresh_token,

-                          (void *)NULL)) {
+                          NULL)) {

         goto out;
     }
 
         goto out;
     }
 


@@ -421,7 +422,7 @@ cred_from_response(mh_oauth_cred *cred, const char *content_type,
         }
     }
 
         }
     }
 

-    result = TRUE;
+    result = true;

 
     free(cred->access_token);
     cred->access_token = access_token;
 
     free(cred->access_token);
     cred->access_token = access_token;


@@ -470,21 +471,21 @@ do_access_request(mh_oauth_cred *cred, const char *req_body)
         } else {
             set_err_details(ctx, MH_OAUTH_POST, ctx->err_buf);
         }
         } else {
             set_err_details(ctx, MH_OAUTH_POST, ctx->err_buf);
         }

-        return FALSE;
+        return false;

     }
 
     if (curl_ctx.res_code != 200) {
         set_err_http(ctx, &curl_ctx);
     }
 
     if (curl_ctx.res_code != 200) {
         set_err_http(ctx, &curl_ctx);

-        return FALSE;
+        return false;

     }
 
     if (!cred_from_response(cred, curl_ctx.content_type, curl_ctx.res_body,
                             curl_ctx.res_len)) {
         set_err(ctx, MH_OAUTH_RESPONSE_BAD);
     }
 
     if (!cred_from_response(cred, curl_ctx.content_type, curl_ctx.res_body,
                             curl_ctx.res_len)) {
         set_err(ctx, MH_OAUTH_RESPONSE_BAD);

-        return FALSE;
+        return false;

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 mh_oauth_cred *
 }
 
 mh_oauth_cred *


@@ -498,7 +499,7 @@ mh_oauth_authorize(const char *code, mh_oauth_ctx *ctx)
                         "redirect_uri", ctx->svc.redirect_uri,
                         "client_id", ctx->svc.client_id,
                         "client_secret", ctx->svc.client_secret,
                         "redirect_uri", ctx->svc.redirect_uri,
                         "client_id", ctx->svc.client_id,
                         "client_secret", ctx->svc.client_secret,

-                        (void *)NULL)) {
+                        NULL)) {

         set_err(ctx, MH_OAUTH_REQUEST_INIT);
         return NULL;
     }
         set_err(ctx, MH_OAUTH_REQUEST_INIT);
         return NULL;
     }


@@ -523,7 +524,7 @@ mh_oauth_refresh(mh_oauth_cred *cred)
 
     if (cred->refresh_token == NULL) {
         set_err(ctx, MH_OAUTH_NO_REFRESH);
 
     if (cred->refresh_token == NULL) {
         set_err(ctx, MH_OAUTH_NO_REFRESH);

-        return FALSE;
+        return false;

     }
 
     if (!make_query_url(ctx->buf, sizeof ctx->buf, ctx->curl, NULL,
     }
 
     if (!make_query_url(ctx->buf, sizeof ctx->buf, ctx->curl, NULL,


@@ -531,16 +532,16 @@ mh_oauth_refresh(mh_oauth_cred *cred)
                         "refresh_token", cred->refresh_token,
                         "client_id", ctx->svc.client_id,
                         "client_secret", ctx->svc.client_secret,
                         "refresh_token", cred->refresh_token,
                         "client_id", ctx->svc.client_id,
                         "client_secret", ctx->svc.client_secret,

-                        (void *)NULL)) {
+                        NULL)) {

         set_err(ctx, MH_OAUTH_REQUEST_INIT);
         set_err(ctx, MH_OAUTH_REQUEST_INIT);

-        return FALSE;
+        return false;

     }
 
     result = do_access_request(cred, ctx->buf);
 
     if (result && cred->access_token == NULL) {
         set_err_details(ctx, MH_OAUTH_RESPONSE_BAD, "no access token");
     }
 
     result = do_access_request(cred, ctx->buf);
 
     if (result && cred->access_token == NULL) {
         set_err_details(ctx, MH_OAUTH_RESPONSE_BAD, "no access token");

-        return FALSE;
+        return false;

     }
 
     return result;
     }
 
     return result;


@@ -613,7 +614,7 @@ free_user_creds(struct user_creds *user_creds)
 static bool
 load_creds(struct user_creds **result, FILE *fp, mh_oauth_ctx *ctx)
 {
 static bool
 load_creds(struct user_creds **result, FILE *fp, mh_oauth_ctx *ctx)
 {

-    bool success = FALSE;
+    bool success = false;

     char name[NAMESZ], value_buf[BUFSIZ];
     int state;
     m_getfld_state_t getfld_ctx;
     char name[NAMESZ], value_buf[BUFSIZ];
     int state;
     m_getfld_state_t getfld_ctx;


@@ -681,7 +682,7 @@ load_creds(struct user_creds **result, FILE *fp, mh_oauth_ctx *ctx)
 
         case BODY:
         case FILEEOF:
 
         case BODY:
         case FILEEOF:

-            success = TRUE;
+            success = true;

             break;
 
         default:
             break;
 
         default:


@@ -708,17 +709,17 @@ save_user(FILE *fp, const char *user, const char *access, const char *refresh,
           long expires_at)
 {
     if (access != NULL) {
           long expires_at)
 {
     if (access != NULL) {

-        if (fprintf(fp, "access-%s: %s\n", user, access) < 0) return FALSE;
+        if (fprintf(fp, "access-%s: %s\n", user, access) < 0) return false;

     }
     if (refresh != NULL) {
     }
     if (refresh != NULL) {

-        if (fprintf(fp, "refresh-%s: %s\n", user, refresh) < 0) return FALSE;
+        if (fprintf(fp, "refresh-%s: %s\n", user, refresh) < 0) return false;

     }
     if (expires_at > 0) {
         if (fprintf(fp, "expire-%s: %ld\n", user, (long)expires_at) < 0) {
     }
     if (expires_at > 0) {
         if (fprintf(fp, "expire-%s: %ld\n", user, (long)expires_at) < 0) {

-            return FALSE;
+            return false;

         }
     }
         }
     }

-    return TRUE;
+    return true;

 }
 
 bool
 }
 
 bool


@@ -730,7 +731,7 @@ mh_oauth_cred_save(FILE *fp, mh_oauth_cred *cred, const char *user)
 
     /* Load existing creds if any. */
     if (!load_creds(&user_creds, fp, cred->ctx)) {
 
     /* Load existing creds if any. */
     if (!load_creds(&user_creds, fp, cred->ctx)) {

-        return FALSE;
+        return false;

     }
 
     if (fchmod(fd, S_IRUSR | S_IWUSR) < 0) goto err;
     }
 
     if (fchmod(fd, S_IRUSR | S_IWUSR) < 0) goto err;


@@ -755,12 +756,12 @@ mh_oauth_cred_save(FILE *fp, mh_oauth_cred *cred, const char *user)
 
     free_user_creds(user_creds);
 
 
     free_user_creds(user_creds);
 

-    return TRUE;
+    return true;

 
   err:
     free_user_creds(user_creds);
     set_err(cred->ctx, MH_OAUTH_CRED_FILE);
 
   err:
     free_user_creds(user_creds);
     set_err(cred->ctx, MH_OAUTH_CRED_FILE);

-    return FALSE;
+    return false;

 }
 
 mh_oauth_cred *
 }
 
 mh_oauth_cred *


@@ -827,14 +828,14 @@ mh_oauth_sasl_client_response(size_t *res_len,
 
 /*
  * Build null-terminated URL in the array pointed to by s.  If the URL doesn't
 
 /*
  * Build null-terminated URL in the array pointed to by s.  If the URL doesn't

- * fit within size (including the terminating null byte), return FALSE without *
+ * fit within size (including the terminating null byte), return false without *

  * building the entire URL.  Some of URL may already have been written into the
  * result array in that case.
  */
 static bool
 make_query_url(char *s, size_t size, CURL *curl, const char *base_url, ...)
 {
  * building the entire URL.  Some of URL may already have been written into the
  * result array in that case.
  */
 static bool
 make_query_url(char *s, size_t size, CURL *curl, const char *base_url, ...)
 {

-    bool result = FALSE;
+    bool result = false;

     size_t len;
     char *prefix;
     va_list ap;
     size_t len;
     char *prefix;
     va_list ap;


@@ -846,7 +847,7 @@ make_query_url(char *s, size_t size, CURL *curl, const char *base_url, ...)
     } else {
         len = strlen(base_url);
         if (len > size - 1) /* Less one for NUL. */
     } else {
         len = strlen(base_url);
         if (len > size - 1) /* Less one for NUL. */

-            return FALSE;
+            return false;

         strcpy(s, base_url);
         prefix = "?";
     }
         strcpy(s, base_url);
         prefix = "?";
     }


@@ -873,7 +874,7 @@ make_query_url(char *s, size_t size, CURL *curl, const char *base_url, ...)
         prefix = "&";
     }
 
         prefix = "&";
     }
 

-    result = TRUE;
+    result = true;

 
   out:
     va_end(ap);
 
   out:
     va_end(ap);


@@ -920,7 +921,7 @@ write_callback(const char *ptr, size_t size, size_t nmemb, void *userdata)
     size *= nmemb;
     new_len = ctx->res_len + size;
     if (new_len > sizeof ctx->res_body) {
     size *= nmemb;
     new_len = ctx->res_len + size;
     if (new_len > sizeof ctx->res_body) {

-      ctx->too_big = TRUE;
+      ctx->too_big = true;

       return 0;
     }
 
       return 0;
     }
 


@@ -936,7 +937,7 @@ post(struct curl_ctx *ctx, const char *url, const char *req_body)
     CURL *curl = ctx->curl;
     CURLcode status;
 
     CURL *curl = ctx->curl;
     CURLcode status;
 

-    ctx->too_big = FALSE;
+    ctx->too_big = false;

     ctx->res_len = 0;
 
     if (ctx->log != NULL) {
     ctx->res_len = 0;
 
     if (ctx->log != NULL) {


@@ -945,8 +946,8 @@ post(struct curl_ctx *ctx, const char *url, const char *req_body)
         curl_easy_setopt(curl, CURLOPT_DEBUGDATA, ctx->log);
     }
 
         curl_easy_setopt(curl, CURLOPT_DEBUGDATA, ctx->log);
     }
 

-    if ((status = curl_easy_setopt(curl, CURLOPT_URL, url)) != CURLE_OK) {
-        return FALSE;
+    if (curl_easy_setopt(curl, CURLOPT_URL, url) != CURLE_OK) {
+        return false;

     }
 
     curl_easy_setopt(curl, CURLOPT_POSTFIELDS, req_body);
     }
 
     curl_easy_setopt(curl, CURLOPT_POSTFIELDS, req_body);


@@ -964,21 +965,17 @@ post(struct curl_ctx *ctx, const char *url, const char *req_body)
     status = curl_easy_perform(curl);
     /* first check for error from callback */
     if (ctx->too_big) {
     status = curl_easy_perform(curl);
     /* first check for error from callback */
     if (ctx->too_big) {

-        return FALSE;
+        return false;

     }
     /* now from curl */
     if (status != CURLE_OK) {
     }
     /* now from curl */
     if (status != CURLE_OK) {

-        return FALSE;
+        return false;

     }
 
     }
 

-    if ((status = curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE,
-                                    &ctx->res_code)) != CURLE_OK
-        || (status = curl_easy_getinfo(curl, CURLINFO_CONTENT_TYPE,
-                                       &ctx->content_type)) != CURLE_OK) {
-        return FALSE;
-    }
-
-    return TRUE;
+    return curl_easy_getinfo(curl,
+            CURLINFO_RESPONSE_CODE, &ctx->res_code) == CURLE_OK &&
+        curl_easy_getinfo(curl,
+            CURLINFO_CONTENT_TYPE, &ctx->content_type) == CURLE_OK;

 }
 
 /*******************************************************************************
 }
 
 /*******************************************************************************


@@ -1019,11 +1016,8 @@ parse_json(jsmntok_t **tokens, size_t *tokens_len,
            of the response body. */
         *tokens = mh_xrealloc(*tokens, *tokens_len * sizeof **tokens);
     }
            of the response body. */
         *tokens = mh_xrealloc(*tokens, *tokens_len * sizeof **tokens);
     }

-    if (r <= 0) {
-        return FALSE;
-    }

 
 

-    return TRUE;
+    return r > 0;

 }
 
 /*
 }
 
 /*


@@ -1043,7 +1037,7 @@ get_json_string(char **val, const char *input, const jsmntok_t *tokens,
     int skip_tokens = 0;
     /* whether the current token represents a field name */
     /* The next token will be the value. */
     int skip_tokens = 0;
     /* whether the current token represents a field name */
     /* The next token will be the value. */

-    bool is_key = TRUE;
+    bool is_key = true;

 
     int i;
     for (i = 1; i <= token_count; i++) {
 
     int i;
     for (i = 1; i <= token_count; i++) {


@@ -1069,11 +1063,11 @@ get_json_string(char **val, const char *input, const jsmntok_t *tokens,
         if (skip_tokens > 0) {
             skip_tokens--;
             /* When we finish with the object or list, we'll have a key. */
         if (skip_tokens > 0) {
             skip_tokens--;
             /* When we finish with the object or list, we'll have a key. */

-            is_key = TRUE;
+            is_key = true;

             continue;
         }
         if (is_key) {
             continue;
         }
         if (is_key) {

-            is_key = FALSE;
+            is_key = false;

             continue;
         }
         key = input + tokens[i - 1].start;
             continue;
         }
         key = input + tokens[i - 1].start;


@@ -1085,7 +1079,7 @@ get_json_string(char **val, const char *input, const jsmntok_t *tokens,
             (*val)[val_len] = '\0';
             return;
         }
             (*val)[val_len] = '\0';
             return;
         }

-        is_key = TRUE;
+        is_key = true;

     }
 }
 
     }
 }
 


@@ -1109,7 +1103,7 @@ get_json_string(char **val, const char *input, const jsmntok_t *tokens,
 static bool
 get_json_strings(const char *input, size_t input_len, FILE *log, ...)
 {
 static bool
 get_json_strings(const char *input, size_t input_len, FILE *log, ...)
 {

-    bool result = FALSE;
+    bool result = false;

     jsmntok_t *tokens;
     size_t tokens_len;
     va_list ap;
     jsmntok_t *tokens;
     size_t tokens_len;
     va_list ap;


@@ -1123,7 +1117,7 @@ get_json_strings(const char *input, size_t input_len, FILE *log, ...)
         goto out;
     }
 
         goto out;
     }
 

-    result = TRUE;
+    result = true;

 
     va_start(ap, log);
     for (name = va_arg(ap, char *); name != NULL; name = va_arg(ap, char *)) {
 
     va_start(ap, log);
     for (name = va_arg(ap, char *); name != NULL; name = va_arg(ap, char *)) {