cli: implement --force-signature

Implement a new "--force-signature" flag which causes opkg to ignore signature
verification errors.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

diff --git a/libopkg/opkg_cmd.c b/libopkg/opkg_cmd.c
index c30e34dc226c8c397bc5c8bb9c33a5a85986dc30..04716fca626a6bf195ff423350e63b730a80922a 100644 (file)
--- a/libopkg/opkg_cmd.c
+++ b/libopkg/opkg_cmd.c
@@ -196,7 +196,7 @@ opkg_update_cmd(int argc, char **argv)
                   else
                       opkg_msg(NOTICE, "Signature check failed.\n");
               }
                   else
                       opkg_msg(NOTICE, "Signature check failed.\n");
               }

-              if (err) {
+              if (err && !conf->force_signature) {

                   /* The signature was wrong so delete it */
                   opkg_msg(NOTICE, "Remove wrong Signature file.\n");
                   unlink (tmp_file_name);
                   /* The signature was wrong so delete it */
                   opkg_msg(NOTICE, "Remove wrong Signature file.\n");
                   unlink (tmp_file_name);

diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h
index 09437f13fff40691071b7428cdfa9a4078cfb7c3..ca77c88fb914b0647c1453430640cd0cb380a655 100644 (file)
--- a/libopkg/opkg_conf.h
+++ b/libopkg/opkg_conf.h
@@ -80,6 +80,7 @@ struct opkg_conf
      int force_remove;
      int force_checksum;
      int check_signature;
      int force_remove;
      int force_checksum;
      int check_signature;

+     int force_signature;

      int nodeps; /* do not follow dependencies */
      int nocase; /* perform case insensitive matching */
      char *offline_root;
      int nodeps; /* do not follow dependencies */
      int nocase; /* perform case insensitive matching */
      char *offline_root;

diff --git a/libopkg/opkg_install.c b/libopkg/opkg_install.c
index 7e0e17e8262768e9b6025d65108e27c47009768f..f833bc67cb88d972620c06f33bc0e8426dc70e04 100644 (file)
--- a/libopkg/opkg_install.c
+++ b/libopkg/opkg_install.c
@@ -1306,13 +1306,15 @@ opkg_install_pkg(pkg_t *pkg, int from_upgrade)
          if (opkg_verify_file (list_file_name, sig_file_name)){
            opkg_msg(ERROR, "Failed to verify the signature of %s.\n",
                            list_file_name);
          if (opkg_verify_file (list_file_name, sig_file_name)){
            opkg_msg(ERROR, "Failed to verify the signature of %s.\n",
                            list_file_name);

-           return -1;
+           if (!conf->force_signature)
+             return -1;

          }
        }else{
          opkg_msg(ERROR, "Signature file is missing for %s. "
                          "Perhaps you need to run 'opkg update'?\n",
                         pkg->name);
          }
        }else{
          opkg_msg(ERROR, "Signature file is missing for %s. "
                          "Perhaps you need to run 'opkg update'?\n",
                         pkg->name);

-         return -1;
+         if (!conf->force_signature)
+           return -1;

        }
 
        free (lists_dir);
        }
 
        free (lists_dir);

diff --git a/src/opkg-cl.c b/src/opkg-cl.c
index 4ce0414133cd628c87d3e17e8106b58de000b703..a8e5717551301ed126d9a3b4885ea1fe47f75553 100644 (file)
--- a/src/opkg-cl.c
+++ b/src/opkg-cl.c
@@ -51,6 +51,7 @@ enum {
        ARGS_OPT_NOCASE,
        ARGS_OPT_AUTOREMOVE,
        ARGS_OPT_CACHE,
        ARGS_OPT_NOCASE,
        ARGS_OPT_AUTOREMOVE,
        ARGS_OPT_CACHE,

+       ARGS_OPT_FORCE_SIGNATURE,

 };
 
 static struct option long_options[] = {
 };
 
 static struct option long_options[] = {


@@ -87,6 +88,8 @@ static struct option long_options[] = {
        {"force_remove", 0, 0, ARGS_OPT_FORCE_REMOVE},
        {"force-checksum", 0, 0, ARGS_OPT_FORCE_CHECKSUM},
        {"force_checksum", 0, 0, ARGS_OPT_FORCE_CHECKSUM},
        {"force_remove", 0, 0, ARGS_OPT_FORCE_REMOVE},
        {"force-checksum", 0, 0, ARGS_OPT_FORCE_CHECKSUM},
        {"force_checksum", 0, 0, ARGS_OPT_FORCE_CHECKSUM},

+       {"force-signature", 0, 0, ARGS_OPT_FORCE_SIGNATURE},
+       {"force_signature", 0, 0, ARGS_OPT_FORCE_SIGNATURE},

        {"noaction", 0, 0, ARGS_OPT_NOACTION},
        {"download-only", 0, 0, ARGS_OPT_DOWNLOAD_ONLY},
        {"nodeps", 0, 0, ARGS_OPT_NODEPS},
        {"noaction", 0, 0, ARGS_OPT_NOACTION},
        {"download-only", 0, 0, ARGS_OPT_DOWNLOAD_ONLY},
        {"nodeps", 0, 0, ARGS_OPT_NODEPS},


@@ -210,6 +213,9 @@ args_parse(int argc, char *argv[])
         case ARGS_OPT_DOWNLOAD_ONLY:
                        conf->download_only = 1;
                        break;
         case ARGS_OPT_DOWNLOAD_ONLY:
                        conf->download_only = 1;
                        break;

+               case ARGS_OPT_FORCE_SIGNATURE:
+                       conf->force_signature = 1;
+                       break;

                case ':':
                        parse_err = -1;
                        break;
                case ':':
                        parse_err = -1;
                        break;