vmario/fabaccess-bffh
1
0
Fork 0
mirror of https://gitlab.com/fabinfra/fabaccess/bffh.git synced 2024-11-25 16:17:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make compile

Browse Source
This commit is contained in:
Gregor Reitzenstein 2020-04-28 18:40:50 +02:00
parent 453111f0e4
commit f6f0f14081
4 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/access.rs
View File

@ -5,9 +5,6 @@ use slog::Logger;
use casbin::prelude::*; use casbin::prelude::*;
use futures_signals::signal::Mutable;
use crate::api::api;
use crate::config::Config; use crate::config::Config;
use crate::auth::Authentication; use crate::auth::Authentication;
use crate::error::Result; use crate::error::Result;
@ -58,10 +55,6 @@ impl Permissions {
} }
} }
impl api::permissions::Server for Permissions {
}
/// This line documents init /// This line documents init
pub async fn init(log: Logger, config: &Config) -> std::result::Result<PermissionsProvider, Box<dyn std::error::Error>> { pub async fn init(log: Logger, config: &Config) -> std::result::Result<PermissionsProvider, Box<dyn std::error::Error>> {
let model = Model::from_file(config.access.model.clone()).await?; let model = Model::from_file(config.access.model.clone()).await?;

4
src/api.rs
View File

@ -1,6 +1,6 @@
// module needs to be top level for generated functions to be in scope: // module needs to be top level for generated functions to be in scope:
// https://github.com/capnproto/capnproto-rust/issues/16 // https://github.com/capnproto/capnproto-rust/issues/16
pub mod api { pub mod gen {
include!(concat!(env!("OUT_DIR"), "/schema/api_capnp.rs")); include!(concat!(env!("OUT_DIR"), "/schema/api_capnp.rs"));
} }
@ -30,8 +30,6 @@ use capnp_rpc::rpc_twoparty_capnp::Side;
use std::ops::Deref; use std::ops::Deref;
use api::diflouroborane;
pub async fn handle_connection(log: Logger, socket: TcpStream) -> Result<(), Error> { pub async fn handle_connection(log: Logger, socket: TcpStream) -> Result<(), Error> {
unimplemented!() unimplemented!()
} }

10
src/machine.rs
View File

@ -8,22 +8,16 @@ use slog::Logger;
use serde::{Serialize, Deserialize}; use serde::{Serialize, Deserialize};
use toml; use toml;
use futures_signals::signal::Mutable;
use crate::error::Result; use crate::error::Result;
use crate::config::Config; use crate::config::Config;
use crate::api::api;
use crate::access::Permissions; use crate::access::Permissions;
use std::rc::Rc; use std::rc::Rc;
use async_std::sync::{Arc, RwLock}; use async_std::sync::{Arc, RwLock};
use capnp::capability::Promise;
use capnp::Error; use capnp::Error;
use capnp_rpc::Server;
use uuid::Uuid; use uuid::Uuid;
use std::ops::DerefMut;
/// Status of a Machine /// Status of a Machine
#[derive(PartialEq, Eq, Debug, Serialize, Deserialize)] #[derive(PartialEq, Eq, Debug, Serialize, Deserialize)]
@ -115,13 +109,13 @@ impl GiveBack {
} }
} }
fn uuid_from_api(uuid: api::u_u_i_d::Reader) -> Uuid { fn uuid_from_api(uuid: crate::api_capnp::u_u_i_d::Reader) -> Uuid {
let uuid0 = uuid.get_uuid0() as u128; let uuid0 = uuid.get_uuid0() as u128;
let uuid1 = uuid.get_uuid1() as u128; let uuid1 = uuid.get_uuid1() as u128;
let num: u128 = (uuid1 << 64) + uuid0; let num: u128 = (uuid1 << 64) + uuid0;
Uuid::from_u128(num) Uuid::from_u128(num)
} }
fn api_from_uuid(uuid: Uuid, mut wr: api::u_u_i_d::Builder) { fn api_from_uuid(uuid: Uuid, mut wr: crate::api_capnp::u_u_i_d::Builder) {
let num = uuid.to_u128_le(); let num = uuid.to_u128_le();
let uuid0 = num as u64; let uuid0 = num as u64;
let uuid1 = (num >> 64) as u64; let uuid1 = (num >> 64) as u64;

2
src/main.rs
View File

@ -17,7 +17,7 @@ use signal_hook::iterator::Signals;
use clap::{App, Arg}; use clap::{App, Arg};
use api::api as api_capnp; use api::gen as api_capnp;
use futures::prelude::*; use futures::prelude::*;
use futures::executor::{LocalPool, ThreadPool}; use futures::executor::{LocalPool, ThreadPool};