X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwgtpkg-install.c;h=b5f0a402d4d543e8b3c9d33587e4e9f773d755e5;hb=028707375969d857cf3fd1e73069592d09ec851e;hp=b8646fa3693291d7a191a2231e5d88f6d5cdb18f;hpb=10d8291d89b3c594d5a482e7ab48e9cac1eb2837;p=src%2Fapp-framework-main.git

diff --git a/src/wgtpkg-install.c b/src/wgtpkg-install.c
index b8646fa..b5f0a40 100644
--- a/src/wgtpkg-install.c
+++ b/src/wgtpkg-install.c
@@ -38,6 +38,10 @@
 #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-permissions";
+
 static int check_defined(const void *data, const char *name)
 {
 	if (data)
@@ -56,14 +60,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 +93,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 +130,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,7 +144,7 @@ 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) {
+	if (rc >= (int)sizeof newdir) {
 		ERROR("path to long in move_widget");
 		errno = EINVAL;
 		return -1;
@@ -137,15 +160,15 @@ 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->ver);
-	if (rc >= sizeof link) {
+	rc = snprintf(link, sizeof link, "%s/%s", FWK_ICON_DIR, desc->idaver);
+	if (rc >= (int)sizeof link) {
 		ERROR("link to long in install_icon");
 		errno = EINVAL;
 		return -1;
 	}
 
 	rc = snprintf(target, sizeof target, "%s/%s", workdir, desc->icons->src);
-	if (rc >= sizeof target) {
+	if (rc >= (int)sizeof target) {
 		ERROR("target to long in install_icon");
 		errno = EINVAL;
 		return -1;
@@ -162,8 +185,8 @@ 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 +199,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 +209,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;
@@ -248,6 +271,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;