X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwgtpkg-install.c;h=3dbd6ac2d5f6133975557cfc211643635a0c8924;hb=3a6e947bef1b2942e24d2fdee1a76dbf3305b508;hp=deb274128340c5faf1f64b241a5ea9916ba54130;hpb=50dd441a11440201e1da9da81a7103677e2282ad;p=src%2Fapp-framework-main.git diff --git a/src/wgtpkg-install.c b/src/wgtpkg-install.c index deb2741..3dbd6ac 100644 --- a/src/wgtpkg-install.c +++ b/src/wgtpkg-install.c @@ -1,5 +1,5 @@ /* - Copyright 2015 IoT.bzh + Copyright 2015, 2016, 2017 IoT.bzh author: José Bollo @@ -25,6 +25,7 @@ #include #include #include +#include #include "verbose.h" #include "wgt.h" @@ -38,6 +39,14 @@ #include "secmgr-wrap.h" #include "utils-dir.h" +static const char permission_required[] = "required"; +static const char permission_optional[] = "optional"; +static const char feature_required_permissions[] = FWK_PREFIX "required-permission"; +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) @@ -56,14 +65,19 @@ 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; } @@ -84,20 +98,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, permission_required)) + optional = !required; + else if (!strcmp(params->value, permission_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) @@ -107,9 +135,9 @@ 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_permissions)) + result = set_required_permissions(feature->params, feature->required); feature = feature->next; } return result; @@ -121,8 +149,8 @@ static int move_widget(const char *root, const struct wgt_desc *desc, int force) int rc; rc = snprintf(newdir, sizeof newdir, "%s/%s/%s", root, desc->id, desc->ver); - if (rc >= sizeof newdir) { - ERROR("path to long in move_widget"); + if (rc >= (int)sizeof newdir) { + ERROR("path too long in move_widget"); errno = EINVAL; return -1; } @@ -138,15 +166,15 @@ static int install_icon(const struct wgt_desc *desc) create_directory(FWK_ICON_DIR, 0755, 1); rc = snprintf(link, sizeof link, "%s/%s", FWK_ICON_DIR, desc->idaver); - if (rc >= sizeof link) { - ERROR("link to long in install_icon"); + 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; } @@ -158,12 +186,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); @@ -176,8 +218,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; @@ -186,12 +228,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; @@ -210,6 +252,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(); @@ -248,6 +291,7 @@ struct wgt_info *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; @@ -258,9 +302,12 @@ struct wgt_info *install_widget(const char *wgtfile, const char *root, int force if (install_icon(desc)) goto error3; + if (install_exec_flag(desc)) + goto error3; + if (install_security(desc)) goto error3; - + file_reset(); return ifo;