sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing utf-8 problems by sending username as base64.

Browse Source
This commit is contained in:
lotodore
2010-03-21 16:59:41 +00:00
parent 8d6625f8da
commit 5575e6e2b0
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/sessiondata.cpp
+16 -2
View File
@@ -96,8 +96,13 @@ SessionData::CreateClientAuthSession(Gsasl *context, const string &userName, con
errorCode = gsasl_client_start(context, "SCRAM-SHA-1", &m_authSession); errorCode = gsasl_client_start(context, "SCRAM-SHA-1", &m_authSession);
if (errorCode == GSASL_OK) if (errorCode == GSASL_OK)
{ {
gsasl_property_set(m_authSession, GSASL_AUTHID, userName.c_str()); char *base64User = NULL;
gsasl_base64_to(userName.c_str(), userName.length(), &base64User, NULL);
gsasl_property_set(m_authSession, GSASL_AUTHID, base64User);
gsasl_free(base64User);
gsasl_property_set(m_authSession, GSASL_PASSWORD, password.c_str()); gsasl_property_set(m_authSession, GSASL_PASSWORD, password.c_str());
retVal = true; retVal = true;
} }
return retVal; return retVal;
@@ -135,7 +140,16 @@ SessionData::AuthGetUser() const
{ {
string retStr; string retStr;
if (m_authSession) if (m_authSession)
retStr = gsasl_property_fast(m_authSession, GSASL_AUTHID); {
char *base64User = NULL;
const char *tmpUser = gsasl_property_fast(m_authSession, GSASL_AUTHID);
gsasl_base64_from(tmpUser, strlen(tmpUser), &base64User, NULL);
if (base64User)
{
retStr = base64User;
gsasl_free(base64User);
}
}
return retStr; return retStr;
} }