winzer/elwig
2
1
Fork 0
Code Issues 6 Pull Requests Actions Releases 86 Activity

[#76] Utils: Fix non-ascii characters in User-Agent header

Browse Source
This commit is contained in:
lorenz.stechauner
2026-10-08 10:54:17 +02:00
parent d91e8c7e99
commit b8b86ef7ec
2 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Elwig/App.xaml.cs
+14 -13
View File
@@ -339,20 +339,21 @@ namespace Elwig {
public static async Task CheckForUpdates(bool showAlert = false) { public static async Task CheckForUpdates(bool showAlert = false) {
if (Config.UpdateUrl == null) return; if (Config.UpdateUrl == null) return;
var latest = await Utils.GetLatestInstallerUrl(Config.UpdateUrl); try {
if (latest != null && new Version(latest.Value.Version) > Version) { var latest = await Utils.GetLatestInstallerUrl(Config.UpdateUrl);
await MainDispatcher.BeginInvoke(() => { if (new Version(latest.Version) > Version) {
var d = new UpdateDialog(latest.Value.Version, latest.Value.Url, latest.Value.Size); await MainDispatcher.BeginInvoke(() => {
if (d.ShowDialog() == true) { var d = new UpdateDialog(latest.Version, latest.Url, latest.Size);
ShutdownNow(); if (d.ShowDialog() == true) {
} ShutdownNow();
}); }
} else if (showAlert) { });
if (latest == null) { } else if (showAlert) {
InteractionService.ShowError("Nach Updates suchen", "Informationen konnten nicht abgerufen werden!"); InteractionService.ShowInformation("Nach Updates suchen", $"Elwig ist auf dem aktuellsten Stand! (Version: {latest.Version})");
} else {
InteractionService.ShowInformation("Nach Updates suchen", $"Elwig ist auf dem aktuellsten Stand! (Version: {latest.Value.Version})");
} }
} catch (Exception exc) {
if (showAlert)
InteractionService.ShowException("Nach Updates suchen", $"Informationen konnten nicht abgerufen werden!", exc);
} }
} }
Elwig/Helpers/Utils.cs
+16 -13
View File
@@ -483,12 +483,20 @@ namespace Elwig.Helpers {
return InternetGetConnectedState(out var _, 0); return InternetGetConnectedState(out var _, 0);
} }
public static string ReplaceUmlaute(string s) {
return s
.Replace("ä", "ae").Replace("Ä", "Ae")
.Replace("ö", "oe").Replace("Ö", "Oe")
.Replace("ü", "ue").Replace("Ü", "Ue")
.Replace("ß", "ss").Replace("ẞ", "SS");
}
public static HttpClient GetHttpClient(string? username = null, string? password = null, string? accept = null) { public static HttpClient GetHttpClient(string? username = null, string? password = null, string? accept = null) {
var client = new HttpClient() { var client = new HttpClient() {
Timeout = TimeSpan.FromSeconds(5), Timeout = TimeSpan.FromSeconds(5),
}; };
client.DefaultRequestHeaders.UserAgent.Clear(); client.DefaultRequestHeaders.UserAgent.Clear();
client.DefaultRequestHeaders.UserAgent.ParseAdd($"Elwig/{App.Version} ({App.Client?.NameToken}, {App.BranchName}, {Environment.MachineName}, {Environment.OSVersion})"); client.DefaultRequestHeaders.UserAgent.ParseAdd($"Elwig/{App.Version} ({App.Client?.NameToken}, {ReplaceUmlaute(App.BranchName)}, {Environment.MachineName}, {Environment.OSVersion})");
client.DefaultRequestHeaders.Accept.Clear(); client.DefaultRequestHeaders.Accept.Clear();
if (accept != null) if (accept != null)
client.DefaultRequestHeaders.Accept.Add(new(accept)); client.DefaultRequestHeaders.Accept.Add(new(accept));
@@ -497,18 +505,13 @@ namespace Elwig.Helpers {
return client; return client;
} }
public static async Task<(string Version, string Url, long Size)?> GetLatestInstallerUrl(string url) { public static async Task<(string Version, string Url, long Size)> GetLatestInstallerUrl(string url) {
try { using var client = GetHttpClient(accept: "application/json");
using var client = GetHttpClient(accept: "application/json"); using var res = await client.GetAsync(url);
using var res = await client.GetAsync(url); res.EnsureSuccessStatusCode();
if (!res.IsSuccessStatusCode) var resJson = JsonNode.Parse(await res.Content.ReadAsStringAsync());
return null; var data = resJson!["data"]!.AsArray()[^1]!;
var resJson = JsonNode.Parse(await res.Content.ReadAsStringAsync()); return ((string)data["version"]!, (string)data["url"]!, (long)data["size"]!);
var data = resJson!["data"]!.AsArray()[^1]!;
return ((string)data["version"]!, (string)data["url"]!, (long)data["size"]!);
} catch {
return null;
}
} }
public static async Task UploadExportData(string zip, string url, string username, string password) { public static async Task UploadExportData(string zip, string url, string username, string password) {