added:http basic support

xengine-qyt · xengine-qyt · commit 4ed5828a6d18 · 2025-08-18T16:47:05.000+08:00
diff --git a/XEngine_Release/XEngine_Config/XEngine_Config.json b/XEngine_Release/XEngine_Config/XEngine_Config.json
@@ -54,6 +54,10 @@
         "bEnable": false,
         "nPass": 123123
     },
+    "XApiVer": {
+        "bEnable": true,
+        "nVerType": 1
+    },
     "XSql": {
         "nSQLType": 0,
         "SQLAddr": "127.0.0.1",
diff --git a/XEngine_Source/AuthorizeModule_Configure/Config_Define.h b/XEngine_Source/AuthorizeModule_Configure/Config_Define.h
@@ -84,6 +84,11 @@ typedef struct
 		bool bEnable;                                       //是否启用加密传输 
 		int nPassword;                                      //密码
 	}st_XCrypto;
+	struct  
+	{
+		bool bEnable;                                       //是否启用HTTP接口权限验证
+		int nVType;                                         //验证方法,1 基本,2摘要
+	}st_XApiVer;
 	struct
 	{
 		int nDBType;
diff --git a/XEngine_Source/AuthorizeModule_Configure/Config_Error.h b/XEngine_Source/AuthorizeModule_Configure/Config_Error.h
@@ -20,4 +20,5 @@
 #define ERROR_AUTHORIZE_MODULE_CONFIGURE_XLOG 0x0010008
 #define ERROR_AUTHORIZE_MODULE_CONFIGURE_MALLOC 0x0010009
 #define ERROR_AUTHORIZE_MODULE_CONFIGURE_REPORT 0x0010010
-#define ERROR_AUTHORIZE_MODULE_CONFIGURE_XTIME 0x0010011
+#define ERROR_AUTHORIZE_MODULE_CONFIGURE_XTIME 0x0010011
+#define ERROR_AUTHORIZE_MODULE_CONFIGURE_XAPIVER 0x0010012
diff --git a/XEngine_Source/AuthorizeModule_Configure/ModuleConfigure_Json/ModuleConfigure_Json.cpp b/XEngine_Source/AuthorizeModule_Configure/ModuleConfigure_Json/ModuleConfigure_Json.cpp
@@ -155,6 +155,16 @@ bool CModuleConfigure_Json::ModuleConfigure_Json_File(LPCXSTR lpszConfigFile, XE
 	Json::Value st_JsonXCrypto = st_JsonRoot["XCrypto"];
 	pSt_ServerConfig->st_XCrypto.bEnable = st_JsonXCrypto["bEnable"].asBool();
 	pSt_ServerConfig->st_XCrypto.nPassword = st_JsonXCrypto["nPass"].asInt();
+	//接口验证
+	if (st_JsonRoot["XApiVer"].empty() || (2 != st_JsonRoot["XApiVer"].size()))
+	{
+		Config_IsErrorOccur = true;
+		Config_dwErrorCode = ERROR_AUTHORIZE_MODULE_CONFIGURE_XAPIVER;
+		return false;
+	}
+	Json::Value st_JsonXAPIVer = st_JsonRoot["XApiVer"];
+	pSt_ServerConfig->st_XApiVer.bEnable = st_JsonXAPIVer["bEnable"].asBool();
+	pSt_ServerConfig->st_XApiVer.nVType = st_JsonXAPIVer["nVerType"].asInt();
 	//数据库配置
 	if (st_JsonRoot["XSql"].empty() || (6 != st_JsonRoot["XSql"].size()))
 	{
diff --git a/XEngine_Source/AuthorizeModule_Help/AuthHelp_Define.h b/XEngine_Source/AuthorizeModule_Help/AuthHelp_Define.h
@@ -101,6 +101,13 @@ extern "C" bool AuthHelp_DynamicCode_Get(XNETHANDLE xhToken, int nDynamicCode);
 *********************************************************************/
 extern "C" bool AuthHelp_MultiLogin_GetRange(int nClientDevice, int* pInt_IDType);
 /************************************************************************/
+/*                    API帮助函数导出定义                               */
+/************************************************************************/
+
+extern "C" bool AuthHelp_APIHelp_HttpAuth(XCHAR* ptszUser, XCHAR* ptszPass, XCHAR** pptszListHdr, int nHdrCount);
+
+extern "C" bool AuthHelp_APIHelp_Digest(XCHAR* ptszResponseStr, LPCXSTR lpszUser, LPCXSTR lpszPass, LPCXSTR lpszRealm, LPCXSTR lpszMethod, LPCXSTR lpszUrl, LPCXSTR lpszNonce, LPCXSTR lpszCNonce, LPCXSTR lpszNC = NULL);
+/************************************************************************/
 /*                    剪贴板导出定义                                    */
 /************************************************************************/
 #ifdef _MSC_BUILD
diff --git a/XEngine_Source/AuthorizeModule_Help/AuthHelp_Error.h b/XEngine_Source/AuthorizeModule_Help/AuthHelp_Error.h
@@ -38,4 +38,10 @@
 /************************************************************************/
 /*                     多端登录                                         */
 /************************************************************************/
-#define ERROR_AUTHORIZE_MODULE_HELP_MULTI_NOTSUPPORT 0x0050030            //不支持
+#define ERROR_AUTHORIZE_MODULE_HELP_MULTI_NOTSUPPORT 0x0050030            //不支持
+/************************************************************************/
+/*                     API帮助函数                                      */
+/************************************************************************/
+#define ERROR_AUTHORIZE_MODULE_HELP_APIHELP_NOTSUPPORT 0x0050040          //不支持
+#define ERROR_AUTHORIZE_MODULE_HELP_APIHELP_PARAMENT 0x0050041            //参数错误
+#define ERROR_AUTHORIZE_MODULE_HELP_APIHELP_FORMAT 0x0050042              //格式错误
diff --git a/XEngine_Source/AuthorizeModule_Help/AuthorizeModule_Help.def b/XEngine_Source/AuthorizeModule_Help/AuthorizeModule_Help.def
@@ -10,6 +10,9 @@ EXPORTS
 
 	AuthHelp_MultiLogin_GetRange
 
+	AuthHelp_APIHelp_HttpAuth
+	AuthHelp_APIHelp_Digest
+
 	AuthHelp_ClipBoard_Set
 	AuthHelp_ClipBoard_Get
 	AuthHelp_ClipBoard_Clear
diff --git a/XEngine_Source/AuthorizeModule_Help/AuthorizeModule_Help.vcxproj b/XEngine_Source/AuthorizeModule_Help/AuthorizeModule_Help.vcxproj
@@ -248,6 +248,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="AuthHelp_APIHelp\AuthHelp_APIHelp.h" />
     <ClInclude Include="AuthHelp_ClipBoard\AuthHelp_ClipBoard.h" />
     <ClInclude Include="AuthHelp_Define.h" />
     <ClInclude Include="AuthHelp_DynamicCode\AuthHelp_DynamicCode.h" />
@@ -258,6 +259,7 @@
     <ClInclude Include="pch.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="AuthHelp_APIHelp\AuthHelp_APIHelp.cpp" />
     <ClCompile Include="AuthHelp_ClipBoard\AuthHelp_ClipBoard.cpp" />
     <ClCompile Include="AuthHelp_DynamicCode\AuthHelp_DynamicCode.cpp" />
     <ClCompile Include="AuthHelp_MultiLogin\AuthHelp_MultiLogin.cpp" />
diff --git a/XEngine_Source/AuthorizeModule_Help/AuthorizeModule_Help.vcxproj.filters b/XEngine_Source/AuthorizeModule_Help/AuthorizeModule_Help.vcxproj.filters
@@ -37,6 +37,12 @@
     <Filter Include="源文件\AuthHelp_MultiLogin">
       <UniqueIdentifier>{92e4cc9f-02d7-4e6d-92a1-86e433e38fd2}</UniqueIdentifier>
     </Filter>
+    <Filter Include="头文件\AuthHelp_APIHelp">
+      <UniqueIdentifier>{7dd61ed5-7869-47d3-98d7-e8bd46dbcc15}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="源文件\AuthHelp_APIHelp">
+      <UniqueIdentifier>{3d25ff0b-dc39-4507-b453-c2fd2084b370}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="framework.h">
@@ -63,6 +69,9 @@
     <ClInclude Include="AuthHelp_MultiLogin\AuthHelp_MultiLogin.h">
       <Filter>头文件\AuthHelp_MultiLogin</Filter>
     </ClInclude>
+    <ClInclude Include="AuthHelp_APIHelp\AuthHelp_APIHelp.h">
+      <Filter>头文件\AuthHelp_APIHelp</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="dllmain.cpp">
@@ -83,6 +92,9 @@
     <ClCompile Include="AuthHelp_MultiLogin\AuthHelp_MultiLogin.cpp">
       <Filter>源文件\AuthHelp_MultiLogin</Filter>
     </ClCompile>
+    <ClCompile Include="AuthHelp_APIHelp\AuthHelp_APIHelp.cpp">
+      <Filter>源文件\AuthHelp_APIHelp</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="AuthorizeModule_Help.def">
diff --git a/XEngine_Source/AuthorizeModule_Help/pch.cpp b/XEngine_Source/AuthorizeModule_Help/pch.cpp
@@ -1,6 +1,7 @@
 ﻿#include "pch.h"
 #include "AuthHelp_DynamicCode/AuthHelp_DynamicCode.h"
 #include "AuthHelp_MultiLogin/AuthHelp_MultiLogin.h"
+#include "AuthHelp_APIHelp/AuthHelp_APIHelp.h"
 #ifdef _MSC_BUILD
 #include "AuthHelp_ClipBoard/AuthHelp_ClipBoard.h"
 #include "AuthHelp_Windows/AuthHelp_Windows.h"
@@ -21,6 +22,7 @@ XLONG Help_dwErrorCode = 0;
 //////////////////////////////////////////////////////////////////////////
 CAuthHelp_DynamicCode m_HelpDynamic;
 CAuthHelp_MultiLogin m_HelpLogin;
+CAuthHelp_APIHelp m_APIHelp;
 #ifdef _MSC_BUILD
 CAuthHelp_ClipBoard m_HelpClipBoard;
 CAuthHelp_Windows m_HelpWindow;
@@ -61,6 +63,17 @@ extern "C" bool AuthHelp_MultiLogin_GetRange(int nClientDevice, int* pInt_IDType
 	return m_HelpLogin.AuthHelp_MultiLogin_GetRange(nClientDevice, pInt_IDType);
 }
 /************************************************************************/
+/*                    API帮助函数导出定义                               */
+/************************************************************************/
+extern "C" bool AuthHelp_APIHelp_HttpAuth(XCHAR* ptszUser, XCHAR* ptszPass, XCHAR** pptszListHdr, int nHdrCount)
+{
+	return m_APIHelp.AuthHelp_APIHelp_HttpAuth(ptszUser, ptszPass, pptszListHdr, nHdrCount);
+}
+extern "C" bool AuthHelp_APIHelp_Digest(XCHAR* ptszResponseStr, LPCXSTR lpszUser, LPCXSTR lpszPass, LPCXSTR lpszRealm, LPCXSTR lpszMethod, LPCXSTR lpszUrl, LPCXSTR lpszNonce, LPCXSTR lpszCNonce, LPCXSTR lpszNC)
+{
+	return m_APIHelp.AuthHelp_APIHelp_Digest(ptszResponseStr, lpszUser, lpszPass, lpszRealm, lpszMethod, lpszUser, lpszNonce, lpszCNonce, lpszNC);
+}
+/************************************************************************/
 /*                    剪贴板导出定义                                    */
 /************************************************************************/
 #ifdef _MSC_BUILD
diff --git a/XEngine_Source/AuthorizeModule_Help/pch.h b/XEngine_Source/AuthorizeModule_Help/pch.h
@@ -9,6 +9,7 @@
 
 #ifdef _MSC_BUILD
 // 添加要在此处预编译的标头
+#define _CRT_SECURE_NO_WARNINGS
 #include "framework.h"
 #include <tchar.h>
 #include <commctrl.h>
@@ -21,9 +22,15 @@
 #include <unordered_map>
 using namespace std;
 #include <XEngine_Include/XEngine_CommHdr.h>
+#include <XEngine_Include/XEngine_Types.h>
 #include <XEngine_Include/XEngine_ProtocolHdr.h>
 #include <XEngine_Include/XEngine_BaseLib/BaseLib_Define.h>
 #include <XEngine_Include/XEngine_BaseLib/BaseLib_Error.h>
+#include <XEngine_Include/XEngine_Core/Cryption_Define.h>
+#include <XEngine_Include/XEngine_Core/Cryption_Error.h>
+#include <XEngine_Include/XEngine_Core/ManagePool_Define.h>
+#include <XEngine_Include/XEngine_RfcComponents/HttpProtocol_Define.h>
+#include <XEngine_Include/XEngine_RfcComponents/HttpProtocol_Error.h>
 #include "../XAuth_BuildSwitch.h"
 #include "AuthHelp_Define.h"
 #include "AuthHelp_Error.h"
@@ -45,4 +52,6 @@ extern XLONG Help_dwErrorCode;
 #ifdef _MSC_BUILD
 #pragma comment(lib,"Comctl32.lib")
 #pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib")
+#pragma comment(lib,"XEngine_Core/XEngine_Cryption")
+#pragma comment(lib,"XEngine_RfcComponents/RfcComponents_HttpProtocol")
 #endif
diff --git a/XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/Authorize_HttpTask.cpp b/XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/Authorize_HttpTask.cpp
@@ -17,12 +17,12 @@ XHTHREAD XCALLBACK XEngine_AuthService_HttpThread(XPVOID lParam)
 		for (int i = 0; i < nListCount; i++)
 		{
 			int nMsgLen = 0;
+			int nHdrCount = 0;
+			XCHAR** ppszListHdr = NULL;
 			XCHAR* ptszMsgBuffer = NULL;
-			RFCCOMPONENTS_HTTP_REQPARAM st_HTTPParament;
+			RFCCOMPONENTS_HTTP_REQPARAM st_HTTPParament = {};
 
-			memset(&st_HTTPParament, '\0', sizeof(RFCCOMPONENTS_HTTP_REQPARAM));
-
-			if (HttpProtocol_Server_GetMemoryEx(xhHttpPacket, ppSt_ListClient[i]->tszClientAddr, &ptszMsgBuffer, &nMsgLen, &st_HTTPParament))
+			if (HttpProtocol_Server_GetMemoryEx(xhHttpPacket, ppSt_ListClient[i]->tszClientAddr, &ptszMsgBuffer, &nMsgLen, &st_HTTPParament, &ppszListHdr, &nHdrCount))
 			{
 				if (st_AuthConfig.st_XCrypto.bEnable)
 				{
@@ -34,21 +34,22 @@ XHTHREAD XCALLBACK XEngine_AuthService_HttpThread(XPVOID lParam)
 
 					_xstprintf(tszPassword, _X("%d"), st_AuthConfig.st_XCrypto.nPassword);
 					Cryption_XCrypto_Decoder(ptszMsgBuffer, &nMsgLen, tszDeBuffer, tszPassword);
-					XEngine_Client_HttpTask(ppSt_ListClient[i]->tszClientAddr, tszDeBuffer, nMsgLen, &st_HTTPParament);
+					XEngine_Client_HttpTask(ppSt_ListClient[i]->tszClientAddr, tszDeBuffer, nMsgLen, &st_HTTPParament, ppszListHdr, nHdrCount);
 				}
 				else
 				{
-					XEngine_Client_HttpTask(ppSt_ListClient[i]->tszClientAddr, ptszMsgBuffer, nMsgLen, &st_HTTPParament);
+					XEngine_Client_HttpTask(ppSt_ListClient[i]->tszClientAddr, ptszMsgBuffer, nMsgLen, &st_HTTPParament, ppszListHdr, nHdrCount);
 				}
 			}
 			BaseLib_Memory_FreeCStyle((XPPMEM)&ptszMsgBuffer);
+			BaseLib_Memory_Free((XPPPMEM)&ppszListHdr, nHdrCount);
 		}
 		BaseLib_Memory_Free((XPPPMEM)&ppSt_ListClient, nListCount);
 	}
 	return 0;
 }
 
-bool XEngine_Client_HttpTask(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int nMsgLen, RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParament)
+bool XEngine_Client_HttpTask(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int nMsgLen, RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParament, XCHAR** pptszListHdr, int nHdrCount)
 {
 	int nSDLen = 4096;
 	XCHAR tszSDBuffer[4096];
@@ -80,6 +81,27 @@ bool XEngine_Client_HttpTask(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("客户端：%s，登录连接被阻止，用户名或IP地址被禁用!"), lpszClientAddr);
 		return false;
 	}
+	//HTTP验证
+	if (st_AuthConfig.st_XApiVer.bEnable)
+	{
+		XCHAR tszUserName[64] = {};
+		XCHAR tszUserPass[64] = {};
+		RFCCOMPONENTS_HTTP_HDRPARAM st_HDRParam = {};
+
+		st_HDRParam.nHttpCode = 401;
+		st_HDRParam.bIsClose = true;
+		
+		if (!AuthHelp_APIHelp_HttpAuth(tszUserName, tszUserPass, pptszListHdr, nHdrCount))
+		{
+			LPCXSTR lpszHTTPHdr = _X("WWW-Authenticate: Basic realm=\"XEngine Authorize\"\r\n");
+			HttpProtocol_Server_SendMsgEx(xhHttpPacket, tszSDBuffer, &nSDLen, &st_HDRParam, NULL, 0, lpszHTTPHdr);
+			NetCore_TCPXCore_SendEx(xhHttpSocket, lpszClientAddr, tszSDBuffer, nSDLen);
+			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,用户验证失败,错误:%lX"), lpszClientAddr, AuthHelp_GetLastError());
+			return false;
+		}
+		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("HTTP客户端:%s,验证通过,用户名:%s,密码:%s"), lpszClientAddr, tszUserName, tszUserPass);
+	}
+
 	if (0 == _tcsxnicmp(lpszMethodPost, pSt_HTTPParament->tszHttpMethod, _tcsxlen(lpszMethodPost)))
 	{
 		XCHAR tszAPIType[64];
diff --git a/XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/Authorize_HttpTask.h b/XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/Authorize_HttpTask.h
@@ -1,4 +1,4 @@
 ﻿#pragma once
 
 XHTHREAD XCALLBACK XEngine_AuthService_HttpThread(XPVOID lParam);
-bool XEngine_Client_HttpTask(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int nMsgLen, RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParament);
+bool XEngine_Client_HttpTask(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int nMsgLen, RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParament, XCHAR** pptszListHdr, int nHdrCount);
