diff --git a/api/schema b/api/schema index 557f37b..9c745b7 160000 --- a/api/schema +++ b/api/schema @@ -1 +1 @@ -Subproject commit 557f37b7cf7d7f06f27e8bddb0c45ce1153e2d06 +Subproject commit 9c745b79bbb6b6cc14334008ba6cc6a18032fe03 diff --git a/api/src/schema/authenticationsystem_capnp.rs b/api/src/schema/authenticationsystem_capnp.rs index 0607284..354fc4f 100644 --- a/api/src/schema/authenticationsystem_capnp.rs +++ b/api/src/schema/authenticationsystem_capnp.rs @@ -4,7 +4,7 @@ pub mod response { - pub use self::Which::{Error,Challenge,Successful}; + pub use self::Which::{Failed,Challenge,Successful}; #[derive(Copy, Clone)] pub struct Owned(()); @@ -59,7 +59,7 @@ pub mod response { pub fn which(self) -> ::core::result::Result, ::capnp::NotInSchema> { match self.reader.get_data_field::(1) { 0 => { - ::core::result::Result::Ok(Error( + ::core::result::Result::Ok(Failed( ::capnp::traits::FromStructReader::new(self.reader) )) } @@ -127,7 +127,7 @@ pub mod response { self.builder.into_reader().total_size() } #[inline] - pub fn init_error(self, ) -> crate::schema::authenticationsystem_capnp::response::error::Builder<'a> { + pub fn init_failed(self, ) -> crate::schema::authenticationsystem_capnp::response::failed::Builder<'a> { self.builder.set_data_field::(1, 0); self.builder.set_data_field::(0, 0u16); self.builder.get_pointer_field(0).clear(); @@ -158,7 +158,7 @@ pub mod response { pub fn which(self) -> ::core::result::Result, ::capnp::NotInSchema> { match self.builder.get_data_field::(1) { 0 => { - ::core::result::Result::Ok(Error( + ::core::result::Result::Ok(Failed( ::capnp::traits::FromStructBuilder::new(self.builder) )) } @@ -191,43 +191,43 @@ pub mod response { pub const TYPE_ID: u64 = 0xe76b_4158_bdde_4934; } pub enum Which { - Error(A0), + Failed(A0), Challenge(A1), Successful(A2), } - pub type WhichReader<'a,> = Which,::capnp::Result<::capnp::data::Reader<'a>>,crate::schema::authenticationsystem_capnp::response::successful::Reader<'a>>; - pub type WhichBuilder<'a,> = Which,::capnp::Result<::capnp::data::Builder<'a>>,crate::schema::authenticationsystem_capnp::response::successful::Builder<'a>>; + pub type WhichReader<'a,> = Which,::capnp::Result<::capnp::data::Reader<'a>>,crate::schema::authenticationsystem_capnp::response::successful::Reader<'a>>; + pub type WhichBuilder<'a,> = Which,::capnp::Result<::capnp::data::Builder<'a>>,crate::schema::authenticationsystem_capnp::response::successful::Builder<'a>>; #[repr(u16)] #[derive(Clone, Copy, Debug, PartialEq)] - pub enum ErrorCode { + pub enum Error { Aborted = 0, BadMechanism = 1, InvalidCredentials = 2, Failed = 3, } - impl ::capnp::traits::FromU16 for ErrorCode { + impl ::capnp::traits::FromU16 for Error { #[inline] - fn from_u16(value: u16) -> ::core::result::Result { + fn from_u16(value: u16) -> ::core::result::Result { match value { - 0 => ::core::result::Result::Ok(ErrorCode::Aborted), - 1 => ::core::result::Result::Ok(ErrorCode::BadMechanism), - 2 => ::core::result::Result::Ok(ErrorCode::InvalidCredentials), - 3 => ::core::result::Result::Ok(ErrorCode::Failed), + 0 => ::core::result::Result::Ok(Error::Aborted), + 1 => ::core::result::Result::Ok(Error::BadMechanism), + 2 => ::core::result::Result::Ok(Error::InvalidCredentials), + 3 => ::core::result::Result::Ok(Error::Failed), n => ::core::result::Result::Err(::capnp::NotInSchema(n)), } } } - impl ::capnp::traits::ToU16 for ErrorCode { + impl ::capnp::traits::ToU16 for Error { #[inline] fn to_u16(self) -> u16 { self as u16 } } - impl ::capnp::traits::HasTypeId for ErrorCode { + impl ::capnp::traits::HasTypeId for Error { #[inline] - fn type_id() -> u64 { 0x80be_9646_4422_da0bu64 } + fn type_id() -> u64 { 0xe87e_ae86_8b88_cfc1u64 } } - pub mod error { + pub mod failed { #[derive(Copy, Clone)] pub struct Owned(()); impl <'a> ::capnp::traits::Owned<'a> for Owned { type Reader = Reader<'a>; type Builder = Builder<'a>; } @@ -274,7 +274,7 @@ pub mod response { self.reader.total_size() } #[inline] - pub fn get_code(self) -> ::core::result::Result { + pub fn get_code(self) -> ::core::result::Result { ::capnp::traits::FromU16::from_u16(self.reader.get_data_field::(0)) } #[inline] @@ -335,11 +335,11 @@ pub mod response { self.builder.into_reader().total_size() } #[inline] - pub fn get_code(self) -> ::core::result::Result { + pub fn get_code(self) -> ::core::result::Result { ::capnp::traits::FromU16::from_u16(self.builder.get_data_field::(0)) } #[inline] - pub fn set_code(&mut self, value: crate::schema::authenticationsystem_capnp::response::ErrorCode) { + pub fn set_code(&mut self, value: crate::schema::authenticationsystem_capnp::response::Error) { self.builder.set_data_field::(0, value as u16) } #[inline] @@ -539,7 +539,7 @@ pub mod response { pub mod authentication { #![allow(unused_variables)] pub type StepParams<> = ::capnp::capability::Params; - pub type StepResults<> = ::capnp::capability::Results; + pub type StepResults<> = ::capnp::capability::Results; pub type AbortParams<> = ::capnp::capability::Params; pub type AbortResults<> = ::capnp::capability::Results; @@ -585,7 +585,7 @@ pub mod authentication { } } impl Client { - pub fn step_request(&self) -> ::capnp::capability::Request { + pub fn step_request(&self) -> ::capnp::capability::Request { self.client.new_call(_private::TYPE_ID, 0, None) } pub fn abort_request(&self) -> ::capnp::capability::Request { @@ -768,6 +768,144 @@ pub mod authentication { } } + pub mod step_results { + #[derive(Copy, Clone)] + pub struct Owned(()); + impl <'a> ::capnp::traits::Owned<'a> for Owned { type Reader = Reader<'a>; type Builder = Builder<'a>; } + impl <'a> ::capnp::traits::OwnedStruct<'a> for Owned { type Reader = Reader<'a>; type Builder = Builder<'a>; } + impl ::capnp::traits::Pipelined for Owned { type Pipeline = Pipeline; } + + #[derive(Clone, Copy)] + pub struct Reader<'a> { reader: ::capnp::private::layout::StructReader<'a> } + + impl <'a,> ::capnp::traits::HasTypeId for Reader<'a,> { + #[inline] + fn type_id() -> u64 { _private::TYPE_ID } + } + impl <'a,> ::capnp::traits::FromStructReader<'a> for Reader<'a,> { + fn new(reader: ::capnp::private::layout::StructReader<'a>) -> Reader<'a,> { + Reader { reader, } + } + } + + impl <'a,> ::capnp::traits::FromPointerReader<'a> for Reader<'a,> { + fn get_from_pointer(reader: &::capnp::private::layout::PointerReader<'a>, default: ::core::option::Option<&'a [capnp::Word]>) -> ::capnp::Result> { + ::core::result::Result::Ok(::capnp::traits::FromStructReader::new(reader.get_struct(default)?)) + } + } + + impl <'a,> ::capnp::traits::IntoInternalStructReader<'a> for Reader<'a,> { + fn into_internal_struct_reader(self) -> ::capnp::private::layout::StructReader<'a> { + self.reader + } + } + + impl <'a,> ::capnp::traits::Imbue<'a> for Reader<'a,> { + fn imbue(&mut self, cap_table: &'a ::capnp::private::layout::CapTable) { + self.reader.imbue(::capnp::private::layout::CapTableReader::Plain(cap_table)) + } + } + + impl <'a,> Reader<'a,> { + pub fn reborrow(&self) -> Reader<'_,> { + Reader { .. *self } + } + + pub fn total_size(&self) -> ::capnp::Result<::capnp::MessageSize> { + self.reader.total_size() + } + #[inline] + pub fn get_response(self) -> ::capnp::Result> { + ::capnp::traits::FromPointerReader::get_from_pointer(&self.reader.get_pointer_field(0), ::core::option::Option::None) + } + pub fn has_response(&self) -> bool { + !self.reader.get_pointer_field(0).is_null() + } + } + + pub struct Builder<'a> { builder: ::capnp::private::layout::StructBuilder<'a> } + impl <'a,> ::capnp::traits::HasStructSize for Builder<'a,> { + #[inline] + fn struct_size() -> ::capnp::private::layout::StructSize { _private::STRUCT_SIZE } + } + impl <'a,> ::capnp::traits::HasTypeId for Builder<'a,> { + #[inline] + fn type_id() -> u64 { _private::TYPE_ID } + } + impl <'a,> ::capnp::traits::FromStructBuilder<'a> for Builder<'a,> { + fn new(builder: ::capnp::private::layout::StructBuilder<'a>) -> Builder<'a, > { + Builder { builder, } + } + } + + impl <'a,> ::capnp::traits::ImbueMut<'a> for Builder<'a,> { + fn imbue_mut(&mut self, cap_table: &'a mut ::capnp::private::layout::CapTable) { + self.builder.imbue(::capnp::private::layout::CapTableBuilder::Plain(cap_table)) + } + } + + impl <'a,> ::capnp::traits::FromPointerBuilder<'a> for Builder<'a,> { + fn init_pointer(builder: ::capnp::private::layout::PointerBuilder<'a>, _size: u32) -> Builder<'a,> { + ::capnp::traits::FromStructBuilder::new(builder.init_struct(_private::STRUCT_SIZE)) + } + fn get_from_pointer(builder: ::capnp::private::layout::PointerBuilder<'a>, default: ::core::option::Option<&'a [capnp::Word]>) -> ::capnp::Result> { + ::core::result::Result::Ok(::capnp::traits::FromStructBuilder::new(builder.get_struct(_private::STRUCT_SIZE, default)?)) + } + } + + impl <'a,> ::capnp::traits::SetPointerBuilder for Reader<'a,> { + fn set_pointer_builder<'b>(pointer: ::capnp::private::layout::PointerBuilder<'b>, value: Reader<'a,>, canonicalize: bool) -> ::capnp::Result<()> { pointer.set_struct(&value.reader, canonicalize) } + } + + impl <'a,> Builder<'a,> { + pub fn into_reader(self) -> Reader<'a,> { + ::capnp::traits::FromStructReader::new(self.builder.into_reader()) + } + pub fn reborrow(&mut self) -> Builder<'_,> { + Builder { .. *self } + } + pub fn reborrow_as_reader(&self) -> Reader<'_,> { + ::capnp::traits::FromStructReader::new(self.builder.into_reader()) + } + + pub fn total_size(&self) -> ::capnp::Result<::capnp::MessageSize> { + self.builder.into_reader().total_size() + } + #[inline] + pub fn get_response(self) -> ::capnp::Result> { + ::capnp::traits::FromPointerBuilder::get_from_pointer(self.builder.get_pointer_field(0), ::core::option::Option::None) + } + #[inline] + pub fn set_response(&mut self, value: crate::schema::authenticationsystem_capnp::response::Reader<'_>) -> ::capnp::Result<()> { + ::capnp::traits::SetPointerBuilder::set_pointer_builder(self.builder.get_pointer_field(0), value, false) + } + #[inline] + pub fn init_response(self, ) -> crate::schema::authenticationsystem_capnp::response::Builder<'a> { + ::capnp::traits::FromPointerBuilder::init_pointer(self.builder.get_pointer_field(0), 0) + } + pub fn has_response(&self) -> bool { + !self.builder.get_pointer_field(0).is_null() + } + } + + pub struct Pipeline { _typeless: ::capnp::any_pointer::Pipeline } + impl ::capnp::capability::FromTypelessPipeline for Pipeline { + fn new(typeless: ::capnp::any_pointer::Pipeline) -> Pipeline { + Pipeline { _typeless: typeless, } + } + } + impl Pipeline { + pub fn get_response(&self) -> crate::schema::authenticationsystem_capnp::response::Pipeline { + ::capnp::capability::FromTypelessPipeline::new(self._typeless.get_pointer_field(0)) + } + } + mod _private { + use capnp::private::layout; + pub const STRUCT_SIZE: layout::StructSize = layout::StructSize { data: 0, pointers: 1 }; + pub const TYPE_ID: u64 = 0xa284_a41d_d880_1774; + } + } + pub mod abort_params { #[derive(Copy, Clone)] pub struct Owned(()); diff --git a/api/src/schema/connection_capnp.rs b/api/src/schema/connection_capnp.rs index 023bd5e..b031d5d 100644 --- a/api/src/schema/connection_capnp.rs +++ b/api/src/schema/connection_capnp.rs @@ -159,7 +159,7 @@ pub mod version { pub mod bootstrap { #![allow(unused_variables)] pub type GetAPIVersionParams<> = ::capnp::capability::Params; - pub type GetAPIVersionResults<> = ::capnp::capability::Results; + pub type GetAPIVersionResults<> = ::capnp::capability::Results; pub type GetServerReleaseParams<> = ::capnp::capability::Params; pub type GetServerReleaseResults<> = ::capnp::capability::Results; pub type MechanismsParams<> = ::capnp::capability::Params; @@ -209,7 +209,7 @@ pub mod bootstrap { } } impl Client { - pub fn get_a_p_i_version_request(&self) -> ::capnp::capability::Request { + pub fn get_a_p_i_version_request(&self) -> ::capnp::capability::Request { self.client.new_call(_private::TYPE_ID, 0, None) } pub fn get_server_release_request(&self) -> ::capnp::capability::Request { @@ -380,6 +380,144 @@ pub mod bootstrap { } } + pub mod get_a_p_i_version_results { + #[derive(Copy, Clone)] + pub struct Owned(()); + impl <'a> ::capnp::traits::Owned<'a> for Owned { type Reader = Reader<'a>; type Builder = Builder<'a>; } + impl <'a> ::capnp::traits::OwnedStruct<'a> for Owned { type Reader = Reader<'a>; type Builder = Builder<'a>; } + impl ::capnp::traits::Pipelined for Owned { type Pipeline = Pipeline; } + + #[derive(Clone, Copy)] + pub struct Reader<'a> { reader: ::capnp::private::layout::StructReader<'a> } + + impl <'a,> ::capnp::traits::HasTypeId for Reader<'a,> { + #[inline] + fn type_id() -> u64 { _private::TYPE_ID } + } + impl <'a,> ::capnp::traits::FromStructReader<'a> for Reader<'a,> { + fn new(reader: ::capnp::private::layout::StructReader<'a>) -> Reader<'a,> { + Reader { reader, } + } + } + + impl <'a,> ::capnp::traits::FromPointerReader<'a> for Reader<'a,> { + fn get_from_pointer(reader: &::capnp::private::layout::PointerReader<'a>, default: ::core::option::Option<&'a [capnp::Word]>) -> ::capnp::Result> { + ::core::result::Result::Ok(::capnp::traits::FromStructReader::new(reader.get_struct(default)?)) + } + } + + impl <'a,> ::capnp::traits::IntoInternalStructReader<'a> for Reader<'a,> { + fn into_internal_struct_reader(self) -> ::capnp::private::layout::StructReader<'a> { + self.reader + } + } + + impl <'a,> ::capnp::traits::Imbue<'a> for Reader<'a,> { + fn imbue(&mut self, cap_table: &'a ::capnp::private::layout::CapTable) { + self.reader.imbue(::capnp::private::layout::CapTableReader::Plain(cap_table)) + } + } + + impl <'a,> Reader<'a,> { + pub fn reborrow(&self) -> Reader<'_,> { + Reader { .. *self } + } + + pub fn total_size(&self) -> ::capnp::Result<::capnp::MessageSize> { + self.reader.total_size() + } + #[inline] + pub fn get_version(self) -> ::capnp::Result> { + ::capnp::traits::FromPointerReader::get_from_pointer(&self.reader.get_pointer_field(0), ::core::option::Option::None) + } + pub fn has_version(&self) -> bool { + !self.reader.get_pointer_field(0).is_null() + } + } + + pub struct Builder<'a> { builder: ::capnp::private::layout::StructBuilder<'a> } + impl <'a,> ::capnp::traits::HasStructSize for Builder<'a,> { + #[inline] + fn struct_size() -> ::capnp::private::layout::StructSize { _private::STRUCT_SIZE } + } + impl <'a,> ::capnp::traits::HasTypeId for Builder<'a,> { + #[inline] + fn type_id() -> u64 { _private::TYPE_ID } + } + impl <'a,> ::capnp::traits::FromStructBuilder<'a> for Builder<'a,> { + fn new(builder: ::capnp::private::layout::StructBuilder<'a>) -> Builder<'a, > { + Builder { builder, } + } + } + + impl <'a,> ::capnp::traits::ImbueMut<'a> for Builder<'a,> { + fn imbue_mut(&mut self, cap_table: &'a mut ::capnp::private::layout::CapTable) { + self.builder.imbue(::capnp::private::layout::CapTableBuilder::Plain(cap_table)) + } + } + + impl <'a,> ::capnp::traits::FromPointerBuilder<'a> for Builder<'a,> { + fn init_pointer(builder: ::capnp::private::layout::PointerBuilder<'a>, _size: u32) -> Builder<'a,> { + ::capnp::traits::FromStructBuilder::new(builder.init_struct(_private::STRUCT_SIZE)) + } + fn get_from_pointer(builder: ::capnp::private::layout::PointerBuilder<'a>, default: ::core::option::Option<&'a [capnp::Word]>) -> ::capnp::Result> { + ::core::result::Result::Ok(::capnp::traits::FromStructBuilder::new(builder.get_struct(_private::STRUCT_SIZE, default)?)) + } + } + + impl <'a,> ::capnp::traits::SetPointerBuilder for Reader<'a,> { + fn set_pointer_builder<'b>(pointer: ::capnp::private::layout::PointerBuilder<'b>, value: Reader<'a,>, canonicalize: bool) -> ::capnp::Result<()> { pointer.set_struct(&value.reader, canonicalize) } + } + + impl <'a,> Builder<'a,> { + pub fn into_reader(self) -> Reader<'a,> { + ::capnp::traits::FromStructReader::new(self.builder.into_reader()) + } + pub fn reborrow(&mut self) -> Builder<'_,> { + Builder { .. *self } + } + pub fn reborrow_as_reader(&self) -> Reader<'_,> { + ::capnp::traits::FromStructReader::new(self.builder.into_reader()) + } + + pub fn total_size(&self) -> ::capnp::Result<::capnp::MessageSize> { + self.builder.into_reader().total_size() + } + #[inline] + pub fn get_version(self) -> ::capnp::Result> { + ::capnp::traits::FromPointerBuilder::get_from_pointer(self.builder.get_pointer_field(0), ::core::option::Option::None) + } + #[inline] + pub fn set_version(&mut self, value: crate::schema::connection_capnp::version::Reader<'_>) -> ::capnp::Result<()> { + ::capnp::traits::SetPointerBuilder::set_pointer_builder(self.builder.get_pointer_field(0), value, false) + } + #[inline] + pub fn init_version(self, ) -> crate::schema::connection_capnp::version::Builder<'a> { + ::capnp::traits::FromPointerBuilder::init_pointer(self.builder.get_pointer_field(0), 0) + } + pub fn has_version(&self) -> bool { + !self.builder.get_pointer_field(0).is_null() + } + } + + pub struct Pipeline { _typeless: ::capnp::any_pointer::Pipeline } + impl ::capnp::capability::FromTypelessPipeline for Pipeline { + fn new(typeless: ::capnp::any_pointer::Pipeline) -> Pipeline { + Pipeline { _typeless: typeless, } + } + } + impl Pipeline { + pub fn get_version(&self) -> crate::schema::connection_capnp::version::Pipeline { + ::capnp::capability::FromTypelessPipeline::new(self._typeless.get_pointer_field(0)) + } + } + mod _private { + use capnp::private::layout; + pub const STRUCT_SIZE: layout::StructSize = layout::StructSize { data: 0, pointers: 1 }; + pub const TYPE_ID: u64 = 0xe749_ee32_e90c_3e2e; + } + } + pub mod get_server_release_params { #[derive(Copy, Clone)] pub struct Owned(()); diff --git a/bffhd/capnp/authenticationsystem.rs b/bffhd/capnp/authenticationsystem.rs index 7903cab..db15266 100644 --- a/bffhd/capnp/authenticationsystem.rs +++ b/bffhd/capnp/authenticationsystem.rs @@ -4,7 +4,7 @@ use capnp::Error; use capnp_rpc::pry; use rsasl::session::{Session, Step}; -use api::authenticationsystem_capnp::authentication_system::{ +use api::authenticationsystem_capnp::authentication::{ Server as AuthenticationSystem, StepParams, StepResults, AbortParams, AbortResults, diff --git a/bffhd/capnp/machine.rs b/bffhd/capnp/machine.rs index f3d257a..43014ac 100644 --- a/bffhd/capnp/machine.rs +++ b/bffhd/capnp/machine.rs @@ -10,15 +10,6 @@ use api::machine_capnp::machine::{ pub struct Machine; impl InfoServer for Machine { - fn get_machine_info_extended( - &mut self, - _: info::GetMachineInfoExtendedParams, - _: info::GetMachineInfoExtendedResults, - ) -> ::capnp::capability::Promise<(), ::capnp::Error> { - ::capnp::capability::Promise::err(::capnp::Error::unimplemented( - "method not implemented".to_string(), - )) - } fn get_property_list( &mut self, _: info::GetPropertyListParams, @@ -112,6 +103,15 @@ impl CheckServer for Machine { } impl ManageServer for Machine { + fn get_machine_info_extended( + &mut self, + _: manage::GetMachineInfoExtendedParams, + _: manage::GetMachineInfoExtendedResults, + ) -> ::capnp::capability::Promise<(), ::capnp::Error> { + ::capnp::capability::Promise::err(::capnp::Error::unimplemented( + "method not implemented".to_string(), + )) + } fn set_property( &mut self, _: manage::SetPropertyParams, diff --git a/bffhd/capnp/user.rs b/bffhd/capnp/user.rs index d051902..3c91c25 100644 --- a/bffhd/capnp/user.rs +++ b/bffhd/capnp/user.rs @@ -9,7 +9,6 @@ struct User; impl info::Server for User { - fn get_user_info_extended(&mut self, _: info::GetUserInfoExtendedParams<>, _: info::GetUserInfoExtendedResults<>) -> ::capnp::capability::Promise<(), ::capnp::Error> { ::capnp::capability::Promise::err(::capnp::Error::unimplemented("method not implemented".to_string())) } fn list_roles(&mut self, _: info::ListRolesParams<>, _: info::ListRolesResults<>) -> ::capnp::capability::Promise<(), ::capnp::Error> { ::capnp::capability::Promise::err(::capnp::Error::unimplemented("method not implemented".to_string())) } } @@ -20,6 +19,7 @@ impl manage::Server for User { impl admin::Server for User { + fn get_user_info_extended(&mut self, _: admin::GetUserInfoExtendedParams<>, _: admin::GetUserInfoExtendedResults<>) -> ::capnp::capability::Promise<(), ::capnp::Error> { ::capnp::capability::Promise::err(::capnp::Error::unimplemented("method not implemented".to_string())) } fn add_role(&mut self, _: admin::AddRoleParams<>, _: admin::AddRoleResults<>) -> ::capnp::capability::Promise<(), ::capnp::Error> { ::capnp::capability::Promise::err(::capnp::Error::unimplemented("method not implemented".to_string())) } fn remove_role(&mut self, _: admin::RemoveRoleParams<>, _: admin::RemoveRoleResults<>) -> ::capnp::capability::Promise<(), ::capnp::Error> { ::capnp::capability::Promise::err(::capnp::Error::unimplemented("method not implemented".to_string())) } fn pwd(&mut self, _: admin::PwdParams<>, _: admin::PwdResults<>) -> ::capnp::capability::Promise<(), ::capnp::Error> { ::capnp::capability::Promise::err(::capnp::Error::unimplemented("method not implemented".to_string())) }