Skip to content

Commit 702f3ce

Browse files
committed
modify:http basic and digest verification bug
1 parent ca9c047 commit 702f3ce

File tree

7 files changed

+343
-44
lines changed

7 files changed

+343
-44
lines changed

XEngine.sln

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AIApi_APPExample", "XEngine
6060
EndProject
6161
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_Verification", "XEngine_Module\XEngine_Verification\XEngine_Verification.vcxproj", "{A8E43EC0-698A-4807-8A61-B2BE5FAB7256}"
6262
EndProject
63-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Verification_APPExample", "XEngine_Example\Verification_APPExample\Verification_APPExample.vcxproj", "{EEFE5A12-A7C8-4C60-BB92-84DCCD0B5EE5}"
64-
EndProject
6563
Global
6664
GlobalSection(SolutionConfigurationPlatforms) = preSolution
6765
Debug|ARM64 = Debug|ARM64
@@ -252,18 +250,6 @@ Global
252250
{A8E43EC0-698A-4807-8A61-B2BE5FAB7256}.Release|x64.Build.0 = Release|x64
253251
{A8E43EC0-698A-4807-8A61-B2BE5FAB7256}.Release|x86.ActiveCfg = Release|Win32
254252
{A8E43EC0-698A-4807-8A61-B2BE5FAB7256}.Release|x86.Build.0 = Release|Win32
255-
{EEFE5A12-A7C8-4C60-BB92-84DCCD0B5EE5}.Debug|ARM64.ActiveCfg = Debug|x64
256-
{EEFE5A12-A7C8-4C60-BB92-84DCCD0B5EE5}.Debug|ARM64.Build.0 = Debug|x64
257-
{EEFE5A12-A7C8-4C60-BB92-84DCCD0B5EE5}.Debug|x64.ActiveCfg = Debug|x64
258-
{EEFE5A12-A7C8-4C60-BB92-84DCCD0B5EE5}.Debug|x64.Build.0 = Debug|x64
259-
{EEFE5A12-A7C8-4C60-BB92-84DCCD0B5EE5}.Debug|x86.ActiveCfg = Debug|Win32
260-
{EEFE5A12-A7C8-4C60-BB92-84DCCD0B5EE5}.Debug|x86.Build.0 = Debug|Win32
261-
{EEFE5A12-A7C8-4C60-BB92-84DCCD0B5EE5}.Release|ARM64.ActiveCfg = Release|x64
262-
{EEFE5A12-A7C8-4C60-BB92-84DCCD0B5EE5}.Release|ARM64.Build.0 = Release|x64
263-
{EEFE5A12-A7C8-4C60-BB92-84DCCD0B5EE5}.Release|x64.ActiveCfg = Release|x64
264-
{EEFE5A12-A7C8-4C60-BB92-84DCCD0B5EE5}.Release|x64.Build.0 = Release|x64
265-
{EEFE5A12-A7C8-4C60-BB92-84DCCD0B5EE5}.Release|x86.ActiveCfg = Release|Win32
266-
{EEFE5A12-A7C8-4C60-BB92-84DCCD0B5EE5}.Release|x86.Build.0 = Release|Win32
267253
EndGlobalSection
268254
GlobalSection(SolutionProperties) = preSolution
269255
HideSolutionNode = FALSE
@@ -284,7 +270,6 @@ Global
284270
{DE495AB3-201F-4288-9A3A-41DFA146AD30} = {26417B01-459E-4287-9524-7B0293BAD18A}
285271
{C0792082-058B-4BF1-894F-D4D5D7124022} = {58092034-5B83-4806-B7FE-CCDD7414C4AE}
286272
{A8E43EC0-698A-4807-8A61-B2BE5FAB7256} = {26417B01-459E-4287-9524-7B0293BAD18A}
287-
{EEFE5A12-A7C8-4C60-BB92-84DCCD0B5EE5} = {58092034-5B83-4806-B7FE-CCDD7414C4AE}
288273
EndGlobalSection
289274
GlobalSection(ExtensibilityGlobals) = postSolution
290275
SolutionGuid = {16D43B4F-E3D4-4036-A44C-5DDD64988164}

XEngine_Module/XEngine_Verification/Verification_Define.h

Lines changed: 98 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,4 +137,101 @@ extern "C" bool Verification_HTTP_BasicServerPacket(XCHAR* ptszMSGBuffer, int* p
137137
意思:是否成功
138138
备注:
139139
*********************************************************************/
140-
extern "C" bool Verification_HTTP_DigestServerPacket(XCHAR* ptszMSGBuffer, int* pInt_MSGLen, XCHAR* ptszNonceStr, XCHAR* ptszOpaqueStr, bool bQOPBody = false);
140+
extern "C" bool Verification_HTTP_DigestServerPacket(XCHAR* ptszMSGBuffer, int* pInt_MSGLen, XCHAR* ptszNonceStr, XCHAR* ptszOpaqueStr, bool bQOPBody = false);
141+
/********************************************************************
142+
函数名称:Verification_HTTP_GetType
143+
函数功能:获得HTTP验证类型
144+
参数.一:pptszListHdr
145+
In/Out:In
146+
类型:三级指针
147+
可空:N
148+
意思:输入HTTP头
149+
参数.二:nHdrCount
150+
In/Out:In
151+
类型:整数型
152+
可空:N
153+
意思:输入HTTP头个数
154+
参数.三:pInt_Type
155+
In/Out:In
156+
类型:整数型指针
157+
可空:N
158+
意思:输出HTTP验证类型1:BASIC验证 2:摘要验证
159+
返回值
160+
类型:逻辑型
161+
意思:是否成功
162+
备注:
163+
*********************************************************************/
164+
extern "C" bool Verification_HTTP_GetType(XCHAR** pptszListHdr, int nHdrCount, int* pInt_Type);
165+
/********************************************************************
166+
函数名称:Verification_HTTP_Basic
167+
函数功能:HTTP基本验证
168+
参数.一:lpszUser
169+
In/Out:In
170+
类型:常量字符指针
171+
可空:N
172+
意思:要验证的用户名
173+
参数.二:lpszPass
174+
In/Out:In
175+
类型:常量字符指针
176+
可空:N
177+
意思:要验证的密码
178+
参数.三:pptszListHdr
179+
In/Out:In
180+
类型:指向指针的指针
181+
可空:N
182+
意思:输入要解析的HTTP头
183+
参数.四:nHdrCount
184+
In/Out:In
185+
类型:整数型
186+
可空:N
187+
意思:输入要解析的HTTP头列表个数
188+
返回值
189+
类型:逻辑型
190+
意思:是否成功
191+
备注:
192+
*********************************************************************/
193+
extern "C" bool Verification_HTTP_Basic(LPCXSTR lpszUser, LPCXSTR lpszPass, XCHAR** pptszListHdr, int nHdrCount);
194+
/********************************************************************
195+
函数名称:Verification_HTTP_Digest
196+
函数功能:HTTP摘要验证
197+
参数.一:lpszUser
198+
In/Out:In
199+
类型:常量字符指针
200+
可空:N
201+
意思:要验证的用户名
202+
参数.二:lpszPass
203+
In/Out:In
204+
类型:常量字符指针
205+
可空:N
206+
意思:要验证的密码
207+
参数.三:lpszMethod
208+
In/Out:In
209+
类型:常量字符指针
210+
可空:N
211+
意思:客户端请求的方法
212+
参数.四:pptszListHdr
213+
In/Out:In
214+
类型:指向指针的指针
215+
可空:N
216+
意思:输入要解析的HTTP头
217+
参数.五:nHdrCount
218+
In/Out:In
219+
类型:整数型
220+
可空:N
221+
意思:输入要解析的HTTP头列表个数
222+
参数.六:lpszNonceStr
223+
In/Out:In
224+
类型:常量字符指针
225+
可空:Y
226+
意思:要验证服务端设置的NONCE字符串
227+
参数.七:lpszOpaqueStr
228+
In/Out:In
229+
类型:常量字符指针
230+
可空:Y
231+
意思:要验证服务端设置的OPAQUE字符串
232+
返回值
233+
类型:逻辑型
234+
意思:是否成功
235+
备注:
236+
*********************************************************************/
237+
extern "C" bool Verification_HTTP_Digest(LPCXSTR lpszUser, LPCXSTR lpszPass, LPCXSTR lpszMethod, XCHAR** pptszListHdr, int nHdrCount, LPCXSTR lpszNonceStr = NULL, LPCXSTR lpszOpaqueStr = NULL);

XEngine_Module/XEngine_Verification/Verification_Error.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,7 @@
1414
/* HTTP验证错误 */
1515
/************************************************************************/
1616
#define ERROR_XENGINE_MODULE_VERIFICATION_HTTP_PARAMENT 0x01E0001 //参数错误,无法继续
17-
#define ERROR_XENGINE_MODULE_VERIFICATION_HTTP_NOTSUPPORT 0x01E0002 //不支持
17+
#define ERROR_XENGINE_MODULE_VERIFICATION_HTTP_NOTSUPPORT 0x01E0002 //不支持
18+
#define ERROR_XENGINE_MODULE_VERIFICATION_HTTP_NONCE 0x01E0003 //Nonce错误
19+
#define ERROR_XENGINE_MODULE_VERIFICATION_HTTP_OPAQUE 0x01E0004 //Opaque错误
20+
#define ERROR_XENGINE_MODULE_VERIFICATION_HTTP_RESULT 0x01E0005 //验证结果错误

0 commit comments

Comments
 (0)