From 110b291bce427209d629cdb9688a8e785a66ef47 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 15 Jun 2023 11:41:41 +0300
Subject: Steam: service packet sending

---
 protocols/Steam/src/steam_login.cpp |  2 +-
 protocols/Steam/src/steam_proto.h   |  5 +++-
 protocols/Steam/src/steam_utils.cpp | 55 ++++++++++++++++++++++++++-----------
 3 files changed, 44 insertions(+), 18 deletions(-)

(limited to 'protocols/Steam/src')

diff --git a/protocols/Steam/src/steam_login.cpp b/protocols/Steam/src/steam_login.cpp
index e2937a203b..44b419a5f6 100644
--- a/protocols/Steam/src/steam_login.cpp
+++ b/protocols/Steam/src/steam_login.cpp
@@ -30,7 +30,7 @@ void CSteamProto::Login()
 	else {
 		CAuthenticationGetPasswordRSAPublicKeyRequest request;
 		request.account_name = username.get();
-		WSSend(0, request);
+		WSSendService("Authentication.GetPasswordRSAPublicKey#1", request);
 	}
 }
 
diff --git a/protocols/Steam/src/steam_proto.h b/protocols/Steam/src/steam_proto.h
index 3bf5b5915c..1d933c25d6 100644
--- a/protocols/Steam/src/steam_proto.h
+++ b/protocols/Steam/src/steam_proto.h
@@ -14,6 +14,7 @@
 
 enum EMsg
 {
+	ServiceMethodCallFromClientNonAuthed = 9804,
 	ClientHello = 9805,
 };
 
@@ -73,7 +74,9 @@ class CSteamProto : public PROTO<CSteamProto>
 	void __cdecl ServerThread(void *);
 	bool ServerThreadStub(const char *szHost);
 
-	void WSSend(int msgType, const ProtobufCppMessage &msg);
+	void WSSend(EMsg msgType, const ProtobufCppMessage &msg);
+	void WSSendHeader(EMsg msgType, const CMsgProtoBufHeader &hdr, const ProtobufCppMessage &msg);
+	void WSSendService(const char *pszServiceName, const ProtobufCppMessage &msg);
 
 	// requests
 	bool SendRequest(HttpRequest *request);
diff --git a/protocols/Steam/src/steam_utils.cpp b/protocols/Steam/src/steam_utils.cpp
index fbf2066b6e..90b892b355 100644
--- a/protocols/Steam/src/steam_utils.cpp
+++ b/protocols/Steam/src/steam_utils.cpp
@@ -1,33 +1,42 @@
 #include "stdafx.h"
 
-static bool sttIncludesSessionId(const ProtobufCppMessage &msg)
+static int64_t getRandomInt()
 {
-	if (!mir_strcmp(msg.descriptor->short_name, "CMsgClientHello"))
-		return false;
-	if (!mir_strcmp(msg.descriptor->short_name, "CMsgServiceMethodCallFromClientNonAuthed"))
-		return false;
-	return true;
+	int64_t ret;
+	Utils_GetRandom(&ret, sizeof(ret));
+	return (ret >= 0) ? ret : -ret;
 }
 
-void CSteamProto::WSSend(int msgType, const ProtobufCppMessage &msg)
+void CSteamProto::WSSend(EMsg msgType, const ProtobufCppMessage &msg)
 {
-	msgType |= STEAM_PROTOCOL_MASK;
-
 	CMsgProtoBufHeader hdr;
 	hdr.has_client_sessionid = hdr.has_steamid = hdr.has_jobid_source = hdr.has_jobid_target = true;
-	if (sttIncludesSessionId(msg)) {
-	}
-	else {
-		hdr.client_sessionid = 0;
-		hdr.steamid = 0;
+
+	switch (msgType) {
+	case EMsg::ClientHello:
+		hdr.jobid_source = -1;
+		break;
+
+	default:
+		hdr.jobid_source = getRandomInt();
+		break;
 	}
-	hdr.jobid_source = hdr.jobid_target = -1;
+	
+	hdr.jobid_target = -1;
+
+	WSSendHeader(msgType, hdr, msg);
+}
 
+void CSteamProto::WSSendHeader(EMsg msgType, const CMsgProtoBufHeader &hdr, const ProtobufCppMessage &msg)
+{
 	unsigned hdrLen = (unsigned)protobuf_c_message_get_packed_size(&hdr);
 	MBinBuffer hdrbuf(hdrLen);
 	protobuf_c_message_pack(&hdr, (uint8_t *)hdrbuf.data());
 	hdrbuf.appendBefore(&hdrLen, sizeof(hdrLen));
-	hdrbuf.appendBefore(&msgType, sizeof(msgType));
+
+	unsigned type = (unsigned)msgType;
+	type |= STEAM_PROTOCOL_MASK;
+	hdrbuf.appendBefore(&type, sizeof(type));
 	Netlib_Dump(m_hServerConn, hdrbuf.data(), hdrbuf.length(), true, 0);
 
 	MBinBuffer body(protobuf_c_message_get_packed_size(&msg));
@@ -38,6 +47,20 @@ void CSteamProto::WSSend(int msgType, const ProtobufCppMessage &msg)
 	WebSocket_SendBinary(m_hServerConn, hdrbuf.data(), hdrbuf.length());
 }
 
+void CSteamProto::WSSendService(const char *pszServiceName, const ProtobufCppMessage &msg)
+{
+	CMsgProtoBufHeader hdr;
+	hdr.has_client_sessionid = hdr.has_steamid = hdr.has_jobid_source = hdr.has_jobid_target = true;
+	hdr.jobid_source = getRandomInt();
+	hdr.jobid_target = -1;
+	hdr.target_job_name = (char*)pszServiceName;
+	hdr.realm = 1; hdr.has_realm = true;
+
+	WSSendHeader(EMsg::ServiceMethodCallFromClientNonAuthed, hdr, msg);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+
 uint16_t CSteamProto::SteamToMirandaStatus(PersonaState state)
 {
 	switch (state) {
-- 
cgit v1.2.3