nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-07-22 11:59:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

upgrades: Multiple fixes for parsing Apt's Deb822 style sources

Browse Source 
- Allow DOS style line endings

- Allow preceding, trailing, and repeating empty lines

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Sunil Mohan Adapa 2025-09-09 15:11:36 -07:00 committed by James Valleroy
parent 795bd1fd9e
commit a98e6f7563
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plinth/modules/upgrades/data/usr/share/augeas/lenses/aptsources822.aug
View File

@ -1,6 +1,6 @@
(*
Module: Aptsources822
Augeas module for souces list (Deb822 style) for Apt package manager
Augeas module for sources list (Deb822 style) for Apt package manager
Authors:
James Valleroy <jvalleroy@mailbox.org>
@ -50,7 +50,7 @@ let field_value = /[!-Z\\^-~][!-Z\\^-~]*/
(* Variable: empty_line
Lens for an empty line separating two stanzas. It can't be a comment. Only
tabs and spaces are allowed. *)
let empty_line = Util.empty_generic /[ \t]*/
let empty_line = Util.empty_generic_dos /[ \t]*/
(* Variable: name_value_separator
Lens for separating a name and value. Field name is followed by a ':' and
@ -72,13 +72,13 @@ let field_value_with_separator = [seq "item" . store field_value . del Rx.space
(* Variable: field_value_with_eol
Lens for value that followed by an end-of-line. This indicates that this is
the last value for this field. *)
let field_value_with_eol = [seq "item" . store field_value . Util.eol]
let field_value_with_eol = [seq "item" . store field_value . Util.doseol]
(* Variable: single_value_field
Lens for a field (field name, separator and field value) with only a single
value. *)
let single_value_field = [ key single_value_field_name . name_value_separator .
store field_value . Util.eol ]
store field_value . Util.doseol ]
(* Variable: multi_value_field
Lens for a field (field name, separator and field value) with multiple values
@ -94,7 +94,7 @@ let stanza = [ seq "source" . (single_value_field | multi_value_field |
(* Variable: lns
Lens for parsing the entire apt sources file in Deb822 format. *)
let lns = stanza . (empty_line . stanza)*
let lns = empty_line* . stanza . (empty_line+ . stanza)* . empty_line*
(* Variable: filter
All files in the sources.list.d directory are files describing sources.

23
plinth/modules/upgrades/data/usr/share/augeas/lenses/tests/test_aptsources822.aug
View File

@ -113,6 +113,29 @@ test Aptsources822.lns get sources2 =
{ "Components" { "1" = "main" } }
}
(* Test edge cases in parsing: leading, trailer, and repeating new lines and
dos-style line terminators for empty lines and stanza lines*)
let sources3 = "
Enabled: yes
\r
Enabled: no\r
"
test Aptsources822.lns get sources3 =
{ }
{ }
{ "1"
{ "Enabled" = "yes" }
}
{ }
{ }
{ "2"
{ "Enabled" = "no" }
}
{ }
(* Test adding nodes to tree *)
test Aptsources822.lns put "Types: deb\n" after set "/1/Enabled" "yes" = "Types: deb\nEnabled: yes\n"
test Aptsources822.lns put "Types: deb\n" after