Cert rotator

scripts/performance/common.py

@@ -18,6 +18,7 @@
 import os
 import sys
 import time
+import base64
 from typing import Callable, List, Optional, Tuple, Type, TypeVar
 
 
@@ -139,6 +140,10 @@ def get_packages_directory() -> str:
     '''
     return os.path.join(get_artifacts_directory(), 'packages')
 
+def base64_to_bytes(base64_string: str) -> bytes:
+    byte_data = base64.b64decode(base64_string)
+    return byte_data
+
 @contextmanager
 def push_dir(path: Optional[str] = None):
     '''

scripts/performance/constants.py

@@ -5,4 +5,5 @@
 UPLOAD_STORAGE_URI = 'https://pvscmdupload.{}.core.windows.net'
 UPLOAD_QUEUE = 'resultsqueue'
 TENANT_ID = '72f988bf-86f1-41af-91ab-2d7cd011db47'
-CLIENT_ID = 'a231f733-103b-46e9-b58a-9416edde0eb4'
+ARC_CLIENT_ID = 'a231f733-103b-46e9-b58a-9416edde0eb4'
+CERT_CLIENT_ID = '8c4b65ef-5a73-4d5a-a298-962d4a4ef7bc'

scripts/run_performance_job.py

@@ -774,6 +774,32 @@ def run_performance_job(args: RunPerformanceJobArgs):
     getLogger().info("Copying global.json to payload directory")
     shutil.copy(os.path.join(args.performance_repo_dir, 'global.json'), os.path.join(performance_payload_dir, 'global.json'))
 
+    # Building CertHelper needs to happen here as we need it on every run. This also means that we will need to move the calculation
+    # of the parameters needed outside of the if block
+
+    framework = os.environ["PERFLAB_Framework"]
+    os.environ["PERFLAB_TARGET_FRAMEWORKS"] = framework
+    if args.os_group == "windows":
+        runtime_id = f"win-{args.architecture}"
+    elif args.os_group == "osx":
+        runtime_id = f"osx-{args.architecture}"
+    else:
+        runtime_id = f"linux-{args.architecture}"
+
+    dotnet_executable_path = os.path.join(ci_setup_arguments.install_dir, "dotnet")
+
+    RunCommand([
+        dotnet_executable_path, "publish", 
+        "-c", "Release", 
+        "-o", os.path.join(payload_dir, "certhelper"),
+        "-f", framework,
+        "-r", runtime_id,
+        "--self-contained",
+        os.path.join(args.performance_repo_dir, "src", "tools", "CertHelper", "CertHelper.csproj"),
+        f"/bl:{os.path.join(args.performance_repo_dir, 'artifacts', 'log', build_config, 'CertHelper.binlog')}",
+        "-p:DisableTransitiveFrameworkReferenceDownloads=true"],
+        verbose=True).run()
+
     if args.is_scenario:
         set_environment_variable("DOTNET_ROOT", ci_setup_arguments.install_dir, save_to_pipeline=True)
         getLogger().info(f"Set DOTNET_ROOT to {ci_setup_arguments.install_dir}")
@@ -782,17 +808,6 @@ def run_performance_job(args: RunPerformanceJobArgs):
         set_environment_variable("PATH", new_path, save_to_pipeline=True)
         getLogger().info(f"Set PATH to {new_path}")
 
-        framework = os.environ["PERFLAB_Framework"]
-        os.environ["PERFLAB_TARGET_FRAMEWORKS"] = framework
-        if args.os_group == "windows":
-            runtime_id = f"win-{args.architecture}"
-        elif args.os_group == "osx":
-            runtime_id = f"osx-{args.architecture}"
-        else:
-            runtime_id = f"linux-{args.architecture}"
-
-        dotnet_executable_path = os.path.join(ci_setup_arguments.install_dir, "dotnet")
-
         os.environ["MSBUILDDISABLENODEREUSE"] = "1" # without this, MSbuild will be kept alive
 
         # build Startup

scripts/upload.py

@@ -3,11 +3,11 @@
 from azure.storage.blob import BlobClient, ContentSettings
 from azure.storage.queue import QueueClient, TextBase64EncodePolicy
 from azure.core.exceptions import ResourceExistsError, ClientAuthenticationError
-from azure.identity import DefaultAzureCredential, ClientAssertionCredential
+from azure.identity import DefaultAzureCredential, ClientAssertionCredential, CertificateCredential
 from traceback import format_exc
 from glob import glob
-from performance.common import retry_on_exception
-from performance.constants import TENANT_ID, CLIENT_ID
+from performance.common import retry_on_exception, RunCommand, helixpayload, base64_to_bytes, extension
+from performance.constants import TENANT_ID, ARC_CLIENT_ID, CERT_CLIENT_ID
 import os
 import json
 
@@ -32,14 +32,25 @@ def upload(globpath: str, container: str, queue: str, sas_token_env: str, storag
         credential = None
         try:
             dac = DefaultAzureCredential()
-            credential = ClientAssertionCredential(TENANT_ID, CLIENT_ID, lambda: dac.get_token("api://AzureADTokenExchange/.default").token)
+            credential = ClientAssertionCredential(TENANT_ID, ARC_CLIENT_ID, lambda: dac.get_token("api://AzureADTokenExchange/.default").token)
             credential.get_token("https://storage.azure.com/.default")
         except ClientAuthenticationError as ex:
-            getLogger().info("Unable to use managed identity. Falling back to environment variable.")
-            credential = os.getenv(sas_token_env)
+            credential = None
+            getLogger().info("Unable to use managed identity. Falling back to certificate.")
+            cmd_line = list((os.path.join(str(helixpayload()), 'certhelper', "CertHelper%s" % extension())))
+            cert_helper = RunCommand(cmd_line, None, False, 0)
+            cert_helper.run()
+            for cert in cert_helper.stdout.splitlines():
+                credential = CertificateCredential(TENANT_ID, CERT_CLIENT_ID, certificate_data=base64_to_bytes(cert))
+                try:
+                    credential.get_token("https://storage.azure.com/.default")
+                except ClientAuthenticationError as ex:
+                    credential = None
+                    continue
         if credential is None:
-            getLogger().error("Sas token environment variable {} was not defined.".format(sas_token_env))
-            return 1
+            getLogger().error("Unable to authenticate with managed identity or certificates.")
+            getLogger().info("Falling back to environment variable.")
+            credential = os.getenv(sas_token_env)
 
         files = glob(globpath, recursive=True)
         any_upload_or_queue_failed = False

src/tools/CertHelper/CertHelper.csproj

@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>

src/tools/CertHelper/CertHelper.sln

@@ -0,0 +1,22 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.12.35514.174 d17.12
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CertHelper", "CertHelper.csproj", "{165A37BD-2E9E-4D0A-8402-BB58C29A0BF4}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{165A37BD-2E9E-4D0A-8402-BB58C29A0BF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{165A37BD-2E9E-4D0A-8402-BB58C29A0BF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{165A37BD-2E9E-4D0A-8402-BB58C29A0BF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{165A37BD-2E9E-4D0A-8402-BB58C29A0BF4}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

src/tools/CertHelper/Program.cs

@@ -0,0 +1,19 @@
+using System.Security.Cryptography.X509Certificates;
+using System.Text;
+
+namespace CertHelper
+{
+    internal class Program
+    {
+        static void Main(string[] args)
+        {
+            using(var store = new X509Store(StoreName.My, StoreLocation.CurrentUser, OpenFlags.ReadWrite))
+            {
+                foreach(var cert in store.Certificates.Find(X509FindType.FindBySubjectName, "dotnetperf.microsoft.com", false))
+                {
+                    Console.WriteLine(Convert.ToBase64String(cert.Export(X509ContentType.Pfx)));
+                }
+            }
+        }
+    }
+}