afm-system-daemon: Improve error message report

[src/app-framework-main.git] / src / wgtpkg-install.c

diff --git a/src/wgtpkg-install.c b/src/wgtpkg-install.c
index 79cb7fb..31ef7c4 100644 (file)
--- a/src/wgtpkg-install.c
+++ b/src/wgtpkg-install.c
@@ -1,5 +1,5 @@
 /*
- Copyright 2015, 2016, 2017 IoT.bzh
+ Copyright (C) 2015-2018 IoT.bzh
 
  author: José Bollo <jose.bollo@iot.bzh>
 
@@ -40,6 +40,7 @@
 #include "wgtpkg-permissions.h"
 #include "wgtpkg-digsig.h"
 #include "wgtpkg-install.h"
+#include "wgtpkg-uninstall.h"
 #include "secmgr-wrap.h"
 #include "utils-dir.h"
 #include "wgtpkg-unit.h"
@@ -168,13 +169,13 @@ static int check_valid_string(const char *value, const char *name)
        if (c == 0) {
                ERROR("empty string forbidden in '%s' (temporary constraints)", name);
                errno = EINVAL;
-               return -1;                      
+               return -1;
        }
        do {
                if (!isalnum(c) && !strchr(".-_", c)) {
                        ERROR("forbidden char %c in '%s' -> '%s' (temporary constraints)", c, name, value);
                        errno = EINVAL;
-                       return -1;                      
+                       return -1;
                }
                c = value[++pos];
        } while(c);
@@ -295,6 +296,7 @@ static int check_one_content(const char *src, const char *type)
 {
        int rc;
        struct stat s;
+       int fhtdocs, serr;
 
        if (!src) {
                ERROR("a content src is missing");
@@ -304,6 +306,16 @@ static int check_one_content(const char *src, const char *type)
                /* TODO: when dealing with HTML and languages, the check should
                 * include i18n path search of widgets */
                rc = fstatat(workdirfd, src, &s, AT_NO_AUTOMOUNT|AT_SYMLINK_NOFOLLOW);
+               if (rc < 0) {
+                       serr = errno;
+                       fhtdocs = openat(workdirfd, "htdocs", O_DIRECTORY|O_PATH);
+                       if (fhtdocs >= 0) {
+                               rc = fstatat(fhtdocs, src, &s, AT_NO_AUTOMOUNT|AT_SYMLINK_NOFOLLOW);
+                               serr = errno;
+                               close(fhtdocs);
+                       }
+                       errno = serr;
+               }
                if (rc < 0)
                        ERROR("can't get info on content %s: %m", src);
                else if (!S_ISREG(s.st_mode)) {
@@ -447,7 +459,7 @@ static int install_security(const struct wgt_desc *desc)
        len--;
        *head++ = '/';
        icon = desc->icons ? desc->icons->src : NULL;
-       lic = (unsigned)strlen(icon);
+       lic = (unsigned)(icon ? strlen(icon) : 0);
        n = file_count();
        i = 0;
        while(i < n) {
@@ -491,7 +503,7 @@ struct wgt_info *install_widget(const char *wgtfile, const char *root, int force
        struct wgt_info *ifo;
        const struct wgt_desc *desc;
        char installdir[PATH_MAX];
-       int port;
+       int port, err;
        struct unitconf uconf;
 
        NOTICE("-- INSTALLING widget %s to %s --", wgtfile, root);
@@ -506,7 +518,7 @@ struct wgt_info *install_widget(const char *wgtfile, const char *root, int force
        if (zread(wgtfile, 0))
                goto error2;
 
-       if (check_all_signatures())
+       if (check_all_signatures(DEFAULT_ALLOW_NO_SIGNATURE))
                goto error2;
 
        ifo = wgt_info_createat(workdirfd, NULL, 1, 1, 1);
@@ -521,6 +533,16 @@ struct wgt_info *install_widget(const char *wgtfile, const char *root, int force
        if (get_target_directory(installdir, root, desc))
                goto error3;
 
+       if (access(installdir, F_OK) == 0) {
+               if (!force) {
+                       ERROR("widget already installed");
+                       errno = EEXIST;
+                       goto error3;
+               }
+               if (uninstall_widget(desc->idaver, root))
+                       goto error3;
+       }
+
        if (move_widget_to(installdir, force))
                goto error3;
 
@@ -556,7 +578,9 @@ error3:
        wgt_info_unref(ifo);
 
 error2:
+       err = errno;
        remove_workdir();
+       errno = err;
 
 error1:
        file_reset();