aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/Makefile.inc2
-rw-r--r--lib/Makefile.vc61
-rw-r--r--lib/curl_sasl.c49
-rw-r--r--lib/vauth/oauth2.c86
-rw-r--r--lib/vauth/vauth.h7
-rw-r--r--packages/Symbian/group/libcurl.mmp2
6 files changed, 96 insertions, 51 deletions
diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index 92cc40f01..4ec8bcfb7 100644
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -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
diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6
index 57e03929f..addaf794f 100644
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -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 \
diff --git a/lib/curl_sasl.c b/lib/curl_sasl.c
index aabf3ecf5..e92eda5b5 100644
--- a/lib/curl_sasl.c
+++ b/lib/curl_sasl.c
@@ -71,55 +71,6 @@ const struct {
};
/*
- * 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()
*
* This is used to cleanup any libraries or curl modules used by the sasl
diff --git a/lib/vauth/oauth2.c b/lib/vauth/oauth2.c
new file mode 100644
index 000000000..eb4df3ec0
--- /dev/null
+++ b/lib/vauth/oauth2.c
@@ -0,0 +1,86 @@
+/***************************************************************************
+ * _ _ ____ _
+ * 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;
+}
diff --git a/lib/vauth/vauth.h b/lib/vauth/vauth.h
index c26b9e31d..e34a930cf 100644
--- a/lib/vauth/vauth.h
+++ b/lib/vauth/vauth.h
@@ -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 */
diff --git a/packages/Symbian/group/libcurl.mmp b/packages/Symbian/group/libcurl.mmp
index ab628bc53..234e188ef 100644
--- a/packages/Symbian/group/libcurl.mmp
+++ b/packages/Symbian/group/libcurl.mmp
@@ -42,7 +42,7 @@ SOURCE \
curl_sasl_sspi.c smb.c curl_endian.c curl_des.c \
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/ntlm.c vauth/ntlm_sspi.c vauth/oauth.c
USERINCLUDE ../../../lib ../../../include/curl
#ifdef ENABLE_SSL
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 16:39:24 +0000