Don't check malware history before scan single file

Overhead to check db for all scan request is bigger than scan file. So
we check history for getting ignored flag only when file scan finished
and it has detected malware.

Change-Id: Iac391e33069cbff46cd94588837d1f0ceb813c05
Signed-off-by: Kyungwook Tak <k.tak@samsung.com>

diff --git a/src/framework/service/cs-logic.cpp b/src/framework/service/cs-logic.cpp
index b02f263..6dd4699 100644 (file)
--- a/src/framework/service/cs-logic.cpp
+++ b/src/framework/service/cs-logic.cpp
@@ -381,33 +381,6 @@ RawBuffer CsLogic::scanApp(const CsContext &context, const FilePtr &pkgPtr)
        }
 }
 
-RawBuffer CsLogic::scanFileWithoutDelta(const CsContext &context,
-                                                                               const std::string &filepath, FilePtr &&fileptr)
-{
-       if (isInBlackList(filepath))
-               return BinaryQueue::Serialize(CSR_ERROR_NONE).pop();
-
-       CsEngineContext engineContext(this->m_loader);
-       auto &c = engineContext.get();
-
-       auto timestamp = ::time(nullptr);
-
-       csre_cs_detected_h result = nullptr;
-       this->m_loader->scanFile(c, filepath, &result);
-
-       // detected handle is null if it's safe
-       if (result == nullptr)
-               return BinaryQueue::Serialize(CSR_ERROR_NONE).pop();
-
-       INFO("New malware detected on file: " << filepath);
-
-       auto d = this->convert(result, filepath, timestamp);
-
-       this->m_db->insertDetectedFile(d.targetName, d, this->m_dataVersion);
-
-       return this->handleAskUser(context, d, std::move(fileptr));
-}
-
 RawBuffer CsLogic::scanFile(const CsContext &context, const std::string &filepath)
 {
        if (this->m_db->getEngineState(CSR_ENGINE_CS) != CSR_STATE_ENABLE)
@@ -427,26 +400,35 @@ RawBuffer CsLogic::scanFile(const CsContext &context, const std::string &filepat
 
        DEBUG("Scan request on file: " << name);
 
+       if (isInBlackList(name))
+               return BinaryQueue::Serialize(CSR_ERROR_NONE).pop();
+
        CsEngineContext engineContext(this->m_loader);
-       auto since = this->m_loader->getEngineLatestUpdateTime(engineContext.get());
-       auto history = this->m_db->getDetectedAllByNameOnPath(name, since);
+       auto &c = engineContext.get();
 
-       if (history == nullptr) {
-               DEBUG("No history exist on target. Newly scan needed: " << name);
-               return this->scanFileWithoutDelta(context, name, std::move(target));
-       } else if (target->isModifiedSince(history->ts)) {
-               DEBUG("file[" << name << "] is modified since the detected time. "
-                         "let's remove history and re-scan");
-               this->m_db->deleteDetectedByNameOnPath(name);
-               return this->scanFileWithoutDelta(context, name, std::move(target));
-       }
+       auto timestamp = ::time(nullptr);
 
-       DEBUG("Usable scan history exist on file: " << name);
+       csre_cs_detected_h result = nullptr;
+       this->m_loader->scanFile(c, name, &result);
 
-       if (history->isIgnored)
+       // detected handle is null if it's safe
+       if (result == nullptr)
                return BinaryQueue::Serialize(CSR_ERROR_NONE).pop();
 
-       return this->handleAskUser(context, *history);
+       INFO("Malware detected on file: " << name);
+
+       auto d = this->convert(result, name, timestamp);
+
+       // check malware detected history for inherit ignored flag
+       auto since = this->m_loader->getEngineLatestUpdateTime(c);
+       auto history = this->m_db->getDetectedAllByNameOnPath(name, since);
+
+       this->m_db->insertDetectedFile(d.targetName, d, this->m_dataVersion);
+
+       if (history != nullptr && history->isIgnored && !(d > *history))
+               return BinaryQueue::Serialize(CSR_ERROR_NONE).pop();
+       else
+               return this->handleAskUser(context, d, std::move(target));
 }
 
 // Application in input param directory will be treated as one item.

diff --git a/src/framework/service/cs-logic.h b/src/framework/service/cs-logic.h
index 86ce3d3..237c67a 100644 (file)
--- a/src/framework/service/cs-logic.h
+++ b/src/framework/service/cs-logic.h
@@ -62,9 +62,6 @@ private:
        CsDetectedPtr scanAppDelta(const std::string &pkgPath, const std::string &pkgId,
                                                           std::string &riskiestPath);
 
-       RawBuffer scanFileWithoutDelta(const CsContext &context, const std::string &filepath,
-                                                                  FilePtr &&fileptr);
-
        CsDetected convert(csre_cs_detected_h &result, const std::string &targetName,
                                           time_t timestamp);
        RawBuffer handleAskUser(const CsContext &c, CsDetected &d,