mirror of
https://github.com/moparisthebest/curl
synced 2024-11-14 13:35:03 -05:00
1d5d0ae9e5
curlx_convert_UTF8_to_tchar must be freed by curlx_unicodefree, but prior to this change some uses mistakenly called free. I've reviewed all other uses of curlx_convert_UTF8_to_tchar and curlx_convert_tchar_to_UTF8. Bug: https://github.com/curl/curl/pull/6602#issuecomment-825236763 Reported-by: sergio-nsk@users.noreply.github.com Closes https://github.com/curl/curl/pull/6938
145 lines
4.4 KiB
C
145 lines
4.4 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 2014 - 2020, Steve Holme, <steve_holme@hotmail.com>.
|
|
*
|
|
* 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 https://curl.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.
|
|
*
|
|
***************************************************************************/
|
|
|
|
#include "curl_setup.h"
|
|
|
|
#include <curl/curl.h>
|
|
|
|
#include "vauth.h"
|
|
#include "curl_multibyte.h"
|
|
#include "curl_printf.h"
|
|
|
|
/* The last #include files should be: */
|
|
#include "curl_memory.h"
|
|
#include "memdebug.h"
|
|
|
|
/*
|
|
* Curl_auth_build_spn()
|
|
*
|
|
* This is used to build a SPN string in the following formats:
|
|
*
|
|
* service/host@realm (Not currently used)
|
|
* service/host (Not used by GSS-API)
|
|
* service@realm (Not used by Windows SSPI)
|
|
*
|
|
* Parameters:
|
|
*
|
|
* service [in] - The service type such as http, smtp, pop or imap.
|
|
* host [in] - The host name.
|
|
* realm [in] - The realm.
|
|
*
|
|
* Returns a pointer to the newly allocated SPN.
|
|
*/
|
|
#if !defined(USE_WINDOWS_SSPI)
|
|
char *Curl_auth_build_spn(const char *service, const char *host,
|
|
const char *realm)
|
|
{
|
|
char *spn = NULL;
|
|
|
|
/* Generate our SPN */
|
|
if(host && realm)
|
|
spn = aprintf("%s/%s@%s", service, host, realm);
|
|
else if(host)
|
|
spn = aprintf("%s/%s", service, host);
|
|
else if(realm)
|
|
spn = aprintf("%s@%s", service, realm);
|
|
|
|
/* Return our newly allocated SPN */
|
|
return spn;
|
|
}
|
|
#else
|
|
TCHAR *Curl_auth_build_spn(const char *service, const char *host,
|
|
const char *realm)
|
|
{
|
|
char *utf8_spn = NULL;
|
|
TCHAR *tchar_spn = NULL;
|
|
TCHAR *dupe_tchar_spn = NULL;
|
|
|
|
(void) realm;
|
|
|
|
/* Note: We could use DsMakeSPN() or DsClientMakeSpnForTargetServer() rather
|
|
than doing this ourselves but the first is only available in Windows XP
|
|
and Windows Server 2003 and the latter is only available in Windows 2000
|
|
but not Windows95/98/ME or Windows NT4.0 unless the Active Directory
|
|
Client Extensions are installed. As such it is far simpler for us to
|
|
formulate the SPN instead. */
|
|
|
|
/* Generate our UTF8 based SPN */
|
|
utf8_spn = aprintf("%s/%s", service, host);
|
|
if(!utf8_spn)
|
|
return NULL;
|
|
|
|
/* Allocate and return a TCHAR based SPN. Since curlx_convert_UTF8_to_tchar
|
|
must be freed by curlx_unicodefree we'll dupe the result so that the
|
|
pointer this function returns can be normally free'd. */
|
|
tchar_spn = curlx_convert_UTF8_to_tchar(utf8_spn);
|
|
free(utf8_spn);
|
|
if(!tchar_spn)
|
|
return NULL;
|
|
dupe_tchar_spn = _tcsdup(tchar_spn);
|
|
curlx_unicodefree(tchar_spn);
|
|
return dupe_tchar_spn;
|
|
}
|
|
#endif /* USE_WINDOWS_SSPI */
|
|
|
|
/*
|
|
* Curl_auth_user_contains_domain()
|
|
*
|
|
* This is used to test if the specified user contains a Windows domain name as
|
|
* follows:
|
|
*
|
|
* Domain\User (Down-level Logon Name)
|
|
* Domain/User (curl Down-level format - for compatibility with existing code)
|
|
* User@Domain (User Principal Name)
|
|
*
|
|
* Note: The user name may be empty when using a GSS-API library or Windows
|
|
* SSPI as the user and domain are either obtained from the credentials cache
|
|
* when using GSS-API or via the currently logged in user's credentials when
|
|
* using Windows SSPI.
|
|
*
|
|
* Parameters:
|
|
*
|
|
* user [in] - The user name.
|
|
*
|
|
* Returns TRUE on success; otherwise FALSE.
|
|
*/
|
|
bool Curl_auth_user_contains_domain(const char *user)
|
|
{
|
|
bool valid = FALSE;
|
|
|
|
if(user && *user) {
|
|
/* Check we have a domain name or UPN present */
|
|
char *p = strpbrk(user, "\\/@");
|
|
|
|
valid = (p != NULL && p > user && p < user + strlen(user) - 1 ? TRUE :
|
|
FALSE);
|
|
}
|
|
#if defined(HAVE_GSSAPI) || defined(USE_WINDOWS_SSPI)
|
|
else
|
|
/* User and domain are obtained from the GSS-API credentials cache or the
|
|
currently logged in user from Windows */
|
|
valid = TRUE;
|
|
#endif
|
|
|
|
return valid;
|
|
}
|