Skip to content

ee/wcp: switch to using LSA #791

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BeryJu wants to merge 1 commit into
base: main
Choose a base branch
from
Open

ee/wcp: switch to using LSA #791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 3 additions & 21 deletions ee/wcp/ak_cred_provider/Credential.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,13 +247,13 @@ LRESULT APIENTRY Credential::WndProc(_In_ HWND hWnd, _In_ UINT uMsg, _In_ WPARAM
.c_str());
if ((m_oCefAppData.pCefApp)) {
spdlog::debug("WndProc:: CEFLaunch");
pData->strUsername = "";
pData->strUserToken = "";
try {
CEFLaunch(pData, m_oCefAppData.pCefApp);
} catch (const std::exception& e) {
spdlog::warn("Failed to CEFLaunch", e.what());
}
spdlog::debug(std::string("User logged in: " + pData->strUsername).c_str());
spdlog::debug(std::string("User logged in: " + pData->strUserToken).c_str());
spdlog::debug("WndProc:: CEFLaunched");
} else {
::MessageBox(hWnd,
Expand Down Expand Up @@ -545,25 +545,7 @@ IFACEMETHODIMP Credential::Connect(IQueryContinueWithStatus* pqcws) {
} else {
strCredUser = std::wstring(m_pszQualifiedUserName);
}
std::wstring strAuthUser =
std::wstring(m_oHookData.strUsername.begin(), m_oHookData.strUsername.end());
if ((strAuthUser == strCredUser) && (strCredUser != L"")) {
// Reset password
USER_INFO_1003 oUserInfo1003;
DWORD dwParamErr = 0;
m_strPass = GetRandomWStr(WIN_PASS_LEN);
oUserInfo1003.usri1003_password = (LPWSTR)(m_strPass.c_str());
if (NetUserSetInfo(NULL, strCredUser.c_str(), 1003, (LPBYTE)(&oUserInfo1003), &dwParamErr) !=
NERR_Success) {
hr = E_FAIL;
}
} else {
if (strAuthUser != L"") {
MessageBox(hwndOwner, std::wstring(L"Username mismatch.").c_str(),
(LPCWSTR)L"Login Failure", MB_OK | MB_TASKMODAL);
}
hr = E_FAIL;
}
m_strPass = utf8_decode(m_oHookData.strUserToken);
} else {
hr = E_POINTER;
}
Expand Down
2 changes: 1 addition & 1 deletion ee/wcp/ak_cred_provider/Helpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ HRESULT RetrieveNegotiateAuthPackage(_Out_ ULONG* pulAuthPackage) {
if (SUCCEEDED(HRESULT_FROM_NT(status))) {
ULONG ulAuthPackage;
LSA_STRING lsaszKerberosName;
_LsaInitString(&lsaszKerberosName, NEGOSSP_NAME_A);
_LsaInitString(&lsaszKerberosName, "ak_lsa");

status = LsaLookupAuthenticationPackage(hLsa, &lsaszKerberosName, &ulAuthPackage);
if (SUCCEEDED(HRESULT_FROM_NT(status))) {
Expand Down
6 changes: 3 additions & 3 deletions ee/wcp/ak_cred_provider/include/Credential.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ struct sHookData {
hInstance = phInstance;
oMutex.unlock();
}
void UpdateUser(const std::string& strUser) {
void UpdateUserToken(const std::string& strUser) {
oMutex.lock();
strUsername = strUser;
strUserToken = strUser;
oMutex.unlock();
}
void UpdateHeaderToken(const std::string& headerToken) {
Expand Down Expand Up @@ -97,7 +97,7 @@ struct sHookData {
}
PWSTR UserSid = NULL;
HINSTANCE hInstance = NULL;
std::string strUsername = "";
std::string strUserToken = "";
std::string strHeaderToken = "";
bool bExit = false; // flag to exit the custom loop
bool bComplete = false; // UI call complete
Expand Down
8 changes: 4 additions & 4 deletions ee/wcp/cefsimple/cefsimple_win.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
#include "cefsimple/simple_handler.h"
#include "cefsimple/cefsimple_win.h"
#include "ak_common/include/ak_log.h"
#include "ak_common/include/ak_sentry.h"
#include "ak_common/include/crypt.h"
#include <ak_common/include/ak_sentry.h>
#include "crypt.h"
#include "Credential.h"

extern std::string g_strPath;
Expand Down Expand Up @@ -87,7 +87,7 @@ int CEFLaunch(sHookData* pData, CefRefPtr<SimpleApp> pCefApp) {
{
spdlog::debug("Sub-loop");
pHandler->CloseAllBrowsers(true);
pData->UpdateUser("");
pData->UpdateUserToken("");
// pData->SetCancel(true);
// // perform (at max) 10 precautionary loops even though 1 `CefDoMessageLoopWork()`
// // seems to be sufficient
Expand Down Expand Up @@ -117,7 +117,7 @@ int CEFLaunch(sHookData* pData, CefRefPtr<SimpleApp> pCefApp) {
Sleep(5); // as precaution to relieve the CPU (though unlikely that its needed)
}
pHandler = nullptr; // Release for the destructor to be called subsequently
if (pData->strUsername == "") // User clicked the close button or cancel
if (pData->strUserToken == "") // User clicked the close button or cancel
{
spdlog::debug("Token empty");
pData->SetCancel(true);
Expand Down
14 changes: 6 additions & 8 deletions ee/wcp/cefsimple/simple_handler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,16 +96,14 @@ class SimpleHandler : public CefClient,
", ThreadID: ", std::to_string(GetCurrentThreadId()));
Hide();
m_pData->UpdateStatus(L"Authenticating, please wait...");
TokenResponse validatedToken;
std::string extractedToken;
try {
if (!ak_sys_auth_url(strURL, validatedToken)) {
spdlog::warn("failed to validate token");
} else {
spdlog::debug("successfully validated token");
m_pData->UpdateUser(validatedToken.username.c_str());
}
ak_sys_auth_url_extract_token(strURL, extractedToken);
spdlog::debug("successfully extracted token");
m_pData->UpdateUserToken(extractedToken);
} catch (const rust::Error& ex) {
spdlog::warn("Exception in ak_sys_auth_url: {}", ex.what());
spdlog::warn("failed to extract token");
spdlog::warn("Exception in ak_sys_auth_url_extract_token: {}", ex.what());
}
CloseAllBrowsers(false);

Expand Down
Loading