pierre/SolarEnergy
1
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Packages Projects Releases 3 Wiki Activity

Fix cargo clippy issues
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Pierre HUBERT
2025-08-27 08:28:45 +02:00
parent 9e9a227332
commit dd96cc4bf3
3 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
central_backend/src/crypto/pki.rs
View File

@@ -174,17 +174,16 @@ fn gen_certificate(req: GenCertificateReq) -> anyhow::Result<(Option<Vec<u8>>, V
cert_builder.set_not_after(&not_after)?; cert_builder.set_not_after(&not_after)?;
// Specify CRL URL // Specify CRL URL
if let Some(issuer) = req.issuer { if let Some(issuer) = req.issuer
if let Some(crl) = &issuer.crl { && let Some(crl) = &issuer.crl
let crl_url = format!( {
"{}/pki/{}", let crl_url = format!(
AppConfig::get().unsecure_origin(), "{}/pki/{}",
crl.file_name().unwrap().to_string_lossy() AppConfig::get().unsecure_origin(),
); crl.file_name().unwrap().to_string_lossy()
);
cert_builder cert_builder.append_extension(CRLDistributionPointExt { url: crl_url }.as_extension()?)?;
.append_extension(CRLDistributionPointExt { url: crl_url }.as_extension()?)?;
}
} }
// If cert is a CA or not // If cert is a CA or not
@@ -424,12 +423,12 @@ fn refresh_crl(d: &CertData, new_cert: Option<&X509>) -> anyhow::Result<()> {
} }
// Add old entries // Add old entries
if let Some(old_crl) = old_crl { if let Some(old_crl) = old_crl
if let Some(entries) = old_crl.get_revoked() { && let Some(entries) = old_crl.get_revoked()
for entry in entries { {
if X509_CRL_add0_revoked(crl, X509_REVOKED_dup(entry.as_ptr())) == 0 { for entry in entries {
return Err(PKIError::GenCRLError("X509_CRL_add0_revoked").into()); if X509_CRL_add0_revoked(crl, X509_REVOKED_dup(entry.as_ptr())) == 0 {
} return Err(PKIError::GenCRLError("X509_CRL_add0_revoked").into());
} }
} }
} }

11
central_backend/src/server/devices_api/mgmt_controller.rs
View File

@@ -155,12 +155,11 @@ pub async fn sync_device(body: web::Json<JWTRequest>, actor: WebEnergyActor) ->
let mut available_update = None; let mut available_update = None;
// Check if the version is available // Check if the version is available
if let Some(desired) = device.desired_version { if let Some(desired) = device.desired_version
if claims.info.version < desired && claims.info.version < desired
&& ota_manager::update_exists(OTAPlatform::from_str(&claims.info.reference)?, &desired)? && ota_manager::update_exists(OTAPlatform::from_str(&claims.info.reference)?, &desired)?
{ {
available_update = Some(desired); available_update = Some(desired);
}
} }
Ok(HttpResponse::Ok().json(SyncResult { Ok(HttpResponse::Ok().json(SyncResult {

16
central_backend/src/server/web_api/ota_controller.rs
View File

@@ -123,17 +123,17 @@ pub async fn set_desired_version(
for d in devices { for d in devices {
// Filter per platform // Filter per platform
if let Some(p) = body.platform { if let Some(p) = body.platform
if d.info.reference != p.to_string() { && d.info.reference != p.to_string()
continue; {
} continue;
} }
// Filter per device // Filter per device
if let Some(ids) = &body.devices { if let Some(ids) = &body.devices
if !ids.contains(&d.id) { && !ids.contains(&d.id)
continue; {
} continue;
} }
actor actor