diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2020-07-28 20:52:28 -0600 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2020-07-28 20:52:28 -0600 |
| commit | 0d181b64d4d433a5ec88c4bfd55cd5a1d5f9a1da (patch) | |
| tree | 981d63dd006c04c1b884d0b6cbbcd6a405593ae0 /pith | |
| parent | 6591233b484d8f303b64f9042aee516d1b3a9cc6 (diff) | |
| download | alpine-0d181b64d4d433a5ec88c4bfd55cd5a1d5f9a1da.tar.xz | |
* XOAUTH2: automatic renew of access token and connection to a server
within 60 seconds of expiration of the access token.
Diffstat (limited to 'pith')
| -rw-r--r-- | pith/newmail.c | 25 | ||||
| -rw-r--r-- | pith/pine.hlp | 5 |
2 files changed, 29 insertions, 1 deletions
diff --git a/pith/newmail.c b/pith/newmail.c index 1f026eeb..bdbb2a58 100644 --- a/pith/newmail.c +++ b/pith/newmail.c @@ -118,6 +118,31 @@ new_mail(int force_arg, CheckPointTime time_for_check_point, int flags) if(!force && sp_unsorted_newmail(ps_global->mail_stream)) force = !(flags & NM_DEFER_SORT); + /* Some servers prefer to close the connection when the access token expires, + * while some others prefer to keep the connection alive. This means we + * need to check if the access token is about to expire, and if so renew + * the access token and the stream. Under normal circumstances this is done + * invisible to the user. Hide error messages here, in case there are any. + * The worst thing that could happen is that the user will SEE the error + * later, when the connection is closed by the server (and the error will + * be seen then.) Sending error messages at this time will confuse users. + * Avoid it now. + */ + for(i = 0; i < ps_global->s_pool.nstream; i++){ + m = ps_global->s_pool.streams[i]; + if(m && m->auth.name + && (!strucmp(m->auth.name, OA2NAME) || !strucmp(m->auth.name, BEARERNAME)) + && now + 60 > m->auth.expiration){ /* procastinate doing this */ + int skip = m->auth.expiration == 0 ? 1 : 0; + dprint((9, "renew_accesstoken: %s: now = %lu, auth = %s, expiration = %lu\n", STREAMNAME(m), now, m->auth.name, m->auth.expiration)); + ps_global->noshow_error = 1; /* make this invisible to the user */ + renew_accesstoken(m); + if(skip == 0) mail_renew_stream(m); + ps_global->noshow_error = 0; /* return to normal status */ + dprint((9, "renew_accesstoken: %s: result: expiration = %lu\n", STREAMNAME(m), m->auth.expiration)); + } + } + if(!ps_global->mail_stream || !(timeo || force || sp_a_locked_stream_changed())) return(-1); diff --git a/pith/pine.hlp b/pith/pine.hlp index 428792b5..e215ec9b 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 496 2020-07-19 02:52:27 +Alpine Commit 498 2020-07-28 20:52:25 ============= h_news ================= <HTML> <HEAD> @@ -194,6 +194,9 @@ problems you find with this release. <LI> Expansion of the configuration screen for XOAUTH2 to include username, authorization flow, and tenant. +<LI> XOAUTH2: automatic renew of access token and connection to a server + within 60 seconds of expiration of the access token. + <LI> If a user has more than one client-id for a service, Alpine tries to asks the user which client-id to use and associates that client-id to the credentials in the XOAUTH2 configuration screen. |