From: s414kim <s414.kim@samsung.com>
Date: Fri, 22 Sep 2017 08:55:42 +0000 (+0900)
Subject: Remove 'erase' API from secure-erase
X-Git-Tag: submit/tizen_4.0/20171018.042033~15
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7016a8da41705507afb0fd4e5d5688e1e468052e;p=platform%2Fcore%2Fsecurity%2Fode.git

Remove 'erase' API from secure-erase

Change-Id: I4d9d287fe3915e1d2a4fd8fc7a405af06139efd0
Signed-off-by: s414kim <s414.kim@samsung.com>
---

diff --git a/lib/ode/secure-erase.cpp b/lib/ode/secure-erase.cpp
index 1ad49f5..ff84342 100644
--- a/lib/ode/secure-erase.cpp
+++ b/lib/ode/secure-erase.cpp
@@ -22,17 +22,6 @@
 
 using namespace ode;
 
-int ode_secure_erase(const char* name)
-{
-	RET_ON_FAILURE(name, ODE_ERROR_INVALID_PARAMETER);
-
-	ODEContext client;
-	RET_ON_FAILURE(client.connect() == 0, ODE_ERROR_CONNECTION_REFUSED);
-	SecureErase secure = client.createInterface<SecureErase>();
-
-	return secure.erase(name);
-}
-
 int ode_secure_clean(const char* name)
 {
 	RET_ON_FAILURE(name, ODE_ERROR_INVALID_PARAMETER);
diff --git a/lib/ode/secure-erase.h b/lib/ode/secure-erase.h
index 8fb8c6d..e70ee1d 100644
--- a/lib/ode/secure-erase.h
+++ b/lib/ode/secure-erase.h
@@ -28,24 +28,6 @@
 extern "C" {
 #endif
 
-/**
- * @brief       Erase the file or device with given name securely.
- * @details     Administrator can use this API to secure-erase the files.
- * @since_tizen 4.0
- * @param[in]   name The file/directory or device name
- * @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_SUCH_FILE No such file or directory
- * @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 file or device to the given name must be exists.
- * @pre         If the device is specified, it must be a block device.
- */
-ODE_API int ode_secure_erase(const char* name);
-
 /**
  * @brief       Clean garbage in the device with given name securely.
  * @details     Administrator can use this API to collect garbage in the device.
diff --git a/lib/secure-erase.cpp b/lib/secure-erase.cpp
index f96ced9..2d397e5 100644
--- a/lib/secure-erase.cpp
+++ b/lib/secure-erase.cpp
@@ -26,15 +26,6 @@ SecureErase::~SecureErase()
 {
 }
 
-int SecureErase::erase(const std::string& name)
-{
-	try {
-		return context->methodCall<int>("SecureErase::erase", name);
-	} catch (runtime::Exception& e) {
-		return -1;
-	}
-}
-
 int SecureErase::clean(const std::string& name)
 {
 	try {
diff --git a/rmi/secure-erase.h b/rmi/secure-erase.h
index 2eb4735..a64ee99 100644
--- a/rmi/secure-erase.h
+++ b/rmi/secure-erase.h
@@ -30,7 +30,6 @@ public:
 	SecureErase(ODEControlContext& ctxt);
 	~SecureErase();
 
-	int erase(const std::string& name);
 	int clean(const std::string& name);
 
 private:
diff --git a/server/secure-erase.cpp b/server/secure-erase.cpp
index fe0e362..a0c6cda 100644
--- a/server/secure-erase.cpp
+++ b/server/secure-erase.cpp
@@ -94,7 +94,6 @@ const std::string evaluateTarget(const std::string &path)
 SecureErase::SecureErase(ODEControlContext &ctx) :
 	context(ctx)
 {
-	context.expose(this, PRIVILEGE_PLATFORM, (int)(SecureErase::erase)(std::string));
 	context.expose(this, PRIVILEGE_PLATFORM, (int)(SecureErase::clean)(std::string));
 
 	engine.reset(new ERASE_ENGINE(ProgressBar([](int v) {
@@ -107,21 +106,6 @@ SecureErase::~SecureErase()
 {
 }
 
-
-
-int SecureErase::erase(const std::string &name)
-{
-	auto eraseWorker = [name, this]() {
-		try {
-		} catch (runtime::Exception &e) {}
-	};
-
-	std::thread asyncWork(eraseWorker);
-	asyncWork.detach();
-
-	return 0;
-}
-
 int SecureErase::clean(const std::string &name)
 {
 	auto cleanWorker = [name, this]() {
diff --git a/tools/cli/ode-admin-cli.cpp b/tools/cli/ode-admin-cli.cpp
index ae9a6f9..4bce8ad 100644
--- a/tools/cli/ode-admin-cli.cpp
+++ b/tools/cli/ode-admin-cli.cpp
@@ -48,7 +48,6 @@ static inline int usage(const std::string name)
 			  << "   -p, --changepw=internal|external|extension change password" << std::endl
 			  << "   -s, --state=internal|external|extension    get state" << std::endl
 			  << "   -w, --waitmnt=internal|external|extension  wait for mount"<< std::endl
-			  << "   -r, --erase=FILE|DIRECTORY                 secure-erase" << std::endl
 			  << "   -c, --clean=DIRECTORY                      secure-clean" << std::endl
 			  << "   -h, --help                                 show this" << std::endl
 			  << std::endl;
@@ -420,18 +419,6 @@ static inline int wait_for_mount(const std::string name)
 	return ret;
 }
 
-static inline int erase(const std::string name)
-{
-	int ret;
-
-	ret = ode_secure_erase(name.c_str());
-	if (ret != 0) {
-		std::cerr << "Error : " << ret <<std::endl;
-	}
-
-	return ret;
-}
-
 static inline int clean(const std::string name)
 {
 	int ret;
@@ -457,7 +444,6 @@ int main(int argc, char* argv[])
 		{"format", required_argument, 0, 'f'},
 		{"state", required_argument, 0, 's'},
 		{"waitmnt", required_argument, 0, 'w'},
-		{"erase", required_argument, 0, 'r'},
 		{"clean", required_argument, 0, 'c'},
 		{0, 0, 0, 0}
 	};
@@ -467,7 +453,7 @@ int main(int argc, char* argv[])
 		return EXIT_SUCCESS;
 	}
 
-	while ((opt = getopt_long(argc, argv, "m:u:e:d:f:p:s:w:r:c:h", options, &index)) != -1) {
+	while ((opt = getopt_long(argc, argv, "m:u:e:d:f:p:s:w:c:h", options, &index)) != -1) {
 		switch (opt) {
 		case 'm':
 			ret = mount(optarg);
@@ -493,9 +479,6 @@ int main(int argc, char* argv[])
 		case 's':
 			ret = get_state(optarg);
 			break;
-		case 'r':
-			ret = erase(optarg);
-			break;
 		case 'c':
 			ret = clean(optarg);
 			break;