Commit eaa98cef authored by Steve Holme's avatar Steve Holme
Browse files

oauth2: Don't use XOAUTH2 in OAuth 2.0 variables

parent 4e3d3969

lib/curl_sasl.c

+4 −3
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
 * RFC4422 Simple Authentication and Security Layer (SASL)

 * RFC4616 PLAIN authentication

 * RFC6749 OAuth 2.0 Authorization Framework

 * RFC7628 A Set of SASL Mechanisms for OAuth

 * Draft   LOGIN SASL Mechanism <draft-murchison-sasl-login-00.txt>

 *

 ***************************************************************************/
@@ -1443,14 +1444,14 @@ CURLcode Curl_sasl_start(struct SASL *sasl, struct connectdata *conn, 
      }

    else

#endif

    if((enabledmechs & SASL_MECH_XOAUTH2) || conn->xoauth2_bearer) {

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

      mech = SASL_MECH_STRING_XOAUTH2;

      state1 = SASL_XOAUTH2;

      sasl->authused = SASL_MECH_XOAUTH2;



      if(force_ir || data->set.sasl_ir)

        result = sasl_create_xoauth2_message(data, conn->user,

                                             conn->xoauth2_bearer,

                                             conn->oauth_bearer,

                                             &resp, &len);

    }

    else if(enabledmechs & SASL_MECH_LOGIN) {
@@ -1629,7 +1630,7 @@ CURLcode Curl_sasl_continue(struct SASL *sasl, struct connectdata *conn, 
  case SASL_XOAUTH2:

    /* Create the authorisation message */

    result = sasl_create_xoauth2_message(data, conn->user,

                                         conn->xoauth2_bearer, &resp, &len);

                                         conn->oauth_bearer, &resp, &len);

    break;

  case SASL_CANCEL:

    /* Remove the offending mechanism from the supported list */

lib/url.c

+3 −3
Original line number Diff line number Diff line
@@ -2725,7 +2725,7 @@ static void conn_free(struct connectdata *conn) 


  Curl_safefree(conn->user);

  Curl_safefree(conn->passwd);

  Curl_safefree(conn->xoauth2_bearer);

  Curl_safefree(conn->oauth_bearer);

  Curl_safefree(conn->options);

  Curl_safefree(conn->proxyuser);

  Curl_safefree(conn->proxypasswd);
@@ -5535,8 +5535,8 @@ static CURLcode create_conn(struct SessionHandle *data, 
  }



  if(data->set.str[STRING_BEARER]) {

    conn->xoauth2_bearer = strdup(data->set.str[STRING_BEARER]);

    if(!conn->xoauth2_bearer) {

    conn->oauth_bearer = strdup(data->set.str[STRING_BEARER]);

    if(!conn->oauth_bearer) {

      result = CURLE_OUT_OF_MEMORY;

      goto out;

    }

lib/urldata.h

+1 −1
Original line number Diff line number Diff line
@@ -915,7 +915,7 @@ struct connectdata { 
  char *passwd;  /* password string, allocated */

  char *options; /* options string, allocated */



  char *xoauth2_bearer; /* bearer token for OAuth 2.0, allocated */

  char *oauth_bearer; /* bearer token for OAuth 2.0, allocated */



  char *proxyuser;    /* proxy user name string, allocated */

  char *proxypasswd;  /* proxy password string, allocated */

src/tool_cfgable.c

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ static void free_config_fields(struct OperationConfig *config) 
  Curl_safefree(config->customrequest);

  Curl_safefree(config->krblevel);



  Curl_safefree(config->xoauth2_bearer);

  Curl_safefree(config->oauth_bearer);



  Curl_safefree(config->unix_socket_path);

  Curl_safefree(config->writeout);

src/tool_cfgable.h

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ struct OperationConfig { 
#ifdef CURLDEBUG

  bool test_event_based;

#endif

  char *xoauth2_bearer;           /* OAuth 2.0 bearer token */

  char *oauth_bearer;             /* OAuth 2.0 bearer token */

  bool nonpn;                     /* enable/disable TLS NPN extension */

  bool noalpn;                    /* enable/disable TLS ALPN extension */

  char *unix_socket_path;         /* path to Unix domain socket */