X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fsecmgr-wrap.c;h=83a266015892e525d911fbea5f2987936b8f6507;hb=70d6c64f0639b0c8ed2d8624227d1ecdf2853300;hp=c95160f8969692aae265b015f7db644fccb624ca;hpb=26d75de504d808191dbadc9a735009a214a789b0;p=src%2Fapp-framework-main.git

diff --git a/src/secmgr-wrap.c b/src/secmgr-wrap.c
index c95160f..83a2660 100644
--- a/src/secmgr-wrap.c
+++ b/src/secmgr-wrap.c
@@ -1,5 +1,7 @@
 /*
- Copyright 2015 IoT.bzh
+ Copyright (C) 2015-2020 IoT.bzh
+
+ author: José Bollo <jose.bollo@iot.bzh>
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -18,49 +20,13 @@
 #include <errno.h>
 #include <assert.h>
 
-#if 0
-#include <security-manager.h>
+#if SIMULATE_SECURITY_MANAGER
+#include "simulation/security-manager.h"
 #else
-#include <stdio.h>
-#include <stdint.h>
-enum lib_retcode {
-	SECURITY_MANAGER_SUCCESS,
-	SECURITY_MANAGER_ERROR_INPUT_PARAM,
-	SECURITY_MANAGER_ERROR_MEMORY,
-	SECURITY_MANAGER_ERROR_REQ_NOT_COMPLETE,
-	SECURITY_MANAGER_ERROR_AUTHENTICATION_FAILED,
-	SECURITY_MANAGER_ERROR_ACCESS_DENIED
-};
-enum app_install_path_type {
-	SECURITY_MANAGER_PATH_PUBLIC_RO,
-	SECURITY_MANAGER_PATH_RO,
-	SECURITY_MANAGER_PATH_RW
-};
-typedef void app_inst_req;
-static int diese = 0;
-#define  security_manager_app_inst_req_free(r) \
- (printf("security_manager_app_inst_req_free(%p)\n",r),(void)0)
-
-#define  security_manager_app_inst_req_new(pr) \
- (*(pr)=(void*)(intptr_t)(++diese), printf("security_manager_app_inst_req_new(%p)\n",*pr), SECURITY_MANAGER_SUCCESS)
-
-#define security_manager_app_inst_req_set_pkg_id(r,i) \
- (printf("security_manager_app_inst_req_set_pkg_id(%p,\"%s\")\n",r,i), SECURITY_MANAGER_SUCCESS)
- 
-#define security_manager_app_inst_req_set_app_id(r,i) \
- (printf("security_manager_app_inst_req_set_app_id(%p,\"%s\")\n",r,i), SECURITY_MANAGER_SUCCESS)
- 
-#define security_manager_app_inst_req_add_privilege(r,p) \
- (printf("security_manager_app_inst_req_add_privilege(%p,\"%s\")\n",r,p), SECURITY_MANAGER_SUCCESS)
-
-#define security_manager_app_inst_req_add_path(r,p,t) \
- (printf("security_manager_app_inst_req_add_path(%p,\"%s\",%d)\n",r,p,t), SECURITY_MANAGER_SUCCESS)
-
-#define security_manager_app_install(r) \
- (printf("security_manager_app_install(%p)\n",r), SECURITY_MANAGER_SUCCESS)
-
+#include <security-manager.h>
 #endif
 
+#include "verbose.h"
 #include "secmgr-wrap.h"
 
 static app_inst_req *request = NULL;
@@ -74,20 +40,27 @@ static int retcode(enum lib_retcode rc)
 	case SECURITY_MANAGER_ERROR_REQ_NOT_COMPLETE: errno = EBADMSG; break;
 	case SECURITY_MANAGER_ERROR_AUTHENTICATION_FAILED: errno = EPERM; break;
 	case SECURITY_MANAGER_ERROR_ACCESS_DENIED: errno = EACCES; break;
-	default: errno = 0; break;
+	default: errno = ECANCELED; break;
 	}
 	return -1;
 }
 
-int secmgr_init(const char *pkgid, const char *appid)
+int secmgr_init(const char *id)
 {
 	int rc;
 	assert(request == NULL);
 	rc = security_manager_app_inst_req_new(&request);
-	if (rc == SECURITY_MANAGER_SUCCESS) {
-		rc = security_manager_app_inst_req_set_pkg_id(request, pkgid);
-		if (rc == SECURITY_MANAGER_SUCCESS)
-			rc = security_manager_app_inst_req_set_app_id(request, appid);
+	if (rc != SECURITY_MANAGER_SUCCESS)
+		ERROR("security_manager_app_inst_req_new failed");
+	else {
+		rc = security_manager_app_inst_req_set_pkg_id(request, id);
+		if (rc != SECURITY_MANAGER_SUCCESS)
+			ERROR("security_manager_app_inst_req_set_pkg_id failed");
+		else {
+			rc = security_manager_app_inst_req_set_app_id(request, id);
+			if (rc != SECURITY_MANAGER_SUCCESS)
+				ERROR("security_manager_app_inst_req_set_app_id failed");
+		}
 	}
 	if (rc != SECURITY_MANAGER_SUCCESS)
 		secmgr_cancel();
@@ -105,6 +78,20 @@ int secmgr_install()
 	int rc;
 	assert(request != NULL);
 	rc = security_manager_app_install(request);
+	if (rc != SECURITY_MANAGER_SUCCESS)
+		ERROR("security_manager_app_install failed");
+	secmgr_cancel();
+	return retcode(rc);
+}
+
+int secmgr_uninstall()
+{
+	int rc;
+	assert(request != NULL);
+	rc = security_manager_app_uninstall(request);
+	if (rc != SECURITY_MANAGER_SUCCESS)
+		ERROR("security_manager_app_uninstall failed");
+	secmgr_cancel();
 	return retcode(rc);
 }
 
@@ -113,6 +100,8 @@ int secmgr_permit(const char *permission)
 	int rc;
 	assert(request != NULL);
 	rc = security_manager_app_inst_req_add_privilege(request, permission);
+	if (rc != SECURITY_MANAGER_SUCCESS)
+		ERROR("security_manager_app_inst_add_privilege %s failed", permission);
 	return retcode(rc);
 }
 
@@ -121,6 +110,8 @@ static int addpath(const char *pathname, enum app_install_path_type type)
 	int rc;
 	assert(request != NULL);
 	rc = security_manager_app_inst_req_add_path(request, pathname, type);
+	if (rc != SECURITY_MANAGER_SUCCESS)
+		ERROR("security_manager_app_inst_add_path %s failed", pathname);
 	return retcode(rc);
 }
 
@@ -139,3 +130,13 @@ int secmgr_path_read_write(const char *pathname)
 	return addpath(pathname, SECURITY_MANAGER_PATH_RW);
 }
 
+int secmgr_path_private(const char *pathname)
+{
+	return addpath(pathname, SECURITY_MANAGER_PATH_PRIVATE);
+}
+
+int secmgr_prepare_exec(const char *appid)
+{
+	return retcode(security_manager_prepare_app(appid));
+}
+