Fix path to TA checking

Change-Id: Id8aa25911dfc412e5b7b257707327db113829d5f

diff --git a/simulatordaemon/src/SecurityContext.cpp b/simulatordaemon/src/SecurityContext.cpp
index a70c9e8..3a5c377 100644 (file)
--- a/simulatordaemon/src/SecurityContext.cpp
+++ b/simulatordaemon/src/SecurityContext.cpp
@@ -92,9 +92,9 @@ std::string SecurityContext::getCaFullPathFromPkgId(char* pkgid) {
                LOGE(SIM_DAEMON, "Path doesn't exist: %s", path.c_str());
                return "";
        }
-
-       path = fs::read_symlink(fs::path(path)).string();
-
+       if (fs::is_symlink(path)) {
+               path = fs::read_symlink(path).string();
+       }
        if (path.empty()) {
                LOGE(SIM_DAEMON, "Bad CA path. Does this directory exist: %s ?", path.c_str());
        }
@@ -140,7 +140,7 @@ bool SecurityContext::findRequestedTa(const std::string &ta_name, std::string &a
        p_char p_pkg_id_ca(pkg_id_ca, &free);
 
        std::string ca_pkg_path = getCaFullPathFromPkgId(pkg_id_ca);
-       if (ca_pkg_path.empty()) {
+       if (!fs::exists(ca_pkg_path)) {
                LOGE(SIM_DAEMON, "Error while loading client's path");
                return false;
        }

diff --git a/simulatordaemon/src/TABinaryManager/TABinaryManager.cpp b/simulatordaemon/src/TABinaryManager/TABinaryManager.cpp
index 77aba5e..15ea234 100644 (file)
--- a/simulatordaemon/src/TABinaryManager/TABinaryManager.cpp
+++ b/simulatordaemon/src/TABinaryManager/TABinaryManager.cpp
@@ -247,7 +247,7 @@ void TABinaryManager::decryptImage(StructBinaryInfo& info) {
 bool TABinaryManager::unpackBinary(const string &uuid, const string &path, StructBinaryInfo& info) {
        TAUnpack* unpacker = TAUnpack::getInstance();
        bool ret = false;
-       LOGE(SIM_DAEMON, "Unpacking TA");
+       LOGE(SIM_DAEMON, "Unpacking TA %s in %s", uuid.c_str(), path.c_str());
        if (0 == unpacker->unpackTA(path, uuid)) {
                LOGE(SIM_DAEMON, "Unpacked, filling info");
                // 1. Set binary info