Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions DesktopShell/Forms/ShellForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
private int fadeDirection = 0;
private bool regexHit = false;
private bool fadeBool = false;
private float? shellVersionF;

Check warning on line 29 in DesktopShell/Forms/ShellForm.cs

View workflow job for this annotation

GitHub Actions / build-and-test

The field 'Shell.shellVersionF' is never used

Check warning on line 29 in DesktopShell/Forms/ShellForm.cs

View workflow job for this annotation

GitHub Actions / build-and-test

The field 'Shell.shellVersionF' is never used
private float? shellVersionW;

Check warning on line 30 in DesktopShell/Forms/ShellForm.cs

View workflow job for this annotation

GitHub Actions / build-and-test

The field 'Shell.shellVersionW' is never used

Check warning on line 30 in DesktopShell/Forms/ShellForm.cs

View workflow job for this annotation

GitHub Actions / build-and-test

The field 'Shell.shellVersionW' is never used
private int onHour;
private int fadeTickAmount = 0;
private int upCounter = 0;
Expand Down Expand Up @@ -133,6 +133,7 @@
{
GlobalVar.ResetLog();
GlobalVar.LogQueueEnvSummary();
GlobalVar.LogTcpEnvSummary();
Settings.ScanSettings();

// Needed for both the local TCP server port selection and remote command routing.
Expand Down
13 changes: 13 additions & 0 deletions DesktopShell/GlobalVar.cs
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,19 @@ public static void LogQueueEnvSummary()
$"{EnvCfAccessClientSecret}={(string.IsNullOrWhiteSpace(secret) ? "missing" : "set")} (len={(secret ?? "").Length}, source={GetEnvSource(EnvCfAccessClientSecret)})");
}

public static void LogTcpEnvSummary()
{
string tlsRaw = GetEnvValue("DESKTOPSHELL_TCP_TLS") ?? "";
string? pfx = GetEnvValue("DESKTOPSHELL_TCP_TLS_PFX");
string? pfxPassword = GetEnvValue("DESKTOPSHELL_TCP_TLS_PFX_PASSWORD");
string? thumbprint = GetEnvValue("DESKTOPSHELL_TCP_TLS_THUMBPRINT");

Log($"^^^ TCP TLS env: DESKTOPSHELL_TCP_TLS='{tlsRaw}' (source={GetEnvSource("DESKTOPSHELL_TCP_TLS")}), " +
$"DESKTOPSHELL_TCP_TLS_PFX={(string.IsNullOrWhiteSpace(pfx) ? "missing" : "set")} (source={GetEnvSource("DESKTOPSHELL_TCP_TLS_PFX")}), " +
$"DESKTOPSHELL_TCP_TLS_PFX_PASSWORD={(string.IsNullOrWhiteSpace(pfxPassword) ? "missing" : "set")} (len={(pfxPassword ?? "").Length}, source={GetEnvSource("DESKTOPSHELL_TCP_TLS_PFX_PASSWORD")}), " +
$"DESKTOPSHELL_TCP_TLS_THUMBPRINT={(string.IsNullOrWhiteSpace(thumbprint) ? "missing" : "set")} (source={GetEnvSource("DESKTOPSHELL_TCP_TLS_THUMBPRINT")})");
}

public static bool QueueEnabled => string.Equals(GetEnvValue(EnvQueueEnabled), "1", StringComparison.OrdinalIgnoreCase);
public static string QueueBaseUrl => (GetEnvValue(EnvQueueBaseUrl) ?? "https://queue.dlamanna.com").TrimEnd('/');
public static string? QueueKeyBase64 => GetEnvValue(EnvQueueKeyBase64);
Expand Down