From fc542c0974840882e5bbba0046c530e2ede34170 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Mon, 12 Apr 2021 07:46:35 -0700 Subject: Add support for configuring SNI SSL certificates --- src/test/WixToolsetTest.Http/HttpExtensionFixture.cs | 19 +++++++++++++++++++ .../TestData/SniSsl/Package.en-us.wxl | 11 +++++++++++ .../WixToolsetTest.Http/TestData/SniSsl/Package.wxs | 15 +++++++++++++++ .../TestData/SniSsl/PackageComponents.wxs | 12 ++++++++++++ .../WixToolsetTest.Http/TestData/SniSsl/example.txt | 1 + 5 files changed, 58 insertions(+) create mode 100644 src/test/WixToolsetTest.Http/TestData/SniSsl/Package.en-us.wxl create mode 100644 src/test/WixToolsetTest.Http/TestData/SniSsl/Package.wxs create mode 100644 src/test/WixToolsetTest.Http/TestData/SniSsl/PackageComponents.wxs create mode 100644 src/test/WixToolsetTest.Http/TestData/SniSsl/example.txt (limited to 'src/test') diff --git a/src/test/WixToolsetTest.Http/HttpExtensionFixture.cs b/src/test/WixToolsetTest.Http/HttpExtensionFixture.cs index d1a1f565..1d350bdf 100644 --- a/src/test/WixToolsetTest.Http/HttpExtensionFixture.cs +++ b/src/test/WixToolsetTest.Http/HttpExtensionFixture.cs @@ -9,6 +9,25 @@ namespace WixToolsetTest.Http public class HttpExtensionFixture { + [Fact] + public void CanBuildUsingSniSssl() + { + var folder = TestData.Get("TestData", "SniSsl"); + var build = new Builder(folder, typeof(HttpExtensionFactory), new[] { folder }); + + var results = build.BuildAndQuery(Build, "CustomAction", "WixHttpSniSslCert"); + 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", + "WixHttpSniSslCert:sslC9YX6_H7UL_WGBx4DoDGI.Sj.D0\texample.com\t8080\t[SOME_THUMBPRINT]\t\t\t2\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", + }, results); + } + [Fact] public void CanBuildUsingUrlReservation() { diff --git a/src/test/WixToolsetTest.Http/TestData/SniSsl/Package.en-us.wxl b/src/test/WixToolsetTest.Http/TestData/SniSsl/Package.en-us.wxl new file mode 100644 index 00000000..38c12ac1 --- /dev/null +++ b/src/test/WixToolsetTest.Http/TestData/SniSsl/Package.en-us.wxl @@ -0,0 +1,11 @@ + + + + + + A newer version of [ProductName] is already installed. + MsiPackage + + diff --git a/src/test/WixToolsetTest.Http/TestData/SniSsl/Package.wxs b/src/test/WixToolsetTest.Http/TestData/SniSsl/Package.wxs new file mode 100644 index 00000000..c85e9bba --- /dev/null +++ b/src/test/WixToolsetTest.Http/TestData/SniSsl/Package.wxs @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.Http/TestData/SniSsl/PackageComponents.wxs b/src/test/WixToolsetTest.Http/TestData/SniSsl/PackageComponents.wxs new file mode 100644 index 00000000..f0aae485 --- /dev/null +++ b/src/test/WixToolsetTest.Http/TestData/SniSsl/PackageComponents.wxs @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.Http/TestData/SniSsl/example.txt b/src/test/WixToolsetTest.Http/TestData/SniSsl/example.txt new file mode 100644 index 00000000..1b4ffe8a --- /dev/null +++ b/src/test/WixToolsetTest.Http/TestData/SniSsl/example.txt @@ -0,0 +1 @@ +This is example.txt. \ No newline at end of file -- cgit v1.2.3-55-g6feb