noth/surrealpatch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes to the SurrealDB Rust API for public consumption (#4613)

Browse source
This commit is contained in:
Gerard Guillemas Martos 2024-08-27 12:45:03 +02:00 committed by GitHub
parent 876e55918f
commit 91f9260ea1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
core/src/dbs/capabilities.rs
View file

@ -338,13 +338,6 @@ impl Capabilities {
self.live_query_notifications
}
// function is public API so we can't remove it, but you should prefer allows_function_name
pub fn allows_function(&self, target: &FuncTarget) -> bool {
self.allow_funcs.matches(target) && !self.deny_funcs.matches(target)
}
// doc hidden so we don't extend api in the library.
#[doc(hidden)]
pub fn allows_function_name(&self, target: &str) -> bool {
self.allow_funcs.matches(target) && !self.deny_funcs.matches(target)
}
@ -620,8 +613,8 @@ mod tests {
let caps = Capabilities::default()
.with_functions(Targets::<FuncTarget>::All)
.without_functions(Targets::<FuncTarget>::None);
assert!(caps.allows_function(&FuncTarget::from_str("http::get").unwrap()));
assert!(caps.allows_function(&FuncTarget::from_str("http::post").unwrap()));
assert!(caps.allows_function_name("http::get"));
assert!(caps.allows_function_name("http::post"));
}
// When all funcs are allowed and denied at the same time
@ -629,8 +622,8 @@ mod tests {
let caps = Capabilities::default()
.with_functions(Targets::<FuncTarget>::All)
.without_functions(Targets::<FuncTarget>::All);
assert!(!caps.allows_function(&FuncTarget::from_str("http::get").unwrap()));
assert!(!caps.allows_function(&FuncTarget::from_str("http::post").unwrap()));
assert!(!caps.allows_function_name("http::get"));
assert!(!caps.allows_function_name("http::post"));
}
// When some funcs are allowed and some are denied, deny overrides the allow rules
@ -642,9 +635,9 @@ mod tests {
.without_functions(Targets::<FuncTarget>::Some(
[FuncTarget::from_str("http::post").unwrap()].into(),
));
assert!(caps.allows_function(&FuncTarget::from_str("http::get").unwrap()));
assert!(caps.allows_function(&FuncTarget::from_str("http::put").unwrap()));
assert!(!caps.allows_function(&FuncTarget::from_str("http::post").unwrap()));
assert!(caps.allows_function_name("http::get"));
assert!(caps.allows_function_name("http::put"));
assert!(!caps.allows_function_name("http::post"));
}
}
}

2
core/src/syn/parser/mac.rs
View file

@ -138,6 +138,7 @@ macro_rules! expected_whitespace {
}
#[cfg(test)]
#[doc(hidden)]
#[macro_export]
macro_rules! test_parse {
($func:ident$( ( $($e:expr),* $(,)? ))? , $t:expr) => {{
@ -147,6 +148,7 @@ macro_rules! test_parse {
}};
}
#[doc(hidden)]
#[macro_export]
macro_rules! enter_object_recursion {
($name:ident = $this:expr => { $($t:tt)* }) => {{

4
sdk/src/api/opt/capabilities.rs
View file

@ -183,7 +183,7 @@ impl Capabilities {
}
/// Set the deny list to deny all functions
pub fn with_deny_all_function(mut self) -> Self {
pub fn with_deny_all_functions(mut self) -> Self {
self.deny_all_functions();
self
}
@ -309,7 +309,7 @@ impl Capabilities {
}
/// Set the deny list to deny all net targets
pub fn with_deny_all_net_target(mut self) -> Self {
pub fn with_deny_all_net_targets(mut self) -> Self {
self.deny_all_net_targets();
self
}