kossLAN/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

config: add exe client criteria

Browse source
This commit is contained in:
Julian Orth 2025-05-03 13:09:13 +02:00
parent cc734a135c
commit a6257910bb
13 changed files with 85 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/criteria/clm.rs
View file

@ -11,7 +11,7 @@ use {
clmm_pid::ClmMatchPid,
clmm_sandboxed::ClmMatchSandboxed,
clmm_string::{
ClmMatchComm, ClmMatchSandboxAppId, ClmMatchSandboxEngine,
ClmMatchComm, ClmMatchExe, ClmMatchSandboxAppId, ClmMatchSandboxEngine,
ClmMatchSandboxInstanceId,
},
clmm_uid::ClmMatchUid,
@ -60,6 +60,7 @@ pub struct RootMatchers {
uid: ClmRootMatcherMap<ClmMatchUid>,
pid: ClmRootMatcherMap<ClmMatchPid>,
comm: ClmRootMatcherMap<ClmMatchComm>,
exe: ClmRootMatcherMap<ClmMatchExe>,
}
pub async fn handle_cl_changes(state: Rc<State>) {
@ -163,6 +164,7 @@ impl ClMatcherManager {
unconditional!(uid);
unconditional!(pid);
unconditional!(comm);
unconditional!(exe);
fixed!(sandboxed);
fixed!(is_xwayland);
self.constant[true].handle(data);
@ -200,6 +202,10 @@ impl ClMatcherManager {
pub fn comm(&self, string: CritLiteralOrRegex) -> Rc<ClmUpstreamNode> {
self.root(ClmMatchComm::new(string))
}
pub fn exe(&self, string: CritLiteralOrRegex) -> Rc<ClmUpstreamNode> {
self.root(ClmMatchExe::new(string))
}
}
impl CritTarget for Rc<Client> {

12
src/criteria/clm/clm_matchers/clmm_string.rs
View file

@ -16,9 +16,11 @@ pub type ClmMatchSandboxEngine = ClmMatchString<AcceptorMetadataAccess<SandboxEn
pub type ClmMatchSandboxAppId = ClmMatchString<AcceptorMetadataAccess<SandboxAppIdField>>;
pub type ClmMatchSandboxInstanceId = ClmMatchString<AcceptorMetadataAccess<SandboxInstanceIdField>>;
pub type ClmMatchComm = ClmMatchString<CommAccess>;
pub type ClmMatchExe = ClmMatchString<ExeAccess>;
pub struct AcceptorMetadataAccess<T>(PhantomData<T>);
pub struct CommAccess;
pub struct ExeAccess;
trait SandboxField: Sized + 'static {
fn field(meta: &AcceptorMetadata) -> &Option<String>;
@ -89,3 +91,13 @@ impl StringAccess<Rc<Client>> for CommAccess {
&roots.comm
}
}
impl StringAccess<Rc<Client>> for ExeAccess {
fn with_string(data: &Rc<Client>, f: impl FnOnce(&str) -> bool) -> bool {
f(&data.pid_info.exe)
}
fn nodes(roots: &RootMatchers) -> &ClmRootMatcherMap<ClmMatchString<Self>> {
&roots.exe
}
}