From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.88; helo=mga01.intel.com; envelope-from=ting.ye@intel.com; receiver=edk2-devel@lists.01.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 45390209605D1 for ; Wed, 4 Jul 2018 19:20:51 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Jul 2018 19:20:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,310,1526367600"; d="scan'208";a="69731170" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by fmsmga001.fm.intel.com with ESMTP; 04 Jul 2018 19:20:27 -0700 Received: from fmsmsx120.amr.corp.intel.com (10.18.124.208) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 4 Jul 2018 19:20:26 -0700 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by fmsmsx120.amr.corp.intel.com (10.18.124.208) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 4 Jul 2018 19:20:26 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.100]) by SHSMSX104.ccr.corp.intel.com ([169.254.5.81]) with mapi id 14.03.0319.002; Thu, 5 Jul 2018 10:20:24 +0800 From: "Ye, Ting" To: "Wu, Jiaxin" , "edk2-devel@lists.01.org" CC: "Fu, Siyuan" , Gary Lin Thread-Topic: [Patch v3] NetworkPkg/HttpDxe: Fix the bug when parsing HTTP(S) message body. Thread-Index: AQHUEy+v5g0f3KaGrUePUivW0qi/X6R/5v6A Date: Thu, 5 Jul 2018 02:20:23 +0000 Message-ID: References: <20180704004052.4560-1-Jiaxin.wu@intel.com> In-Reply-To: <20180704004052.4560-1-Jiaxin.wu@intel.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch v3] NetworkPkg/HttpDxe: Fix the bug when parsing HTTP(S) message body. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jul 2018 02:20:51 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Looks good to me. Reviewed-by: Ye Ting =20 -----Original Message----- From: Wu, Jiaxin=20 Sent: Wednesday, July 4, 2018 8:41 AM To: edk2-devel@lists.01.org Cc: Ye, Ting ; Fu, Siyuan ; Gary Li= n ; Wu, Jiaxin Subject: [Patch v3] NetworkPkg/HttpDxe: Fix the bug when parsing HTTP(S) me= ssage body. *v2: Resolve the conflict commit. *v3: Fixed the failure if BodyLength in HTTP token is less than the receive= d size of HTTPS message. HttpBodyParserCallback function is to parse the HTTP(S) message body so as = to confirm whether there is the next message header. But it doesn't record = the parsing message data/length correctly. This patch is refine the parsing logic so as to fix the potential failure. Cc: Ye Ting Cc: Fu Siyuan Cc: Gary Lin Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Wu Jiaxin Tested-by: Gary Lin --- NetworkPkg/HttpDxe/HttpImpl.c | 112 +++++++++++++++++---------------- Ne= tworkPkg/HttpDxe/HttpProto.c | 10 +++ NetworkPkg/HttpDxe/HttpProto.h | 1= 0 +++ 3 files changed, 78 insertions(+), 54 deletions(-) diff --git a/NetworkPkg/HttpDxe/HttpImpl.c b/NetworkPkg/HttpDxe/HttpImpl.c = index f70e116f38..17deceb395 100644 --- a/NetworkPkg/HttpDxe/HttpImpl.c +++ b/NetworkPkg/HttpDxe/HttpImpl.c @@ -914,10 +914,11 @@ HttpBodyParserCallback ( IN CHAR8 *Data, IN UINTN Length, IN VOID *Context ) { + HTTP_CALLBACK_DATA *CallbackData; HTTP_TOKEN_WRAP *Wrap; UINTN BodyLength; CHAR8 *Body; =20 if (EventType !=3D BodyParseEventOnComplete) { @@ -926,25 +927,22 @@ Htt= pBodyParserCallback ( =20 if (Data =3D=3D NULL || Length !=3D 0 || Context =3D=3D NULL) { return EFI_SUCCESS; } =20 - Wrap =3D (HTTP_TOKEN_WRAP *) Context; - Body =3D Wrap->HttpToken->Message->Body; - BodyLength =3D Wrap->HttpToken->Message->BodyLength; + CallbackData =3D (HTTP_CALLBACK_DATA *) Context; + + Wrap =3D (HTTP_TOKEN_WRAP *) (CallbackData->Wrap); + Body =3D CallbackData->ParseData; + BodyLength =3D CallbackData->ParseDataLength; + if (Data < Body + BodyLength) { Wrap->HttpInstance->NextMsg =3D Data; } else { Wrap->HttpInstance->NextMsg =3D NULL; } =20 - - // - // Free Tx4Token or Tx6Token since already received corrsponding HTTP re= sponse. - // - FreePool (Wrap); - return EFI_SUCCESS; } =20 /** The work function of EfiHttpResponse(). @@ -1189,33 +1187,43 @@ HttpResponseWorker ( HttpInstance->Method, HttpMsg->Data.Response->StatusCode, HttpMsg->HeaderCount, HttpMsg->Headers, HttpBodyParserCallback, - (VOID *) ValueInItem, + (VOID *) (&HttpInstance->CallbackData), &HttpInstance->MsgParser ); if (EFI_ERROR (Status)) { goto Error2; } =20 // // Check whether we received a complete HTTP message. // if (HttpInstance->CacheBody !=3D NULL) { + // + // Record the CallbackData data. + // + HttpInstance->CallbackData.Wrap =3D (VOID *) Wrap; + HttpInstance->CallbackData.ParseData =3D (VOID *) HttpInstance->Ca= cheBody; + HttpInstance->CallbackData.ParseDataLength =3D=20 + HttpInstance->CacheLen; + + // + // Parse message with CallbackData data. + // Status =3D HttpParseMessageBody (HttpInstance->MsgParser, HttpInst= ance->CacheLen, HttpInstance->CacheBody); if (EFI_ERROR (Status)) { goto Error2; } + } =20 - if (HttpIsMessageComplete (HttpInstance->MsgParser)) { - // - // Free the MsgParse since we already have a full HTTP message. - // - HttpFreeMsgParser (HttpInstance->MsgParser); - HttpInstance->MsgParser =3D NULL; - } + if (HttpIsMessageComplete (HttpInstance->MsgParser)) { + // + // Free the MsgParse since we already have a full HTTP message. + // + HttpFreeMsgParser (HttpInstance->MsgParser); + HttpInstance->MsgParser =3D NULL; } } =20 if ((HttpMsg->Body =3D=3D NULL) || (HttpMsg->BodyLength =3D=3D 0)) { Status =3D EFI_SUCCESS; @@ -1330,16 +1338,30 @@ HttpResponseWorker ( if (EFI_ERROR (Status)) { goto Error2; } =20 // - // Check whether we receive a complete HTTP message. + // Process the received the body packet. + // + HttpMsg->BodyLength =3D MIN (Fragment.Len, (UINT32)=20 + HttpMsg->BodyLength); + + CopyMem (HttpMsg->Body, Fragment.Bulk, HttpMsg->BodyLength); + + // + // Record the CallbackData data. + // + HttpInstance->CallbackData.Wrap =3D (VOID *) Wrap; + HttpInstance->CallbackData.ParseData =3D HttpMsg->Body; + HttpInstance->CallbackData.ParseDataLength =3D HttpMsg->BodyLength; + + // + // Parse Body with CallbackData data. // Status =3D HttpParseMessageBody ( HttpInstance->MsgParser, - (UINTN) Fragment.Len, - (CHAR8 *) Fragment.Bulk + HttpMsg->BodyLength, + HttpMsg->Body ); if (EFI_ERROR (Status)) { goto Error2; } =20 @@ -1350,50 +1372,32 @@ HttpResponseWorker ( HttpFreeMsgParser (HttpInstance->MsgParser); HttpInstance->MsgParser =3D NULL; } =20 // - // We receive part of header of next HTTP msg. + // Check whether there is the next message header in the HttpMsg->Body= . // if (HttpInstance->NextMsg !=3D NULL) { - HttpMsg->BodyLength =3D MIN ((UINTN) HttpInstance->NextMsg - (UINTN)= Fragment.Bulk, HttpMsg->BodyLength); - CopyMem (HttpMsg->Body, Fragment.Bulk, HttpMsg->BodyLength); - - HttpInstance->CacheLen =3D Fragment.Len - HttpMsg->BodyLength; - if (HttpInstance->CacheLen !=3D 0) { - if (HttpInstance->CacheBody !=3D NULL) { - FreePool (HttpInstance->CacheBody); - } - - HttpInstance->CacheBody =3D AllocateZeroPool (HttpInstance->CacheL= en); - if (HttpInstance->CacheBody =3D=3D NULL) { - Status =3D EFI_OUT_OF_RESOURCES; - goto Error2; - } - - CopyMem (HttpInstance->CacheBody, Fragment.Bulk + HttpMsg->BodyLen= gth, HttpInstance->CacheLen); - HttpInstance->CacheOffset =3D 0; + HttpMsg->BodyLength =3D HttpInstance->NextMsg - (CHAR8 *) HttpMsg->B= ody; + } =20 - HttpInstance->NextMsg =3D HttpInstance->CacheBody + ((UINTN) HttpI= nstance->NextMsg - (UINTN) (Fragment.Bulk + HttpMsg->BodyLength)); + HttpInstance->CacheLen =3D Fragment.Len - HttpMsg->BodyLength; + if (HttpInstance->CacheLen !=3D 0) { + if (HttpInstance->CacheBody !=3D NULL) { + FreePool (HttpInstance->CacheBody); } - } else { - HttpMsg->BodyLength =3D MIN (Fragment.Len, (UINT32) HttpMsg->BodyLen= gth); - CopyMem (HttpMsg->Body, Fragment.Bulk, HttpMsg->BodyLength); - HttpInstance->CacheLen =3D Fragment.Len - HttpMsg->BodyLength; - if (HttpInstance->CacheLen !=3D 0) { - if (HttpInstance->CacheBody !=3D NULL) { - FreePool (HttpInstance->CacheBody); - } =20 - HttpInstance->CacheBody =3D AllocateZeroPool (HttpInstance->CacheL= en); - if (HttpInstance->CacheBody =3D=3D NULL) { - Status =3D EFI_OUT_OF_RESOURCES; - goto Error2; - } + HttpInstance->CacheBody =3D AllocateZeroPool (HttpInstance->CacheLen= ); + if (HttpInstance->CacheBody =3D=3D NULL) { + Status =3D EFI_OUT_OF_RESOURCES; + goto Error2; + } =20 - CopyMem (HttpInstance->CacheBody, Fragment.Bulk + HttpMsg->BodyLen= gth, HttpInstance->CacheLen); - HttpInstance->CacheOffset =3D 0; + CopyMem (HttpInstance->CacheBody, Fragment.Bulk + HttpMsg->BodyLengt= h, HttpInstance->CacheLen); + HttpInstance->CacheOffset =3D 0; + if (HttpInstance->NextMsg !=3D NULL) { + HttpInstance->NextMsg =3D HttpInstance->CacheBody; } } =20 if (Fragment.Bulk !=3D NULL) { FreePool (Fragment.Bulk); diff --git a/NetworkPkg/HttpDxe/HttpProto.c b/NetworkPkg/HttpDxe/HttpProto.= c index 5356cd35c0..94f89f5665 100644 --- a/NetworkPkg/HttpDxe/HttpProto.c +++ b/NetworkPkg/HttpDxe/HttpProto.c @@ -195,10 +195,20 @@ HttpTcpReceiveNotifyDpc ( Length =3D (UINTN) Wrap->TcpWrap.Rx6Data.FragmentTable[0].FragmentLeng= th; } else { Length =3D (UINTN) Wrap->TcpWrap.Rx4Data.FragmentTable[0].FragmentLeng= th; } =20 + // + // Record the CallbackData data. + // + HttpInstance->CallbackData.Wrap =3D (VOID *) Wrap; =20 + HttpInstance->CallbackData.ParseData =3D Wrap->HttpToken->Message->Body; = =20 + HttpInstance->CallbackData.ParseDataLength =3D Length; + + // + // Parse Body with CallbackData data. + // Status =3D HttpParseMessageBody ( HttpInstance->MsgParser, Length, Wrap->HttpToken->Message->Body ); diff --git a/NetworkPkg/HttpDxe/HttpProto.h b/NetworkPkg/HttpDxe/HttpProto.= h index cc6c1eb566..fa57dbfd39 100644 --- a/NetworkPkg/HttpDxe/HttpProto.h +++ b/NetworkPkg/HttpDxe/HttpProto.h @@ -89,10 +89,19 @@ typedef struct { EFI_TLS_CONNECTION_END ConnectionEnd; EFI_TLS_VERIFY VerifyMethod; EFI_TLS_SESSION_STATE SessionState; } TLS_CONFIG_DATA; =20 +// +// Callback data for HTTP_PARSER_CALLBACK() // typedef struct { + UINTN ParseDataLength; + VOID *ParseData; + VOID *Wrap; +} HTTP_CALLBACK_DATA; + typedef struct _HTTP_PROTOCOL { UINT32 Signature; EFI_HTTP_PROTOCOL Http; EFI_HANDLE Handle; HTTP_SERVICE *Service; @@ -147,10 +156,11 @@ typedef struct _HTTP_PROTOCOL { =20 // // HTTP message-body parser. // VOID *MsgParser; + HTTP_CALLBACK_DATA CallbackData; =20 EFI_HTTP_VERSION HttpVersion; UINT32 TimeOutMillisec; BOOLEAN LocalAddressIsIPv6; =20 -- 2.17.1.windows.2