tensamin/iota
Watch
6
0
Fork
You've already forked iota
 0
Code Issues Pull requests 3 Projects Releases 1 Packages Wiki Activity Actions

Fix Clippy warnings blocking release checks
Some checks failed
Validate authentication / Validate authentication (push) Failing after 1s
Details

Browse source
This commit is contained in:
Alois 2026-10-04 21:14:35 +02:00
commit 976ffde7a8
Signed by: alois
SSH key fingerprint: SHA256:GBzT2DXvAuGV9XIV5W3WrzVpjU54FThmxHXdbz95J24
42 changed files with 315 additions and 346 deletions
Download patch file Download diff file Expand all files Collapse all files

60
omikron-connector/src/omikron_connection.rs
View file

@ -1,3 +1,8 @@
#![allow(
clippy::result_large_err,
reason = "return protocol error frames directly to the sender"
)]
use base64::{Engine as _, engine::general_purpose::STANDARD};
use dashmap::{DashMap, DashSet};
use iota_logger::{LogLevel, PrintType, log, log_cv_in, log_cv_out, log_event, log_t};
@ -350,7 +355,7 @@ pub struct WaitingTask {
pub inserted_at: Instant,
}
pub static WAITING_TASKS: LazyLock<DashMap<u32, WaitingTask>> = LazyLock::new(|| DashMap::new());
pub static WAITING_TASKS: LazyLock<DashMap<u32, WaitingTask>> = LazyLock::new(DashMap::new);
pub fn start_task_cleanup_loop() {
tokio::spawn(async {
@ -960,7 +965,7 @@ impl OmikronConnection {
let conf = CONFIG.load();
match (&conf.omikron_id, &conf.omikron_host, conf.omikron_port) {
(Some(id), Some(host), Some(port)) if !host.trim().is_empty() && port != 0 => {
mtp::files::load_public_key_bundle(&omikron_public_key_path(*id))
mtp::files::load_public_key_bundle(omikron_public_key_path(*id))
.ok()
.map(|public_key| ResolvedOmikronEndpoint {
id: Some(*id),
@ -1100,10 +1105,10 @@ impl OmikronConnection {
});
continue;
};
if let Some((_, task)) = WAITING_TASKS.remove(&msg_id) {
if (task.task)(cv.clone()) {
continue;
}
if let Some((_, task)) = WAITING_TASKS.remove(&msg_id)
&& (task.task)(cv.clone())
{
continue;
}
let permit = self.handler_semaphore.clone().acquire_owned().await;
let self_clone = self.clone();
@ -1604,8 +1609,7 @@ impl OmikronConnection {
Ok(response) if !response.is_type(CommunicationType::ErrorInternal) => {
if let (Some(message_id), Some(signer_id)) =
(record.relay_message_id.as_deref(), record.relay_signer_id)
{
if let Err(error) =
&& let Err(error) =
iota_storage::util::downstream_relay::reject_iota_delivery(
record.frame_id,
signer_principal,
@ -1620,7 +1624,6 @@ impl OmikronConnection {
error
);
}
}
}
Ok(response) => log!(
"Pending Relay {} route returned retryable {}",
@ -1701,10 +1704,10 @@ impl OmikronConnection {
return;
};
if let Some((_, task)) = WAITING_TASKS.remove(&msg_id) {
if (task.task)(cv.clone()) {
return;
}
if let Some((_, task)) = WAITING_TASKS.remove(&msg_id)
&& (task.task)(cv.clone())
{
return;
}
self.clone().handle_message_impl(cv).await;
@ -1916,15 +1919,14 @@ impl OmikronConnection {
if matches!(
result,
Ok(iota_storage::users::invitations::ProvisioningResult::MissingInvitation)
) {
if self.sync_omega_invitations().await.is_ok() {
result = iota_storage::users::invitations::apply_external_invitation_provisioning(
invitation_id,
invitation_revision,
&profile,
now,
);
}
) && self.sync_omega_invitations().await.is_ok()
{
result = iota_storage::users::invitations::apply_external_invitation_provisioning(
invitation_id,
invitation_revision,
&profile,
now,
);
}
match result {
Ok(
@ -2378,7 +2380,7 @@ impl OmikronConnection {
let port = config
.omikron_port
.ok_or_else(|| "Omikron port is unavailable".to_string())?;
let omikron_key = mtp::files::load_public_key_bundle(&omikron_public_key_path(omikron_id))
let omikron_key = mtp::files::load_public_key_bundle(omikron_public_key_path(omikron_id))
.map_err(|error| error.to_string())?;
let omikron_public_key = omikron_key
.try_to_base64()
@ -3150,11 +3152,7 @@ impl OmikronConnection {
}
async fn handle_call_envelope_store(self: Arc<Self>, cv: &CommunicationValue) {
let response = match CONFIG
.load()
.omikron_id
.and_then(|id| i64::try_from(id).ok())
{
let response = match CONFIG.load().omikron_id {
Some(owner) => message_handlers::handle_call_envelope_store(cv, owner),
None => error_response(cv, CommunicationType::ErrorInternal),
};
@ -3162,11 +3160,7 @@ impl OmikronConnection {
}
async fn handle_call_envelope_get(self: Arc<Self>, cv: &CommunicationValue) {
let response = match CONFIG
.load()
.omikron_id
.and_then(|id| i64::try_from(id).ok())
{
let response = match CONFIG.load().omikron_id {
Some(owner) => message_handlers::handle_call_envelope_get(cv, owner),
None => error_response(cv, CommunicationType::ErrorInternal),
};

1
omikron-connector/src/password/protected.rs
View file

@ -121,6 +121,7 @@ impl OmikronConnection {
)
}
#[expect(clippy::too_many_arguments, reason = "explicit protected frame fields")]
pub(super) fn build_protected(
&self,
frame: &CommunicationValue,

24
omikron-connector/src/password/runtime.rs
View file

@ -79,10 +79,10 @@ impl AttemptLease {
impl Drop for AttemptLease {
fn drop(&mut self) {
if !self.settled {
if let Some(runtime) = self.runtime.upgrade() {
runtime.finish_attempt_cancel(self.user_id);
}
if !self.settled
&& let Some(runtime) = self.runtime.upgrade()
{
runtime.finish_attempt_cancel(self.user_id);
}
}
}
@ -219,10 +219,10 @@ impl PasswordAuthRuntime {
})
.collect::<Vec<_>>();
for id in expired {
if let Some((_, pending)) = self.logins.remove(&id) {
if let Some(attempt) = pending.attempt {
attempt.failure();
}
if let Some((_, pending)) = self.logins.remove(&id)
&& let Some(attempt) = pending.attempt
{
attempt.failure();
}
}
self.enrollments
@ -311,10 +311,10 @@ impl PasswordAuthRuntime {
.filter_map(|entry| (entry.user_id == user_id).then_some(*entry.key()))
.collect::<Vec<_>>();
for id in ids {
if let Some((_, pending)) = self.logins.remove(&id) {
if let Some(attempt) = pending.attempt {
attempt.cancel();
}
if let Some((_, pending)) = self.logins.remove(&id)
&& let Some(attempt) = pending.attempt
{
attempt.cancel();
}
}
}

38
omikron-connector/src/user_ops.rs
View file

@ -386,15 +386,15 @@ pub async fn reconcile_managed_users(connection: &dyn OmikronClient) {
let _ = pending_operations::remove(operation.user_id);
}
}
PendingUserOperationKind::Release if remote_iota_id != Some(local_iota_id) => {
if iota_storage::users::user_manager::finalize_local_release(
operation.user_id,
Some(&operation.username),
)
.is_ok()
{
let _ = pending_operations::remove(operation.user_id);
}
PendingUserOperationKind::Release
if remote_iota_id != Some(local_iota_id)
&& iota_storage::users::user_manager::finalize_local_release(
operation.user_id,
Some(&operation.username),
)
.is_ok() =>
{
let _ = pending_operations::remove(operation.user_id);
}
_ => {}
}
@ -425,17 +425,17 @@ pub async fn reconcile_managed_users(connection: &dyn OmikronClient) {
continue;
}
};
if should_release {
if let Err(error) = iota_storage::users::user_manager::finalize_local_release(
if should_release
&& let Err(error) = iota_storage::users::user_manager::finalize_local_release(
user.user_id,
Some(&user.username),
) {
log!(
"Could not release local user {} after Omega reconciliation: {}",
user.user_id,
error
);
}
)
{
log!(
"Could not release local user {} after Omega reconciliation: {}",
user.user_id,
error
);
}
}
}
@ -598,7 +598,7 @@ pub async fn create_user(
let mut bytes = [0u8; 192];
OsRng.fill_bytes(&mut bytes);
let reset_token = STANDARD.encode(&bytes);
let reset_token = STANDARD.encode(bytes);
let user_profile = UserProfile::new(
user_id,