X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwgtpkg-install.c;h=31c9e9105a10a3c1d922e846bdcb436bc8b754da;hb=bfc9c138b1a9e87f9d387e2f900c14807c9da9b9;hp=4825d1c91bdaaeac6fd9bf436087f8fd1d7b4dd0;hpb=41e3ea4dbae634ca13941d134e990d953b741c4b;p=src%2Fapp-framework-main.git diff --git a/src/wgtpkg-install.c b/src/wgtpkg-install.c index 4825d1c..31c9e91 100644 --- a/src/wgtpkg-install.c +++ b/src/wgtpkg-install.c @@ -1,5 +1,7 @@ /* - Copyright 2015 IoT.bzh + Copyright 2015, 2016, 2017 IoT.bzh + + author: José Bollo Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -16,19 +18,33 @@ #define _GNU_SOURCE +#include #include #include #include #include #include +#include +#include #include "verbose.h" -#include "wgtpkg.h" #include "wgt.h" #include "wgt-info.h" +#include "wgt-strings.h" +#include "wgtpkg-files.h" +#include "wgtpkg-workdir.h" +#include "wgtpkg-zip.h" +#include "wgtpkg-permissions.h" +#include "wgtpkg-digsig.h" +#include "wgtpkg-install.h" #include "secmgr-wrap.h" #include "utils-dir.h" +static const char* exec_type_strings[] = { + "application/x-executable", + "application/vnd.agl.native" +}; + static int check_defined(const void *data, const char *name) { if (data) @@ -47,25 +63,34 @@ static int check_valid_string(const char *value, const char *name) return -1; pos = 0; c = value[pos]; - while(c) { + if (c == 0) { + ERROR("empty string forbidden in '%s' (temporary constraints)", name); + errno = EINVAL; + return -1; + } + do { if (!isalnum(c) && !strchr(".-_", c)) { ERROR("forbidden char %c in '%s' -> '%s' (temporary constraints)", c, name, value); errno = EINVAL; return -1; } c = value[++pos]; - } + } while(c); return 0; } static int check_temporary_constraints(const struct wgt_desc *desc) { - int result = check_valid_string(desc->id, "id"); + int result; + + result = check_valid_string(desc->id, "id"); result |= check_valid_string(desc->version, "version"); + result |= check_valid_string(desc->ver, "ver"); result |= check_defined(desc->icons, "icon"); result |= check_defined(desc->content_src, "content"); if (result) return result; + if (desc->icons->next) { ERROR("widget has more than one icon defined (temporary constraints)"); errno = EINVAL; @@ -74,20 +99,34 @@ static int check_temporary_constraints(const struct wgt_desc *desc) return 0; } -static int check_permissions(const char *name, int required) +static int set_required_permissions(struct wgt_desc_param *params, int required) { - if (permission_exists(name)) { - if (request_permission(name)) { - DEBUG("granted permission: %s", name); - } else if (required) { - ERROR("ungranted permission required: %s", name); + int optional; + + while (params) { + /* check the value */ + if (!strcmp(params->value, string_required)) + optional = !required; + else if (!strcmp(params->value, string_optional)) + optional = 1; + else { + ERROR("unexpected parameter value: %s found for %s", params->value, params->name); errno = EPERM; - return 0; + return -1; + } + /* set the permission */ + if (request_permission(params->name)) { + DEBUG("granted permission: %s", params->name); + } else if (optional) { + INFO("optional permission ungranted: %s", params->name); } else { - INFO("ungranted permission optional: %s", name); + ERROR("ungranted permission required: %s", params->name); + errno = EPERM; + return -1; } + params = params->next; } - return 1; + return 0; } static int check_widget(const struct wgt_desc *desc) @@ -97,27 +136,32 @@ static int check_widget(const struct wgt_desc *desc) result = check_temporary_constraints(desc); feature = desc->features; - while(feature) { - if (!check_permissions(feature->name, feature->required)) - result = -1; + while(result >= 0 && feature) { + if (!strcmp(feature->name, feature_required_permission)) + result = set_required_permissions(feature->params, feature->required); feature = feature->next; } return result; } -static int move_widget(const char *root, const struct wgt_desc *desc, int force) +static int get_target_directory(char target[PATH_MAX], const char *root, const struct wgt_desc *desc) { - char newdir[PATH_MAX]; int rc; - rc = snprintf(newdir, sizeof newdir, "%s/%s/%s", root, desc->id, desc->version); - if (rc >= sizeof newdir) { - ERROR("path to long in move_widget"); + rc = snprintf(target, PATH_MAX, "%s/%s/%s", root, desc->id, desc->ver); + if (rc < PATH_MAX) + rc = 0; + else { + ERROR("path too long"); errno = EINVAL; - return -1; + rc = -1; } + return rc; +} - return move_workdir(newdir, 1, force); +static int move_widget_to(const char *destdir, int force) +{ + return move_workdir(destdir, 1, force); } static int install_icon(const struct wgt_desc *desc) @@ -127,16 +171,16 @@ static int install_icon(const struct wgt_desc *desc) int rc; create_directory(FWK_ICON_DIR, 0755, 1); - rc = snprintf(link, sizeof link, "%s/%s@%s", FWK_ICON_DIR, desc->id, desc->version); - if (rc >= sizeof link) { - ERROR("link to long in install_icon"); + rc = snprintf(link, sizeof link, "%s/%s", FWK_ICON_DIR, desc->idaver); + if (rc >= (int)sizeof link) { + ERROR("link too long in install_icon"); errno = EINVAL; return -1; } rc = snprintf(target, sizeof target, "%s/%s", workdir, desc->icons->src); - if (rc >= sizeof target) { - ERROR("target to long in install_icon"); + if (rc >= (int)sizeof target) { + ERROR("target too long in install_icon"); errno = EINVAL; return -1; } @@ -148,12 +192,26 @@ static int install_icon(const struct wgt_desc *desc) return rc; } +static int install_exec_flag(const struct wgt_desc *desc) +{ + int i; + + if (desc->content_type) { + i = sizeof exec_type_strings / sizeof *exec_type_strings; + while (i) { + if (!strcasecmp(desc->content_type, exec_type_strings[--i])) + return fchmodat(workdirfd, desc->content_src, 0755, 0); + } + } + return 0; +} + static int install_security(const struct wgt_desc *desc) { char path[PATH_MAX], *head; const char *icon, *perm; - int rc, len, lic, lf; - unsigned int i, n; + int rc; + unsigned int i, n, len, lic, lf; struct filedesc *f; rc = secmgr_init(desc->id); @@ -166,8 +224,8 @@ static int install_security(const struct wgt_desc *desc) /* instal the files */ head = stpcpy(path, workdir); - assert(sizeof path > (head - path)); - len = (int)(sizeof path - (head - path)); + assert(head < path + sizeof path); + len = (unsigned)((path + sizeof path) - head); if (!len) { ERROR("root path too long in install_security"); errno = ENAMETOOLONG; @@ -176,12 +234,12 @@ static int install_security(const struct wgt_desc *desc) len--; *head++ = '/'; icon = desc->icons->src; - lic = (int)strlen(icon); + lic = (unsigned)strlen(icon); n = file_count(); i = 0; while(i < n) { f = file_of_index(i++); - lf = (int)strlen(f->name); + lf = (unsigned)strlen(f->name); if (lf >= len) { ERROR("path too long in install_security"); errno = ENAMETOOLONG; @@ -200,6 +258,7 @@ static int install_security(const struct wgt_desc *desc) perm = first_usable_permission(); while(perm) { rc = secmgr_permit(perm); + INFO("permitting %s %s", perm, rc ? "FAILED!" : "success"); if (rc) goto error2; perm = next_usable_permission(); @@ -214,16 +273,17 @@ error: } /* install the widget of the file */ -void install_widget(const char *wgtfile, const char *root, int force) +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]; - NOTICE("-- INSTALLING widget %s --", wgtfile); + NOTICE("-- INSTALLING widget %s to %s --", wgtfile, root); /* workdir */ create_directory(root, 0755, 1); - if (make_workdir_base(root, "TMP", 0)) { + if (make_workdir(root, "TMP", 0)) { ERROR("failed to create a working directory"); goto error1; } @@ -238,20 +298,28 @@ void install_widget(const char *wgtfile, const char *root, int force) if (!ifo) goto error2; + reset_requested_permissions(); desc = wgt_info_desc(ifo); if (check_widget(desc)) goto error3; - if (move_widget(root, desc, force)) + if (get_target_directory(installdir, root, desc)) + goto error3; + + if (move_widget_to(installdir, force)) goto error3; if (install_icon(desc)) goto error3; + if (install_exec_flag(desc)) + goto error3; + if (install_security(desc)) goto error3; - - return; + + file_reset(); + return ifo; error3: wgt_info_unref(ifo); @@ -260,6 +328,7 @@ error2: remove_workdir(); error1: - return; + file_reset(); + return NULL; }