January 2022 - Pacman-dev - lists.archlinux.org

[PATCH] Fix buffer overflow for 'Include' parameter in pacman.conf
by tim174 21 Jul '22

21 Jul '22

If the 'Include' parameter in the config file is set to a long string (for example 3000x '/') the pacman config parser will crash when calling glob in conf.c with this value. If the string is shorter than approx. 3000 symbols the normal error message is printed and the segfault does not occur. I was able to reproduce this on my own system and on the official Arch Linux iso image. The PATH_MAX variable is too large to prevent this bug, hence the new variable GLOB_LIMIT with a security buffer of 1000 since I don't know how persistent this limit is across systems. Its origin is unclear to me and I am not sure if it is a fixed value. This is why I would appreciate any help to make this a sustainable patch. Thanks Tim Signed-off-by: Tim <tim174 at protonmail.com> --- src/pacman/conf.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index f9edf75b..d8222752 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -65,6 +65,9 @@ config_t *config = NULL; #define BOLDWHITE "\033[1;37m" #define GREY46 "\033[38;5;243m" +/* limit for glob input variable */ +#define GLOB_LIMIT 2000 + void enable_colors(int colors) { colstr_t *colstr = &config->colstr; @@ -1042,6 +1045,13 @@ static int process_include(const char *value, void *data, return 1; } + if(strlen(value) > GLOB_LIMIT) { + pm_printf(ALPM_LOG_ERROR, + ("config file %s, line %d, directive '%s': value too long\n"), + file, linenum, "Include"); + return 1; + } + if(section->depth >= config_max_recursion) { pm_printf(ALPM_LOG_ERROR, _("config parsing exceeded max recursion depth of %d.\n"), -- 2.34.1

2 1

[pacman-dev] [PATCH 1/3] alpm: add ALPM_TRANS_FLAG_NOKEEP
by morganamilo 25 Jun '22

25 Jun '22

this flag prevents backup files from being kept on package installation. This is useful for resetting a package's config files back to their original state. Implements FS#59908 although with it's own flag name instead of reusing nosave. This allows nokeep to optionally create a pacnew that you can then choose to disable by also setting nosave. --- I actually very dislike NOKEEP but it was the best I could come up with I would have prefered overwrite or nosave but they are taken. Better names are welcome. --- lib/libalpm/alpm.h | 3 ++- lib/libalpm/remove.c | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 8d8fe243..c6048b63 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -2704,7 +2704,8 @@ int alpm_pkg_mtree_close(const alpm_pkg_t *pkg, struct archive *archive); typedef enum _alpm_transflag_t { /** Ignore dependency checks. */ ALPM_TRANS_FLAG_NODEPS = 1, - /* (1 << 1) flag can go here */ + /** Don't keep backup files when installing packages. */ + ALPM_TRANS_FLAG_NOKEEP = (1 << 1), /** Delete files even if they are tagged as backup. */ ALPM_TRANS_FLAG_NOSAVE = (1 << 2), /** Ignore version numbers when checking dependencies. */ diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index de39724a..233fff0c 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -575,7 +575,9 @@ static int should_skip_file(alpm_handle_t *handle, { return _alpm_fnmatch_patterns(handle->noupgrade, path) == 0 || alpm_list_find_str(handle->trans->skip_remove, path) - || (newpkg && _alpm_needbackup(path, newpkg) + || (!(handle->trans->flags & ALPM_TRANS_FLAG_NOKEEP) + && newpkg + && _alpm_needbackup(path, newpkg) && alpm_filelist_contains(alpm_pkg_get_files(newpkg), path)); } -- 2.33.0

2 3

[PATCH] libalpm: mark filelist_contains as taking a const filelist
by morganamilo 06 Mar '22

06 Mar '22

This is useful for bindings as it gaurintees the value will not be changed. --- lib/libalpm/alpm.h | 2 +- lib/libalpm/filelist.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index e108213b..f1485bd8 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -161,7 +161,7 @@ typedef struct _alpm_backup_t { * @param path the path to search for in the package * @return a pointer to the matching file or NULL if not found */ -alpm_file_t *alpm_filelist_contains(alpm_filelist_t *filelist, const char *path); +alpm_file_t *alpm_filelist_contains(const alpm_filelist_t *filelist, const char *path); /** Frees a file list */ void alpm_filelist_free(alpm_filelist_t *files); diff --git a/lib/libalpm/filelist.c b/lib/libalpm/filelist.c index 9dfe2012..ffdde9b6 100644 --- a/lib/libalpm/filelist.c +++ b/lib/libalpm/filelist.c @@ -118,7 +118,7 @@ static int _alpm_files_cmp(const void *f1, const void *f2) return strcmp(file1->name, file2->name); } -alpm_file_t SYMEXPORT *alpm_filelist_contains(alpm_filelist_t *filelist, +alpm_file_t SYMEXPORT *alpm_filelist_contains(const alpm_filelist_t *filelist, const char *path) { alpm_file_t key; -- 2.34.1

2 1

CacheServer option (or whatever to work around server error limit)
by Christian Hesse 31 Jan '22

31 Jan '22

Hello everybody, I am still struggling with pacman having the server error limit enabled by default. My attempt to fix this for my use case with http headers [0] was reject. Also someone proposed to add a configuration option to disable server error limit [1]... It was rejected as well. But I guess the best way to solve this is finally implementing an option "CacheServer", as requested a long time ago [2]. Looks like Allan did not fine the "spare 30 minutes" [3] to implement... :) Thus I would like to have a look. Still I would like to have a rough guide where to put what and how to glue things. Anybody wants to share some thoughts what an acceptable solution should look like? [0] https://lists.archlinux.org/pipermail/pacman-dev/2021-May/025159.html [1] https://bugs.archlinux.org/task/71352 [2] https://bugs.archlinux.org/task/23407 [3] https://lists.archlinux.org/pipermail/pacman-dev/2021-June/025184.html -- main(a){char*c=/* Schoene Gruesse */"B?IJj;MEH" "CX:;",b;for(a/* Best regards my address: */=0;b=c[a++];) putchar(b-1/(/* Chris cc -ox -xc - && ./x */b/42*2-3)*42);}

2 14

[PATCH 0/4] Initial support for asignify signatures
by Jeremy Huntwork 13 Jan '22

13 Jan '22

libasignify provides a simple API for checking ed25519 signatures of blake2 file digests. See: https://github.com/vstakhov/asignify These changes add support into libalpm, a new configuration option for the location of trusted public keys that libasignify uses, and modify the build to support only one signature method, gpgme or asignify. A future patch will be needed to add appropriate asignify signing commands to makepkg. Jeremy Huntwork (4): libalpm: Add support for asignify signatures Add a configuration option for asignify's key dir Add documentation for the AsignifyDir option Update meson for asignify doc/pacman.conf.5.asciidoc | 8 +++++ etc/pacman.conf.in | 1 + lib/libalpm/alpm.c | 2 +- lib/libalpm/alpm.h | 19 +++++++++++ lib/libalpm/be_package.c | 22 ++++++++++--- lib/libalpm/be_sync.c | 2 +- lib/libalpm/error.c | 8 ++--- lib/libalpm/handle.c | 23 ++++++++++++-- lib/libalpm/handle.h | 1 + lib/libalpm/signing.c | 65 ++++++++++++++++++++++++++++++++++++++ lib/libalpm/signing.h | 1 + meson.build | 33 +++++++++++++------ meson_options.txt | 4 +-- src/pacman/conf.c | 16 ++++++++++ src/pacman/conf.h | 2 ++ src/pacman/pacman.c | 40 ++++++++++++++++++----- test/pacman/meson.build | 2 +- 17 files changed, 216 insertions(+), 33 deletions(-) -- 2.34.1

2 8

[PATCH] makepkg: lint empty arrays
by morganamilo 13 Jan '22

13 Jan '22

While depend arrays are already linted, many array kinds are still not. An empty string is never a valid array value so check all arrays for it. --- .../libmakepkg/lint_pkgbuild/variable.sh.in | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/scripts/libmakepkg/lint_pkgbuild/variable.sh.in b/scripts/libmakepkg/lint_pkgbuild/variable.sh.in index b4428344..d0951258 100644 --- a/scripts/libmakepkg/lint_pkgbuild/variable.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/variable.sh.in @@ -28,7 +28,7 @@ source "$LIBRARY/util/pkgbuild.sh" source "$LIBRARY/util/schema.sh" lint_pkgbuild_functions+=('lint_variable') - +lint_pkgbuild_functions+=('lint_array') lint_variable() { local i a pkg out bad ret=0 @@ -95,3 +95,21 @@ lint_variable() { return $ret } + +lint_array() { + local i var ret=0 + + for i in ${pkgbuild_schema_arrays[@]}; do + local l=() + get_pkgbuild_all_split_attributes $i l + + for var in "${l[@]}"; do + if [[ -z $var ]]; then + error "$(gettext "%s does not allow empty values.")" "$i" + ret=1 + fi + done + done + + return $ret +} -- 2.34.1

2 1

[Git][pacman/pacman][master] 10 commits: makepkg: use -ffile-prefix-map instead of -fdebug-prefix-map
by Allan McRae (＠allan) 13 Jan '22

13 Jan '22

Allan McRae pushed to branch master at Pacman / Pacman Commits: e37f7d8b by Xiretza at 2022-01-02T17:42:43+10:00 makepkg: use -ffile-prefix-map instead of -fdebug-prefix-map >From gcc(1): -ffile-prefix-map=old=new [...] Specifying this option is equivalent to specifying all the individual -f*-prefix-map options. This can be used to make reproducible builds that are location independent. Specifically, this additionally enables -fmacro-prefix-map=, which causes prefix mapping to be applied to expansions of __FILE__ and similar macros.. Without this option, if source files are compiled by passing the absolute file path to the compiler (as done by e.g. cmake), any expansions of __FILE__ (e.g. from uses of assert()) will contain $srcdir. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 0be1d4e5 by Allan McRae at 2022-01-02T18:06:15+10:00 Remove parsing of long removed files in .PKGINFO These fields have not existed for many years. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 2fe1ba5d by Morten Linderud at 2022-01-02T18:15:11+10:00 makepkg: Use pkgbase in pkgdesc for debug packages When trying to identify debug packages among other packages we discovered that it's pkgname used in pkgdesc. Since pkgname can sometimes be an array when building debug packages for a split package, this could potentially include a pkgname that might not make sense depending on the order of the array. This patch simply uses pkgbase as it seems more correct. Signed-off-by: Morten Linderud <morten(a)linderud.pw> Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - e654aa8a by Sefa Eyeoglu at 2022-01-02T20:55:11+10:00 pacman: support multiple chomps at the same time When two progressbars are present, one of them always had c while the other always had C as the mouth Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 446972b4 by Sefa Eyeoglu at 2022-01-02T20:57:42+10:00 pacman: simplify chomp mouth logic Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - a8d9fb8d by Jonathan Sköld at 2022-01-02T21:39:10+10:00 Print the target arch when using the %a format specifier Adds the %a format specifier to allow printing of a target's arch when using --print-format. Signed-off-by: Jonathan Sköld <arch(a)skold.dev> Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 42fe4864 by Allan McRae at 2022-01-09T12:45:58+10:00 libmakepkg: add extra buildflags only when buildflags is not disabled This means options=('!buildflags') will disable the addition of CFLAG etc for LTO and debug building. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - ae2f506d by Morten Linderud at 2022-01-09T13:58:12+10:00 strip: Use debugedit instead of AWK to parse source files This moves us from the fairly ugly AWK parsing line to debugedit which originally comes out of the rpm project. The original code has issues parsing anything that was not straight C/C++ and languages like Rust or Go would return invalid source code files. debugedit handles all these cases better. Fixes FS#66755 Fixes FS#66888 Fixes FS#65677 Signed-off-by: Morten Linderud <morten(a)linderud.pw> Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 241c29f0 by Morten Linderud at 2022-01-09T14:03:16+10:00 makepkg: Implement pkgtype in .PKGINFO This implements pkgtype into .PKGINFO. This is useful to ensure tools parsing packages do not miss important context on the creation of the package. For instance discovering if a given .pkg.tar is a debug package, one would have to do heuristics on the pkgdesc and "${pkgbase}-debug". However both of these values are controlled by the packager. Similarly, the heuristic for discovering split packages is if pkgbase and pkgname differ, which can happen in any package as both values are packager controlled. This should ensure we don't need to rely on heuristics and instead include the context of how the package was created. Signed-off-by: Morten Linderud <morten(a)linderud.pw> Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 49b08fa9 by Allan McRae at 2022-01-13T13:45:42+10:00 libmakepkg/autodep: fix module name Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 10 changed files: - doc/pacman.8.asciidoc - lib/libalpm/be_package.c - scripts/libmakepkg/autodep/meson.build - scripts/libmakepkg/buildenv/debugflags.sh.in - scripts/libmakepkg/buildenv/lto.sh.in - + scripts/libmakepkg/executable/debugedit.sh.in - scripts/libmakepkg/tidy/strip.sh.in - scripts/makepkg.sh.in - src/pacman/callback.c - src/pacman/util.c View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/90df85e9cf2fef38442345… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/90df85e9cf2fef38442345… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[PATCH] Diff color version strings
by David Gustavsson 10 Jan '22

10 Jan '22

In package table, with VerbosePkgLists and Color, color the part of package version strings that changes. Signed-off-by: David Gustavsson <david.e.gustavsson(a)gmail.com> --- src/pacman/conf.c | 4 ++++ src/pacman/conf.h | 2 ++ src/pacman/util.c | 35 +++++++++++++++++++++++++++++++---- src/pacman/util.h | 1 + 4 files changed, 38 insertions(+), 4 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index f9edf75b..d5c598b9 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -80,6 +80,8 @@ void enable_colors(int colors) colstr->err = BOLDRED; colstr->faint = GREY46; colstr->nocolor = NOCOLOR; + colstr->diffrem = RED; + colstr->diffadd = GREEN; } else { colstr->colon = ":: "; colstr->title = ""; @@ -91,6 +93,8 @@ void enable_colors(int colors) colstr->err = ""; colstr->faint = ""; colstr->nocolor = ""; + colstr->diffrem = ""; + colstr->diffadd = ""; } } diff --git a/src/pacman/conf.h b/src/pacman/conf.h index f7916ca9..782b5758 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -33,6 +33,8 @@ typedef struct __colstr_t { const char *err; const char *faint; const char *nocolor; + const char *diffrem; + const char *diffadd; } colstr_t; typedef struct __config_repo_t { diff --git a/src/pacman/util.c b/src/pacman/util.c index c0d62826..e998fa98 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -840,8 +840,10 @@ static alpm_list_t *create_verbose_row(pm_target_t *target) { char *str; off_t size = 0; + size_t i = 0; double human_size; const char *label; + const char *version; alpm_list_t *ret = NULL; /* a row consists of the package name, */ @@ -858,12 +860,28 @@ static alpm_list_t *create_verbose_row(pm_target_t *target) add_table_cell(&ret, str, CELL_NORMAL | CELL_FREE); /* old and new versions */ - pm_asprintf(&str, "%s", - target->remove != NULL ? alpm_pkg_get_version(target->remove) : ""); + version = alpm_pkg_get_version(target->remove); + char old_version[strlen(version) + strlen(config->colstr.diffrem) + strlen(config->colstr.nocolor) + 1]; + memcpy(old_version, (char *)version, strlen(version) + 1); + version = alpm_pkg_get_version(target->install); + char new_version[strlen(version) + strlen(config->colstr.diffadd) + strlen(config->colstr.nocolor) + 1]; + memcpy(new_version, (char *)version, strlen(version) + 1); + + i = 0; + while (old_version[i] != '\0' && new_version[i] != '\0' && old_version[i] == new_version[i]) { + i++; + } + insertstring(old_version, config->colstr.diffrem, i); + insertstring(new_version, config->colstr.diffadd, i); + snprintf(old_version + i + strlen(old_version + i), + strlen(config->colstr.nocolor) + 1, "%s", config->colstr.nocolor); + snprintf(new_version + i + strlen(new_version + i), + strlen(config->colstr.nocolor) + 1, "%s", config->colstr.nocolor); + + pm_asprintf(&str, "%s", old_version); add_table_cell(&ret, str, CELL_NORMAL | CELL_FREE); - pm_asprintf(&str, "%s", - target->install != NULL ? alpm_pkg_get_version(target->install) : ""); + pm_asprintf(&str, "%s", new_version); add_table_cell(&ret, str, CELL_NORMAL | CELL_FREE); /* and size */ @@ -1849,3 +1867,12 @@ void console_erase_line(void) { printf("\x1B[K"); } + +/* inserts string insert into string at index i, modifying string */ +void insertstring(char *string, const char *insert, size_t i) +{ + char temp[strlen(string) - i + 1]; + memcpy(temp, string + i, strlen(string + i) + 1); + memcpy(string + i, insert, strlen(insert) + 1); + memcpy(string + i + strlen(insert), temp, strlen(temp) + 1); +} diff --git a/src/pacman/util.h b/src/pacman/util.h index 52e79915..003961eb 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -88,6 +88,7 @@ void console_cursor_move_down(unsigned int lines); void console_cursor_move_end(void); /* Erases line from the current cursor position till the end of the line */ void console_erase_line(void); +void insertstring(char *string, const char *insert, size_t i); int pm_printf(alpm_loglevel_t level, const char *format, ...) __attribute__((format(printf,2,3))); int pm_asprintf(char **string, const char *format, ...) __attribute__((format(printf,2,3))); -- 2.34.1

2 2

Re: [PATCH] Add semver coloring
by David Gustavsson 10 Jan '22

10 Jan '22

> > > Message: 1 > Date: Sun, 9 Jan 2022 16:41:26 +0000 > From: Morgan Adamiec <morganamilo(a)archlinux.org> > To: pacman-dev(a)lists.archlinux.org > Subject: Re: [PATCH] Add semver coloring > Message-ID: <6a5cf863-81e5-c663-a807-43b63f599ee6(a)archlinux.org> > Content-Type: text/plain; charset=UTF-8 > > > > On 07/01/2022 19:57, David Gustavsson wrote: > > When both 'verbose' and 'color' is set, the (dot-separated) parts of the > > version strings where a change has occured will be highlighted in bold > > face -- if there are two or more levels. > > > > Signed-off-by: David Gustavsson <david.e.gustavsson(a)gmail.com> > > --- > > src/pacman/conf.c | 2 ++ > > src/pacman/conf.h | 1 + > > src/pacman/util.c | 64 ++++++++++++++++++++++++++++++++++++++++++----- > > src/pacman/util.h | 1 + > > 4 files changed, 62 insertions(+), 6 deletions(-) > > > > diff --git a/src/pacman/conf.c b/src/pacman/conf.c > > index f9edf75b..707bd421 100644 > > --- a/src/pacman/conf.c > > +++ b/src/pacman/conf.c > > @@ -80,6 +80,7 @@ void enable_colors(int colors) > > colstr->err = BOLDRED; > > colstr->faint = GREY46; > > colstr->nocolor = NOCOLOR; > > + colstr->changed = BOLD; > > } else { > > colstr->colon = ":: "; > > colstr->title = ""; > > @@ -91,6 +92,7 @@ void enable_colors(int colors) > > colstr->err = ""; > > colstr->faint = ""; > > colstr->nocolor = ""; > > + colstr->changed = ""; > > } > > } > > > > diff --git a/src/pacman/conf.h b/src/pacman/conf.h > > index f7916ca9..82a958a9 100644 > > --- a/src/pacman/conf.h > > +++ b/src/pacman/conf.h > > @@ -33,6 +33,7 @@ typedef struct __colstr_t { > > const char *err; > > const char *faint; > > const char *nocolor; > > + const char *changed; > > } colstr_t; > > > > typedef struct __config_repo_t { > > diff --git a/src/pacman/util.c b/src/pacman/util.c > > index c0d62826..e8bfdd09 100644 > > --- a/src/pacman/util.c > > +++ b/src/pacman/util.c > > @@ -858,13 +858,52 @@ static alpm_list_t *create_verbose_row(pm_target_t > *target) > > add_table_cell(&ret, str, CELL_NORMAL | CELL_FREE); > > > > /* old and new versions */ > > - pm_asprintf(&str, "%s", > > - target->remove != NULL ? > alpm_pkg_get_version(target->remove) : ""); > > - add_table_cell(&ret, str, CELL_NORMAL | CELL_FREE); > > + const char *old_version = target->remove != NULL ? > alpm_pkg_get_version(target->remove) : ""; > > + char old_version_copy[strlen(old_version)+1]; > > + strcpy(old_version_copy, (char *)old_version); > > + const char *new_version = target->install != NULL ? > alpm_pkg_get_version(target->install) : ""; > > + char new_version_copy[strlen(new_version)+1]; > > + strcpy(new_version_copy, (char *)new_version); > > + > > + char *old_semver[10]; > > + char *new_semver[10]; > > + int old_semver_num = semver(old_semver, old_version_copy); > > + int new_semver_num = semver(new_semver, new_version_copy); > > + > > + if (old_semver_num > 1 && new_semver_num == old_semver_num) { > > + char oldstring[100]; > > + char newstring[100]; > > + int oldoffset = 0; > > + int newoffset = 0; > > + for (int i = 0; i < old_semver_num; i++) { > > + if (i>0) { > > + oldoffset += snprintf(oldstring + > oldoffset, 2, "."); > > + newoffset += snprintf(newstring + > newoffset, 2, "."); > > + } > > > > - pm_asprintf(&str, "%s", > > - target->install != NULL ? > alpm_pkg_get_version(target->install) : ""); > > - add_table_cell(&ret, str, CELL_NORMAL | CELL_FREE); > > + if (strcmp(old_semver[i], new_semver[i]) != 0) { > > + /* This level changed, color in */ > > + oldoffset += sprintf(oldstring + > oldoffset, "%s", config->colstr.changed); > > + newoffset += sprintf(newstring + > newoffset, "%s", config->colstr.changed); > > + } > > + oldoffset += sprintf(oldstring + oldoffset, "%s", > old_semver[i]); > > + newoffset += sprintf(newstring + newoffset, "%s", > new_semver[i]); > > + > > + oldoffset += sprintf(oldstring + oldoffset, "%s", > config->colstr.nocolor); > > + newoffset += sprintf(newstring + newoffset, "%s", > config->colstr.nocolor); > > + } > > + pm_asprintf(&str, "%s", oldstring); > > + add_table_cell(&ret, str, CELL_NORMAL | CELL_FREE); > > + pm_asprintf(&str, "%s", newstring); > > + add_table_cell(&ret, str, CELL_NORMAL | CELL_FREE); > > + } else { > > + > > + pm_asprintf(&str, "%s", old_version); > > + add_table_cell(&ret, str, CELL_NORMAL | CELL_FREE); > > + > > + pm_asprintf(&str, "%s", new_version); > > + add_table_cell(&ret, str, CELL_NORMAL | CELL_FREE); > > + } > > > > /* and size */ > > size -= target->remove ? alpm_pkg_get_isize(target->remove) : 0; > > @@ -1849,3 +1888,16 @@ void console_erase_line(void) > > { > > printf("\x1B[K"); > > } > > + > > +/* Splits version string into semver parts (major.minor.patch). Returns > number of found elements. */ > > +int semver(char **out, char *version) > > +{ > > + int i = 0; > > + char *token = strtok(version, "."); > > + while (token != NULL) { > > + out[i] = token; > > + token = strtok(NULL, "."); > > + i++; > > + } > > + return i; > > +} > > diff --git a/src/pacman/util.h b/src/pacman/util.h > > index 52e79915..a119a2f6 100644 > > --- a/src/pacman/util.h > > +++ b/src/pacman/util.h > > @@ -88,6 +88,7 @@ void console_cursor_move_down(unsigned int lines); > > void console_cursor_move_end(void); > > /* Erases line from the current cursor position till the end of the > line */ > > void console_erase_line(void); > > +int semver(char **out, char *version); > > > > int pm_printf(alpm_loglevel_t level, const char *format, ...) > __attribute__((format(printf,2,3))); > > int pm_asprintf(char **string, const char *format, ...) > __attribute__((format(printf,2,3))); > > > Package versioning does not follow semver so this patch doesn't really > make sense. However I've implemented version diffing before in a way > that matches how package versions are compared. This is implemented in > both yay and paru so you'll have to adapt the code to c. > > I figured in the cases where semver is not followed, the text is left unaffected, and a lot of packages do follow some kind of dot-separated versioning (Here's how the patch looked when I ran the other day: https://imgur.com/Zc1CeXz) But thinking about it, it *would* be much simpler to just compare letter by letter and color everything beyond the first differing letter in. I'll try it out some time this week.

1 0

Initial support for asignify signatures
by jeremy＠merelinux.org 10 Jan '22

10 Jan '22

From: Jeremy Huntwork <jeremy(a)merelinux.org> This is a proof of concept that shows how asignify can be used instead of gpgme to validate packages signed with the asignify tool. Signed-off-by: Jeremy Huntwork <jeremy(a)merelinux.org> --- lib/libalpm/alpm.c | 2 +- lib/libalpm/be_package.c | 10 ++++++ lib/libalpm/be_sync.c | 2 +- lib/libalpm/handle.c | 6 ++-- lib/libalpm/signing.c | 67 ++++++++++++++++++++++++++++++++++++++++ lib/libalpm/signing.h | 11 ++++--- meson.build | 11 ++++++- meson_options.txt | 3 ++ 8 files changed, 101 insertions(+), 11 deletions(-) diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index 5b326ab0..d1261660 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -137,7 +137,7 @@ int SYMEXPORT alpm_capabilities(void) #ifdef HAVE_LIBCURL | ALPM_CAPABILITY_DOWNLOADER #endif -#ifdef HAVE_LIBGPGME +#if defined(HAVE_LIBGPGME) || defined(HAVE_LIBASIGNIFY) | ALPM_CAPABILITY_SIGNATURES #endif | 0; diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 5ca2865c..1b6887ce 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -342,12 +342,20 @@ int _alpm_pkg_validate_internal(alpm_handle_t *handle, handle->pm_errno = ALPM_ERR_PKG_MISSING_SIG; return -1; } +#ifdef HAVE_LIBGPGME if(_alpm_check_pgp_helper(handle, pkgfile, sig, level & ALPM_SIG_PACKAGE_OPTIONAL, level & ALPM_SIG_PACKAGE_MARGINAL_OK, level & ALPM_SIG_PACKAGE_UNKNOWN_OK, sigdata)) { handle->pm_errno = ALPM_ERR_PKG_INVALID_SIG; return -1; } +#endif +#ifdef HAVE_LIBASIGNIFY + if(_alpm_check_asignify_helper(handle, pkgfile, sigdata)) { + handle->pm_errno = ALPM_ERR_PKG_INVALID_SIG; + return -1; + } +#endif if(validation && has_sig) { *validation |= ALPM_PKG_VALIDATION_SIGNATURE; } @@ -743,6 +751,7 @@ int SYMEXPORT alpm_pkg_load(alpm_handle_t *handle, const char *filename, int ful return -1; } +#ifndef HAVE_LIBASIGNIFY if(alpm_extract_keyid(handle, filename, sig, len, &keys) == 0) { alpm_list_t *k; for(k = keys; k; k = k->next) { @@ -771,6 +780,7 @@ int SYMEXPORT alpm_pkg_load(alpm_handle_t *handle, const char *filename, int ful free(sigpath); return -1; } +#endif } } free(sigpath); diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index ede25985..81654902 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -697,7 +697,7 @@ alpm_db_t *_alpm_db_register_sync(alpm_handle_t *handle, const char *treename, _alpm_log(handle, ALPM_LOG_DEBUG, "registering sync database '%s'\n", treename); -#ifndef HAVE_LIBGPGME +#if !defined(HAVE_LIBGPGME) || !defined(HAVE_LIBASIGNIFY) if(level != 0 && level != ALPM_SIG_USE_DEFAULT) { RET_ERR(handle, ALPM_ERR_MISSING_CAPABILITY_SIGNATURES, NULL); } diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 101d4a78..78c7d7bd 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -829,7 +829,7 @@ int SYMEXPORT alpm_option_set_default_siglevel(alpm_handle_t *handle, if(level == ALPM_SIG_USE_DEFAULT) { RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1); } -#ifdef HAVE_LIBGPGME +#if defined(HAVE_LIBGPGME) || defined(HAVE_LIBASIGNIFY) handle->siglevel = level; #else if(level != 0) { @@ -849,7 +849,7 @@ int SYMEXPORT alpm_option_set_local_file_siglevel(alpm_handle_t *handle, int level) { CHECK_HANDLE(handle, return -1); -#ifdef HAVE_LIBGPGME +#if defined(HAVE_LIBGPGME) || defined(HAVE_LIBASIGNIFY) handle->localfilesiglevel = level; #else if(level != 0 && level != ALPM_SIG_USE_DEFAULT) { @@ -873,7 +873,7 @@ int SYMEXPORT alpm_option_set_remote_file_siglevel(alpm_handle_t *handle, int level) { CHECK_HANDLE(handle, return -1); -#ifdef HAVE_LIBGPGME +#if defined(HAVE_LIBGPGME) || defined(HAVE_LIBASIGNIFY) handle->remotefilesiglevel = level; #else if(level != 0 && level != ALPM_SIG_USE_DEFAULT) { diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 66cc3923..cf778f9d 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -26,6 +26,12 @@ #include <gpgme.h> #endif +#ifdef HAVE_LIBASIGNIFY +/* libasignify */ +#include <asignify.h> +#include <dirent.h> +#endif + /* libalpm */ #include "signing.h" #include "package.h" @@ -810,6 +816,67 @@ char *_alpm_sigpath(alpm_handle_t *handle, const char *path) return sigpath; } +/** + * Helper for checking the asignify signature for the given file path. + * @param handle the context handle + * @param path the full path to a file + * @param sigdata a pointer to storage for signature results + * @return 0 on success, -1 on error (consult pm_errno or sigdata) + */ +int _alpm_check_asignify_helper(alpm_handle_t *handle, const char *path, + alpm_siglist_t **sigdata) +{ + int ret = 0; + struct dirent *entry; + struct stat statbuf; + const char *pubkeydir = "/etc/pacman.d/trustedkeys"; /* Add config for this */ + + char *sigpath = _alpm_sigpath(handle, path); + asignify_verify_t *vrf = asignify_verify_init(); + + DIR *pkd = opendir(pubkeydir); + if(pkd == NULL) { + _alpm_log(handle, ALPM_LOG_DEBUG, "cannot open directory: %s\n", pubkeydir); + return -1; + } + + while((entry = readdir(pkd)) != NULL) { + char *fullpath = malloc(strlen(pubkeydir) + strlen(entry->d_name) + 2); + if (fullpath == NULL) { + _alpm_log(handle, ALPM_LOG_DEBUG, "malloc error\n"); + return -1; + } + sprintf(fullpath, "%s/%s", pubkeydir, entry->d_name); + stat(fullpath, &statbuf); + if (S_ISREG(statbuf.st_mode)) { + if (!asignify_verify_load_pubkey(vrf, fullpath)) { + /* Don't return here because there may be multiple public keys to load. */ + _alpm_log(handle, ALPM_LOG_DEBUG, "cannot load public key file: %s\n", fullpath); + } + } + free(fullpath); + } + + if (!asignify_verify_load_signature(vrf, sigpath)) { + _alpm_log(handle, ALPM_LOG_DEBUG, "cannot load signature\n"); + ret = -1; + goto asignify_cleanup; + } + + if (!asignify_verify_file(vrf, path)) { + _alpm_log(handle, ALPM_LOG_DEBUG, "signature is not valid\n"); + ret = -1; + goto asignify_cleanup; + } + + _alpm_log(handle, ALPM_LOG_DEBUG, "signature is valid\n"); + +asignify_cleanup: + free(sigpath); + asignify_verify_free(vrf); + return ret; +} + /** * Helper for checking the PGP signature for the given file path. * This wraps #_alpm_gpgme_checksig in a slightly friendlier manner to simplify diff --git a/lib/libalpm/signing.h b/lib/libalpm/signing.h index 112b2a1f..ce859373 100644 --- a/lib/libalpm/signing.h +++ b/lib/libalpm/signing.h @@ -23,13 +23,14 @@ char *_alpm_sigpath(alpm_handle_t *handle, const char *path); int _alpm_gpgme_checksig(alpm_handle_t *handle, const char *path, - const char *base64_sig, alpm_siglist_t *result); - + const char *base64_sig, alpm_siglist_t *result); +int _alpm_check_asignify_helper(alpm_handle_t *handle, const char *path, + alpm_siglist_t **sigdata); int _alpm_check_pgp_helper(alpm_handle_t *handle, const char *path, - const char *base64_sig, int optional, int marginal, int unknown, - alpm_siglist_t **sigdata); + const char *base64_sig, int optional, int marginal, int unknown, + alpm_siglist_t **sigdata); int _alpm_process_siglist(alpm_handle_t *handle, const char *identifier, - alpm_siglist_t *siglist, int optional, int marginal, int unknown); + alpm_siglist_t *siglist, int optional, int marginal, int unknown); int _alpm_key_in_keychain(alpm_handle_t *handle, const char *fpr); int _alpm_key_import(alpm_handle_t *handle, const char *uid, const char *fpr); diff --git a/meson.build b/meson.build index 76b9d2aa..fc9a6f1c 100644 --- a/meson.build +++ b/meson.build @@ -105,6 +105,14 @@ gpgme = dependency('gpgme', not_found_message : 'gpgme @0@ is needed for GPG signature support'.format(needed_gpgme_version)) conf.set('HAVE_LIBGPGME', gpgme.found()) +needed_libasignify_version = '>=1.0' +libasignify = dependency('libasignify', + version : needed_libasignify_version, + required : get_option('asignify'), + static : get_option('buildstatic'), + not_found_message : 'libasignify @0@ is needed for asignify signature support'.format(needed_libasignify_version)) +conf.set('HAVE_LIBASIGNIFY', libasignify.found()) + want_crypto = get_option('crypto') if want_crypto == 'openssl' libcrypto = dependency('libcrypto', static : get_option('buildstatic'), @@ -305,7 +313,7 @@ libcommon = static_library( gnu_symbol_visibility : 'hidden', install : false) -alpm_deps = [crypto_provider, libarchive, libcurl, libintl, gpgme] +alpm_deps = [crypto_provider, libarchive, libasignify, libcurl, libintl, gpgme] libalpm_a = static_library( 'alpm_objlib', @@ -453,6 +461,7 @@ message('\n '.join([ ' i18n support : @0@'.format(get_option('i18n')), ' Build docs : @0@'.format(build_doc), ' debug build : @0@'.format(get_option('buildtype') == 'debug'), + ' Use libasignify : @0@'.format(conf.get('HAVE_LIBASIGNIFY')), ' Use libcurl : @0@'.format(conf.get('HAVE_LIBCURL')), ' Use GPGME : @0@'.format(conf.get('HAVE_LIBGPGME')), ' Use OpenSSL : @0@'.format(conf.has('HAVE_LIBSSL') and diff --git a/meson_options.txt b/meson_options.txt index 4d8cc300..a254a5d4 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -48,6 +48,9 @@ option('crypto', type : 'combo', choices : ['openssl', 'nettle'], option('gpgme', type : 'feature', value : 'auto', description : 'use GPGME for PGP signature verification') +option('asignify', type : 'feature', value : 'auto', + description : 'use asignify for signature verification') + option('i18n', type : 'boolean', value : true, description : 'enable localization of pacman, libalpm and scripts') -- 2.34.1

4 4