From ba7fd5837ea149b2e319cc577fad27ce1162a064 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Mon, 17 Feb 2025 22:30:31 -0500 Subject: Support non-SNI SSL certificates in Http extension Implements https://github.com/wixtoolset/issues/issues/7622 --- .../WixToolsetTest.Http/HttpExtensionFixture.cs | 36 +++++++++++----------- .../TestData/SniSsl/Package.en-us.wxl | 9 ------ .../TestData/SniSsl/Package.wxs | 15 --------- .../TestData/SniSsl/PackageComponents.wxs | 12 -------- .../TestData/SniSsl/example.txt | 1 - .../TestData/Ssl/Package.en-us.wxl | 9 ++++++ .../WixToolsetTest.Http/TestData/Ssl/Package.wxs | 15 +++++++++ .../TestData/Ssl/PackageComponents.wxs | 17 ++++++++++ .../WixToolsetTest.Http/TestData/Ssl/example.txt | 1 + 9 files changed, 60 insertions(+), 55 deletions(-) delete mode 100644 src/ext/Http/test/WixToolsetTest.Http/TestData/SniSsl/Package.en-us.wxl delete mode 100644 src/ext/Http/test/WixToolsetTest.Http/TestData/SniSsl/Package.wxs delete mode 100644 src/ext/Http/test/WixToolsetTest.Http/TestData/SniSsl/PackageComponents.wxs delete mode 100644 src/ext/Http/test/WixToolsetTest.Http/TestData/SniSsl/example.txt create mode 100644 src/ext/Http/test/WixToolsetTest.Http/TestData/Ssl/Package.en-us.wxl create mode 100644 src/ext/Http/test/WixToolsetTest.Http/TestData/Ssl/Package.wxs create mode 100644 src/ext/Http/test/WixToolsetTest.Http/TestData/Ssl/PackageComponents.wxs create mode 100644 src/ext/Http/test/WixToolsetTest.Http/TestData/Ssl/example.txt (limited to 'src/ext/Http/test') diff --git a/src/ext/Http/test/WixToolsetTest.Http/HttpExtensionFixture.cs b/src/ext/Http/test/WixToolsetTest.Http/HttpExtensionFixture.cs index 14b40bc8..ffd698f5 100644 --- a/src/ext/Http/test/WixToolsetTest.Http/HttpExtensionFixture.cs +++ b/src/ext/Http/test/WixToolsetTest.Http/HttpExtensionFixture.cs @@ -10,21 +10,22 @@ namespace WixToolsetTest.Http public class HttpExtensionFixture { [Fact] - public void CanBuildUsingSniSssl() + public void CanBuildUsingSsl() { - var folder = TestData.Get("TestData", "SniSsl"); + var folder = TestData.Get("TestData", "Ssl"); var build = new Builder(folder, typeof(HttpExtensionFactory), new[] { folder }); - var results = build.BuildAndQuery(Build, "CustomAction", "Wix4HttpSniSslCert"); + var results = build.BuildAndQuery(Build, "CustomAction", "Wix6HttpCertificate"); WixAssert.CompareLineByLine(new[] { - "CustomAction:Wix4ExecHttpSniSslCertsInstall_X86\t3073\tWix4HttpCA_X86\tExecHttpSniSslCerts\t", - "CustomAction:Wix4ExecHttpSniSslCertsUninstall_X86\t3073\tWix4HttpCA_X86\tExecHttpSniSslCerts\t", - "CustomAction:Wix4RollbackHttpSniSslCertsInstall_X86\t3329\tWix4HttpCA_X86\tExecHttpSniSslCerts\t", - "CustomAction:Wix4RollbackHttpSniSslCertsUninstall_X86\t3329\tWix4HttpCA_X86\tExecHttpSniSslCerts\t", - "CustomAction:Wix4SchedHttpSniSslCertsInstall_X86\t1\tWix4HttpCA_X86\tSchedHttpSniSslCertsInstall\t", - "CustomAction:Wix4SchedHttpSniSslCertsUninstall_X86\t1\tWix4HttpCA_X86\tSchedHttpSniSslCertsUninstall\t", - "Wix4HttpSniSslCert:sslC9YX6_H7UL_WGBx4DoDGI.Sj.D0\texample.com\t8080\t[SOME_THUMBPRINT]\t\t\t2\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", + "CustomAction:Wix6ExecHttpCertificatesInstall_X86\t3073\tWix6HttpCA_X86\tExecHttpCertificates\t", + "CustomAction:Wix6ExecHttpCertificatesUninstall_X86\t3073\tWix6HttpCA_X86\tExecHttpCertificates\t", + "CustomAction:Wix6RollbackHttpCertificatesInstall_X86\t3329\tWix6HttpCA_X86\tExecHttpCertificates\t", + "CustomAction:Wix6RollbackHttpCertificatesUninstall_X86\t3329\tWix6HttpCA_X86\tExecHttpCertificates\t", + "CustomAction:Wix6SchedHttpCertificatesInstall_X86\t1\tWix6HttpCA_X86\tSchedHttpCertificatesInstall\t", + "CustomAction:Wix6SchedHttpCertificatesUninstall_X86\t1\tWix6HttpCA_X86\tSchedHttpCertificatesUninstall\t", + "Wix6HttpCertificate:ipsFO5EwsJKZPxl2W2V1nI59m1pDQs\t\t[PORTMANTEAU]\t[SOME_OTHER_THUMBPRINT]\t\t\t0\t1\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", + "Wix6HttpCertificate:sniC9YX6_H7UL_WGBx4DoDGI.Sj.D0\texample.com\t8080\t[SOME_THUMBPRINT]\t\t\t2\t0\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", }, results); } @@ -37,12 +38,12 @@ namespace WixToolsetTest.Http var results = build.BuildAndQuery(Build, "CustomAction", "Wix4HttpUrlAce", "Wix4HttpUrlReservation"); WixAssert.CompareLineByLine(new[] { - "CustomAction:Wix4ExecHttpUrlReservationsInstall_X86\t3073\tWix4HttpCA_X86\tExecHttpUrlReservations\t", - "CustomAction:Wix4ExecHttpUrlReservationsUninstall_X86\t3073\tWix4HttpCA_X86\tExecHttpUrlReservations\t", - "CustomAction:Wix4RollbackHttpUrlReservationsInstall_X86\t3329\tWix4HttpCA_X86\tExecHttpUrlReservations\t", - "CustomAction:Wix4RollbackHttpUrlReservationsUninstall_X86\t3329\tWix4HttpCA_X86\tExecHttpUrlReservations\t", - "CustomAction:Wix4SchedHttpUrlReservationsInstall_X86\t1\tWix4HttpCA_X86\tSchedHttpUrlReservationsInstall\t", - "CustomAction:Wix4SchedHttpUrlReservationsUninstall_X86\t1\tWix4HttpCA_X86\tSchedHttpUrlReservationsUninstall\t", + "CustomAction:Wix4ExecHttpUrlReservationsInstall_X86\t3073\tWix6HttpCA_X86\tExecHttpUrlReservations\t", + "CustomAction:Wix4ExecHttpUrlReservationsUninstall_X86\t3073\tWix6HttpCA_X86\tExecHttpUrlReservations\t", + "CustomAction:Wix4RollbackHttpUrlReservationsInstall_X86\t3329\tWix6HttpCA_X86\tExecHttpUrlReservations\t", + "CustomAction:Wix4RollbackHttpUrlReservationsUninstall_X86\t3329\tWix6HttpCA_X86\tExecHttpUrlReservations\t", + "CustomAction:Wix4SchedHttpUrlReservationsInstall_X86\t1\tWix6HttpCA_X86\tSchedHttpUrlReservationsInstall\t", + "CustomAction:Wix4SchedHttpUrlReservationsUninstall_X86\t1\tWix6HttpCA_X86\tSchedHttpUrlReservationsUninstall\t", "Wix4HttpUrlAce:aceu5os2gQoblRmzwjt85LQf997uD4\turlO23FkY2xzEY54lY6E6sXFW6glXc\tNT SERVICE\\TestService\t268435456", "Wix4HttpUrlReservation:urlO23FkY2xzEY54lY6E6sXFW6glXc\t0\t\thttp://+:80/vroot/\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", }, results); @@ -50,8 +51,7 @@ namespace WixToolsetTest.Http private static void Build(string[] args) { - var result = WixRunner.Execute(args) - .AssertSuccess(); + /*var result =*/ WixRunner.Execute(args).AssertSuccess(); } } } diff --git a/src/ext/Http/test/WixToolsetTest.Http/TestData/SniSsl/Package.en-us.wxl b/src/ext/Http/test/WixToolsetTest.Http/TestData/SniSsl/Package.en-us.wxl deleted file mode 100644 index f1df1234..00000000 --- a/src/ext/Http/test/WixToolsetTest.Http/TestData/SniSsl/Package.en-us.wxl +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/src/ext/Http/test/WixToolsetTest.Http/TestData/SniSsl/Package.wxs b/src/ext/Http/test/WixToolsetTest.Http/TestData/SniSsl/Package.wxs deleted file mode 100644 index c85e9bba..00000000 --- a/src/ext/Http/test/WixToolsetTest.Http/TestData/SniSsl/Package.wxs +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/src/ext/Http/test/WixToolsetTest.Http/TestData/SniSsl/PackageComponents.wxs b/src/ext/Http/test/WixToolsetTest.Http/TestData/SniSsl/PackageComponents.wxs deleted file mode 100644 index f0aae485..00000000 --- a/src/ext/Http/test/WixToolsetTest.Http/TestData/SniSsl/PackageComponents.wxs +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - diff --git a/src/ext/Http/test/WixToolsetTest.Http/TestData/SniSsl/example.txt b/src/ext/Http/test/WixToolsetTest.Http/TestData/SniSsl/example.txt deleted file mode 100644 index 1b4ffe8a..00000000 --- a/src/ext/Http/test/WixToolsetTest.Http/TestData/SniSsl/example.txt +++ /dev/null @@ -1 +0,0 @@ -This is example.txt. \ No newline at end of file diff --git a/src/ext/Http/test/WixToolsetTest.Http/TestData/Ssl/Package.en-us.wxl b/src/ext/Http/test/WixToolsetTest.Http/TestData/Ssl/Package.en-us.wxl new file mode 100644 index 00000000..f1df1234 --- /dev/null +++ b/src/ext/Http/test/WixToolsetTest.Http/TestData/Ssl/Package.en-us.wxl @@ -0,0 +1,9 @@ + + + + + + + diff --git a/src/ext/Http/test/WixToolsetTest.Http/TestData/Ssl/Package.wxs b/src/ext/Http/test/WixToolsetTest.Http/TestData/Ssl/Package.wxs new file mode 100644 index 00000000..69bdbccb --- /dev/null +++ b/src/ext/Http/test/WixToolsetTest.Http/TestData/Ssl/Package.wxs @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/src/ext/Http/test/WixToolsetTest.Http/TestData/Ssl/PackageComponents.wxs b/src/ext/Http/test/WixToolsetTest.Http/TestData/Ssl/PackageComponents.wxs new file mode 100644 index 00000000..126d2944 --- /dev/null +++ b/src/ext/Http/test/WixToolsetTest.Http/TestData/Ssl/PackageComponents.wxs @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + diff --git a/src/ext/Http/test/WixToolsetTest.Http/TestData/Ssl/example.txt b/src/ext/Http/test/WixToolsetTest.Http/TestData/Ssl/example.txt new file mode 100644 index 00000000..1b4ffe8a --- /dev/null +++ b/src/ext/Http/test/WixToolsetTest.Http/TestData/Ssl/example.txt @@ -0,0 +1 @@ +This is example.txt. \ No newline at end of file -- cgit v1.2.3-55-g6feb