From 2d95c882d485be410a404839601cad0f87077bb8 Mon Sep 17 00:00:00 2001 From: Shreyas Gopalakrishna Date: Fri, 20 Dec 2024 00:37:56 -0600 Subject: [PATCH 1/4] write cert to file --- .../Management/LinuxInstanceManager.cs | 1 + .../Models/HostAssignmentContext.cs | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/src/WebJobs.Script.WebHost/Management/LinuxInstanceManager.cs b/src/WebJobs.Script.WebHost/Management/LinuxInstanceManager.cs index 4636194bb3..fee9458bb7 100644 --- a/src/WebJobs.Script.WebHost/Management/LinuxInstanceManager.cs +++ b/src/WebJobs.Script.WebHost/Management/LinuxInstanceManager.cs @@ -112,6 +112,7 @@ private async Task AssignAsync(HostAssignmentContext assignmentContext) // the host to be specialized _logger.LogInformation("Applying {environmentCount} app setting(s)", assignmentContext.Environment.Count); assignmentContext.ApplyAppSettings(_environment, _logger); + assignmentContext.WriteCertificateValidationToken(); await ApplyContextAsync(assignmentContext); } catch (Exception ex) diff --git a/src/WebJobs.Script.WebHost/Models/HostAssignmentContext.cs b/src/WebJobs.Script.WebHost/Models/HostAssignmentContext.cs index 9969ae0c98..3ad9445a4f 100644 --- a/src/WebJobs.Script.WebHost/Models/HostAssignmentContext.cs +++ b/src/WebJobs.Script.WebHost/Models/HostAssignmentContext.cs @@ -33,6 +33,9 @@ public class HostAssignmentContext [JsonProperty("TokenServiceApiEndpoint")] public string TokenServiceApiEndpoint { get; set; } + [JsonProperty("CertificateValidationToken")] + public string CertificateValidationToken { get; set; } + [JsonProperty("CorsSpecializationPayload")] public CorsSettings CorsSettings { get; set; } @@ -165,5 +168,24 @@ public void ApplyAppSettings(IEnvironment environment, ILogger logger) environment.SetEnvironmentVariable(EnvironmentSettingNames.EasyAuthClientId, EasyAuthSettings.SiteAuthClientId); } } + + public void WriteCertificateValidationToken(ILogger logger) + { + if (!string.IsNullOrEmpty(CertificateValidationToken)) + { + try + { + if (!System.IO.Directory.Exists("/tmp")) + { + System.IO.Directory.CreateDirectory("/tmp"); + } + System.IO.File.WriteAllText("/tmp/domainvalidation", CertificateValidationToken); + } + catch (Exception ex) + { + logger.LogError($"Failed to write certificate validation token: { ex.Message}"); + } + } + } } } From 380ef0624d8938e055a88acea163ed389314976c Mon Sep 17 00:00:00 2001 From: Shreyas Gopalakrishna Date: Fri, 3 Jan 2025 15:54:58 -0600 Subject: [PATCH 2/4] fix --- src/WebJobs.Script.WebHost/Management/LinuxInstanceManager.cs | 2 +- src/WebJobs.Script.WebHost/Models/HostAssignmentContext.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/WebJobs.Script.WebHost/Management/LinuxInstanceManager.cs b/src/WebJobs.Script.WebHost/Management/LinuxInstanceManager.cs index fee9458bb7..974c12eec2 100644 --- a/src/WebJobs.Script.WebHost/Management/LinuxInstanceManager.cs +++ b/src/WebJobs.Script.WebHost/Management/LinuxInstanceManager.cs @@ -112,7 +112,7 @@ private async Task AssignAsync(HostAssignmentContext assignmentContext) // the host to be specialized _logger.LogInformation("Applying {environmentCount} app setting(s)", assignmentContext.Environment.Count); assignmentContext.ApplyAppSettings(_environment, _logger); - assignmentContext.WriteCertificateValidationToken(); + assignmentContext.WriteCertificateValidationToken(_logger); await ApplyContextAsync(assignmentContext); } catch (Exception ex) diff --git a/src/WebJobs.Script.WebHost/Models/HostAssignmentContext.cs b/src/WebJobs.Script.WebHost/Models/HostAssignmentContext.cs index 3ad9445a4f..48a91323ac 100644 --- a/src/WebJobs.Script.WebHost/Models/HostAssignmentContext.cs +++ b/src/WebJobs.Script.WebHost/Models/HostAssignmentContext.cs @@ -183,7 +183,7 @@ public void WriteCertificateValidationToken(ILogger logger) } catch (Exception ex) { - logger.LogError($"Failed to write certificate validation token: { ex.Message}"); + logger.LogError($"Failed to write certificate validation token: {ex.Message}"); } } } From e85513624d6fb195e83d0b755cc623be26a6596d Mon Sep 17 00:00:00 2001 From: Shreyas Gopalakrishna Date: Tue, 7 Jan 2025 00:39:54 -0600 Subject: [PATCH 3/4] log --- src/WebJobs.Script.WebHost/Models/HostAssignmentContext.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/WebJobs.Script.WebHost/Models/HostAssignmentContext.cs b/src/WebJobs.Script.WebHost/Models/HostAssignmentContext.cs index 48a91323ac..add7a4bf39 100644 --- a/src/WebJobs.Script.WebHost/Models/HostAssignmentContext.cs +++ b/src/WebJobs.Script.WebHost/Models/HostAssignmentContext.cs @@ -171,6 +171,10 @@ public void ApplyAppSettings(IEnvironment environment, ILogger logger) public void WriteCertificateValidationToken(ILogger logger) { + logger.LogError($"CertificateValidationToken from Antares: {CertificateValidationToken.Substring(0,5)}"); + + logger.LogError($"CertificateValidationToken path: {System.IO.Path.GetFullPath(System.IO.Directory.GetCurrentDirectory())}"); + if (!string.IsNullOrEmpty(CertificateValidationToken)) { try @@ -180,6 +184,8 @@ public void WriteCertificateValidationToken(ILogger logger) System.IO.Directory.CreateDirectory("/tmp"); } System.IO.File.WriteAllText("/tmp/domainvalidation", CertificateValidationToken); + + logger.LogError($"CertificateValidationToken stored: {CertificateValidationToken.Substring(0, 5)}"); } catch (Exception ex) { From 76cb6e07e21ce6b2a0bcd0fc41dc56fe56b312d7 Mon Sep 17 00:00:00 2001 From: Shreyas Gopalakrishna Date: Sun, 12 Jan 2025 22:51:34 -0600 Subject: [PATCH 4/4] log --- src/WebJobs.Script.WebHost/Models/HostAssignmentContext.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/WebJobs.Script.WebHost/Models/HostAssignmentContext.cs b/src/WebJobs.Script.WebHost/Models/HostAssignmentContext.cs index add7a4bf39..20042ff7b9 100644 --- a/src/WebJobs.Script.WebHost/Models/HostAssignmentContext.cs +++ b/src/WebJobs.Script.WebHost/Models/HostAssignmentContext.cs @@ -171,7 +171,7 @@ public void ApplyAppSettings(IEnvironment environment, ILogger logger) public void WriteCertificateValidationToken(ILogger logger) { - logger.LogError($"CertificateValidationToken from Antares: {CertificateValidationToken.Substring(0,5)}"); + logger.LogError($"CertificateValidationToken from Antares: CertificateValidationToken"); logger.LogError($"CertificateValidationToken path: {System.IO.Path.GetFullPath(System.IO.Directory.GetCurrentDirectory())}");