Commit 1f82df91 authored by Steve Holme's avatar Steve Holme
Browse files

sasl: Re-introduced XOAUTH2 in the default enabled authentication mechanism 

Following the fix in commit d6d58dd5 it is necessary to re-introduce
XOAUTH2 in the default enabled authentication mechanism, which was
removed in commit 7b2012f2, otherwise users will have to specify
AUTH=XOAUTH2 in the URL.

Note: OAuth 2.0 will only be used when the bearer is specified.
parent 077fd8f1

lib/curl_sasl.c

+1 −2
Original line number Diff line number Diff line
@@ -1455,8 +1455,7 @@ CURLcode Curl_sasl_start(struct SASL *sasl, struct connectdata *conn, 
      }

    else

#endif

    if((enabledmechs & SASL_MECH_XOAUTH2) && ((conn->oauth_bearer) ||

                                              (!conn->passwd))) {

    if((enabledmechs & SASL_MECH_XOAUTH2) && conn->oauth_bearer) {

      mech = SASL_MECH_STRING_XOAUTH2;

      state1 = SASL_OAUTH2;

      sasl->authused = SASL_MECH_XOAUTH2;

lib/curl_sasl.h

+1 −2
Original line number Diff line number Diff line
@@ -52,8 +52,7 @@ struct kerberos5data; 
/* Authentication mechanism values */

#define SASL_AUTH_NONE          0

#define SASL_AUTH_ANY           ~0U

#define SASL_AUTH_DEFAULT       (SASL_AUTH_ANY & \

                                 ~(SASL_MECH_EXTERNAL | SASL_MECH_XOAUTH2))

#define SASL_AUTH_DEFAULT       (SASL_AUTH_ANY & ~SASL_MECH_EXTERNAL)



/* Authentication mechanism strings */

#define SASL_MECH_STRING_LOGIN      "LOGIN"