Auto merge of #25925 - paulrouget:uwpsign, r=jdm

Properly sign UWP package

Supersede #25661
Fix #25362

---

- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #25362 (GitHub issue number if applicable)

7 files changed, 77 insertions, 18 deletions

diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py
index 1fe9c77690e..38107fda1a2 100644
--- a/etc/taskcluster/decision_task.py
+++ b/etc/taskcluster/decision_task.py
@@ -311,6 +311,8 @@ def windows_arm64():
     return (
         windows_build_task("UWP dev build", arch="arm64", package=False)
         .with_treeherder("Windows arm64", "UWP-Dev")
+        .with_features("taskclusterProxy")
+        .with_scopes("secrets:get:project/servo/windows-codesign-cert/latest")
         .with_script(
             "python mach build --dev --target=aarch64-uwp-windows-msvc",
             "python mach package --dev --target aarch64-uwp-windows-msvc --uwp=arm64",
@@ -324,6 +326,8 @@ def windows_uwp_x64():
     return (
         windows_build_task("UWP dev build", package=False)
         .with_treeherder("Windows x64", "UWP-Dev")
+        .with_features("taskclusterProxy")
+        .with_scopes("secrets:get:project/servo/windows-codesign-cert/latest")
         .with_script(
             "python mach build --dev --target=x86_64-uwp-windows-msvc",
             "python mach package --dev --target=x86_64-uwp-windows-msvc --uwp=x64",
diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py
index a663763a398..a0aa3865b6f 100644
--- a/python/servo/package_commands.py
+++ b/python/servo/package_commands.py
@@ -10,6 +10,7 @@
 from __future__ import absolute_import, print_function, unicode_literals
 
 from datetime import datetime
+import base64
 import hashlib
 import json
 import os
@@ -20,6 +21,7 @@ import subprocess
 import sys
 import tempfile
 import six.moves.urllib as urllib
+import xml
 
 from mach.decorators import (
     CommandArgument,
@@ -91,6 +93,15 @@ else:
             raise e
 
 
+def get_taskcluster_secret(name):
+    url = (
+        os.environ.get("TASKCLUSTER_PROXY_URL", "http://taskcluster") +
+        "/api/secrets/v1/secret/project/servo/" +
+        name
+    )
+    return json.load(urllib.request.urlopen(url))["secret"]
+
+
 def otool(s):
     o = subprocess.Popen(['/usr/bin/otool', '-L', s], stdout=subprocess.PIPE)
     for l in o.stdout:
@@ -209,8 +220,9 @@ class PackageCommands(CommandBase):
                      default=None,
                      action='append',
                      help='Create an APPX package')
+    @CommandArgument('--ms-app-store', default=None, action='store_true')
     def package(self, release=False, dev=False, android=None, magicleap=None, debug=False,
-                debugger=None, target=None, flavor=None, maven=False, uwp=None):
+                debugger=None, target=None, flavor=None, maven=False, uwp=None, ms_app_store=False):
         if android is None:
             android = self.config["build"]["android"]
         if target and android:
@@ -234,7 +246,7 @@ class PackageCommands(CommandBase):
         target_dir = path.dirname(binary_path)
         if uwp:
             vs_info = self.vs_dirs()
-            build_uwp(uwp, dev, vs_info['msbuild'])
+            build_uwp(uwp, dev, vs_info['msbuild'], ms_app_store)
         elif magicleap:
             if platform.system() not in ["Darwin"]:
                 raise Exception("Magic Leap builds are only supported on macOS.")
@@ -588,14 +600,6 @@ class PackageCommands(CommandBase):
     def upload_nightly(self, platform, secret_from_taskcluster):
         import boto3
 
-        def get_taskcluster_secret(name):
-            url = (
-                os.environ.get("TASKCLUSTER_PROXY_URL", "http://taskcluster") +
-                "/api/secrets/v1/secret/project/servo/" +
-                name
-            )
-            return json.load(urllib.request.urlopen(url))["secret"]
-
         def get_s3_secret():
             aws_access_key = None
             aws_secret_access_key = None
@@ -739,7 +743,59 @@ class PackageCommands(CommandBase):
         return 0
 
 
-def build_uwp(platforms, dev, msbuild_dir):
+def setup_uwp_signing(ms_app_store):
+    # App package needs to be signed. If we find a certificate that has been installed
+    # already, we use it. Otherwise we create and install a temporary certificate.
+
+    if ms_app_store:
+        return ["/p:AppxPackageSigningEnabled=false"]
+
+    is_tc = "TASKCLUSTER_PROXY_URL" in os.environ
+
+    def run_powershell_cmd(cmd):
+        try:
+            return subprocess.check_output(['powershell.exe', '-NoProfile', '-Command', cmd])
+        except subprocess.CalledProcessError:
+            print("ERROR: PowerShell command failed: ", cmd)
+            exit(1)
+
+    if is_tc:
+        print("Packaging on TC. Using secret certificate")
+        pfx = get_taskcluster_secret("windows-codesign-cert/latest")["pfx"]
+        open("servo.pfx", "wb").write(base64.b64decode(pfx["base64"]))
+        run_powershell_cmd('Import-PfxCertificate -FilePath .\servo.pfx -CertStoreLocation Cert:\CurrentUser\My')
+        os.remove("servo.pfx")
+
+    # Parse appxmanifest to find the publisher name
+    manifest_file = path.join(os.getcwd(), 'support', 'hololens', 'ServoApp', 'Package.appxmanifest')
+    manifest = xml.etree.ElementTree.parse(manifest_file)
+    namespace = "{http://schemas.microsoft.com/appx/manifest/foundation/windows10}"
+    publisher = manifest.getroot().find(namespace + "Identity").attrib["Publisher"]
+    # Powershell command that lists all certificates for publisher
+    cmd = '(dir cert: -Recurse | Where-Object {$_.Issuer -eq "' + publisher + '"}).Thumbprint'
+    certs = list(set(run_powershell_cmd(cmd).splitlines()))
+    if not certs and is_tc:
+        print("Error: No certificate installed for publisher " + publisher)
+        exit(1)
+    if not certs and not is_tc:
+        print("No certificate installed for publisher " + publisher)
+        print("Creating and installing a temporary certificate")
+        # PowerShell command that creates and install signing certificate for publisher
+        cmd = '(New-SelfSignedCertificate -Type Custom -Subject ' + publisher + \
+              ' -FriendlyName "Allizom Signing Certificate (temporary)"' + \
+              ' -KeyUsage DigitalSignature -CertStoreLocation "Cert:\CurrentUser\My"' + \
+              ' -TextExtension @("2.5.29.37={text}1.3.6.1.5.5.7.3.3", "2.5.29.19={text}")).Thumbprint'
+        thumbprint = run_powershell_cmd(cmd)
+    elif len(certs) > 1:
+        print("Warning: multiple signing certificate are installed for " + publisher)
+        print("Warning: Using first one")
+        thumbprint = certs[0]
+    else:
+        thumbprint = certs[0]
+    return ["/p:AppxPackageSigningEnabled=true", "/p:PackageCertificateThumbprint=" + thumbprint]
+
+
+def build_uwp(platforms, dev, msbuild_dir, ms_app_store):
     if any(map(lambda p: p not in ['x64', 'x86', 'arm64'], platforms)):
         raise Exception("Unsupported appx platforms: " + str(platforms))
     if dev and len(platforms) > 1:
@@ -764,7 +820,8 @@ def build_uwp(platforms, dev, msbuild_dir):
         )
         build_file.close()
         # Generate an appxbundle.
-        subprocess.check_call([msbuild, "/m", build_file.name])
+        msbuild_args = setup_uwp_signing(ms_app_store)
+        subprocess.check_call([msbuild, "/m", build_file.name] + msbuild_args)
         os.unlink(build_file.name)
 
     print("Creating ZIP")
diff --git a/support/hololens/ServoApp/Package.appxmanifest b/support/hololens/ServoApp/Package.appxmanifest
index 53255364338..5ada19983d7 100644
--- a/support/hololens/ServoApp/Package.appxmanifest
+++ b/support/hololens/ServoApp/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5" IgnorableNamespaces="uap mp uap5">
-  <Identity Name="MozillaFoundation.FirefoxReality" Publisher="CN=193FE5E7-EFE6-4FC4-9D96-D742E0265B78" Version="1.0.0.0" />
+  <Identity Name="MozillaFoundation.FirefoxReality" Publisher="CN=Allizom" Version="1.0.0.0" />
   <mp:PhoneIdentity PhoneProductId="1d265729-8836-4bd3-9992-4cb111d1068b" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>Firefox Reality</DisplayName>
diff --git a/support/hololens/ServoApp/ServoApp.vcxproj b/support/hololens/ServoApp/ServoApp.vcxproj
index 615d78c013a..6d729b3661b 100644
--- a/support/hololens/ServoApp/ServoApp.vcxproj
+++ b/support/hololens/ServoApp/ServoApp.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\packages\OpenXR.Loader.1.0.3\build\native\OpenXR.Loader.props" Condition="Exists('..\packages\OpenXR.Loader.1.0.3\build\native\OpenXR.Loader.props')" />
   <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.props')" />
@@ -870,7 +870,6 @@
     <None Include="..\..\..\target\x86_64-uwp-windows-msvc\release\z-1.dll">
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
     </None>
-    <None Include="ServoApp_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
     <Image Include="Assets\LargeTile.scale-100.png" />
diff --git a/support/hololens/ServoApp/ServoApp.vcxproj.filters b/support/hololens/ServoApp/ServoApp.vcxproj.filters
index 5f1a2c73ab3..0e78db725be 100644
--- a/support/hololens/ServoApp/ServoApp.vcxproj.filters
+++ b/support/hololens/ServoApp/ServoApp.vcxproj.filters
@@ -159,7 +159,6 @@
     <AppxManifest Include="Package.appxmanifest" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="ServoApp_TemporaryKey.pfx" />
     <None Include="packages.config" />
     <None Include="..\..\..\target\x86_64-uwp-windows-msvc\release\simpleservo.dll">
       <Filter>ReleaseServoDLLs</Filter>
diff --git a/support/hololens/ServoApp/ServoApp_TemporaryKey.pfx b/support/hololens/ServoApp/ServoApp_TemporaryKey.pfx
deleted file mode 100644
index 8917164b3bb..00000000000
--- a/support/hololens/ServoApp/ServoApp_TemporaryKey.pfx
+++ /dev/null
diff --git a/support/hololens/package.msbuild b/support/hololens/package.msbuild
index d673876c350..8d25a8d3fd6 100644
--- a/support/hololens/package.msbuild
+++ b/support/hololens/package.msbuild
@@ -9,6 +9,6 @@
       </ConfigAndPlatform>
     </ItemGroup>
     <MSBuild Projects="%%SOLUTION%%" Targets="Build"
-             Properties="Configuration=%(ConfigAndPlatform.Identity);Platform=%(ConfigAndPlatform.Platform);AppxBundle=Always;AppxBundlePlatforms=%%PACKAGE_PLATFORMS%%;UseSubFolderForOutputDirDuringMultiPlatformBuild=false;AppxPackageSigningEnabled=false"/>
+             Properties="Configuration=%(ConfigAndPlatform.Identity);Platform=%(ConfigAndPlatform.Platform);AppxBundle=Always;AppxBundlePlatforms=%%PACKAGE_PLATFORMS%%;UseSubFolderForOutputDirDuringMultiPlatformBuild=false"/>
   </Target>
-</Project>
\ No newline at end of file
+</Project>