mirror
/
gluon-packages
mirror of https://github.com/freifunk-gluon/packages.git
1
0
Fork 0
Code Releases Activity

autoupdater: allow skipping the signatures check 

this commit introduces a new cli flag "--force-signatures"
This commit is contained in:
Julian Labus 2019-01-07 15:01:17 +01:00
parent a52d5ced54
commit f39c29ddae
No known key found for this signature in database
GPG Key ID: 8AF209F2C6B3572A
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
admin/autoupdater/src/autoupdater.c
View File

@ -86,6 +86,7 @@ static void usage(void) {
" really flash a new firmware if one is available.\n\n"
" --fallback Upgrade if and only if the upgrade timespan of the new\n"
" version has passed for at least 24 hours.\n\n"
" --force-signatures Skip signature check.\n\n"
" --force-version Skip version check to allow downgrades.\n\n"
" <mirror> ... Override the mirror URLs given in the configuration. If\n"
" specified, these are not shuffled.\n\n",
@ -102,6 +103,7 @@ static void parse_args(int argc, char *argv[], struct settings *settings) {
OPTION_NO_ACTION = 'n',
OPTION_FALLBACK = 256,
OPTION_FORCE_VERSION = 257,
OPTION_FORCE_SIGNATURES = 258,
};
const struct option options[] = {
@ -110,6 +112,7 @@ static void parse_args(int argc, char *argv[], struct settings *settings) {
{"fallback", no_argument, NULL, OPTION_FALLBACK},
{"no-action", no_argument, NULL, OPTION_NO_ACTION},
{"force-version", no_argument, NULL, OPTION_FORCE_VERSION},
{"force-signatures", no_argument, NULL, OPTION_FORCE_SIGNATURES},
{"help", no_argument, NULL, OPTION_HELP},
};
@ -143,6 +146,10 @@ static void parse_args(int argc, char *argv[], struct settings *settings) {
settings->force_version = true;
break;
case OPTION_FORCE_SIGNATURES:
settings->force_signatures = true;
break;
default:
usage();
exit(1);
@ -305,7 +312,7 @@ static bool autoupdate(const char *mirror, struct settings *s, int lock_fd) {
ecdsa_verify_prepare_legacy(&ctxs[i], &hash, m->signatures[i]);
long unsigned int good_signatures = ecdsa_verify_list_legacy(ctxs, m->n_signatures, s->pubkeys, s->n_pubkeys);
if (good_signatures < s->good_signatures) {
if (good_signatures < s->good_signatures && !s->force_signatures) {
fprintf(stderr, "autoupdater: warning: manifest %s only carried %lu valid signatures, %lu are required\n", manifest_url, good_signatures, s->good_signatures);
goto out;
}

1
admin/autoupdater/src/settings.h
View File

@ -34,6 +34,7 @@ struct settings {
bool fallback;
bool no_action;
bool force_version;
bool force_signatures;
const char *branch;
unsigned long good_signatures;
char *old_version;