Skip to content

LordOS — a free, fast and secure GNU/Linux distribution based on Debian, with its own desktop environment: display server and Wayland compositor in C, a React UI engine on QuickJS, and private native apps.

Imager: the C and Rust tag checks accept point releases too (v0.8.4.1-beta), with tests

Federico Pereirabd7a6e9afa6e
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28a757d..adfda6c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,7 +41,8 @@ of the matching [GitHub release](https://github.com/lordbasex/LordOS/releases),
### Fixed
- **LordOS Imager offered 0.8.3 as the newest Raspberry Pi image.** It only accepted release tags
- with three numbers, so it skipped 0.8.4.1; point releases (`v0.8.4.1-beta`) are now listed.
+ with three numbers, so it skipped 0.8.4.1; point releases (`v0.8.4.1-beta`) are now listed and
+ downloaded, in LordOS and in the desktop app, and the desktop app's update check reads them too.
- A monitor plugged in after boot now shows the login screen. The login screen never listened for the
kernel's display events, so a board booted without HDMI (a Raspberry Pi 5) stayed without video until
it was restarted. It now follows them like a session does, without the system bus.
diff --git a/desktop/imager/core/src/lib.rs b/desktop/imager/core/src/lib.rs
index 7f10a47..8aabd45 100644
--- a/desktop/imager/core/src/lib.rs
+++ b/desktop/imager/core/src/lib.rs
@@ -63,6 +63,7 @@ pub fn valid_tag(t: &str) -> bool {
if t.len() < 6 || t.len() > 32 || !t.starts_with('v') { return false; }
let (ver, pre) = match t[1..].split_once('-') { Some((v, p)) => (v, Some(p)), None => (&t[1..], None) };
let parts: Vec<&str> = ver.split('.').collect();
- if parts.len() != 3 || parts.iter().any(|p| p.is_empty() || p.len() > 4 || !p.bytes().all(|c| c.is_ascii_digit())) { return false; }
+ // three numbers, or four for a point release (v0.8.4.1-beta)
+ if !(parts.len() == 3 || parts.len() == 4) || parts.iter().any(|p| p.is_empty() || p.len() > 4 || !p.bytes().all(|c| c.is_ascii_digit())) { return false; }
match pre { None => true, Some(p) => !p.is_empty() && p.bytes().all(|c| c.is_ascii_lowercase() || c.is_ascii_digit() || c == b'.') }
}
diff --git a/desktop/imager/core/tests/core.rs b/desktop/imager/core/tests/core.rs
index bb25d66..a24dea1 100644
--- a/desktop/imager/core/tests/core.rs
+++ b/desktop/imager/core/tests/core.rs
@@ -52,6 +52,7 @@ fn names_and_tags() {
assert_eq!(image_kind("a.iso"), 1);
assert_eq!(image_kind("a.zip"), 0);
assert!(valid_tag("v0.8.4-beta") && valid_tag("v1.0.0") && !valid_tag("v0.8") && !valid_tag("v0.8.4-") && !valid_tag("v0.8.4/../x"));
+ assert!(valid_tag("v0.8.4.1-beta") && valid_tag("v0.8.4.1") && !valid_tag("v0.8.4.1.2") && !valid_tag("v0.8.4.") && !valid_tag("v0.8.4.-beta"));
}
#[test]
diff --git a/server/src/imager/imgverify.c b/server/src/imager/imgverify.c
index 3b1b4a9..3a48e3d 100644
--- a/server/src/imager/imgverify.c
+++ b/server/src/imager/imgverify.c
@@ -63,11 +63,12 @@ int img_valid_tag(const char *t) {
size_t n = strlen(t);
if (n < 6 || n > 32 || t[0] != 'v') return 0;
const char *p = t + 1;
- for (int part = 0; part < 3; part++) {
+ for (int part = 0; part < 4; part++) { /* three numbers, or four for a point release (v0.8.4.1-beta) */
int d = 0;
while (*p >= '0' && *p <= '9') { p++; d++; }
if (!d || d > 4) return 0;
if (part < 2) { if (*p != '.') return 0; p++; }
+ else if (part == 2) { if (*p != '.') break; p++; }
}
if (!*p) return 1;
if (*p != '-' || !p[1]) return 0;
diff --git a/server/tests/imager_test.c b/server/tests/imager_test.c
index 43fb2e8..3d39750 100644
--- a/server/tests/imager_test.c
+++ b/server/tests/imager_test.c
@@ -125,6 +125,11 @@ static void names(void) {
CHECK(img_valid_tag("v0.8.4-beta"));
CHECK(img_valid_tag("v1.0.0"));
CHECK(img_valid_tag("v0.8.10-rc.1"));
+ CHECK(img_valid_tag("v0.8.4.1-beta"));
+ CHECK(img_valid_tag("v0.8.4.1"));
+ CHECK(!img_valid_tag("v0.8.4.1.2"));
+ CHECK(!img_valid_tag("v0.8.4."));
+ CHECK(!img_valid_tag("v0.8.4.-beta"));
CHECK(!img_valid_tag("0.8.4"));
CHECK(!img_valid_tag("v0.8"));
CHECK(!img_valid_tag("v0.8.4-"));