Changeset 4458

Timestamp:

05/29/08 13:42:33 (5 years ago)

Author:

thomas

Message:

opkg: improve opkg_install error reporting and include a check to verify repository signature during install

Location:

trunk/src/target/opkg

Files:

• libopkg/opkg.c (modified) (11 diffs)
• libopkg/opkg.h (modified) (1 diff)
• libopkg/opkg_install.c (modified) (10 diffs)
• libopkg/opkg_install.h (modified) (1 diff)
• tests/libopkg_test.c (modified) (3 diffs)

trunk/src/target/opkg/libopkg/opkg.c

@@ -408 +408 @@
     /* XXX: Error: Could not satisfy dependencies */
     pkg_vec_free (deps);
-    return OPKG_DEPENDANCIES_FAILED;
+    return OPKG_DEPENDENCIES_FAILED;
   }
 
@@ -488 +488 @@
   {
     opkg_package_free (pdata.package);
-    return OPKG_UNKNOWN_ERROR;
+    switch (err)
+    {
+      case PKG_INSTALL_ERR_NOT_TRUSTED: return OPKG_GPG_ERROR;
+      case PKG_INSTALL_ERR_DOWNLOAD: return OPKG_DOWNLOAD_FAILED;
+      case PKG_INSTALL_ERR_DEPENDENCIES:
+      case PKG_INSTALL_ERR_CONFLICTS: return OPKG_DEPENDENCIES_FAILED;
+      case PKG_INSTALL_ERR_ALREADY_INSTALLED: return OPKG_PACKAGE_ALREADY_INSTALLED;
+      case PKG_INSTALL_ERR_SIGNATURE: return OPKG_GPG_ERROR;
+      case PKG_INSTALL_ERR_MD5: return OPKG_MD5_ERROR;
+      default: return OPKG_UNKNOWN_ERROR;
+    }
   }
 
@@ -676 +686 @@
   int sources_list_count, sources_done;
   opkg_progress_data_t pdata;
-  char *tmp_file_name = NULL;
 
   opkg_assert (opkg != NULL);
@@ -717 +726 @@
   }
 
-  /* cout the number of sources so we can give some progress updates */
+  /* count the number of sources so we can give some progress updates */
   sources_list_count = 0;
   sources_done = 0;
@@ -729 +738 @@
   for (iter = opkg->conf->pkg_src_list.head; iter; iter = iter->next)
   {
-    char *url, *list_file_name;
+    char *url, *list_file_name = NULL, *sig_file_name = NULL;
 
     src = iter->data;
@@ -744 +753 @@
       FILE *in, *out;
       struct _curl_cb_data cb_data;
+      char *tmp_file_name = NULL;
 
       sprintf_alloc (&tmp_file_name, "%s/%s.gz", tmp, src->name);
@@ -773 +783 @@
         unlink (tmp_file_name);
       }
+      free (tmp_file_name);
     }
     else
       err = opkg_download (opkg->conf, url, list_file_name, NULL, NULL);
-    free (tmp_file_name);
 
     if (err)
@@ -794 +804 @@
       sprintf_alloc (&url, "%s/%s", src->value, "Packages.sig");
 
-    /* create temporary file for it */
-    sprintf_alloc (&tmp_file_name, "%s/%s", tmp, "Packages.sig");
-
-    err = opkg_download (opkg->conf, url, tmp_file_name, NULL, NULL);
+    /* create filename for signature */
+    sprintf_alloc (&sig_file_name, "%s/%s.sig", lists_dir, src->name);
+
+    /* make sure there is no existing signature file */
+    unlink (sig_file_name);
+
+    err = opkg_download (opkg->conf, url, sig_file_name, NULL, NULL);
     if (err)
     {
@@ -805 +818 @@
     {
       int err;
-      err = opkg_verify_file (opkg->conf, list_file_name, tmp_file_name);
+      err = opkg_verify_file (opkg->conf, list_file_name, sig_file_name);
       if (err == 0)
       {
@@ -815 +828 @@
       }
     }
-    unlink (tmp_file_name);
-    free (tmp_file_name);
+    free (sig_file_name);
+    free (list_file_name);
     free (url);
 #else
@@ -823 +836 @@
      */
 #endif
-    free (list_file_name);
 
     sources_done++;

trunk/src/target/opkg/libopkg/opkg.h

@@ -38 +38 @@
   OPKG_UNKNOWN_ERROR,
   OPKG_DOWNLOAD_FAILED,
-  OPKG_DEPENDANCIES_FAILED,
+  OPKG_DEPENDENCIES_FAILED,
   OPKG_PACKAGE_ALREADY_INSTALLED,
   OPKG_PACKAGE_NOT_AVAILABLE,
   OPKG_PACKAGE_NOT_FOUND,
-  OPKG_PACKAGE_NOT_INSTALLED
+  OPKG_PACKAGE_NOT_INSTALLED,
+  OPKG_GPG_ERROR,
+  OPKG_MD5_ERROR
 };
 

trunk/src/target/opkg/libopkg/opkg_install.c

@@ -756 +756 @@
      char* file_md5;
      char *pkgid;
-
     
      if ( from_upgrade ) 
@@ -764 +763 @@
           opkg_message(conf, OPKG_ERROR,
                        "INTERNAL ERROR: null pkg passed to opkg_install_pkg\n");
-          return -EINVAL;
+          return PKG_INSTALL_ERR_INTERNAL;
      }
 
@@ -772 +771 @@
           opkg_message(conf, OPKG_ERROR, "INTERNAL ERROR: architecture %s for pkg %s is unsupported.\n",
                        pkg->architecture, pkg->name);
-          return -EINVAL;
+          return PKG_INSTALL_ERR_INTERNAL;
      }
      if (pkg->state_status == SS_INSTALLED && conf->force_reinstall == 0 && conf->nodeps == 0) {
           err = satisfy_dependencies_for(conf, pkg);
-          if (err) { return err; }
+          if (err) { return PKG_INSTALL_ERR_DEPENDENCIES; }
 
           opkg_message(conf, OPKG_NOTICE,
@@ -791 +790 @@
 
      err = opkg_install_check_downgrade(conf, pkg, old_pkg, message);
-     if (err) { return err; }
+     if (err) { return PKG_INSTALL_ERR_NO_DOWNGRADE; }
 
      pkg->state_want = SW_INSTALL;
@@ -801 +800 @@
      /* Abhaya: conflicts check */
      err = check_conflicts_for(conf, pkg);
-     if (err) { return err; }
+     if (err) { return PKG_INSTALL_ERR_CONFLICTS; }
     
      /* this setup is to remove the upgrade scenario in the end when
@@ -811 +810 @@
     
      err = verify_pkg_installable(conf, pkg);
-     if (err) { return err; }
+     if (err) { return PKG_INSTALL_ERR_NO_SPACE; }
 
      if (pkg->local_filename == NULL) {
@@ -819 +818 @@
                             "Failed to download %s. Perhaps you need to run 'opkg update'?\n",
                             pkg->name);
-               return err;
-          }
-     }
-
-/* Check for md5 values */
+               return PKG_INSTALL_ERR_DOWNLOAD;
+          }
+     }
+
+     /* check that the repository is valid */
+     #if HAVE_GPGME
+     char *list_file_name, *sig_file_name, *lists_dir;
+
+     sprintf_alloc (&lists_dir, "%s",
+                   (conf->restrict_to_default_dest)
+                    ? conf->default_dest->lists_dir
+                    : conf->lists_dir);
+     sprintf_alloc (&list_file_name, "%s/%s", lists_dir, pkg->src->name);
+     sprintf_alloc (&sig_file_name, "%s/%s.sig", lists_dir, pkg->src->name);
+
+     if (file_exists (sig_file_name))
+     {
+       if (opkg_verify_file (conf, list_file_name, sig_file_name))
+         return PKG_INSTALL_ERR_SIGNATURE;
+     }
+
+     free (lists_dir);
+     free (list_file_name);
+     free (sig_file_name);
+     #endif
+
+     /* Check for md5 values */
      if (pkg->md5sum)
      {
@@ -833 +854 @@
                            pkg->name);
               free(file_md5);
-              return err;
+              return PKG_INSTALL_ERR_MD5;
          }
          free(file_md5);
@@ -846 +867 @@
 /* That's rather strange that files don't change owner. Investigate !!!!!!*/
      err = update_file_ownership(conf, pkg, old_pkg);
-     if (err) { return err; }
+     if (err) { return PKG_INSTALL_ERR_UNKNOWN; }
 
      if (conf->nodeps == 0) {
           err = satisfy_dependencies_for(conf, pkg);
-          if (err) { return err; }
+          if (err) { return PKG_INSTALL_ERR_DEPENDENCIES; }
      }
 
@@ -999 +1020 @@
 
           pkg_vec_free (replacees);
-          return err;
+          return PKG_INSTALL_ERR_UNKNOWN;
      }
      opkg_set_current_state (conf, OPKG_STATE_NONE, NULL);

trunk/src/target/opkg/libopkg/opkg_install.h

@@ -23 +23 @@
 #include "opkg_error.h"
 
+enum {
+  PKG_INSTALL_ERR_NONE,
+  PKG_INSTALL_ERR_NOT_TRUSTED,
+  PKG_INSTALL_ERR_DOWNLOAD,
+  PKG_INSTALL_ERR_CONFLICTS,
+  PKG_INSTALL_ERR_ALREADY_INSTALLED,
+  PKG_INSTALL_ERR_DEPENDENCIES,
+  PKG_INSTALL_ERR_NO_DOWNGRADE,
+  PKG_INSTALL_ERR_NO_SPACE,
+  PKG_INSTALL_ERR_SIGNATURE,
+  PKG_INSTALL_ERR_MD5,
+  PKG_INSTALL_ERR_INTERNAL,
+  PKG_INSTALL_ERR_UNKNOWN
+};
+
 opkg_error_t opkg_install_by_name(opkg_conf_t *conf, const char *pkg_name);
 opkg_error_t opkg_install_multi_by_name(opkg_conf_t *conf, const char *pkg_name);

trunk/src/target/opkg/tests/libopkg_test.c

@@ -5 +5 @@
 opkg_package_t *find_pkg = NULL;
 
-char *errors[8] = {
+char *errors[10] = {
   "No Error",
   "Unknown Eror",
@@ -13 +13 @@
   "Package not available",
   "Package not found",
-  "Package not installed"
+  "Package not installed",
+  "Signature check failed",
+  "MD5 sum failed"
 };
+
+
+#define TEST_PACKAGE "aspell"
 
 void
@@ -113 +118 @@
     printf ("No package available to test find_package.\n");
 
-  err = opkg_install_package (opkg, "aspell", progress_callback, "Installing...");
+  err = opkg_install_package (opkg, TEST_PACKAGE, progress_callback, "Installing...");
   printf ("\nopkg_install_package returned %d (%s)\n", err, errors[err]);
 
-  err = opkg_upgrade_package (opkg, "aspell", progress_callback, "Upgrading...");
+  err = opkg_upgrade_package (opkg, TEST_PACKAGE, progress_callback, "Upgrading...");
   printf ("\nopkg_upgrade_package returned %d (%s)\n", err, errors[err]);
 
-  err = opkg_remove_package (opkg, "aspell", progress_callback, "Removing...");
+  err = opkg_remove_package (opkg, TEST_PACKAGE, progress_callback, "Removing...");
   printf ("\nopkg_remove_package returned %d (%s)\n", err, errors[err]);