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

Compare commits

base: pierre:66e8c5cd8095d4ff6050acf0ae157df9126f1260
Branches Tags
pierre:master pierre:renovate/materialui pierre:renovate/typescript-eslint-8.x pierre:renovate/typescript-eslint-eslint-plugin-8.x pierre:renovate/serde-1.x
pierre:1.0.2 pierre:1.0.1 pierre:1.0.0
...
compare: pierre:50316a665fcbef22b05659811e78eb55ed66bb67
Branches Tags
pierre:renovate/materialui pierre:renovate/typescript-eslint-8.x pierre:renovate/typescript-eslint-eslint-plugin-8.x pierre:renovate/serde-1.x pierre:master
pierre:1.0.2 pierre:1.0.1 pierre:1.0.0

3 Commits
66e8c5cd80 ... 50316a665f

Author SHA1 Message Date
Renovate Bot
50316a665f Update materialui to ^7.3.1
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is passing
Details
2025-08-28 00:32:29 +00:00
Pierre HUBERT
dd96cc4bf3 Fix cargo clippy issues
All checks were successful
continuous-integration/drone/push Build is passing
Details
2025-08-27 08:28:45 +02:00
Pierre HUBERT
9e9a227332 Fix issue with asn1 crate update
Some checks failed
continuous-integration/drone/push Build is failing
Details
2025-08-27 08:25:46 +02:00
6 changed files with 93 additions and 102 deletions
Expand all files Collapse all files

8
central_backend/src/crypto/crl_extension.rs
View File

@@ -16,11 +16,13 @@ impl CRLDistributionPointExt {
let crl_bytes = asn1::write(|w| { let crl_bytes = asn1::write(|w| {
w.write_element(&asn1::SequenceWriter::new(&|w| { w.write_element(&asn1::SequenceWriter::new(&|w| {
w.write_element(&asn1::SequenceWriter::new(&|w| { w.write_element(&asn1::SequenceWriter::new(&|w| {
w.write_tlv(tag_a0, |w| { w.write_tlv(tag_a0, None, |w: &mut asn1::WriteBuf| {
w.push_slice(&asn1::write(|w| { w.push_slice(&asn1::write(|w| {
w.write_tlv(tag_a0, |w| { w.write_tlv(tag_a0, None, |w: &mut asn1::WriteBuf| {
w.push_slice(&asn1::write(|w| { w.push_slice(&asn1::write(|w| {
w.write_tlv(tag_86, |b| b.push_slice(self.url.as_bytes()))?; w.write_tlv(tag_86, None, |b| {
b.push_slice(self.url.as_bytes())
})?;
Ok(()) Ok(())
})?) })?)
})?; })?;

15
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!( let crl_url = format!(
"{}/pki/{}", "{}/pki/{}",
AppConfig::get().unsecure_origin(), AppConfig::get().unsecure_origin(),
crl.file_name().unwrap().to_string_lossy() 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,15 +423,15 @@ 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 { for entry in entries {
if X509_CRL_add0_revoked(crl, X509_REVOKED_dup(entry.as_ptr())) == 0 { if X509_CRL_add0_revoked(crl, X509_REVOKED_dup(entry.as_ptr())) == 0 {
return Err(PKIError::GenCRLError("X509_CRL_add0_revoked").into()); return Err(PKIError::GenCRLError("X509_CRL_add0_revoked").into());
} }
} }
} }
}
// If requested, add new entry // If requested, add new entry
if let Some(new_cert) = new_cert { if let Some(new_cert) = new_cert {

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

@@ -155,13 +155,12 @@ 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 {
relays, relays,

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

@@ -123,18 +123,18 @@ 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
.send(energy_actor::SetDesiredVersion( .send(energy_actor::SetDesiredVersion(

125
central_frontend/package-lock.json generated
View File

@@ -13,8 +13,8 @@
"@fontsource/roboto": "^5.2.6", "@fontsource/roboto": "^5.2.6",
"@mdi/js": "^7.4.47", "@mdi/js": "^7.4.47",
"@mdi/react": "^1.6.1", "@mdi/react": "^1.6.1",
"@mui/icons-material": "^7.0.2", "@mui/icons-material": "^7.3.1",
"@mui/material": "^7.0.2", "@mui/material": "^7.3.1",
"@mui/x-charts": "^7.29.1", "@mui/x-charts": "^7.29.1",
"@mui/x-date-pickers": "^7.29.4", "@mui/x-date-pickers": "^7.29.4",
"date-and-time": "^3.6.0", "date-and-time": "^3.6.0",
@@ -310,13 +310,10 @@
} }
}, },
"node_modules/@babel/runtime": { "node_modules/@babel/runtime": {
"version": "7.27.0", "version": "7.28.3",
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.0.tgz", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.3.tgz",
"integrity": "sha512-VtPOkrdPHZsKc/clNqyi9WUA8TINkZ4cGk63UUE3u4pmB2k+ZMQRDuIOagv8UVd6j7k0T3+RRIb7beKTebNbcw==", "integrity": "sha512-9uIQ10o0WGdpP6GDhXcdOJPJuDgFtIDtN/9+ArJQ2NAfAmiuhTQdzkaTGR33v43GYS2UrSA0eX2pPPHoFVvpxA==",
"license": "MIT", "license": "MIT",
"dependencies": {
"regenerator-runtime": "^0.14.0"
},
"engines": { "engines": {
"node": ">=6.9.0" "node": ">=6.9.0"
} }
@@ -1252,9 +1249,9 @@
} }
}, },
"node_modules/@mui/core-downloads-tracker": { "node_modules/@mui/core-downloads-tracker": {
"version": "7.0.2", "version": "7.3.1",
"resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-7.0.2.tgz", "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-7.3.1.tgz",
"integrity": "sha512-TfeFU9TgN1N06hyb/pV/63FfO34nijZRMqgHk0TJ3gkl4Fbd+wZ73+ZtOd7jag6hMmzO9HSrBc6Vdn591nhkAg==", "integrity": "sha512-+mIK1Z0BhOaQ0vCgOkT1mSrIpEHLo338h4/duuL4TBLXPvUMit732mnwJY3W40Avy30HdeSfwUAAGRkKmwRaEQ==",
"license": "MIT", "license": "MIT",
"funding": { "funding": {
"type": "opencollective", "type": "opencollective",
@@ -1262,12 +1259,12 @@
} }
}, },
"node_modules/@mui/icons-material": { "node_modules/@mui/icons-material": {
"version": "7.0.2", "version": "7.3.1",
"resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-7.0.2.tgz", "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-7.3.1.tgz",
"integrity": "sha512-Bo57PFLOqXOqPNrXjd8AhzH5s6TCsNUQbvnQ0VKZ8D+lIlteqKnrk/O1luMJUc/BXONK7BfIdTdc7qOnXYbMdw==", "integrity": "sha512-upzCtG6awpL6noEZlJ5Z01khZ9VnLNLaj7tb6iPbN6G97eYfUTs8e9OyPKy3rEms3VQWmVBfri7jzeaRxdFIzA==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@babel/runtime": "^7.27.0" "@babel/runtime": "^7.28.2"
}, },
"engines": { "engines": {
"node": ">=14.0.0" "node": ">=14.0.0"
@@ -1277,7 +1274,7 @@
"url": "https://opencollective.com/mui-org" "url": "https://opencollective.com/mui-org"
}, },
"peerDependencies": { "peerDependencies": {
"@mui/material": "^7.0.2", "@mui/material": "^7.3.1",
"@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0",
"react": "^17.0.0 || ^18.0.0 || ^19.0.0" "react": "^17.0.0 || ^18.0.0 || ^19.0.0"
}, },
@@ -1288,22 +1285,22 @@
} }
}, },
"node_modules/@mui/material": { "node_modules/@mui/material": {
"version": "7.0.2", "version": "7.3.1",
"resolved": "https://registry.npmjs.org/@mui/material/-/material-7.0.2.tgz", "resolved": "https://registry.npmjs.org/@mui/material/-/material-7.3.1.tgz",
"integrity": "sha512-rjJlJ13+3LdLfobRplkXbjIFEIkn6LgpetgU/Cs3Xd8qINCCQK9qXQIjjQ6P0FXFTPFzEVMj0VgBR1mN+FhOcA==", "integrity": "sha512-Xf6Shbo03YmcBedZMwSpEFOwpYDtU7tC+rhAHTrA9FHk0FpsDqiQ9jUa1j/9s3HLs7KWb5mDcGnlwdh9Q9KAag==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@babel/runtime": "^7.27.0", "@babel/runtime": "^7.28.2",
"@mui/core-downloads-tracker": "^7.0.2", "@mui/core-downloads-tracker": "^7.3.1",
"@mui/system": "^7.0.2", "@mui/system": "^7.3.1",
"@mui/types": "^7.4.1", "@mui/types": "^7.4.5",
"@mui/utils": "^7.0.2", "@mui/utils": "^7.3.1",
"@popperjs/core": "^2.11.8", "@popperjs/core": "^2.11.8",
"@types/react-transition-group": "^4.4.12", "@types/react-transition-group": "^4.4.12",
"clsx": "^2.1.1", "clsx": "^2.1.1",
"csstype": "^3.1.3", "csstype": "^3.1.3",
"prop-types": "^15.8.1", "prop-types": "^15.8.1",
"react-is": "^19.1.0", "react-is": "^19.1.1",
"react-transition-group": "^4.4.5" "react-transition-group": "^4.4.5"
}, },
"engines": { "engines": {
@@ -1316,7 +1313,7 @@
"peerDependencies": { "peerDependencies": {
"@emotion/react": "^11.5.0", "@emotion/react": "^11.5.0",
"@emotion/styled": "^11.3.0", "@emotion/styled": "^11.3.0",
"@mui/material-pigment-css": "^7.0.2", "@mui/material-pigment-css": "^7.3.1",
"@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0",
"react": "^17.0.0 || ^18.0.0 || ^19.0.0", "react": "^17.0.0 || ^18.0.0 || ^19.0.0",
"react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0" "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0"
@@ -1337,13 +1334,13 @@
} }
}, },
"node_modules/@mui/private-theming": { "node_modules/@mui/private-theming": {
"version": "7.0.2", "version": "7.3.1",
"resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-7.0.2.tgz", "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-7.3.1.tgz",
"integrity": "sha512-6lt8heDC9wN8YaRqEdhqnm0cFCv08AMf4IlttFvOVn7ZdKd81PNpD/rEtPGLLwQAFyyKSxBG4/2XCgpbcdNKiA==", "integrity": "sha512-WU3YLkKXii/x8ZEKnrLKsPwplCVE11yZxUvlaaZSIzCcI3x2OdFC8eMlNy74hVeUsYQvzzX1Es/k4ARPlFvpPQ==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@babel/runtime": "^7.27.0", "@babel/runtime": "^7.28.2",
"@mui/utils": "^7.0.2", "@mui/utils": "^7.3.1",
"prop-types": "^15.8.1" "prop-types": "^15.8.1"
}, },
"engines": { "engines": {
@@ -1364,13 +1361,13 @@
} }
}, },
"node_modules/@mui/styled-engine": { "node_modules/@mui/styled-engine": {
"version": "7.0.2", "version": "7.3.1",
"resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-7.0.2.tgz", "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-7.3.1.tgz",
"integrity": "sha512-11Bt4YdHGlh7sB8P75S9mRCUxTlgv7HGbr0UKz6m6Z9KLeiw1Bm9y/t3iqLLVMvSHYB6zL8X8X+LmfTE++gyBw==", "integrity": "sha512-Nqo6OHjvJpXJ1+9TekTE//+8RybgPQUKwns2Lh0sq+8rJOUSUKS3KALv4InSOdHhIM9Mdi8/L7LTF1/Ky6D6TQ==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@babel/runtime": "^7.27.0", "@babel/runtime": "^7.28.2",
"@emotion/cache": "^11.13.5", "@emotion/cache": "^11.14.0",
"@emotion/serialize": "^1.3.3", "@emotion/serialize": "^1.3.3",
"@emotion/sheet": "^1.4.0", "@emotion/sheet": "^1.4.0",
"csstype": "^3.1.3", "csstype": "^3.1.3",
@@ -1398,16 +1395,16 @@
} }
}, },
"node_modules/@mui/system": { "node_modules/@mui/system": {
"version": "7.0.2", "version": "7.3.1",
"resolved": "https://registry.npmjs.org/@mui/system/-/system-7.0.2.tgz", "resolved": "https://registry.npmjs.org/@mui/system/-/system-7.3.1.tgz",
"integrity": "sha512-yFUraAWYWuKIISPPEVPSQ1NLeqmTT4qiQ+ktmyS8LO/KwHxB+NNVOacEZaIofh5x1NxY8rzphvU5X2heRZ/RDA==", "integrity": "sha512-mIidecvcNVpNJMdPDmCeoSL5zshKBbYPcphjuh6ZMjhybhqhZ4mX6k9zmIWh6XOXcqRQMg5KrcjnO0QstrNj3w==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@babel/runtime": "^7.27.0", "@babel/runtime": "^7.28.2",
"@mui/private-theming": "^7.0.2", "@mui/private-theming": "^7.3.1",
"@mui/styled-engine": "^7.0.2", "@mui/styled-engine": "^7.3.1",
"@mui/types": "^7.4.1", "@mui/types": "^7.4.5",
"@mui/utils": "^7.0.2", "@mui/utils": "^7.3.1",
"clsx": "^2.1.1", "clsx": "^2.1.1",
"csstype": "^3.1.3", "csstype": "^3.1.3",
"prop-types": "^15.8.1" "prop-types": "^15.8.1"
@@ -1438,12 +1435,12 @@
} }
}, },
"node_modules/@mui/types": { "node_modules/@mui/types": {
"version": "7.4.1", "version": "7.4.5",
"resolved": "https://registry.npmjs.org/@mui/types/-/types-7.4.1.tgz", "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.4.5.tgz",
"integrity": "sha512-gUL8IIAI52CRXP/MixT1tJKt3SI6tVv4U/9soFsTtAsHzaJQptZ42ffdHZV3niX1ei0aUgMvOxBBN0KYqdG39g==", "integrity": "sha512-ZPwlAOE3e8C0piCKbaabwrqZbW4QvWz0uapVPWya7fYj6PeDkl5sSJmomT7wjOcZGPB48G/a6Ubidqreptxz4g==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@babel/runtime": "^7.27.0" "@babel/runtime": "^7.28.2"
}, },
"peerDependencies": { "peerDependencies": {
"@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0" "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0"
@@ -1455,17 +1452,17 @@
} }
}, },
"node_modules/@mui/utils": { "node_modules/@mui/utils": {
"version": "7.0.2", "version": "7.3.1",
"resolved": "https://registry.npmjs.org/@mui/utils/-/utils-7.0.2.tgz", "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-7.3.1.tgz",
"integrity": "sha512-72gcuQjPzhj/MLmPHLCgZjy2VjOH4KniR/4qRtXTTXIEwbkgcN+Y5W/rC90rWtMmZbjt9svZev/z+QHUI4j74w==", "integrity": "sha512-/31y4wZqVWa0jzMnzo6JPjxwP6xXy4P3+iLbosFg/mJQowL1KIou0LC+lquWW60FKVbKz5ZUWBg2H3jausa0pw==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@babel/runtime": "^7.27.0", "@babel/runtime": "^7.28.2",
"@mui/types": "^7.4.1", "@mui/types": "^7.4.5",
"@types/prop-types": "^15.7.14", "@types/prop-types": "^15.7.15",
"clsx": "^2.1.1", "clsx": "^2.1.1",
"prop-types": "^15.8.1", "prop-types": "^15.8.1",
"react-is": "^19.1.0" "react-is": "^19.1.1"
}, },
"engines": { "engines": {
"node": ">=14.0.0" "node": ">=14.0.0"
@@ -2152,9 +2149,9 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/@types/prop-types": { "node_modules/@types/prop-types": {
"version": "15.7.14", "version": "15.7.15",
"resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.14.tgz", "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.15.tgz",
"integrity": "sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ==", "integrity": "sha512-F6bEyamV9jKGAFBEmlQnesRPGOQqS2+Uwi0Em15xenOxHaf2hv6L8YCVn3rPdPJOiJfPiCnLIRyvwVaqMY3MIw==",
"license": "MIT" "license": "MIT"
}, },
"node_modules/@types/react": { "node_modules/@types/react": {
@@ -4383,9 +4380,9 @@
} }
}, },
"node_modules/react-is": { "node_modules/react-is": {
"version": "19.1.0", "version": "19.1.1",
"resolved": "https://registry.npmjs.org/react-is/-/react-is-19.1.0.tgz", "resolved": "https://registry.npmjs.org/react-is/-/react-is-19.1.1.tgz",
"integrity": "sha512-Oe56aUPnkHyyDxxkvqtd7KkdQP5uIUfHxd5XTb3wE9d/kRnZLmKbDB0GWk919tdQ+mxxPtG6EAs6RMT6i1qtHg==", "integrity": "sha512-tr41fA15Vn8p4X9ntI+yCyeGSf1TlYaY5vlTZfQmeLBrFo3psOPX6HhTDnFNL9uj3EhP0KAQ80cugCl4b4BERA==",
"license": "MIT" "license": "MIT"
}, },
"node_modules/react-refresh": { "node_modules/react-refresh": {
@@ -4452,12 +4449,6 @@
"react-dom": ">=16.6.0" "react-dom": ">=16.6.0"
} }
}, },
"node_modules/regenerator-runtime": {
"version": "0.14.1",
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
"integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
"license": "MIT"
},
"node_modules/resolve": { "node_modules/resolve": {
"version": "1.22.10", "version": "1.22.10",
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",

4
central_frontend/package.json
View File

@@ -15,8 +15,8 @@
"@fontsource/roboto": "^5.2.6", "@fontsource/roboto": "^5.2.6",
"@mdi/js": "^7.4.47", "@mdi/js": "^7.4.47",
"@mdi/react": "^1.6.1", "@mdi/react": "^1.6.1",
"@mui/icons-material": "^7.0.2", "@mui/icons-material": "^7.3.1",
"@mui/material": "^7.0.2", "@mui/material": "^7.3.1",
"@mui/x-charts": "^7.29.1", "@mui/x-charts": "^7.29.1",
"@mui/x-date-pickers": "^7.29.4", "@mui/x-date-pickers": "^7.29.4",
"date-and-time": "^3.6.0", "date-and-time": "^3.6.0",