NetworkPkg/HttpDxe: Set the HostName for the verification (CVE-2019-14553)

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=960
CVE: CVE-2019-14553
Set the HostName by consuming TLS protocol to enable the host name
check so as to avoid the potential Man-In-The-Middle attack.

Signed-off-by: Wu Jiaxin <jiaxin.wu@intel.com>
Reviewed-by: Ye Ting <ting.ye@intel.com>
Reviewed-by: Long Qin <qin.long@intel.com>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>
Acked-by: Laszlo Ersek <lersek@redhat.com>
Message-Id: <20190927034441.3096-5-Jiaxin.wu@intel.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Jiaxin Wu <jiaxin.wu@intel.com>
Cc: Sivaraman Nainar <sivaramann@amiindia.co.in>
Cc: Xiaoyu Lu <xiaoyux.lu@intel.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>

2 files changed, 18 insertions, 4 deletions

diff --git a/NetworkPkg/HttpDxe/HttpProto.h b/NetworkPkg/HttpDxe/HttpProto.h
index 6e1f51748a..34308e016d 100644
--- a/NetworkPkg/HttpDxe/HttpProto.h
+++ b/NetworkPkg/HttpDxe/HttpProto.h
@@ -82,6 +82,7 @@ typedef struct {
   EFI_TLS_VERSION               Version;

   EFI_TLS_CONNECTION_END        ConnectionEnd;

   EFI_TLS_VERIFY                VerifyMethod;

+  EFI_TLS_VERIFY_HOST           VerifyHost;

   EFI_TLS_SESSION_STATE         SessionState;

 } TLS_CONFIG_DATA;

 

diff --git a/NetworkPkg/HttpDxe/HttpsSupport.c b/NetworkPkg/HttpDxe/HttpsSupport.c
index 988bbcbce7..5dfb13bd60 100644
--- a/NetworkPkg/HttpDxe/HttpsSupport.c
+++ b/NetworkPkg/HttpDxe/HttpsSupport.c
@@ -623,13 +623,16 @@ TlsConfigureSession (
   //

   // TlsConfigData initialization

   //

-  HttpInstance->TlsConfigData.ConnectionEnd = EfiTlsClient;

-  HttpInstance->TlsConfigData.VerifyMethod = EFI_TLS_VERIFY_PEER;

-  HttpInstance->TlsConfigData.SessionState = EfiTlsSessionNotStarted;

+  HttpInstance->TlsConfigData.ConnectionEnd       = EfiTlsClient;

+  HttpInstance->TlsConfigData.VerifyMethod        = EFI_TLS_VERIFY_PEER;

+  HttpInstance->TlsConfigData.VerifyHost.Flags    = EFI_TLS_VERIFY_FLAG_NO_WILDCARDS;

+  HttpInstance->TlsConfigData.VerifyHost.HostName = HttpInstance->RemoteHost;

+  HttpInstance->TlsConfigData.SessionState        = EfiTlsSessionNotStarted;

 

   //

   // EfiTlsConnectionEnd,

-  // EfiTlsVerifyMethod

+  // EfiTlsVerifyMethod,

+  // EfiTlsVerifyHost,

   // EfiTlsSessionState

   //

   Status = HttpInstance->Tls->SetSessionData (

@@ -654,6 +657,16 @@ TlsConfigureSession (
 

   Status = HttpInstance->Tls->SetSessionData (

                                 HttpInstance->Tls,

+                                EfiTlsVerifyHost,

+                                &HttpInstance->TlsConfigData.VerifyHost,

+                                sizeof (EFI_TLS_VERIFY_HOST)

+                                );

+  if (EFI_ERROR (Status)) {

+    return Status;

+  }

+

+  Status = HttpInstance->Tls->SetSessionData (

+                                HttpInstance->Tls,

                                 EfiTlsSessionState,

                                 &(HttpInstance->TlsConfigData.SessionState),

                                 sizeof (EFI_TLS_SESSION_STATE)