diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2021-08-28 01:06:28 -0600 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2021-08-28 01:06:28 -0600 |
| commit | b465d22ea5ccf8c138b44e319e7032385cd47f55 (patch) | |
| tree | cca45e7271f671255d63ea3c1663e02e6be32190 | |
| parent | 5431d789f6a736924230ff3e51c14e0db441bdb6 (diff) | |
| download | alpine-b465d22ea5ccf8c138b44e319e7032385cd47f55.tar.xz | |
* Changes to auth_bea.c similar to those of auth_oa2.c.
| -rw-r--r-- | imap/src/c-client/auth_bea.c | 25 | ||||
| -rw-r--r-- | pith/pine.hlp | 2 |
2 files changed, 16 insertions, 11 deletions
diff --git a/imap/src/c-client/auth_bea.c b/imap/src/c-client/auth_bea.c index d6dca992..f9e8e190 100644 --- a/imap/src/c-client/auth_bea.c +++ b/imap/src/c-client/auth_bea.c @@ -27,11 +27,21 @@ AUTHENTICATOR auth_bea = { }; #define BEARER_ACCOUNT "n,a=" +#define BEARER_ACCOUNT_LEN (4) + #ifndef OAUTH2_BEARER #define OAUTH2_BEARER "auth=Bearer " #endif + +#ifndef OAUTH2_BEARER_LEN +#define OAUTH2_BEARER_LEN (12) +#endif + #define BEARER_HOST "host=" +#define BEARER_HOST_LEN (5) + #define BEARER_PORT "port=" +#define BEARER_PORT_LEN (5) /* Client authenticator * Accepts: challenger function @@ -120,10 +130,10 @@ long auth_oauthbearer_client (authchallenge_t challenger,authrespond_t responder char *response; sprintf(ports, "%lu", port); - rlen = strlen(BEARER_ACCOUNT) + strlen(user) + 1 + 1 - + strlen(BEARER_HOST) + strlen(mb->orighost) + 1 - + strlen(BEARER_PORT) + strlen(ports) + 1 - + strlen(OAUTH2_BEARER) + strlen(oauth2.access_token) + 2; + rlen = BEARER_ACCOUNT_LEN + strlen(user) + 1 + 1 + + BEARER_HOST_LEN + strlen(mb->orighost) + 1 + + BEARER_PORT_LEN + strlen(ports) + 1 + + OAUTH2_BEARER_LEN + strlen(oauth2.access_token) + 2; response = (char *) fs_get (rlen+1); sprintf(response, "%s%s,\001%s%s\001%s%s\001%s%s\001\001", BEARER_ACCOUNT, user, BEARER_HOST, mb->orighost, BEARER_PORT, ports, OAUTH2_BEARER, oauth2.access_token); @@ -138,13 +148,8 @@ long auth_oauthbearer_client (authchallenge_t challenger,authrespond_t responder * Refresh Token has expired somehow, we invalidate it if we * reach *trial to 3. This forces the process to restart later on. */ - if(*trial == 3){ - if(oauth2.param[OA2_State].value) - fs_give((void **) &oauth2.param[OA2_State].value); - fs_give((void **) &oauth2.param[OA2_RefreshToken].value); - fs_give((void **) &oauth2.access_token); + if(*trial == 3) oauth2.expiration = 0L; - } } } fs_give ((void **) &response); diff --git a/pith/pine.hlp b/pith/pine.hlp index 714c5611..e4c85f70 100644 --- a/pith/pine.hlp +++ b/pith/pine.hlp @@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any reasonable place to be called from. Dummy change to get revision in pine.hlp ============= h_revision ================= -Alpine Commit 582 2021-08-28 00:40:42 +Alpine Commit 583 2021-08-28 01:06:23 ============= h_news ================= <HTML> <HEAD> |