Public-Mirror/gbe_fork
1
0
Fork 0
mirror of https://github.com/Detanup01/gbe_fork.git synced 2024-11-23 19:25:35 +08:00
Code Issues 1 Projects Releases Wiki Activity

* use corresponding steam types for auth functions

Browse Source 
* corrected the ticket size in `Auth_Manager::getWebApiTicket`
This commit is contained in:
otavepto 2024-04-30 00:26:43 +03:00
parent d6a4b7f0ba
commit 5cd5f814e6
3 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
dll/auth.cpp
View File

@ -158,49 +158,51 @@ Auth_Data Auth_Manager::getTicketData( void *pTicket, int cbMaxTicket, uint32 *p
//Steam returns 234 //Steam returns 234
#define STEAM_AUTH_TICKET_SIZE 256 //234 #define STEAM_AUTH_TICKET_SIZE 256 //234
uint32 Auth_Manager::getTicket( void *pTicket, int cbMaxTicket, uint32 *pcbTicket ) HAuthTicket Auth_Manager::getTicket( void *pTicket, int cbMaxTicket, uint32 *pcbTicket )
{ {
if (settings->enable_new_app_ticket) if (settings->enable_new_app_ticket)
{ {
if (cbMaxTicket < STEAM_TICKET_MIN_SIZE_NEW) return 0; if (cbMaxTicket < STEAM_TICKET_MIN_SIZE_NEW) return k_HAuthTicketInvalid;
} }
else else
{ {
if (cbMaxTicket < STEAM_TICKET_MIN_SIZE) return 0; if (cbMaxTicket < STEAM_TICKET_MIN_SIZE) return k_HAuthTicketInvalid;
if (cbMaxTicket > STEAM_AUTH_TICKET_SIZE) cbMaxTicket = STEAM_AUTH_TICKET_SIZE; if (cbMaxTicket > STEAM_AUTH_TICKET_SIZE) cbMaxTicket = STEAM_AUTH_TICKET_SIZE;
} }
Auth_Data ticket_data = getTicketData(pTicket, cbMaxTicket, pcbTicket ); Auth_Data ticket_data = getTicketData(pTicket, cbMaxTicket, pcbTicket );
if (*pcbTicket > cbMaxTicket)
return 0;
uint32 ttt = ticket_data.number;
GetAuthSessionTicketResponse_t data;
data.m_hAuthTicket = ttt;
data.m_eResult = k_EResultOK;
callbacks->addCBResult(data.k_iCallback, &data, sizeof(data), STEAM_TICKET_PROCESS_TIME);
if (*pcbTicket > cbMaxTicket)
return k_HAuthTicketInvalid;
GetAuthSessionTicketResponse_t data{};
data.m_hAuthTicket = (HAuthTicket)ticket_data.number;
data.m_eResult = EResult::k_EResultOK;
callbacks->addCBResult(data.k_iCallback, &data, sizeof(data), STEAM_TICKET_PROCESS_TIME);
outbound.push_back(ticket_data); outbound.push_back(ticket_data);
return ttt; return data.m_hAuthTicket;
} }
uint32 Auth_Manager::getWebApiTicket( const char* pchIdentity ) HAuthTicket Auth_Manager::getWebApiTicket( const char* pchIdentity )
{ {
// https://docs.unity.com/ugs/en-us/manual/authentication/manual/platform-signin-steam // https://docs.unity.com/ugs/en-us/manual/authentication/manual/platform-signin-steam
GetTicketForWebApiResponse_t data{}; GetTicketForWebApiResponse_t data{};
uint32 cbTicket = 0;
Auth_Data ticket_data = getTicketData(data.m_rgubTicket, STEAM_AUTH_TICKET_SIZE, &cbTicket);
if (cbTicket > STEAM_AUTH_TICKET_SIZE)
return 0;
data.m_cubTicket = (int)cbTicket;
uint32 ttt = ticket_data.number;
data.m_hAuthTicket = ttt;
data.m_eResult = k_EResultOK;
callbacks->addCBResult(data.k_iCallback, &data, sizeof(data), STEAM_TICKET_PROCESS_TIME);
uint32 cbTicket = 0;
Auth_Data ticket_data = getTicketData(data.m_rgubTicket, sizeof(data.m_rgubTicket), &cbTicket);
if (cbTicket > sizeof(data.m_rgubTicket))
return k_HAuthTicketInvalid;
data.m_cubTicket = (int)cbTicket;
data.m_hAuthTicket = (HAuthTicket)ticket_data.number;
data.m_eResult = EResult::k_EResultOK;
callbacks->addCBResult(data.k_iCallback, &data, sizeof(data), STEAM_TICKET_PROCESS_TIME);
outbound.push_back(ticket_data); outbound.push_back(ticket_data);
return ttt; return data.m_hAuthTicket;
} }
CSteamID Auth_Manager::fakeUser() CSteamID Auth_Manager::fakeUser()

4
dll/dll/auth.h
View File

@ -645,8 +645,8 @@ public:
~Auth_Manager(); ~Auth_Manager();
void Callback(Common_Message *msg); void Callback(Common_Message *msg);
uint32 getTicket( void *pTicket, int cbMaxTicket, uint32 *pcbTicket ); HAuthTicket getTicket( void *pTicket, int cbMaxTicket, uint32 *pcbTicket );
uint32 getWebApiTicket( const char *pchIdentity ); HAuthTicket getWebApiTicket( const char *pchIdentity );
void cancelTicket(uint32 number); void cancelTicket(uint32 number);
EBeginAuthSessionResult beginAuth(const void *pAuthTicket, int cbAuthTicket, CSteamID steamID); EBeginAuthSessionResult beginAuth(const void *pAuthTicket, int cbAuthTicket, CSteamID steamID);
bool endAuth(CSteamID id); bool endAuth(CSteamID id);

2
dll/dll/steam_user.h
View File

@ -311,7 +311,7 @@ HAuthTicket GetAuthSessionTicket( void *pTicket, int cbMaxTicket, uint32 *pcbTic
// if a Steam ID is passed Steam will only allow the ticket to be used by that Steam ID // if a Steam ID is passed Steam will only allow the ticket to be used by that Steam ID
HAuthTicket GetAuthSessionTicket( void *pTicket, int cbMaxTicket, uint32 *pcbTicket, const SteamNetworkingIdentity *pSteamNetworkingIdentity ) HAuthTicket GetAuthSessionTicket( void *pTicket, int cbMaxTicket, uint32 *pcbTicket, const SteamNetworkingIdentity *pSteamNetworkingIdentity )
{ {
PRINT_DEBUG("%i", cbMaxTicket); PRINT_DEBUG("%p [%i] %p", pTicket, cbMaxTicket, pcbTicket);
std::lock_guard<std::recursive_mutex> lock(global_mutex); std::lock_guard<std::recursive_mutex> lock(global_mutex);
if (!pTicket) return k_HAuthTicketInvalid; if (!pTicket) return k_HAuthTicketInvalid;