X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwgtpkg-install.c;h=c5c41ea54c69f89d8528180de088d5f01f4c6014;hb=1b1399ed154f68d90665db122073c18d60b2c685;hp=0e3025c9a837f5b83b4fa2d0f228acb6f3a01a36;hpb=51c7935c6535ddb5865e6bd67de603326458cedd;p=src%2Fapp-framework-main.git diff --git a/src/wgtpkg-install.c b/src/wgtpkg-install.c index 0e3025c..c5c41ea 100644 --- 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 @@ -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" @@ -51,7 +52,52 @@ static const char* exec_type_strings[] = { "application/vnd.agl.native" }; -static const char key_http_port[] = "X-AFM--http-port"; +static const char key_afm_prefix[] = "X-AFM-"; +static const char key_http_port[] = "http-port"; + +#define HTTP_PORT_MIN 31000 +#define HTTP_PORT_MAX 32759 +#define HTTP_PORT_IS_VALID(port) (HTTP_PORT_MIN <= (port) && (port) <= HTTP_PORT_MAX) +#define HTTP_PORT_COUNT (HTTP_PORT_MAX - HTTP_PORT_MIN + 1) +#define HTTP_PORT_ACNT ((HTTP_PORT_COUNT + 31) >> 5) +#define HTTP_PORT_ASFT(port) (((port) - HTTP_PORT_MIN) & 31) +#define HTTP_PORT_AIDX(port) (((port) - HTTP_PORT_MIN) >> 5) +#define HTTP_PORT_TEST(array,port) ((((array)[HTTP_PORT_AIDX(port)]) >> HTTP_PORT_ASFT(port)) & 1) +#define HTTP_PORT_SET(array,port) (((array)[HTTP_PORT_AIDX(port)]) |= (((uint32_t)1) << HTTP_PORT_ASFT(port))) + +static uint32_t *port_bits = NULL; + +/* + * normalize unit files: remove comments, remove heading blanks, + * make single lines + */ +static void normalize_unit_file(char *content) +{ + char *read, *write, c; + + read = write = content; + c = *read++; + while (c) { + switch (c) { + case '\n': + case ' ': + case '\t': + c = *read++; + break; + case '#': + case ';': + do { c = *read++; } while(c && c != '\n'); + break; + default: + *write++ = c; + do { *write++ = c = *read++; } while(c && c != '\n'); + if (write - content >= 2 && write[-2] == '\\') + (--write)[-1] = ' '; + break; + } + } + *write = c; +} static int get_port_cb(void *closure, const char *name, const char *path, int isuser) { @@ -65,46 +111,81 @@ static int get_port_cb(void *closure, const char *name, const char *path, int is if (rc < 0) return rc; + /* normalize the unit file */ + normalize_unit_file(content); + /* process the file */ - iter = strstr(content, key_http_port); + iter = strstr(content, key_afm_prefix); while (iter) { - iter += sizeof key_http_port - 1; - while(*iter && *iter != '=' && *iter != '\n') + iter += sizeof key_afm_prefix - 1; + if (*iter == '-') iter++; - if (*iter == '=') { - while(*++iter == ' '); - p = atoi(iter); - if (p >= 0 && p < 32768) - ((uint32_t*)closure)[p >> 5] |= (uint32_t)1 << (p & 31); + if (!strncmp(iter, key_http_port, sizeof key_http_port - 1)) { + iter += sizeof key_http_port - 1; + while(*iter && *iter != '=' && *iter != '\n') + iter++; + if (*iter == '=') { + while(*++iter == ' '); + p = atoi(iter); + if (HTTP_PORT_IS_VALID(p)) + HTTP_PORT_SET((uint32_t*)closure, p); + } } - iter = strstr(iter, key_http_port); + iter = strstr(iter, key_afm_prefix); } free(content); return 0; } -static int get_port() +static int update_portbits(uint32_t *portbits) { int rc; - uint32_t ports[1024]; /* 1024 * 32 = 32768 */ - - memset(ports, 0, sizeof ports); - rc = systemd_unit_list(0, get_port_cb, &ports); - if (rc >= 0) { - rc = systemd_unit_list(1, get_port_cb, ports); - if (rc >= 0) { - for (rc = 1024 ; rc < 32768 && !~ports[rc >> 5] ; rc += 32); - if (rc == 32768) { - errno = EADDRNOTAVAIL; - rc = -1; - } else { - while (1 & (ports[rc >> 5] >> (rc & 31))) rc++; - } - } - } + + memset(portbits, 0, HTTP_PORT_ACNT * sizeof(uint32_t)); + rc = systemd_unit_list(0, get_port_cb, portbits); + if (rc >= 0) + rc = systemd_unit_list(1, get_port_cb, portbits); + if (rc < 0) + ERROR("troubles while updating ports"); return rc; } +static int first_free_port(uint32_t *portbits) +{ + int port; + + port = HTTP_PORT_MIN; + while (port <= HTTP_PORT_MAX && !~portbits[HTTP_PORT_AIDX(port)]) + port += 32; + while (port <= HTTP_PORT_MAX && HTTP_PORT_TEST(portbits, port)) + port++; + if (port > HTTP_PORT_MAX) { + ERROR("Can't compute a valid port"); + errno = EADDRNOTAVAIL; + port = -1; + } + return port; +} + +static int get_port() +{ + int port; + + /* ensure existing port bitmap */ + if (port_bits == NULL) { + port_bits = malloc(HTTP_PORT_ACNT * sizeof(uint32_t)); + if (port_bits == NULL || update_portbits(port_bits) < 0) + return -1; + } + + /* allocates the port */ + port = first_free_port(port_bits); + if (port >= 0) + HTTP_PORT_SET(port_bits, port); + + return port; +} + static int check_defined(const void *data, const char *name) { if (data) @@ -126,13 +207,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); @@ -146,12 +227,13 @@ static int check_temporary_constraints(const struct wgt_desc *desc) 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 (desc->icons) + result |= check_defined(desc->icons->src, "icon.src"); if (result) return result; - if (desc->icons->next) { + if (desc->icons && desc->icons->next) { ERROR("widget has more than one icon defined (temporary constraints)"); errno = EINVAL; result = -1; @@ -252,6 +334,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"); @@ -261,6 +344,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)) { @@ -315,6 +408,9 @@ static int install_icon(const struct wgt_desc *desc) char target[PATH_MAX]; int rc; + if (!desc->icons) + return 0; + create_directory(FWK_ICON_DIR, 0755, 1); rc = snprintf(link, sizeof link, "%s/%s", FWK_ICON_DIR, desc->idaver); if (rc >= (int)sizeof link) { @@ -342,6 +438,37 @@ static int install_exec_flag(const struct wgt_desc *desc) return for_all_content(desc, set_exec_flag); } +static int install_file_properties(const struct wgt_desc *desc) +{ + int rc, rc2; + struct wgt_desc_feature *feat; + struct wgt_desc_param *param; + + rc = 0; + feat = desc->features; + while (feat) { + if (!strcmp(feat->name, "urn:AGL:widget:file-properties")) { + param = feat->params; + while (param) { + if (!strcmp(param->value, "executable")) { + rc2 = fchmodat(workdirfd, param->name, 0755, 0); + if (rc2 < 0) + ERROR("can't make executable the file %s: %m", param->name); + } else { + ERROR("unknown file property %s for %s", param->value, param->name); + errno = EINVAL; + rc2 = -1; + } + if (rc2 < 0 && !rc) + rc = rc2; + param = param->next; + } + } + feat = feat->next; + } + return rc; +} + static int install_security(const struct wgt_desc *desc) { char path[PATH_MAX], *head; @@ -369,8 +496,8 @@ static int install_security(const struct wgt_desc *desc) } len--; *head++ = '/'; - icon = desc->icons->src; - lic = (unsigned)strlen(icon); + icon = desc->icons ? desc->icons->src : NULL; + lic = (unsigned)(icon ? strlen(icon) : 0); n = file_count(); i = 0; while(i < n) { @@ -382,7 +509,7 @@ static int install_security(const struct wgt_desc *desc) goto error2; } strcpy(head, f->name); - if (lf <= lic && !memcmp(f->name, icon, lf) && (!f->name[lf] || f->name[lf] == '/')) + if (lf <= lic && icon && !memcmp(f->name, icon, lf) && (!f->name[lf] || f->name[lf] == '/')) rc = secmgr_path_public_read_only(path); else rc = secmgr_path_read_only(path); @@ -414,7 +541,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); @@ -429,7 +556,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); @@ -444,6 +571,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; @@ -456,6 +593,9 @@ struct wgt_info *install_widget(const char *wgtfile, const char *root, int force if (install_exec_flag(desc)) goto error4; + if (install_file_properties(desc)) + goto error4; + port = get_port(); if (port < 0) goto error4; @@ -476,7 +616,9 @@ error3: wgt_info_unref(ifo); error2: + err = errno; remove_workdir(); + errno = err; error1: file_reset();