security/fortify
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 25 Wiki Activity

update reverse-DNS style identifiers
All checks were successful
Tests / Go tests (push) Successful in 1m6s
Details
Nix / NixOS tests (push) Successful in 4m11s
Details

Browse Source 
Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
Ophestra 2024-12-31 16:16:38 +09:00
parent 22a4b99674
commit c4d6651cae
Signed by: cat
SSH Key Fingerprint: SHA256:gQ67O0enBZ7UdZypgtspB2FDM1g3GVw8nX0XSdcFw8Q
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dbus/samples_test.go
View File

@ -82,10 +82,10 @@ var samples = []dbusTestCase{
}, },
{ {
"moe.ophivana.CrashTestDummy", &dbus.Config{ "uk.gensokyo.CrashTestDummy", &dbus.Config{
See: []string{"moe.ophivana.CrashTestDummy1"}, See: []string{"uk.gensokyo.CrashTestDummy1"},
Talk: []string{"org.freedesktop.Notifications"}, Talk: []string{"org.freedesktop.Notifications"},
Own: []string{"moe.ophivana.CrashTestDummy.*", "org.mpris.MediaPlayer2.moe.ophivana.CrashTestDummy.*"}, Own: []string{"uk.gensokyo.CrashTestDummy.*", "org.mpris.MediaPlayer2.uk.gensokyo.CrashTestDummy.*"},
Call: map[string]string{"org.freedesktop.portal.*": "*"}, Call: map[string]string{"org.freedesktop.portal.*": "*"},
Broadcast: map[string]string{"org.freedesktop.portal.*": "@/org/freedesktop/portal/*"}, Broadcast: map[string]string{"org.freedesktop.portal.*": "@/org/freedesktop/portal/*"},
Log: true, Log: true,
@ -96,19 +96,19 @@ var samples = []dbusTestCase{
"unix:path=/run/user/1971/bus", "unix:path=/run/user/1971/bus",
"/tmp/fortify.1971/5da7845287a936efbc2fa75d7d81e501/bus", "/tmp/fortify.1971/5da7845287a936efbc2fa75d7d81e501/bus",
"--filter", "--filter",
"--see=moe.ophivana.CrashTestDummy1", "--see=uk.gensokyo.CrashTestDummy1",
"--talk=org.freedesktop.Notifications", "--talk=org.freedesktop.Notifications",
"--own=moe.ophivana.CrashTestDummy.*", "--own=uk.gensokyo.CrashTestDummy.*",
"--own=org.mpris.MediaPlayer2.moe.ophivana.CrashTestDummy.*", "--own=org.mpris.MediaPlayer2.uk.gensokyo.CrashTestDummy.*",
"--call=org.freedesktop.portal.*=*", "--call=org.freedesktop.portal.*=*",
"--broadcast=org.freedesktop.portal.*=@/org/freedesktop/portal/*", "--broadcast=org.freedesktop.portal.*=@/org/freedesktop/portal/*",
"--log"}, "--log"},
}, },
{ {
"moe.ophivana.CrashTestDummy1", &dbus.Config{ "uk.gensokyo.CrashTestDummy1", &dbus.Config{
See: []string{"moe.ophivana.CrashTestDummy"}, See: []string{"uk.gensokyo.CrashTestDummy"},
Talk: []string{"org.freedesktop.Notifications"}, Talk: []string{"org.freedesktop.Notifications"},
Own: []string{"moe.ophivana.CrashTestDummy1.*", "org.mpris.MediaPlayer2.moe.ophivana.CrashTestDummy1.*"}, Own: []string{"uk.gensokyo.CrashTestDummy1.*", "org.mpris.MediaPlayer2.uk.gensokyo.CrashTestDummy1.*"},
Call: map[string]string{"org.freedesktop.portal.*": "*"}, Call: map[string]string{"org.freedesktop.portal.*": "*"},
Broadcast: map[string]string{"org.freedesktop.portal.*": "@/org/freedesktop/portal/*"}, Broadcast: map[string]string{"org.freedesktop.portal.*": "@/org/freedesktop/portal/*"},
Log: true, Log: true,
@ -119,10 +119,10 @@ var samples = []dbusTestCase{
"unix:path=/run/user/1971/bus", "unix:path=/run/user/1971/bus",
"/tmp/fortify.1971/5da7845287a936efbc2fa75d7d81e501/bus", "/tmp/fortify.1971/5da7845287a936efbc2fa75d7d81e501/bus",
"--filter", "--filter",
"--see=moe.ophivana.CrashTestDummy", "--see=uk.gensokyo.CrashTestDummy",
"--talk=org.freedesktop.Notifications", "--talk=org.freedesktop.Notifications",
"--own=moe.ophivana.CrashTestDummy1.*", "--own=uk.gensokyo.CrashTestDummy1.*",
"--own=org.mpris.MediaPlayer2.moe.ophivana.CrashTestDummy1.*", "--own=org.mpris.MediaPlayer2.uk.gensokyo.CrashTestDummy1.*",
"--call=org.freedesktop.portal.*=*", "--call=org.freedesktop.portal.*=*",
"--broadcast=org.freedesktop.portal.*=@/org/freedesktop/portal/*", "--broadcast=org.freedesktop.portal.*=@/org/freedesktop/portal/*",
"--log"}, "--log"},

6
dbus/testdata/moe.ophivana.CrashTestDummy.json → dbus/testdata/uk.gensokyo.CrashTestDummy.json vendored
View File

@ -1,13 +1,13 @@
{ {
"see": [ "see": [
"moe.ophivana.CrashTestDummy1" "uk.gensokyo.CrashTestDummy1"
], ],
"talk":[ "talk":[
"org.freedesktop.Notifications" "org.freedesktop.Notifications"
], ],
"own":[ "own":[
"moe.ophivana.CrashTestDummy.*", "uk.gensokyo.CrashTestDummy.*",
"org.mpris.MediaPlayer2.moe.ophivana.CrashTestDummy.*" "org.mpris.MediaPlayer2.uk.gensokyo.CrashTestDummy.*"
], ],
"call":{ "call":{
"org.freedesktop.portal.*":"*" "org.freedesktop.portal.*":"*"

2
internal/app/share.go
View File

@ -170,7 +170,7 @@ func (seal *appSeal) setupShares(bus [2]*dbus.Config, os linux.System) error {
appID := seal.fid appID := seal.fid
if appID == "" { if appID == "" {
// use instance ID in case app id is not set // use instance ID in case app id is not set
appID = "moe.ophivana.fortify." + seal.id appID = "uk.gensokyo.fortify." + seal.id
} }
seal.sys.Wayland(wt, wp, appID, seal.id) seal.sys.Wayland(wt, wp, appID, seal.id)
seal.sys.bwrap.Bind(wt, w) seal.sys.bwrap.Bind(wt, w)

2
wl/c.go
View File

@ -74,7 +74,7 @@ static int32_t bind_wayland_fd(char *socket_path, int fd, const char *app_id, co
struct wp_security_context_v1 *security_context; struct wp_security_context_v1 *security_context;
security_context = wp_security_context_manager_v1_create_listener(security_context_manager, listen_fd, sync_fd); security_context = wp_security_context_manager_v1_create_listener(security_context_manager, listen_fd, sync_fd);
wp_security_context_v1_set_sandbox_engine(security_context, "moe.ophivana.fortify"); wp_security_context_v1_set_sandbox_engine(security_context, "uk.gensokyo.fortify");
wp_security_context_v1_set_app_id(security_context, app_id); wp_security_context_v1_set_app_id(security_context, app_id);
wp_security_context_v1_set_instance_id(security_context, instance_id); wp_security_context_v1_set_instance_id(security_context, instance_id);
wp_security_context_v1_commit(security_context); wp_security_context_v1_commit(security_context);