X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwgtpkg-install.c;h=2b57a4ea3bf302462ba49c65875616ba95fbd46a;hb=bd1c15e047fd3dc2207b26a4a9c115a54aded836;hp=0e3025c9a837f5b83b4fa2d0f228acb6f3a01a36;hpb=51c7935c6535ddb5865e6bd67de603326458cedd;p=src%2Fapp-framework-main.git diff --git a/src/wgtpkg-install.c b/src/wgtpkg-install.c index 0e3025c..2b57a4e 100644 --- a/src/wgtpkg-install.c +++ b/src/wgtpkg-install.c @@ -51,7 +51,40 @@ 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"; + +/* + * 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,19 +98,27 @@ 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 (p >= 0 && p < 32768) + ((uint32_t*)closure)[p >> 5] |= (uint32_t)1 << (p & 31); + } } - iter = strstr(iter, key_http_port); + iter = strstr(iter, key_afm_prefix); } free(content); return 0; @@ -95,6 +136,7 @@ static int get_port() if (rc >= 0) { for (rc = 1024 ; rc < 32768 && !~ports[rc >> 5] ; rc += 32); if (rc == 32768) { + ERROR("Can't compute a valid port"); errno = EADDRNOTAVAIL; rc = -1; } else { @@ -146,12 +188,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 +295,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 +305,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 +369,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 +399,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,7 +457,7 @@ static int install_security(const struct wgt_desc *desc) } len--; *head++ = '/'; - icon = desc->icons->src; + icon = desc->icons ? desc->icons->src : NULL; lic = (unsigned)strlen(icon); n = file_count(); i = 0; @@ -382,7 +470,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); @@ -456,6 +544,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;