Support non-SNI SSL certificates in Http extension

Implements https://github.com/wixtoolset/issues/issues/7622

4 files changed, 119 insertions, 98 deletions

diff --git a/src/ext/Http/wixext/Symbols/CertificateType.cs b/src/ext/Http/wixext/Symbols/CertificateType.cs
new file mode 100644
index 00000000..1e57ff13
--- /dev/null
+++ b/src/ext/Http/wixext/Symbols/CertificateType.cs
@@ -0,0 +1,13 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Http.Symbols
+{
+    /// <summary>
+    /// Must match constants in httpcerts.cpp
+    /// </summary>
+    public enum CertificateType
+    {
+        SniSsl = 0,
+        IpSsl = 1,
+    }
+}
diff --git a/src/ext/Http/wixext/Symbols/HttpCertificateSymbol.cs b/src/ext/Http/wixext/Symbols/HttpCertificateSymbol.cs
new file mode 100644
index 00000000..1e361b54
--- /dev/null
+++ b/src/ext/Http/wixext/Symbols/HttpCertificateSymbol.cs
@@ -0,0 +1,103 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Http
+{
+    using WixToolset.Data;
+    using WixToolset.Http.Symbols;
+
+    public static partial class HttpSymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition HttpCertificate = new IntermediateSymbolDefinition(
+            HttpSymbolDefinitionType.HttpCertificate.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(HttpCertificateSymbolFields.Host), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(HttpCertificateSymbolFields.Port), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(HttpCertificateSymbolFields.Thumbprint), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(HttpCertificateSymbolFields.AppId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(HttpCertificateSymbolFields.Store), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(HttpCertificateSymbolFields.HandleExisting), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(HttpCertificateSymbolFields.CertificateType), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(HttpCertificateSymbolFields.ComponentRef), IntermediateFieldType.String),
+            },
+            typeof(HttpCertificateSymbol));
+    }
+}
+
+namespace WixToolset.Http.Symbols
+{
+    using WixToolset.Data;
+
+    public enum HttpCertificateSymbolFields
+    {
+        Host,
+        Port,
+        Thumbprint,
+        AppId,
+        Store,
+        HandleExisting,
+        CertificateType,
+        ComponentRef,
+    }
+
+    public class HttpCertificateSymbol : IntermediateSymbol
+    {
+        public HttpCertificateSymbol() : base(HttpSymbolDefinitions.HttpCertificate, null, null)
+        {
+        }
+
+        public HttpCertificateSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(HttpSymbolDefinitions.HttpCertificate, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[HttpCertificateSymbolFields index] => this.Fields[(int)index];
+
+        public string Host
+        {
+            get => this.Fields[(int)HttpCertificateSymbolFields.Host].AsString();
+            set => this.Set((int)HttpCertificateSymbolFields.Host, value);
+        }
+
+        public string Port
+        {
+            get => this.Fields[(int)HttpCertificateSymbolFields.Port].AsString();
+            set => this.Set((int)HttpCertificateSymbolFields.Port, value);
+        }
+
+        public string Thumbprint
+        {
+            get => this.Fields[(int)HttpCertificateSymbolFields.Thumbprint].AsString();
+            set => this.Set((int)HttpCertificateSymbolFields.Thumbprint, value);
+        }
+
+        public string AppId
+        {
+            get => this.Fields[(int)HttpCertificateSymbolFields.AppId].AsString();
+            set => this.Set((int)HttpCertificateSymbolFields.AppId, value);
+        }
+
+        public string Store
+        {
+            get => this.Fields[(int)HttpCertificateSymbolFields.Store].AsString();
+            set => this.Set((int)HttpCertificateSymbolFields.Store, value);
+        }
+
+        public HandleExisting HandleExisting
+        {
+            get => (HandleExisting)this.Fields[(int)HttpCertificateSymbolFields.HandleExisting].AsNumber();
+            set => this.Set((int)HttpCertificateSymbolFields.HandleExisting, (int)value);
+        }
+
+        public CertificateType CertificateType
+        {
+            get => (CertificateType)this.Fields[(int)HttpCertificateSymbolFields.CertificateType].AsNumber();
+            set => this.Set((int)HttpCertificateSymbolFields.CertificateType, (int)value);
+        }
+
+        public string ComponentRef
+        {
+            get => this.Fields[(int)HttpCertificateSymbolFields.ComponentRef].AsString();
+            set => this.Set((int)HttpCertificateSymbolFields.ComponentRef, value);
+        }
+    }
+}
diff --git a/src/ext/Http/wixext/Symbols/HttpSymbolDefinitions.cs b/src/ext/Http/wixext/Symbols/HttpSymbolDefinitions.cs
index ff46ce3b..37a7abf0 100644
--- a/src/ext/Http/wixext/Symbols/HttpSymbolDefinitions.cs
+++ b/src/ext/Http/wixext/Symbols/HttpSymbolDefinitions.cs
@@ -7,7 +7,7 @@ namespace WixToolset.Http
 
     public enum HttpSymbolDefinitionType
     {
-        WixHttpSniSslCert,
+        HttpCertificate,
         WixHttpUrlAce,
         WixHttpUrlReservation,
     }
@@ -28,8 +28,8 @@ namespace WixToolset.Http
         {
             switch (type)
             {
-                case HttpSymbolDefinitionType.WixHttpSniSslCert:
-                    return HttpSymbolDefinitions.WixHttpSniSslCert;
+                case HttpSymbolDefinitionType.HttpCertificate:
+                    return HttpSymbolDefinitions.HttpCertificate;
 
                 case HttpSymbolDefinitionType.WixHttpUrlAce:
                     return HttpSymbolDefinitions.WixHttpUrlAce;
diff --git a/src/ext/Http/wixext/Symbols/WixHttpSniSslCertSymbol.cs b/src/ext/Http/wixext/Symbols/WixHttpSniSslCertSymbol.cs
deleted file mode 100644
index ec67a089..00000000
--- a/src/ext/Http/wixext/Symbols/WixHttpSniSslCertSymbol.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolset.Http
-{
-    using WixToolset.Data;
-    using WixToolset.Http.Symbols;
-
-    public static partial class HttpSymbolDefinitions
-    {
-        public static readonly IntermediateSymbolDefinition WixHttpSniSslCert = new IntermediateSymbolDefinition(
-            HttpSymbolDefinitionType.WixHttpSniSslCert.ToString(),
-            new[]
-            {
-                new IntermediateFieldDefinition(nameof(WixHttpSniSslCertSymbolFields.Host), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixHttpSniSslCertSymbolFields.Port), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixHttpSniSslCertSymbolFields.Thumbprint), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixHttpSniSslCertSymbolFields.AppId), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixHttpSniSslCertSymbolFields.Store), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixHttpSniSslCertSymbolFields.HandleExisting), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixHttpSniSslCertSymbolFields.ComponentRef), IntermediateFieldType.String),
-            },
-            typeof(WixHttpSniSslCertSymbol));
-    }
-}
-
-namespace WixToolset.Http.Symbols
-{
-    using WixToolset.Data;
-
-    public enum WixHttpSniSslCertSymbolFields
-    {
-        Host,
-        Port,
-        Thumbprint,
-        AppId,
-        Store,
-        HandleExisting,
-        ComponentRef,
-    }
-
-    public class WixHttpSniSslCertSymbol : IntermediateSymbol
-    {
-        public WixHttpSniSslCertSymbol() : base(HttpSymbolDefinitions.WixHttpSniSslCert, null, null)
-        {
-        }
-
-        public WixHttpSniSslCertSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(HttpSymbolDefinitions.WixHttpSniSslCert, sourceLineNumber, id)
-        {
-        }
-
-        public IntermediateField this[WixHttpSniSslCertSymbolFields index] => this.Fields[(int)index];
-
-        public string Host
-        {
-            get => this.Fields[(int)WixHttpSniSslCertSymbolFields.Host].AsString();
-            set => this.Set((int)WixHttpSniSslCertSymbolFields.Host, value);
-        }
-
-        public string Port
-        {
-            get => this.Fields[(int)WixHttpSniSslCertSymbolFields.Port].AsString();
-            set => this.Set((int)WixHttpSniSslCertSymbolFields.Port, value);
-        }
-
-        public string Thumbprint
-        {
-            get => this.Fields[(int)WixHttpSniSslCertSymbolFields.Thumbprint].AsString();
-            set => this.Set((int)WixHttpSniSslCertSymbolFields.Thumbprint, value);
-        }
-
-        public string AppId
-        {
-            get => this.Fields[(int)WixHttpSniSslCertSymbolFields.AppId].AsString();
-            set => this.Set((int)WixHttpSniSslCertSymbolFields.AppId, value);
-        }
-
-        public string Store
-        {
-            get => this.Fields[(int)WixHttpSniSslCertSymbolFields.Store].AsString();
-            set => this.Set((int)WixHttpSniSslCertSymbolFields.Store, value);
-        }
-
-        public HandleExisting HandleExisting
-        {
-            get => (HandleExisting)this.Fields[(int)WixHttpSniSslCertSymbolFields.HandleExisting].AsNumber();
-            set => this.Set((int)WixHttpSniSslCertSymbolFields.HandleExisting, (int)value);
-        }
-
-        public string ComponentRef
-        {
-            get => this.Fields[(int)WixHttpSniSslCertSymbolFields.ComponentRef].AsString();
-            set => this.Set((int)WixHttpSniSslCertSymbolFields.ComponentRef, value);
-        }
-    }
-}