/*
- Copyright 2015, 2016 IoT.bzh
+ Copyright 2015, 2016, 2017 IoT.bzh
author: José Bollo <jose.bollo@iot.bzh>
#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"
#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_string[] = "application/x-executable";
+static const char* exec_type_strings[] = {
+ "application/x-executable",
+ "application/vnd.agl.native"
+};
static int check_defined(const void *data, const char *name)
{
while (params) {
/* check the value */
- if (!strcmp(params->value, permission_required))
+ if (!strcmp(params->value, string_required))
optional = !required;
- else if (!strcmp(params->value, permission_optional))
+ else if (!strcmp(params->value, string_optional))
optional = 1;
else {
ERROR("unexpected parameter value: %s found for %s", params->value, params->name);
result = check_temporary_constraints(desc);
feature = desc->features;
while(result >= 0 && feature) {
- if (!strcmp(feature->name, feature_required_permissions))
+ if (!strcmp(feature->name, feature_required_permission))
result = set_required_permissions(feature->params, feature->required);
feature = feature->next;
}
static int install_exec_flag(const struct wgt_desc *desc)
{
- return desc->content_type != NULL && !strcmp(desc->content_type, exec_type_string)
- ? fchmodat(workdirfd, desc->content_src, 0755, 0) : 0;
+ 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)
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();