mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-18 11:19:10 +00:00
Split pfPasswordStore into platform-specific files.
This commit is contained in:
@ -12,6 +12,24 @@ set(pfPasswordStore_SOURCES
|
||||
pfPasswordStore.cpp
|
||||
)
|
||||
|
||||
if(WIN32 AND NOT CYGWIN)
|
||||
set(pfPasswordStore_SOURCES ${pfPasswordStore_SOURCES}
|
||||
pfPasswordStore_Win.cpp
|
||||
)
|
||||
endif(WIN32 AND NOT CYGWIN)
|
||||
|
||||
if(UNIX)
|
||||
set(pfPasswordStore_SOURCES ${pfPasswordStore_SOURCES}
|
||||
pfPasswordStore_Unix.cpp
|
||||
)
|
||||
endif(UNIX)
|
||||
|
||||
if(APPLE)
|
||||
set(pfPasswordStore_SOURCES ${pfPasswordStore_SOURCES}
|
||||
pfPasswordStore_Mac.cpp
|
||||
)
|
||||
endif(APPLE)
|
||||
|
||||
add_library(pfPasswordStore STATIC ${pfPasswordStore_HEADERS} ${pfPasswordStore_SOURCES})
|
||||
target_link_libraries(pfPasswordStore CoreLib plFile)
|
||||
|
||||
|
@ -142,112 +142,3 @@ bool pfFilePasswordStore::SetPassword(const plString& username, const plString&
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
|
||||
#ifdef HS_BUILD_FOR_WIN32
|
||||
#include "hsWindows.h"
|
||||
#include <wincred.h>
|
||||
|
||||
/*****************************************************************************
|
||||
** pfWin32PasswordStore **
|
||||
*****************************************************************************/
|
||||
const plString pfWin32PasswordStore::GetPassword(const plString& username)
|
||||
{
|
||||
PCREDENTIALW credential;
|
||||
plString target = plString::Format("%s__%s", plProduct::UUID(), username.c_str());
|
||||
plString password = plString::Null;
|
||||
|
||||
if (!CredReadW(target.ToWchar().GetData(), CRED_TYPE_GENERIC, 0, &credential)) {
|
||||
return password;
|
||||
}
|
||||
|
||||
password = plString::FromUtf8(reinterpret_cast<const char *>(credential->CredentialBlob), credential->CredentialBlobSize);
|
||||
|
||||
memset(credential->CredentialBlob, 0, credential->CredentialBlobSize);
|
||||
CredFree(credential);
|
||||
|
||||
return password;
|
||||
}
|
||||
|
||||
|
||||
bool pfWin32PasswordStore::SetPassword(const plString& username, const plString& password)
|
||||
{
|
||||
CREDENTIALW credential;
|
||||
plString target = plString::Format("%s__%s", plProduct::UUID(), username.c_str());
|
||||
|
||||
if (password.IsNull()) {
|
||||
if (CredDeleteW(target.ToWchar().GetData(), CRED_TYPE_GENERIC, 0)) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
plStringBuffer<wchar_t> tbuff = target.ToWchar();
|
||||
plStringBuffer<char> pbuff = password.ToUtf8();
|
||||
plStringBuffer<wchar_t> ubuff = username.ToWchar();
|
||||
|
||||
memset(&credential, 0, sizeof(CREDENTIALW));
|
||||
credential.Type = CRED_TYPE_GENERIC;
|
||||
credential.TargetName = (LPWSTR)tbuff.GetData();
|
||||
credential.CredentialBlobSize = pbuff.GetSize();
|
||||
credential.CredentialBlob = (LPBYTE)pbuff.GetData();
|
||||
credential.Persist = CRED_PERSIST_LOCAL_MACHINE;
|
||||
credential.UserName = (LPWSTR)ubuff.GetData();
|
||||
|
||||
if (!CredWriteW(&credential, 0)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
#ifdef HS_BUILD_FOR_OSX
|
||||
#include <Security/Security.h>
|
||||
|
||||
/*****************************************************************************
|
||||
** pfMacPasswordStore **
|
||||
*****************************************************************************/
|
||||
const plString pfMacPasswordStore::GetPassword(const plString& username)
|
||||
{
|
||||
plString service = plProduct::UUID();
|
||||
|
||||
void* passwd = nullptr;
|
||||
uint32_t passwd_len = 0;
|
||||
|
||||
if (SecKeychainFindGenericPassword(nullptr,
|
||||
service.GetSize(),
|
||||
service.c_str(),
|
||||
username.GetSize(),
|
||||
username.c_str(),
|
||||
&passwd_len,
|
||||
&passwd,
|
||||
nullptr) != errSecSuccess)
|
||||
{
|
||||
return plString::Null;
|
||||
}
|
||||
|
||||
plString ret(reinterpret_cast<const char*>(passwd), size_t(passwd_len));
|
||||
|
||||
SecKeychainItemFreeContent(nullptr, passwd);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
bool pfMacPasswordStore::SetPassword(const plString& username, const plString& password)
|
||||
{
|
||||
plString service = plProduct::UUID();
|
||||
|
||||
return SecKeychainAddGenericPassword(nullptr,
|
||||
service.GetSize(),
|
||||
service.c_str(),
|
||||
username.GetSize(),
|
||||
username.c_str(),
|
||||
password.GetSize(),
|
||||
password.c_str(),
|
||||
nullptr) == errSecSuccess;
|
||||
}
|
||||
#endif
|
||||
|
@ -0,0 +1,91 @@
|
||||
/*==LICENSE==*
|
||||
|
||||
CyanWorlds.com Engine - MMOG client, server and tools
|
||||
Copyright (C) 2011 Cyan Worlds, Inc.
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
Additional permissions under GNU GPL version 3 section 7
|
||||
|
||||
If you modify this Program, or any covered work, by linking or
|
||||
combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
|
||||
NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
|
||||
JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
|
||||
(or a modified version of those libraries),
|
||||
containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
|
||||
PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
|
||||
JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
|
||||
licensors of this Program grant you additional
|
||||
permission to convey the resulting work. Corresponding Source for a
|
||||
non-source form of such a combination shall include the source code for
|
||||
the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
|
||||
work.
|
||||
|
||||
You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
or by snail mail at:
|
||||
Cyan Worlds, Inc.
|
||||
14617 N Newport Hwy
|
||||
Mead, WA 99021
|
||||
|
||||
*==LICENSE==*/
|
||||
|
||||
#include "pfPasswordStore.h"
|
||||
#include "pfPasswordStore_impl.h"
|
||||
|
||||
#include "plProduct.h"
|
||||
|
||||
#include <Security/Security.h>
|
||||
|
||||
/*****************************************************************************
|
||||
** pfMacPasswordStore **
|
||||
*****************************************************************************/
|
||||
const plString pfMacPasswordStore::GetPassword(const plString& username)
|
||||
{
|
||||
plString service = plProduct::UUID();
|
||||
|
||||
void* passwd = nullptr;
|
||||
uint32_t passwd_len = 0;
|
||||
|
||||
if (SecKeychainFindGenericPassword(nullptr,
|
||||
service.GetSize(),
|
||||
service.c_str(),
|
||||
username.GetSize(),
|
||||
username.c_str(),
|
||||
&passwd_len,
|
||||
&passwd,
|
||||
nullptr) != errSecSuccess)
|
||||
{
|
||||
return plString::Null;
|
||||
}
|
||||
|
||||
plString ret(reinterpret_cast<const char*>(passwd), size_t(passwd_len));
|
||||
|
||||
SecKeychainItemFreeContent(nullptr, passwd);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
bool pfMacPasswordStore::SetPassword(const plString& username, const plString& password)
|
||||
{
|
||||
plString service = plProduct::UUID();
|
||||
|
||||
return SecKeychainAddGenericPassword(nullptr,
|
||||
service.GetSize(),
|
||||
service.c_str(),
|
||||
username.GetSize(),
|
||||
username.c_str(),
|
||||
password.GetSize(),
|
||||
password.c_str(),
|
||||
nullptr) == errSecSuccess;
|
||||
}
|
@ -0,0 +1,58 @@
|
||||
/*==LICENSE==*
|
||||
|
||||
CyanWorlds.com Engine - MMOG client, server and tools
|
||||
Copyright (C) 2011 Cyan Worlds, Inc.
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
Additional permissions under GNU GPL version 3 section 7
|
||||
|
||||
If you modify this Program, or any covered work, by linking or
|
||||
combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
|
||||
NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
|
||||
JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
|
||||
(or a modified version of those libraries),
|
||||
containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
|
||||
PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
|
||||
JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
|
||||
licensors of this Program grant you additional
|
||||
permission to convey the resulting work. Corresponding Source for a
|
||||
non-source form of such a combination shall include the source code for
|
||||
the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
|
||||
work.
|
||||
|
||||
You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
or by snail mail at:
|
||||
Cyan Worlds, Inc.
|
||||
14617 N Newport Hwy
|
||||
Mead, WA 99021
|
||||
|
||||
*==LICENSE==*/
|
||||
|
||||
#include "pfPasswordStore.h"
|
||||
#include "pfPasswordStore_impl.h"
|
||||
|
||||
#include "plProduct.h"
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
** pfUnixPasswordStore **
|
||||
*****************************************************************************/
|
||||
const plString pfUnixPasswordStore::GetPassword(const plString& username)
|
||||
{
|
||||
}
|
||||
|
||||
bool pfUnixPasswordStore::SetPassword(const plString& username, const plString& password)
|
||||
{
|
||||
}
|
@ -0,0 +1,103 @@
|
||||
/*==LICENSE==*
|
||||
|
||||
CyanWorlds.com Engine - MMOG client, server and tools
|
||||
Copyright (C) 2011 Cyan Worlds, Inc.
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
Additional permissions under GNU GPL version 3 section 7
|
||||
|
||||
If you modify this Program, or any covered work, by linking or
|
||||
combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
|
||||
NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
|
||||
JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
|
||||
(or a modified version of those libraries),
|
||||
containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
|
||||
PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
|
||||
JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
|
||||
licensors of this Program grant you additional
|
||||
permission to convey the resulting work. Corresponding Source for a
|
||||
non-source form of such a combination shall include the source code for
|
||||
the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
|
||||
work.
|
||||
|
||||
You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
or by snail mail at:
|
||||
Cyan Worlds, Inc.
|
||||
14617 N Newport Hwy
|
||||
Mead, WA 99021
|
||||
|
||||
*==LICENSE==*/
|
||||
|
||||
#include "pfPasswordStore.h"
|
||||
#include "pfPasswordStore_impl.h"
|
||||
|
||||
#include "plProduct.h"
|
||||
#include "plFormat.h"
|
||||
|
||||
#include "hsWindows.h"
|
||||
#include <wincred.h>
|
||||
|
||||
/*****************************************************************************
|
||||
** pfWin32PasswordStore **
|
||||
*****************************************************************************/
|
||||
const plString pfWin32PasswordStore::GetPassword(const plString& username)
|
||||
{
|
||||
PCREDENTIALW credential;
|
||||
plString target = plFormat("%s__%s", plProduct::UUID(), username);
|
||||
plString password = plString::Null;
|
||||
|
||||
if (!CredReadW(target.ToWchar().GetData(), CRED_TYPE_GENERIC, 0, &credential)) {
|
||||
return password;
|
||||
}
|
||||
|
||||
password = plString::FromUtf8(reinterpret_cast<const char *>(credential->CredentialBlob), credential->CredentialBlobSize);
|
||||
|
||||
memset(credential->CredentialBlob, 0, credential->CredentialBlobSize);
|
||||
CredFree(credential);
|
||||
|
||||
return password;
|
||||
}
|
||||
|
||||
|
||||
bool pfWin32PasswordStore::SetPassword(const plString& username, const plString& password)
|
||||
{
|
||||
CREDENTIALW credential;
|
||||
plString target = plFormat("%s__%s", plProduct::UUID(), username);
|
||||
|
||||
if (password.IsNull()) {
|
||||
if (CredDeleteW(target.ToWchar().GetData(), CRED_TYPE_GENERIC, 0)) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
plStringBuffer<wchar_t> tbuff = target.ToWchar();
|
||||
plStringBuffer<char> pbuff = password.ToUtf8();
|
||||
plStringBuffer<wchar_t> ubuff = username.ToWchar();
|
||||
|
||||
memset(&credential, 0, sizeof(CREDENTIALW));
|
||||
credential.Type = CRED_TYPE_GENERIC;
|
||||
credential.TargetName = (LPWSTR)tbuff.GetData();
|
||||
credential.CredentialBlobSize = pbuff.GetSize();
|
||||
credential.CredentialBlob = (LPBYTE)pbuff.GetData();
|
||||
credential.Persist = CRED_PERSIST_LOCAL_MACHINE;
|
||||
credential.UserName = (LPWSTR)ubuff.GetData();
|
||||
|
||||
if (!CredWriteW(&credential, 0)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
Reference in New Issue
Block a user