X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwgtpkg-install.c;h=71a0ff69b00e3d7dbbee4bad986d17b38bb463ed;hb=6f6d04fef9f08d756a37d17333f5b9b9a6b72dd2;hp=c4e70e3aefc3e9b1bacafedd66775580ed35f68a;hpb=66155de48c685b29d96ca95bc1a45078f8f4c681;p=src%2Fapp-framework-main.git

diff --git a/src/wgtpkg-install.c b/src/wgtpkg-install.c
index c4e70e3..71a0ff6 100644
--- a/src/wgtpkg-install.c
+++ b/src/wgtpkg-install.c
@@ -1,5 +1,5 @@
 /*
- Copyright 2015 IoT.bzh
+ Copyright 2015, 2016 IoT.bzh
 
  author: José Bollo <jose.bollo@iot.bzh>
 
@@ -25,6 +25,7 @@
 #include <assert.h>
 #include <unistd.h>
 #include <stdio.h>
+#include <sys/stat.h>
 
 #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-permissions";
+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)
@@ -89,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)
@@ -112,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;
@@ -127,7 +150,7 @@ static int move_widget(const char *root, const struct wgt_desc *desc, int force)
 
 	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");
+		ERROR("path too long in move_widget");
 		errno = EINVAL;
 		return -1;
 	}
@@ -144,14 +167,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 +186,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;
@@ -264,9 +301,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;