Modify to split mount API into 2 APIs - set mount password, just mount

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Change-Id: I7af3071bad3fd673115fe5db25bf3887b387b13f

diff --git a/lib/external-encryption.cpp b/lib/external-encryption.cpp
index fd0308c..5fcb4af 100644 (file)
--- a/lib/external-encryption.cpp
+++ b/lib/external-encryption.cpp
@@ -26,10 +26,19 @@ ExternalEncryption::~ExternalEncryption()
 {
 }
 
-int ExternalEncryption::mount(const std::string& password)
+int ExternalEncryption::setMountPassword(const std::string& password)
 {
        try {
-               return context->methodCall<int>("ExternalEncryption::mount", password);
+               return context->methodCall<int>("ExternalEncryption::setMountPassword", password);
+       } catch (runtime::Exception& e) {
+               return -1;
+       }
+}
+
+int ExternalEncryption::mount()
+{
+       try {
+               return context->methodCall<int>("ExternalEncryption::mount");
        } catch (runtime::Exception& e) {
                return -1;
        }

diff --git a/lib/internal-encryption.cpp b/lib/internal-encryption.cpp
index c1bf9e3..7b5aed1 100644 (file)
--- a/lib/internal-encryption.cpp
+++ b/lib/internal-encryption.cpp
@@ -26,10 +26,19 @@ InternalEncryption::~InternalEncryption()
 {
 }
 
-int InternalEncryption::mount(const std::string& password)
+int InternalEncryption::setMountPassword(const std::string& password)
 {
        try {
-               return context->methodCall<int>("InternalEncryption::mount", password);
+               return context->methodCall<int>("InternalEncryption::setMountPassword", password);
+       } catch (runtime::Exception& e) {
+               return -1;
+       }
+}
+
+int InternalEncryption::mount()
+{
+       try {
+               return context->methodCall<int>("InternalEncryption::mount");
        } catch (runtime::Exception& e) {
                return -1;
        }

diff --git a/lib/ode/common.h b/lib/ode/common.h
index d0f89cc..3d07bcc 100644 (file)
--- a/lib/ode/common.h
+++ b/lib/ode/common.h
@@ -60,7 +60,8 @@ typedef enum {
        ODE_ERROR_FILE_EXISTS          = TIZEN_ERROR_FILE_EXISTS,          /**< File exists */
        ODE_ERROR_OUT_OF_MEMORY        = TIZEN_ERROR_OUT_OF_MEMORY,        /**< Out of memory */
        ODE_ERROR_NOT_PERMITTED        = TIZEN_ERROR_NOT_PERMITTED,        /**< Operation is not permitted */
-       ODE_ERROR_KEY_REJECTED         = TIZEN_ERROR_KEY_REJECTED          /**< Passwor is rejected */
+       ODE_ERROR_KEY_REJECTED         = TIZEN_ERROR_KEY_REJECTED,         /**< Passwor is rejected */
+       ODE_ERROR_NO_DATA              = TIZEN_ERROR_NO_DATA               /**< No Data */
 } ode_error_type_e;
 
 /*

diff --git a/lib/ode/external-encryption.cpp b/lib/ode/external-encryption.cpp
index 35fe505..eae3ecb 100644 (file)
--- a/lib/ode/external-encryption.cpp
+++ b/lib/ode/external-encryption.cpp
@@ -22,7 +22,7 @@
 
 using namespace ode;
 
-int ode_external_encryption_mount(const char* password)
+int ode_external_encryption_set_mount_password(const char* password)
 {
        RET_ON_FAILURE(password, ODE_ERROR_INVALID_PARAMETER);
 
@@ -30,7 +30,16 @@ int ode_external_encryption_mount(const char* password)
        RET_ON_FAILURE(client.connect() == 0, ODE_ERROR_CONNECTION_REFUSED);
        ExternalEncryption external = client.createInterface<ExternalEncryption>();
 
-       return external.mount(password);
+       return external.setMountPassword(password);
+}
+
+int ode_external_encryption_mount()
+{
+       ODEContext client;
+       RET_ON_FAILURE(client.connect() == 0, ODE_ERROR_CONNECTION_REFUSED);
+       ExternalEncryption external = client.createInterface<ExternalEncryption>();
+
+       return external.mount();
 }
 
 int ode_external_encryption_umount()

diff --git a/lib/ode/external-encryption.h b/lib/ode/external-encryption.h
index b156f74..624832d 100644 (file)
--- a/lib/ode/external-encryption.h
+++ b/lib/ode/external-encryption.h
@@ -30,9 +30,9 @@ extern "C" {
 #endif
 
 /**
- * @brief       Mount external storage with encryption by given password.
- * @details     Administrator can use this API to mount encrypted external
- *              storage.
+ * @brief       Set a password to be used by mount of encrypted external storage
+ * @details     Administrator can use this API to set a password for external
+ *              mount external storage with encryption.
  * @since_tizen 3.0
  * @param[in]   password The password to mount external storage
  * @return      #ODE_ERROR_NONE on success, otherwise a negative value
@@ -40,15 +40,34 @@ extern "C" {
  * @retval      #ODE_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval      #ODE_ERROR_TIMED_OUT Time out
  * @retval      #ODE_ERROR_KEY_REJECTED Password doen't match
- * @retval      #ODE_ERROR_NOT_PERMITTED Operation not permitted
  * @retval      #ODE_ERROR_PERMISSION_DENIED The application does not have
  *              the privilege to call this API
  * @pre         The password must match with what is set by
  *              ode_external_encryption_init_password().
- * @see         ode_external_encryption_encrypt()
+ * @see         ode_external_encryption_init_password()
+ * @see         ode_external_encryption_mount()
+ */
+ODE_API int ode_external_encryption_set_mount_password(const char* password);
+
+/**
+ * @brief       Mount external storage with encryption
+ * @details     Administrator can use this API to mount encrypted external
+ *              storage.
+ * @since_tizen 3.0
+ * @return      #ODE_ERROR_NONE on success, otherwise a negative value
+ * @retval      #ODE_ERROR_NONE Successful
+ * @retval      #ODE_ERROR_INVALID_PARAMETER Invalid parameter
+ * @retval      #ODE_ERROR_TIMED_OUT Time out
+ * @retval      #ODE_ERROR_NO_DATA Password isn't set
+ * @retval      #ODE_ERROR_NOT_PERMITTED Operation not permitted
+ * @retval      #ODE_ERROR_PERMISSION_DENIED The application does not have
+ *              the privilege to call this API
+ * @pre         A password must be set by
+ *              ode_external_encryption_set_mount_password().
+ * @see         ode_external_encryption_set_mount_password()
  * @see         ode_external_encryption_umount()
  */
-ODE_API int ode_external_encryption_mount(const char* password);
+ODE_API int ode_external_encryption_mount();
 
 /**
  * @brief       Umount external storage

diff --git a/lib/ode/internal-encryption.cpp b/lib/ode/internal-encryption.cpp
index 527174d..095a75a 100644 (file)
--- a/lib/ode/internal-encryption.cpp
+++ b/lib/ode/internal-encryption.cpp
@@ -22,7 +22,7 @@
 
 using namespace ode;
 
-int ode_internal_encryption_mount(const char* password)
+int ode_internal_encryption_set_mount_password(const char* password)
 {
        RET_ON_FAILURE(password, ODE_ERROR_INVALID_PARAMETER);
 
@@ -30,7 +30,16 @@ int ode_internal_encryption_mount(const char* password)
        RET_ON_FAILURE(client.connect() == 0, ODE_ERROR_CONNECTION_REFUSED);
        InternalEncryption internal = client.createInterface<InternalEncryption>();
 
-       return internal.mount(password);
+       return internal.setMountPassword(password);
+}
+
+int ode_internal_encryption_mount()
+{
+       ODEContext client;
+       RET_ON_FAILURE(client.connect() == 0, ODE_ERROR_CONNECTION_REFUSED);
+       InternalEncryption internal = client.createInterface<InternalEncryption>();
+
+       return internal.mount();
 }
 
 int ode_internal_encryption_umount()

diff --git a/lib/ode/internal-encryption.h b/lib/ode/internal-encryption.h
index 94eb681..17ad253 100644 (file)
--- a/lib/ode/internal-encryption.h
+++ b/lib/ode/internal-encryption.h
@@ -29,9 +29,9 @@ extern "C" {
 #endif
 
 /**
- * @brief       Mount internal storage with encryption by given password.
- * @details     Administrator can use this API to mount encrypted internal
- *              storage.
+ * @brief       Set a password to be used by mount of encrypted internal storage
+ * @details     Administrator can use this API to set a password for internal
+ *              mount internal storage with encryption.
  * @since_tizen 3.0
  * @param[in]   password The password to mount internal storage
  * @return      #ODE_ERROR_NONE on success, otherwise a negative value
@@ -39,15 +39,34 @@ extern "C" {
  * @retval      #ODE_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval      #ODE_ERROR_TIMED_OUT Time out
  * @retval      #ODE_ERROR_KEY_REJECTED Password doen't match
- * @retval      #ODE_ERROR_NOT_PERMITTED Operation not permitted
  * @retval      #ODE_ERROR_PERMISSION_DENIED The application does not have
  *              the privilege to call this API
- * @pre         The password must match with what is set by
+ * @pre         The password set before must match with what is set by
  *              ode_internal_encryption_init_password().
- * @see         ode_internal_encryption_encrypt()
+ * @see         ode_internal_encryption_init_password()
+ * @see         ode_internal_encryption_mount()
+ */
+ODE_API int ode_internal_encryption_set_mount_password(const char* password);
+
+/**
+ * @brief       Mount internal storage with encryption
+ * @details     Administrator can use this API to mount encrypted internal
+ *              storage.
+ * @since_tizen 3.0
+ * @return      #ODE_ERROR_NONE on success, otherwise a negative value
+ * @retval      #ODE_ERROR_NONE Successful
+ * @retval      #ODE_ERROR_INVALID_PARAMETER Invalid parameter
+ * @retval      #ODE_ERROR_TIMED_OUT Time out
+ * @retval      #ODE_ERROR_NO_DATA Password isn't set
+ * @retval      #ODE_ERROR_NOT_PERMITTED Operation not permitted
+ * @retval      #ODE_ERROR_PERMISSION_DENIED The application does not have
+ *              the privilege to call this API
+ * @pre         A password must be set by
+ *              ode_internal_encryption_set_mount_password().
+ * @see         ode_internal_encryption_set_mount_password()
  * @see         ode_internal_encryption_umount()
  */
-ODE_API int ode_internal_encryption_mount(const char* password);
+ODE_API int ode_internal_encryption_mount();
 
 /**
  * @brief       Umount internal storage

diff --git a/rmi/external-encryption.h b/rmi/external-encryption.h
index b935018..5223413 100644 (file)
--- a/rmi/external-encryption.h
+++ b/rmi/external-encryption.h
@@ -31,9 +31,9 @@ public:
        ExternalEncryption(ODEControlContext& ctxt);
        ~ExternalEncryption();
 
-       unsigned int getSupportedOptions();
+       int setMountPassword(const std::string& password);
 
-       int mount(const std::string& password);
+       int mount();
        int umount();
 
        int encrypt(const std::string& password, unsigned int options);
@@ -60,6 +60,8 @@ public:
                ExceptForMediaFile = 1 << 1,
        };
 
+       unsigned int getSupportedOptions();
+
 private:
        ODEControlContext& context;
 };

diff --git a/rmi/internal-encryption.h b/rmi/internal-encryption.h
index 8b04e82..2c8ed9e 100644 (file)
--- a/rmi/internal-encryption.h
+++ b/rmi/internal-encryption.h
@@ -30,7 +30,9 @@ public:
        InternalEncryption(ODEControlContext& ctxt);
        ~InternalEncryption();
 
-       int mount(const std::string& password);
+       int setMountPassword(const std::string& password);
+
+       int mount();
        int umount();
 
        int encrypt(const std::string& password, unsigned int options);

diff --git a/server/external-encryption.cpp b/server/external-encryption.cpp
index 0033904..6185a21 100644 (file)
--- a/server/external-encryption.cpp
+++ b/server/external-encryption.cpp
@@ -51,6 +51,7 @@ namespace ode {
 namespace {
 
 std::unique_ptr<EXTERNAL_ENGINE> engine;
+KeyManager::data mountKey;
 
 void killDependedApplications()
 {
@@ -159,7 +160,8 @@ void setOptions(unsigned int options)
 ExternalEncryption::ExternalEncryption(ODEControlContext &ctx) :
        context(ctx)
 {
-       context.expose(this, PRIVILEGE_PLATFORM, (int)(ExternalEncryption::mount)(std::string));
+       context.expose(this, PRIVILEGE_PLATFORM, (int)(ExternalEncryption::setMountPassword)(std::string));
+       context.expose(this, PRIVILEGE_PLATFORM, (int)(ExternalEncryption::mount)());
        context.expose(this, PRIVILEGE_PLATFORM, (int)(ExternalEncryption::umount)());
        context.expose(this, PRIVILEGE_PLATFORM, (int)(ExternalEncryption::encrypt)(std::string, unsigned int));
        context.expose(this, PRIVILEGE_PLATFORM, (int)(ExternalEncryption::decrypt)(std::string));
@@ -188,17 +190,24 @@ ExternalEncryption::~ExternalEncryption()
 {
 }
 
-int ExternalEncryption::mount(const std::string &password)
+
+int ExternalEncryption::setMountPassword(const std::string& password)
 {
-       if (getState() != State::Encrypted) {
-               return -1;
+       KeyManager::data pwData(password.begin(), password.end());
+       KeyManager keyManager(engine->getKeyMeta());
+       if (!keyManager.verifyPassword(pwData)) {
+               return -2;
        }
 
-       KeyManager::data data(password.begin(), password.end());
-       KeyManager keyManager(engine->getKeyMeta());
+       ode::mountKey = keyManager.getMasterKey(pwData);
 
-       if (!keyManager.verifyPassword(data)) {
-               return -2;
+       return 0;
+}
+
+int ExternalEncryption::mount()
+{
+       if (getState() != State::Encrypted) {
+               return -1;
        }
 
        if (engine->isMounted()) {
@@ -206,7 +215,9 @@ int ExternalEncryption::mount(const std::string &password)
                return 0;
        }
 
-       engine->mount(keyManager.getMasterKey(data), getOptions());
+       engine->mount(mountKey, getOptions());
+       mountKey.clear();
+
        context.notify("ExternalEncryption::mount");
 
        return 0;

diff --git a/server/internal-encryption.cpp b/server/internal-encryption.cpp
index 63c0f24..e9e40e9 100644 (file)
--- a/server/internal-encryption.cpp
+++ b/server/internal-encryption.cpp
@@ -59,6 +59,7 @@ namespace ode {
 namespace {
 
 std::unique_ptr<INTERNAL_ENGINE> engine;
+KeyManager::data mountKey;
 
 void stopSystemdUserSessions() {
        std::vector<std::string> userSessionServices;
@@ -194,7 +195,8 @@ void setOptions(unsigned int options)
 InternalEncryption::InternalEncryption(ODEControlContext& ctx) :
        context(ctx)
 {
-       context.expose(this, PRIVILEGE_PLATFORM, (int)(InternalEncryption::mount)(std::string));
+       context.expose(this, PRIVILEGE_PLATFORM, (int)(InternalEncryption::setMountPassword)(std::string));
+       context.expose(this, PRIVILEGE_PLATFORM, (int)(InternalEncryption::mount)());
        context.expose(this, PRIVILEGE_PLATFORM, (int)(InternalEncryption::umount)());
        context.expose(this, PRIVILEGE_PLATFORM, (int)(InternalEncryption::encrypt)(std::string, unsigned int));
        context.expose(this, PRIVILEGE_PLATFORM, (int)(InternalEncryption::decrypt)(std::string));
@@ -221,25 +223,33 @@ InternalEncryption::~InternalEncryption()
 {
 }
 
-int InternalEncryption::mount(const std::string& password)
+int InternalEncryption::setMountPassword(const std::string& password)
 {
-       if (getState() != State::Encrypted) {
-               return -1;
-       }
-
        KeyManager::data pwData(password.begin(), password.end());
        KeyManager keyManager(engine->getKeyMeta());
-
        if (!keyManager.verifyPassword(pwData)) {
                return -2;
        }
 
+       ode::mountKey = keyManager.getMasterKey(pwData);
+
+       return 0;
+}
+
+int InternalEncryption::mount()
+{
+       if (getState() != State::Encrypted) {
+               return -1;
+       }
+
     if (engine->isMounted()) {
                INFO("Already mounted");
                return 0;
        }
 
-       engine->mount(keyManager.getMasterKey(pwData), getOptions());
+       engine->mount(mountKey, getOptions());
+       mountKey.clear();
+
        context.notify("InternalEncryption::mount");
 
        return 0;

diff --git a/tools/apps/lockscreen/src/ui.c b/tools/apps/lockscreen/src/ui.c
index e110b9c..dacd897 100644 (file)
--- a/tools/apps/lockscreen/src/ui.c
+++ b/tools/apps/lockscreen/src/ui.c
@@ -31,7 +31,8 @@ static int verify_password(Evas_Object *layout)
        ode_internal_encryption_verify_password(key, &result);
        if (result) {
                dlog_print(DLOG_ERROR, LOG_TAG, "Correct password.");
-               ode_internal_encryption_mount(key);
+               ode_internal_encryption_set_mount_password(key);
+               ode_internal_encryption_mount();
                exit(0);
        } else {
                dlog_print(DLOG_ERROR, LOG_TAG, "Incorrect password.");

diff --git a/tools/apps/ode/src/password/password.c b/tools/apps/ode/src/password/password.c
index 578f388..bfe06e1 100755 (executable)
--- a/tools/apps/ode/src/password/password.c
+++ b/tools/apps/ode/src/password/password.c
@@ -109,7 +109,12 @@ void password_result_callback(popup_data_s *data, const char *result)
                }
                break;
        case INSERT_SD_CARD:
-               ret = ode_external_encryption_mount(data->entry_data);
+               ret = ode_external_encryption_set_mount_password(data->entry_data);
+               if (ret != ODE_ERROR_NONE) {
+                       dlog_print(DLOG_ERROR, LOG_TAG, "failed to set mount password for external storage");
+                       return;
+               }
+               ret = ode_external_encryption_mount();
                if (ret != ODE_ERROR_NONE) {
                        dlog_print(DLOG_ERROR, LOG_TAG, "failed to mount external storage");
                        return;

diff --git a/tools/cli/ode-admin-cli.cpp b/tools/cli/ode-admin-cli.cpp
index 0b412a8..a128f15 100644 (file)
--- a/tools/cli/ode-admin-cli.cpp
+++ b/tools/cli/ode-admin-cli.cpp
@@ -85,10 +85,20 @@ static inline int mount(const std::string name)
 
        if (name == "internal") {
                std::string password = getPassword();
-               ret = ode_internal_encryption_mount(password.c_str());
+               ret = ode_internal_encryption_set_mount_password(password.c_str());
+               if (ret == 0) {
+                       ret = ode_internal_encryption_mount();
+               } else {
+                       std::cerr << "Password setting failed" << std::endl;
+               }
        } else if (name == "external") {
                std::string password = getPassword();
-               ret = ode_external_encryption_mount(password.c_str());
+               ret = ode_external_encryption_set_mount_password(password.c_str());
+               if (ret == 0) {
+                       ret = ode_external_encryption_mount();
+               } else {
+                       std::cerr << "Password setting failed" << std::endl;
+               }
        } else {
                printSelectableStorage();
                return -1;