X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwgtpkg-install.c;h=836b136b6da007638f02c43c478ae5b23a799e92;hb=fcc925c4a6d7bc82106f6c8da13b1a58a7b23115;hp=c4e70e3aefc3e9b1bacafedd66775580ed35f68a;hpb=66155de48c685b29d96ca95bc1a45078f8f4c681;p=src%2Fapp-framework-main.git diff --git a/src/wgtpkg-install.c b/src/wgtpkg-install.c index c4e70e3..836b136 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,10 +25,12 @@ #include #include #include +#include #include "verbose.h" #include "wgt.h" #include "wgt-info.h" +#include "wgt-strings.h" #include "wgtpkg-files.h" #include "wgtpkg-workdir.h" #include "wgtpkg-zip.h" @@ -37,6 +39,12 @@ #include "wgtpkg-install.h" #include "secmgr-wrap.h" #include "utils-dir.h" +#include "wgtpkg-unit.h" + +static const char* exec_type_strings[] = { + "application/x-executable", + "application/vnd.agl.native" +}; static int check_defined(const void *data, const char *name) { @@ -74,13 +82,16 @@ static int check_valid_string(const char *value, const char *name) 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; @@ -89,50 +100,84 @@ 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); - errno = EPERM; - return 0; + int optional; + + while (params) { + /* check if target */ + if (!strcmp(params->name, string_sharp_target)) { + /* do nothing when #target */ } else { - INFO("ungranted permission optional: %s", name); + /* 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 -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 { + 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) +static int check_permissions(const struct wgt_desc *desc) { int result; const struct wgt_desc_feature *feature; - result = check_temporary_constraints(desc); + result = 0; 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 check_widget(const struct wgt_desc *desc) +{ + int result; + + result = check_temporary_constraints(desc); + if (result >= 0) + result = check_permissions(desc); + return result; +} + +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->ver); - if (rc >= (int)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) @@ -144,14 +189,14 @@ 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 >= (int)sizeof link) { - ERROR("link to long in install_icon"); + ERROR("link too long in install_icon"); errno = EINVAL; return -1; } rc = snprintf(target, sizeof target, "%s/%s", workdir, desc->icons->src); if (rc >= (int)sizeof target) { - ERROR("target to long in install_icon"); + ERROR("target too long in install_icon"); errno = EINVAL; return -1; } @@ -163,6 +208,20 @@ 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; @@ -215,6 +274,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(); @@ -233,6 +293,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]; NOTICE("-- INSTALLING widget %s to %s --", wgtfile, root); @@ -258,18 +319,30 @@ struct wgt_info *install_widget(const char *wgtfile, const char *root, int force 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_security(desc)) - goto error3; - + goto error4; + + if (install_exec_flag(desc)) + goto error4; + + if (unit_install(ifo, installdir, FWK_ICON_DIR, 1234/*TODO*/)) + goto error4; + file_reset(); return ifo; +error4: + /* todo: cleanup */ + error3: wgt_info_unref(ifo);