mirror of
https://git.anonymousland.org/anonymousland/synapse-product.git
synced 2024-10-01 08:25:44 -04:00
e746f80b4f
Internally the push rules module uses a `pattern_type` property for `event_match` conditions (and `related_event_match`) to mark the condition as matching the current user's Matrix ID or localpart. This is leaky to the Client-Server API where a user can successfully set a condition which provides `pattern_type` instead of `pattern` (note that there's no benefit to doing this -- the user can just use their own Matrix ID or localpart instead). When serializing back to the client the `pattern_type` property is converted into a proper `pattern`. The following changes are made to avoid this: * Separate the `KnownCondition::EventMatch` enum value into `EventMatch` and `EventMatchType`, each with their own expected properties. (Note that a similar change is made for `RelatedEventMatch`.) * Make it such that the `pattern_type` variants serialize to the same condition kind, but cannot be deserialized (since they're only provided by base rules). * As a final tweak, convert `user_id` vs. `user_localpart` values into an enum.
216 lines
5.4 KiB
Rust
216 lines
5.4 KiB
Rust
// Copyright 2022 The Matrix.org Foundation C.I.C.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
#![feature(test)]
|
|
use std::collections::BTreeSet;
|
|
use synapse::push::{
|
|
evaluator::PushRuleEvaluator, Condition, EventMatchCondition, FilteredPushRules, JsonValue,
|
|
PushRules, SimpleJsonValue,
|
|
};
|
|
use test::Bencher;
|
|
|
|
extern crate test;
|
|
|
|
#[bench]
|
|
fn bench_match_exact(b: &mut Bencher) {
|
|
let flattened_keys = [
|
|
(
|
|
"type".to_string(),
|
|
JsonValue::Value(SimpleJsonValue::Str("m.text".to_string())),
|
|
),
|
|
(
|
|
"room_id".to_string(),
|
|
JsonValue::Value(SimpleJsonValue::Str("!room:server".to_string())),
|
|
),
|
|
(
|
|
"content.body".to_string(),
|
|
JsonValue::Value(SimpleJsonValue::Str("test message".to_string())),
|
|
),
|
|
]
|
|
.into_iter()
|
|
.collect();
|
|
|
|
let eval = PushRuleEvaluator::py_new(
|
|
flattened_keys,
|
|
false,
|
|
BTreeSet::new(),
|
|
10,
|
|
Some(0),
|
|
Default::default(),
|
|
Default::default(),
|
|
true,
|
|
vec![],
|
|
false,
|
|
false,
|
|
false,
|
|
)
|
|
.unwrap();
|
|
|
|
let condition = Condition::Known(synapse::push::KnownCondition::EventMatch(
|
|
EventMatchCondition {
|
|
key: "room_id".into(),
|
|
pattern: "!room:server".into(),
|
|
},
|
|
));
|
|
|
|
let matched = eval.match_condition(&condition, None, None).unwrap();
|
|
assert!(matched, "Didn't match");
|
|
|
|
b.iter(|| eval.match_condition(&condition, None, None).unwrap());
|
|
}
|
|
|
|
#[bench]
|
|
fn bench_match_word(b: &mut Bencher) {
|
|
let flattened_keys = [
|
|
(
|
|
"type".to_string(),
|
|
JsonValue::Value(SimpleJsonValue::Str("m.text".to_string())),
|
|
),
|
|
(
|
|
"room_id".to_string(),
|
|
JsonValue::Value(SimpleJsonValue::Str("!room:server".to_string())),
|
|
),
|
|
(
|
|
"content.body".to_string(),
|
|
JsonValue::Value(SimpleJsonValue::Str("test message".to_string())),
|
|
),
|
|
]
|
|
.into_iter()
|
|
.collect();
|
|
|
|
let eval = PushRuleEvaluator::py_new(
|
|
flattened_keys,
|
|
false,
|
|
BTreeSet::new(),
|
|
10,
|
|
Some(0),
|
|
Default::default(),
|
|
Default::default(),
|
|
true,
|
|
vec![],
|
|
false,
|
|
false,
|
|
false,
|
|
)
|
|
.unwrap();
|
|
|
|
let condition = Condition::Known(synapse::push::KnownCondition::EventMatch(
|
|
EventMatchCondition {
|
|
key: "content.body".into(),
|
|
pattern: "test".into(),
|
|
},
|
|
));
|
|
|
|
let matched = eval.match_condition(&condition, None, None).unwrap();
|
|
assert!(matched, "Didn't match");
|
|
|
|
b.iter(|| eval.match_condition(&condition, None, None).unwrap());
|
|
}
|
|
|
|
#[bench]
|
|
fn bench_match_word_miss(b: &mut Bencher) {
|
|
let flattened_keys = [
|
|
(
|
|
"type".to_string(),
|
|
JsonValue::Value(SimpleJsonValue::Str("m.text".to_string())),
|
|
),
|
|
(
|
|
"room_id".to_string(),
|
|
JsonValue::Value(SimpleJsonValue::Str("!room:server".to_string())),
|
|
),
|
|
(
|
|
"content.body".to_string(),
|
|
JsonValue::Value(SimpleJsonValue::Str("test message".to_string())),
|
|
),
|
|
]
|
|
.into_iter()
|
|
.collect();
|
|
|
|
let eval = PushRuleEvaluator::py_new(
|
|
flattened_keys,
|
|
false,
|
|
BTreeSet::new(),
|
|
10,
|
|
Some(0),
|
|
Default::default(),
|
|
Default::default(),
|
|
true,
|
|
vec![],
|
|
false,
|
|
false,
|
|
false,
|
|
)
|
|
.unwrap();
|
|
|
|
let condition = Condition::Known(synapse::push::KnownCondition::EventMatch(
|
|
EventMatchCondition {
|
|
key: "content.body".into(),
|
|
pattern: "foobar".into(),
|
|
},
|
|
));
|
|
|
|
let matched = eval.match_condition(&condition, None, None).unwrap();
|
|
assert!(!matched, "Didn't match");
|
|
|
|
b.iter(|| eval.match_condition(&condition, None, None).unwrap());
|
|
}
|
|
|
|
#[bench]
|
|
fn bench_eval_message(b: &mut Bencher) {
|
|
let flattened_keys = [
|
|
(
|
|
"type".to_string(),
|
|
JsonValue::Value(SimpleJsonValue::Str("m.text".to_string())),
|
|
),
|
|
(
|
|
"room_id".to_string(),
|
|
JsonValue::Value(SimpleJsonValue::Str("!room:server".to_string())),
|
|
),
|
|
(
|
|
"content.body".to_string(),
|
|
JsonValue::Value(SimpleJsonValue::Str("test message".to_string())),
|
|
),
|
|
]
|
|
.into_iter()
|
|
.collect();
|
|
|
|
let eval = PushRuleEvaluator::py_new(
|
|
flattened_keys,
|
|
false,
|
|
BTreeSet::new(),
|
|
10,
|
|
Some(0),
|
|
Default::default(),
|
|
Default::default(),
|
|
true,
|
|
vec![],
|
|
false,
|
|
false,
|
|
false,
|
|
)
|
|
.unwrap();
|
|
|
|
let rules = FilteredPushRules::py_new(
|
|
PushRules::new(Vec::new()),
|
|
Default::default(),
|
|
false,
|
|
false,
|
|
false,
|
|
false,
|
|
false,
|
|
);
|
|
|
|
b.iter(|| eval.run(&rules, Some("bob"), Some("person")));
|
|
}
|