mirror of
https://gitlab.com/fabinfra/fabaccess/bffh.git
synced 2025-06-11 02:43:20 +02:00
Cargo fix
This commit is contained in:
@ -2,10 +2,10 @@ use capnp::capability::Promise;
|
||||
use capnp::Error;
|
||||
use capnp_rpc::pry;
|
||||
use rsasl::property::AuthId;
|
||||
use rsasl::session::{Session, Step, StepResult};
|
||||
use rsasl::session::{Session, Step};
|
||||
use std::io::Cursor;
|
||||
|
||||
use crate::authorization::AuthorizationHandle;
|
||||
|
||||
use crate::capnp::session::APISession;
|
||||
use crate::session::SessionManager;
|
||||
use api::authenticationsystem_capnp::authentication::{
|
||||
|
@ -53,7 +53,7 @@ impl bootstrap::Server for BootCap {
|
||||
|
||||
fn mechanisms(
|
||||
&mut self,
|
||||
params: bootstrap::MechanismsParams,
|
||||
_params: bootstrap::MechanismsParams,
|
||||
mut result: bootstrap::MechanismsResults,
|
||||
) -> Promise<(), ::capnp::Error> {
|
||||
let span = tracing::trace_span!("mechanisms", peer_addr=%self.peer_addr);
|
||||
@ -61,7 +61,7 @@ impl bootstrap::Server for BootCap {
|
||||
|
||||
tracing::trace!("mechanisms");
|
||||
|
||||
let mut builder = result.get();
|
||||
let builder = result.get();
|
||||
let mechs: Vec<_> = self.authentication.list_available_mechs()
|
||||
.into_iter()
|
||||
.map(|m| m.as_str())
|
||||
|
@ -1,4 +1,4 @@
|
||||
use crate::resources::modules::fabaccess::{MachineState, Status};
|
||||
use crate::resources::modules::fabaccess::{Status};
|
||||
use crate::resources::Resource;
|
||||
use crate::session::SessionHandle;
|
||||
use api::machine_capnp::machine::{
|
||||
@ -17,7 +17,7 @@ pub struct Machine {
|
||||
|
||||
impl Machine {
|
||||
/// Builds a machine into the given builder. Re
|
||||
pub fn build(session: SessionHandle, resource: Resource, builder: Builder) {
|
||||
pub fn build(session: SessionHandle, resource: Resource, _builder: Builder) {
|
||||
if resource.visible(&session) {}
|
||||
}
|
||||
}
|
||||
@ -178,7 +178,7 @@ impl ManageServer for Machine {
|
||||
_: manage::ForceFreeResults,
|
||||
) -> Promise<(), ::capnp::Error> {
|
||||
let resource = self.resource.clone();
|
||||
let session = self.session.clone();
|
||||
let _session = self.session.clone();
|
||||
Promise::from_future(async move {
|
||||
resource.force_set(Status::Free).await;
|
||||
Ok(())
|
||||
@ -213,7 +213,7 @@ impl ManageServer for Machine {
|
||||
_: manage::DisabledParams,
|
||||
_: manage::DisabledResults,
|
||||
) -> Promise<(), ::capnp::Error> {
|
||||
let mut resource = self.resource.clone();
|
||||
let resource = self.resource.clone();
|
||||
Promise::from_future(async move {
|
||||
resource.force_set(Status::Disabled).await;
|
||||
Ok(())
|
||||
|
@ -1,4 +1,4 @@
|
||||
use crate::authorization::AuthorizationHandle;
|
||||
|
||||
use crate::session::SessionHandle;
|
||||
use api::machinesystem_capnp::machine_system::{
|
||||
info, InfoParams, InfoResults, Server as MachineSystem,
|
||||
@ -45,7 +45,7 @@ impl info::Server for Machines {
|
||||
let mut builder = result.get().init_machine_list(machine_list.len() as u32);
|
||||
for (i, m) in machine_list {
|
||||
let resource = m.clone();
|
||||
let mut mbuilder = builder.reborrow().get(i as u32);
|
||||
let mbuilder = builder.reborrow().get(i as u32);
|
||||
Machine::build(self.session.clone(), resource, mbuilder);
|
||||
}
|
||||
|
||||
@ -61,7 +61,7 @@ impl info::Server for Machines {
|
||||
let id = pry!(params.get_id());
|
||||
|
||||
if let Some(resource) = self.resources.get_by_id(id) {
|
||||
let mut builder = result.get();
|
||||
let builder = result.get();
|
||||
Machine::build(self.session.clone(), resource.clone(), builder);
|
||||
}
|
||||
|
||||
@ -77,7 +77,7 @@ impl info::Server for Machines {
|
||||
let urn = pry!(params.get_urn());
|
||||
|
||||
if let Some(resource) = self.resources.get_by_urn(urn) {
|
||||
let mut builder = result.get();
|
||||
let builder = result.get();
|
||||
Machine::build(self.session.clone(), resource.clone(), builder);
|
||||
}
|
||||
|
||||
|
@ -1,9 +1,9 @@
|
||||
use crate::config::Listen;
|
||||
use crate::{Diflouroborane, TlsConfig};
|
||||
use anyhow::Context;
|
||||
|
||||
|
||||
use async_net::TcpListener;
|
||||
use capnp::capability::Promise;
|
||||
use capnp::Error;
|
||||
|
||||
|
||||
use capnp_rpc::rpc_twoparty_capnp::Side;
|
||||
use capnp_rpc::twoparty::VatNetwork;
|
||||
use capnp_rpc::RpcSystem;
|
||||
@ -12,17 +12,17 @@ use futures_rustls::server::TlsStream;
|
||||
use futures_rustls::TlsAcceptor;
|
||||
use futures_util::stream::FuturesUnordered;
|
||||
use futures_util::{stream, AsyncRead, AsyncWrite, FutureExt, StreamExt};
|
||||
use std::fs::File;
|
||||
|
||||
use std::future::Future;
|
||||
use std::io;
|
||||
use std::io::BufReader;
|
||||
use std::net::SocketAddr;
|
||||
use std::sync::Arc;
|
||||
use nix::sys::socket::SockAddr;
|
||||
use crate::authentication::AuthenticationHandle;
|
||||
use crate::authorization::AuthorizationHandle;
|
||||
|
||||
use crate::error::Result;
|
||||
use std::net::SocketAddr;
|
||||
|
||||
|
||||
use crate::authentication::AuthenticationHandle;
|
||||
|
||||
|
||||
|
||||
use crate::session::SessionManager;
|
||||
|
||||
mod authenticationsystem;
|
||||
@ -69,7 +69,7 @@ impl APIServer {
|
||||
let span = tracing::info_span!("binding API listen sockets");
|
||||
let _guard = span.enter();
|
||||
|
||||
let mut sockets = FuturesUnordered::new();
|
||||
let sockets = FuturesUnordered::new();
|
||||
|
||||
listens
|
||||
.into_iter()
|
||||
|
@ -1,11 +1,11 @@
|
||||
use api::permissionsystem_capnp::permission_system::Server as PermissionSystem;
|
||||
use crate::authorization::AuthorizationHandle;
|
||||
|
||||
use crate::session::SessionHandle;
|
||||
|
||||
pub struct Permissions;
|
||||
|
||||
impl Permissions {
|
||||
pub fn new(session: SessionHandle) -> Self {
|
||||
pub fn new(_session: SessionHandle) -> Self {
|
||||
Self
|
||||
}
|
||||
}
|
||||
|
@ -1,11 +1,11 @@
|
||||
use api::authenticationsystem_capnp::response::successful::Builder;
|
||||
use capnp::capability::Promise;
|
||||
use crate::authorization::AuthorizationHandle;
|
||||
|
||||
|
||||
use crate::capnp::machinesystem::Machines;
|
||||
use crate::capnp::permissionsystem::Permissions;
|
||||
use crate::capnp::user_system::Users;
|
||||
use crate::session::{SessionHandle, SessionManager};
|
||||
use crate::users::UserRef;
|
||||
use crate::session::{SessionHandle};
|
||||
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct APISession;
|
||||
@ -15,7 +15,7 @@ impl APISession {
|
||||
Self
|
||||
}
|
||||
|
||||
pub fn build(session: SessionHandle, mut builder: Builder) {
|
||||
pub fn build(session: SessionHandle, builder: Builder) {
|
||||
let mut builder = builder.init_session();
|
||||
builder.set_machine_system(capnp_rpc::new_client(Machines::new(session.clone())));
|
||||
builder.set_user_system(capnp_rpc::new_client(Users::new(session.clone())));
|
||||
|
@ -1,4 +1,4 @@
|
||||
use api::permissionsystem_capnp::permission_system::Server as PermissionSystem;
|
||||
|
||||
use api::user_capnp::user::{
|
||||
info,
|
||||
manage,
|
||||
|
@ -1,13 +1,11 @@
|
||||
use capnp::capability::Promise;
|
||||
use capnp::Error;
|
||||
use capnp_rpc::pry;
|
||||
|
||||
|
||||
|
||||
|
||||
use api::usersystem_capnp::user_system::{
|
||||
Server as UserSystem,
|
||||
info, info::Server as InfoServer,
|
||||
manage, manage::Server as ManageServer,
|
||||
Server as UserSystem, info::Server as InfoServer, manage::Server as ManageServer,
|
||||
};
|
||||
use crate::authorization::AuthorizationHandle;
|
||||
|
||||
use crate::session::SessionHandle;
|
||||
|
||||
#[derive(Clone)]
|
||||
|
Reference in New Issue
Block a user