vauth: Moved the OAuth 2.0 authentication code to the new vauth directory (70e56939) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP curl

lib/Makefile.inc

+1 −1

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@

		LIB_VAUTH_CFILES = vauth/vauth.c vauth/cleartext.c vauth/cram.c \
		vauth/digest.c vauth/digest_sspi.c vauth/krb5_gssapi.c \
		vauth/krb5_sspi.c vauth/ntlm.c vauth/ntlm_sspi.c
		vauth/krb5_sspi.c vauth/ntlm.c vauth/ntlm_sspi.c vauth/oauth2.c

		LIB_VAUTH_HFILES = vauth/vauth.h vauth/digest.h vauth/ntlm.h

lib/Makefile.vc6

+1 −0

Original line number	Diff line number	Diff line
		@@ -626,6 +626,7 @@ X_OBJS= \
		$(DIROBJ)\krb5_sspi.obj \
		$(DIROBJ)\ntlm.obj \
		$(DIROBJ)\ntlm_sspi.obj \
		$(DIROBJ)\oauth.obj \
		$(DIROBJ)\vtls.obj \
		$(DIROBJ)\openssl.obj \
		$(DIROBJ)\strdup.obj \

lib/curl_sasl.c

+0 −49

Original line number	Diff line number	Diff line
		@@ -70,55 +70,6 @@ const struct {
		{ ZERO_NULL, 0, 0 }
		};

		/*
		* sasl_create_oauth_bearer_message()
		*
		* This is used to generate an already encoded OAuth 2.0 message ready for
		* sending to the recipient.
		*
		* Parameters:
		*
		* data [in] - The session handle.
		* user [in] - The user name.
		* host [in] - The host name (for OAUTHBEARER).
		* port [in] - The port (for OAUTHBEARER when not Port 80).
		* bearer [in] - The bearer token.
		* outptr [in/out] - The address where a pointer to newly allocated memory
		* holding the result will be stored upon completion.
		* outlen [out] - The length of the output message.
		*
		* Returns CURLE_OK on success.
		*/
		static CURLcode sasl_create_oauth_bearer_message(struct SessionHandle *data,
		const char *user,
		const char *host,
		const long port,
		const char *bearer,
		char *outptr, size_t outlen)
		{
		CURLcode result = CURLE_OK;
		char *oauth = NULL;

		/* Generate the message */
		if(host == NULL && (port == 0 \|\| port == 80))
		oauth = aprintf("user=%s\1auth=Bearer %s\1\1", user, bearer);
		else if(port == 0 \|\| port == 80)
		oauth = aprintf("user=%s\1host=%s\1auth=Bearer %s\1\1", user, host,
		bearer);
		else
		oauth = aprintf("user=%s\1host=%s\1port=%ld\1auth=Bearer %s\1\1", user,
		host, port, bearer);
		if(!oauth)
		return CURLE_OUT_OF_MEMORY;

		/* Base64 encode the reply */
		result = Curl_base64_encode(data, oauth, strlen(oauth), outptr, outlen);

		free(oauth);

		return result;
		}

		/*
		* Curl_sasl_cleanup()
		*

lib/vauth/oauth2.c

0 → 100644

+86 −0

Original line number	Diff line number	Diff line
		/***************************************************************************
		* _ _ ____ _
		* Project ___\| \| \| \| _ \\| \|
		* / __\| \| \| \| \|_) \| \|
		* \| (__\| \|_\| \| _ <\| \|___
		* \___\|\___/\|_\| \_\_____\|
		*
		* Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
		*
		* This software is licensed as described in the file COPYING, which
		* you should have received as part of this distribution. The terms
		* are also available at http://curl.haxx.se/docs/copyright.html.
		*
		* You may opt to use, copy, modify, merge, publish, distribute and/or sell
		* copies of the Software, and permit persons to whom the Software is
		* furnished to do so, under the terms of the COPYING file.
		*
		* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
		* KIND, either express or implied.
		*
		* RFC6749 OAuth 2.0 Authorization Framework
		*
		***************************************************************************/

		#include "curl_setup.h"

		#include <curl/curl.h>
		#include "urldata.h"

		#include "vauth/vauth.h"
		#include "curl_base64.h"
		#include "warnless.h"
		#include "curl_printf.h"

		/* The last #include files should be: */
		#include "curl_memory.h"
		#include "memdebug.h"

		/*
		* sasl_create_oauth_bearer_message()
		*
		* This is used to generate an already encoded OAuth 2.0 message ready for
		* sending to the recipient.
		*
		* Parameters:
		*
		* data[in] - The session handle.
		* user[in] - The user name.
		* host[in] - The host name(for OAUTHBEARER).
		* port[in] - The port(for OAUTHBEARER when not Port 80).
		* bearer[in] - The bearer token.
		* outptr[in / out] - The address where a pointer to newly allocated memory
		* holding the result will be stored upon completion.
		* outlen[out] - The length of the output message.
		*
		* Returns CURLE_OK on success.
		*/
		CURLcode sasl_create_oauth_bearer_message(struct SessionHandle *data,
		const char *user,
		const char *host,
		const long port,
		const char *bearer,
		char *outptr, size_t outlen)
		{
		CURLcode result = CURLE_OK;
		char *oauth = NULL;

		/* Generate the message */
		if(host == NULL && (port == 0 \|\| port == 80))
		oauth = aprintf("user=%s\1auth=Bearer %s\1\1", user, bearer);
		else if(port == 0 \|\| port == 80)
		oauth = aprintf("user=%s\1host=%s\1auth=Bearer %s\1\1", user, host,
		bearer);
		else
		oauth = aprintf("user=%s\1host=%s\1port=%ld\1auth=Bearer %s\1\1", user,
		host, port, bearer);
		if(!oauth)
		return CURLE_OUT_OF_MEMORY;

		/* Base64 encode the reply */
		result = Curl_base64_encode(data, oauth, strlen(oauth), outptr, outlen);

		free(oauth);

		return result;
		}

lib/vauth/vauth.h

+7 −0

Original line number	Diff line number	Diff line
		@@ -126,6 +126,13 @@ CURLcode Curl_sasl_create_ntlm_type3_message(struct SessionHandle *data,
		void Curl_sasl_ntlm_cleanup(struct ntlmdata *ntlm);
		#endif /* USE_NTLM */

		/* This is used to generate a base64 encoded OAuth 2.0 message */
		CURLcode sasl_create_oauth_bearer_message(struct SessionHandle *data,
		const char *user,
		const char *host,
		const long port,
		const char *bearer,
		char *outptr, size_t outlen);
		#if defined(USE_KERBEROS5)
		/* This is used to generate a base64 encoded GSSAPI (Kerberos V5) user token
		message */

Admin message