Skip to content

Commit bf0fa45

Browse files
committed
fixed:reply ver network incorrect for http verification
1 parent a22b0f7 commit bf0fa45

12 files changed

Lines changed: 27 additions & 31 deletions

File tree

‎XEngine_Release/XEngine_Config/XEngine_Config.json‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
"tszIPAddr": "127.0.0.1",
33
"bDeamon": 0,
44
"nCenterPort": 5100,
5-
"nStorageDLPort": 5101,
6-
"nStorageUPPort": 5102,
7-
"nWebdavPort": 5103,
8-
"nFTPPort": 5104,
5+
"nHTTPPort": 5101,
6+
"nWebdavPort": 5102,
7+
"nFTPPort": 5103,
98
"XMax": {
109
"MaxClient": 10000,
1110
"MaxQueue": 10000,
@@ -46,15 +45,12 @@
4645
"nHashMode": 2
4746
},
4847
"XProxy": {
49-
"bUPPass": false,
50-
"bDLPass": false,
51-
"bWDPass": false,
52-
"bAuthPass": false,
53-
"nVType": 1,
48+
"nVType": 0,
5449
"tszUPPass": "http://192.168.1.7:5200/Api/Pass/UPFile",
5550
"tszDLPass": "http://192.168.1.7:5200/Api/Pass/UPFile",
5651
"tszWDPass": "http://192.168.1.7:5200/Api/Pass/WDFile",
57-
"tszAuthPass": ""
52+
"tszAuthPass": "",
53+
"tszFTPPass": "http://192.168.1.7:5200/Api/Pass/FTPFile",
5854
},
5955
"XLimit": {
6056
"bLimitMode": true,

‎XEngine_Source/StorageModule_Protocol/Protocol_Packet/Protocol_StoragePacket.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -314,8 +314,8 @@ bool CProtocol_StoragePacket::Protocol_StoragePacket_DirOperator(XCHAR* ptszMsgB
314314
return true;
315315
}
316316
/********************************************************************
317-
函数名称:Protocol_StoragePacket_BasicAuth
318-
函数功能:基本验证协议代理转发
317+
函数名称:Protocol_StoragePacket_Auth
318+
函数功能:验证协议代理转发
319319
参数.一:lpszRequestType
320320
In/Out:In
321321
类型:常量字符指针
@@ -361,7 +361,7 @@ bool CProtocol_StoragePacket::Protocol_StoragePacket_DirOperator(XCHAR* ptszMsgB
361361
意思:是否成功
362362
备注:
363363
*********************************************************************/
364-
bool CProtocol_StoragePacket::Protocol_StoragePacket_BasicAuth(int nRequestType, LPCXSTR lpszMethod, LPCXSTR lpszPostUrl, LPCXSTR lpszClientAddr, LPCXSTR lpszUser, LPCXSTR lpszPass, XCHAR* ptszMsgBuffer, int* pInt_MsgLen)
364+
bool CProtocol_StoragePacket::Protocol_StoragePacket_Auth(int nRequestType, LPCXSTR lpszMethod, LPCXSTR lpszPostUrl, LPCXSTR lpszClientAddr, LPCXSTR lpszUser, LPCXSTR lpszPass, XCHAR* ptszMsgBuffer, int* pInt_MsgLen)
365365
{
366366
Protocol_IsErrorOccur = false;
367367

‎XEngine_Source/StorageModule_Protocol/Protocol_Packet/Protocol_StoragePacket.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class CProtocol_StoragePacket
2121
bool Protocol_StoragePacket_QueryFile(XCHAR* ptszMsgBuffer, int* pInt_MsgLen, XSTORAGECORE_DBFILE*** pppSt_DBFile, int nListCount, LPCXSTR lpszTimeStart = NULL, LPCXSTR lpszTimeEnd = NULL, XNETHANDLE xhToken = 0);
2222
bool Protocol_StoragePacket_Info(XCHAR* ptszMsgBuffer, int* pInt_MsgLen, SESSION_STORAGEINFO*** pppSt_DLInfo, SESSION_STORAGEINFO*** pppSt_UPInfo, int nDLCount, int nUPCount);
2323
bool Protocol_StoragePacket_DirOperator(XCHAR* ptszMsgBuffer, int* pInt_MsgLen, XCHAR*** pppszListEnum, int nListCount);
24-
bool Protocol_StoragePacket_BasicAuth(int nRequestType, LPCXSTR lpszMethod, LPCXSTR lpszPostUrl, LPCXSTR lpszClientAddr, LPCXSTR lpszUser, LPCXSTR lpszPass, XCHAR* ptszMsgBuffer, int* pInt_MsgLen);
24+
bool Protocol_StoragePacket_Auth(int nRequestType, LPCXSTR lpszMethod, LPCXSTR lpszPostUrl, LPCXSTR lpszClientAddr, LPCXSTR lpszUser, LPCXSTR lpszPass, XCHAR* ptszMsgBuffer, int* pInt_MsgLen);
2525
bool Protocol_StoragePacket_UPDown(XCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCXSTR lpszBuckKey, LPCXSTR lpszFileName, LPCXSTR lpszClientAddr, __int64x nFileSize, bool bDown, LPCXSTR lpszFileHash = NULL);
2626
bool Protocol_StoragePacket_REQFile(XCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCXSTR lpszFileName = NULL, LPCXSTR lpszFileHash = NULL, XNETHANDLE xhToken = 0);
2727
bool Protocol_StoragePacket_Action(XCHAR* ptszMsgBuffer, int* pInt_MsgLen, XNETHANDLE xhToken, XENGINE_ACTIONINFO* pSt_ActionInfo);

‎XEngine_Source/StorageModule_Protocol/StorageModule_Protocol.def‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ EXPORTS
1616
Protocol_StorageParse_WDPropPatch
1717

1818
Protocol_StoragePacket_HTTPPacket
19-
Protocol_StoragePacket_BasicAuth
19+
Protocol_StoragePacket_Auth
2020
Protocol_StoragePacket_UPDown
2121
Protocol_StoragePacket_QueryFile
2222
Protocol_StoragePacket_Info

‎XEngine_Source/StorageModule_Protocol/StorageProtocol_Define.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ extern "C" bool Protocol_StorageParse_WDPropPatch(LPCXSTR lpszMsgBuffer, int nMs
350350
*********************************************************************/
351351
extern "C" bool Protocol_StoragePacket_HTTPPacket(XCHAR* ptszMsgBuffer, int* pInt_MsgLen, int nCode = 0, LPCXSTR lpszMSGInfo = NULL);
352352
/********************************************************************
353-
函数名称:Protocol_StoragePacket_BasicAuth
353+
函数名称:Protocol_StoragePacket_Auth
354354
函数功能:基本验证协议代理转发
355355
参数.一:lpszRequestType
356356
In/Out:In
@@ -397,7 +397,7 @@ extern "C" bool Protocol_StoragePacket_HTTPPacket(XCHAR* ptszMsgBuffer, int* pIn
397397
意思:是否成功
398398
备注:
399399
*********************************************************************/
400-
extern "C" bool Protocol_StoragePacket_BasicAuth(int nRequestType, LPCXSTR lpszMethod, LPCXSTR lpszPostUrl, LPCXSTR lpszClientAddr, LPCXSTR lpszUser, LPCXSTR lpszPass, XCHAR * ptszMsgBuffer, int* pInt_MsgLen);
400+
extern "C" bool Protocol_StoragePacket_Auth(int nRequestType, LPCXSTR lpszMethod, LPCXSTR lpszPostUrl, LPCXSTR lpszClientAddr, LPCXSTR lpszUser, LPCXSTR lpszPass, XCHAR * ptszMsgBuffer, int* pInt_MsgLen);
401401
/********************************************************************
402402
函数名称:Protocol_StoragePacket_UPDown
403403
函数功能:上传下载完成代理通知协议

‎XEngine_Source/StorageModule_Protocol/pch.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ extern "C" bool Protocol_StoragePacket_HTTPPacket(XCHAR* ptszMsgBuffer, int* pIn
7676
{
7777
return m_StoragePacket.Protocol_StoragePacket_HTTPPacket(ptszMsgBuffer, pInt_MsgLen, nCode, lpszMSGInfo);
7878
}
79-
extern "C" bool Protocol_StoragePacket_BasicAuth(int nRequestType, LPCXSTR lpszMethod, LPCXSTR lpszPostUrl, LPCXSTR lpszClientAddr, LPCXSTR lpszUser, LPCXSTR lpszPass, XCHAR * ptszMsgBuffer, int* pInt_MsgLen)
79+
extern "C" bool Protocol_StoragePacket_Auth(int nRequestType, LPCXSTR lpszMethod, LPCXSTR lpszPostUrl, LPCXSTR lpszClientAddr, LPCXSTR lpszUser, LPCXSTR lpszPass, XCHAR * ptszMsgBuffer, int* pInt_MsgLen)
8080
{
81-
return m_StoragePacket.Protocol_StoragePacket_BasicAuth(nRequestType, lpszMethod, lpszPostUrl, lpszClientAddr, lpszUser, lpszPass, ptszMsgBuffer, pInt_MsgLen);
81+
return m_StoragePacket.Protocol_StoragePacket_Auth(nRequestType, lpszMethod, lpszPostUrl, lpszClientAddr, lpszUser, lpszPass, ptszMsgBuffer, pInt_MsgLen);
8282
}
8383
extern "C" bool Protocol_StoragePacket_UPDown(XCHAR * ptszMsgBuffer, int* pInt_MsgLen, LPCXSTR lpszBuckKey, LPCXSTR lpszFileName, LPCXSTR lpszClientAddr, __int64x nFileSize, bool bDown, LPCXSTR lpszFileHash)
8484
{

‎XEngine_Source/XEngine_StorageApp/StorageApp_Center.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ bool XEngine_Task_HttpCenter(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int
7171

7272
if (st_ServiceCfg.st_XProxy.nVType > 0)
7373
{
74-
if (!StorageApp_HTTPHelp_Verification(lpszClientAddr, pSt_HTTPParam, pptszListHdr, nHdrCount, st_ServiceCfg.st_XProxy.tszAuthPass))
74+
if (!StorageApp_HTTPHelp_Verification(STORAGE_NETTYPE_HTTPCENTER, lpszClientAddr, pSt_HTTPParam, pptszListHdr, nHdrCount, st_ServiceCfg.st_XProxy.tszAuthPass))
7575
{
7676
return false;
7777
}

‎XEngine_Source/XEngine_StorageApp/StorageApp_Download.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ bool XEngine_Task_HttpDownload(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, in
176176
//验证用户
177177
if (st_ServiceCfg.st_XProxy.nVType > 0)
178178
{
179-
if (!StorageApp_HTTPHelp_Verification(lpszClientAddr, pSt_HTTPParam, pptszListHdr, nHdrCount, st_ServiceCfg.st_XProxy.tszDLPass))
179+
if (!StorageApp_HTTPHelp_Verification(STORAGE_NETTYPE_HTTPDOWNLOAD, lpszClientAddr, pSt_HTTPParam, pptszListHdr, nHdrCount, st_ServiceCfg.st_XProxy.tszDLPass))
180180
{
181181
return false;
182182
}

‎XEngine_Source/XEngine_StorageApp/StorageApp_HTTPHelp.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "StorageApp_Hdr.h"
22

3-
bool StorageApp_HTTPHelp_Verification(LPCXSTR lpszClientAddr, RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam, XCHAR** pptszListHdr, int nHdrCount, LPCXSTR lpszRestApi)
3+
bool StorageApp_HTTPHelp_Verification(int nClient, LPCXSTR lpszClientAddr, RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam, XCHAR** pptszListHdr, int nHdrCount, LPCXSTR lpszRestApi)
44
{
55
int nSDLen = 2048;
66
int nRVLen = 2048;
@@ -29,15 +29,15 @@ bool StorageApp_HTTPHelp_Verification(LPCXSTR lpszClientAddr, RFCCOMPONENTS_HTTP
2929
if (!Verification_HTTP_GetType(pptszListHdr, nHdrCount, &nVType))
3030
{
3131
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam, NULL, 0, tszHDRBuffer);
32-
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
32+
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, nClient);
3333
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,用户验证失败,验证方式:%d,错误:%lX"), lpszClientAddr, st_ServiceCfg.st_XProxy.nVType, Verification_GetLastError());
3434
return false;
3535
}
3636
//验证方式是否一致
3737
if (st_ServiceCfg.st_XProxy.nVType != nVType)
3838
{
3939
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam, NULL, 0, tszHDRBuffer);
40-
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
40+
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, nClient);
4141
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,用户验证失败,验证方式错误,请求:%d,需求:%d"), lpszClientAddr, nVType, st_ServiceCfg.st_XProxy.nVType);
4242
return false;
4343
}
@@ -52,7 +52,7 @@ bool StorageApp_HTTPHelp_Verification(LPCXSTR lpszClientAddr, RFCCOMPONENTS_HTTP
5252
st_HDRParam.nHttpCode = 500;
5353
Protocol_StoragePacket_HTTPPacket(tszRVBuffer, &nRVLen, ERROR_STORAGE_PROTOCOL_HTTP_MANAGE_SERVERDOWN, "api server is down,cant verification");
5454
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen, tszHDRBuffer);
55-
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
55+
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, nClient);
5656
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,用户验证失败,GET请求验证服务:%s 失败,错误码:%lX"), lpszClientAddr, lpszRestApi, APIClient_GetLastError());
5757
return false;
5858
}
@@ -61,7 +61,7 @@ bool StorageApp_HTTPHelp_Verification(LPCXSTR lpszClientAddr, RFCCOMPONENTS_HTTP
6161
st_HDRParam.nHttpCode = 500;
6262
Protocol_StoragePacket_HTTPPacket(tszRVBuffer, &nRVLen, ERROR_STORAGE_PROTOCOL_HTTP_MANAGE_SERVERDOWN, "api server is down,cant verification");
6363
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen, tszHDRBuffer);
64-
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
64+
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, nClient);
6565
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,用户验证失败,GET请求验证服务:%s 失败,错误:%d"), lpszClientAddr, lpszRestApi, nHTTPCode);
6666
return false;
6767
}
@@ -71,7 +71,7 @@ bool StorageApp_HTTPHelp_Verification(LPCXSTR lpszClientAddr, RFCCOMPONENTS_HTTP
7171
st_HDRParam.nHttpCode = 500;
7272
Protocol_StoragePacket_HTTPPacket(tszRVBuffer, &nRVLen, ERROR_STORAGE_PROTOCOL_HTTP_MANAGE_AUTHFAIL, "api server reply failure,cant verification");
7373
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam, tszRVBuffer, nRVLen, tszHDRBuffer);
74-
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
74+
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, nClient);
7575
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,用户验证失败,返回内容:%s 错误,无法继续"), lpszClientAddr, ptszMSGBuffer);
7676
BaseLib_Memory_FreeCStyle((XPPMEM)&ptszMSGBuffer);
7777
return false;
@@ -90,7 +90,7 @@ bool StorageApp_HTTPHelp_Verification(LPCXSTR lpszClientAddr, RFCCOMPONENTS_HTTP
9090
if (!bRet)
9191
{
9292
HttpProtocol_Server_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam, NULL, 0, tszHDRBuffer);
93-
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
93+
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, nClient);
9494
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,用户验证失败,验证处理错误,可能用户密码登信息不匹配,类型:%d"), lpszClientAddr, nVType);
9595
return false;
9696
}

‎XEngine_Source/XEngine_StorageApp/StorageApp_HTTPHelp.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
// Purpose: HTTP 帮助函数封装
1111
// History:
1212
*********************************************************************/
13-
bool StorageApp_HTTPHelp_Verification(LPCXSTR lpszClientAddr, RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam, XCHAR** pptszListHdr, int nHdrCount, LPCXSTR lpszRestApi);
13+
bool StorageApp_HTTPHelp_Verification(int nClient, LPCXSTR lpszClientAddr, RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam, XCHAR** pptszListHdr, int nHdrCount, LPCXSTR lpszRestApi);

0 commit comments

Comments
 (0)