mart-w/kanidm
1
0
Fork 0
mirror of https://github.com/kanidm/kanidm.git synced 2025-02-23 12:37:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fmt

Browse source
This commit is contained in:
William Brown 2018-12-29 21:01:38 +10:00
parent db024258f2
commit 8c97a08b74
5 changed files with 59 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/lib/audit.rs
View file

@ -1,7 +1,7 @@
use actix::prelude::*;
use std::fmt;
use std::time::Duration;
use std::time::SystemTime;
use std::fmt;
use chrono::offset::Utc;
use chrono::DateTime;

14
src/lib/filter.rs
View file

@ -55,24 +55,20 @@ impl Filter {
// Go through the filter components and check them in the entry.
// This is recursive!!!!
match self {
Filter::Eq(attr, value) => {
e.attribute_equality(attr.as_str(), value.as_str())
}
Filter::Sub(attr, subvalue) => {
e.attribute_substring(attr.as_str(), subvalue.as_str())
}
Filter::Eq(attr, value) => e.attribute_equality(attr.as_str(), value.as_str()),
Filter::Sub(attr, subvalue) => e.attribute_substring(attr.as_str(), subvalue.as_str()),
Filter::Pres(attr) => {
// Given attr, is is present in the entry?
e.attribute_pres(attr.as_str())
}
Filter::Or(_) => {
unimplemented!();
unimplemented!();
}
Filter::And(_) => {
unimplemented!();
unimplemented!();
}
Filter::Not(_) => {
unimplemented!();
unimplemented!();
}
}
}

19
src/lib/plugins/mod.rs
View file

@ -49,7 +49,7 @@ trait Plugin {
}
}
pub struct Plugins{}
pub struct Plugins {}
macro_rules! run_pre_create_plugin {
(
@ -61,14 +61,16 @@ macro_rules! run_pre_create_plugin {
$target_plugin:ty
) => {{
let mut audit_scope = AuditScope::new(<($target_plugin)>::id());
let r = audit_segment!(audit_scope, || {
<($target_plugin)>::pre_create(
$be, &mut audit_scope, $cand, $ce, $schema
)
});
let r = audit_segment!(audit_scope, || <($target_plugin)>::pre_create(
$be,
&mut audit_scope,
$cand,
$ce,
$schema
));
$au.append_scope(audit_scope);
r
}}
}};
}
impl Plugins {
@ -80,16 +82,13 @@ impl Plugins {
schema: &Schema,
) -> Result<(), OperationError> {
audit_segment!(audit_plugin_pre, || {
// map chain?
let uuid_res = run_pre_create_plugin!(be, au, cand, ce, schema, uuid::UUID);
// TODO, actually return the right thing ...
uuid_res
})
}
}
// We should define the order that plugins should run

33
src/lib/plugins/uuid.rs
View file

@ -9,6 +9,14 @@ use event::CreateEvent;
use filter::Filter;
use schema::Schema;
// TO FINISH
/*
Add UUID type
Add base system class to all incoming objects (so we can add our values)
Add normalisation step
Add filter normaliser to search.
*/
pub struct UUID {}
impl Plugin for UUID {
@ -41,16 +49,16 @@ impl Plugin for UUID {
Some(u) => {
// Actually check we have a value, could be empty array ...
if u.len() > 1 {
audit_log!(au, "Entry defines uuid attr, but multiple values.");
return Err(OperationError::Plugin)
audit_log!(au, "Entry defines uuid attr, but multiple values.");
return Err(OperationError::Plugin);
};
let v = match u.first() {
Some(v) => v,
None => {
audit_log!(au, "Entry defines uuid attr, but no value.");
return Err(OperationError::Plugin)
}
return Err(OperationError::Plugin);
}
};
// This could actually fail, so we probably need to handle
@ -60,8 +68,11 @@ impl Plugin for UUID {
match Uuid::parse_str(v.as_str()) {
Ok(up) => up,
Err(_) => {
audit_log!(au, "Entry contains invalid UUID content, rejecting out of principle.");
return Err(OperationError::Plugin)
audit_log!(
au,
"Entry contains invalid UUID content, rejecting out of principle."
);
return Err(OperationError::Plugin);
}
}
}
@ -90,7 +101,7 @@ impl Plugin for UUID {
}
Err(e) => {
audit_log!(au, "Backend error occured checking UUID existance.");
return Err(OperationError::Plugin)
return Err(OperationError::Plugin);
}
}
@ -131,11 +142,8 @@ mod tests {
let mut be = Backend::new(&mut au, "");
// TODO: Preload entries here!
if ! $preload_entries.is_empty() {
assert!(be.create(
&mut au,
&$preload_entries
).is_ok());
if !$preload_entries.is_empty() {
assert!(be.create(&mut au, &$preload_entries).is_ok());
};
let ce = CreateEvent::from_vec($create_entries.clone());
@ -292,7 +300,6 @@ mod tests {
);
}
// check create where provided uuid is valid. It should be unchanged.
#[test]
fn test_pre_create_uuid_valid() {

28
src/lib/server.rs
View file

@ -73,6 +73,16 @@ impl QueryServer {
au: &mut AuditScope,
se: &SearchEvent,
) -> Result<Vec<Entry>, OperationError> {
// TODO: Validate the filter
// This is an important security step because it prevents us from
// performing un-indexed searches on attr's that don't exist in the
// server. This is why ExtensibleObject can only take schema that
// exists in the server, not arbitrary attr names.
// TODO: Normalise the filter
// TODO: Pre-search plugins
let mut audit_be = AuditScope::new("backend_search");
let res = self
.be
@ -81,7 +91,11 @@ impl QueryServer {
.map_err(|_| OperationError::Backend);
au.append_scope(audit_be);
// TODO: We'll add ACI later
// TODO: Post-search plugins
// TODO: We'll add ACI here. I think ACI should transform from
// internal -> proto entries since we have to anyway ...
// alternately, we can just clone again ...
res
}
@ -96,9 +110,7 @@ impl QueryServer {
// based on request size in the frontend?
// Copy the entries to a writeable form.
let mut candidates: Vec<Entry> = ce.entries.iter()
.map(|er| er.clone())
.collect();
let mut candidates: Vec<Entry> = ce.entries.iter().map(|er| er.clone()).collect();
// Start a txn
@ -107,7 +119,13 @@ impl QueryServer {
// I have no intent to make these dynamic or configurable.
let mut audit_plugin_pre = AuditScope::new("plugin_pre_create");
let plug_pre_res = Plugins::run_pre_create(&mut self.be, &mut audit_plugin_pre, &mut candidates, ce, &self.schema);
let plug_pre_res = Plugins::run_pre_create(
&mut self.be,
&mut audit_plugin_pre,
&mut candidates,
ce,
&self.schema,
);
au.append_scope(audit_plugin_pre);
if plug_pre_res.is_err() {