superrob1500
/
mirror-ghostty
mirror of https://github.com/ghostty-org/ghostty
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gtk: improve app id validation 

'g_application_id_is_valid' doesn't allow empty elements or elements
that start with digits.
This commit updates 'isValidAppId' to be more consistant with
'g_application_id_is_valid' avoiding the app id defaulting to 'GTK
Application' for app ids like '0foo.bar' or 'foo..bar'.
pull/7442/head
alex-huff 2025-05-25 11:43:40 -05:00
parent 034c1c12ef
commit 0415a65083
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/apprt/gtk/App.zig
View File

@ -1690,30 +1690,33 @@ fn initActions(self: *App) void {
}
fn isValidAppId(app_id: [:0]const u8) bool {
if (app_id.len > 255 or app_id.len == 0) return false;
if (app_id[0] == '.') return false;
if (app_id[app_id.len - 1] == '.') return false;
if (app_id.len > 255) return false;
var hasDot = false;
var hasSep = false;
var lastWasSep = true;
for (app_id) |char| {
switch (char) {
'a'...'z', 'A'...'Z', '0'...'9', '_', '-' => {},
'.' => hasDot = true,
'a'...'z', 'A'...'Z', '_', '-' => {},
'0'...'9', '.' => if (lastWasSep) return false,
else => return false,
}
lastWasSep = char == '.';
hasSep = hasSep or lastWasSep;
}
if (!hasDot) return false;
return true;
return hasSep and !lastWasSep;
}
test "isValidAppId" {
try testing.expect(isValidAppId("foo.bar"));
try testing.expect(isValidAppId("foo.bar.baz"));
try testing.expect(isValidAppId("f00.bar"));
try testing.expect(isValidAppId("foo-bar._baz"));
try testing.expect(!isValidAppId("foo"));
try testing.expect(!isValidAppId("foo.bar?"));
try testing.expect(!isValidAppId("foo."));
try testing.expect(!isValidAppId(".foo"));
try testing.expect(!isValidAppId(""));
try testing.expect(!isValidAppId("foo" ** 86));
try testing.expect(!isValidAppId("foo..bar"));
try testing.expect(!isValidAppId("0foo.bar"));
}