Change target autocleaner to be more selective

Only deletes until the second last version.

Signed-off-by: Laurent Bonnans <[email protected]>

src/libaktualizr/primary/aktualizr.cc

@@ -170,6 +170,31 @@ boost::signals2::connection Aktualizr::SetSignalHandler(
   return sig_->connect(handler);
 }
 
+Aktualizr::InstallationLog Aktualizr::GetInstallationLog() {
+  Aktualizr::InstallationLog ilog;
+
+  EcuSerials serials;
+  if (!storage_->loadEcuSerials(&serials)) {
+    throw std::runtime_error("Could not load ecu serials");
+  }
+
+  for (const auto &s : serials) {
+    ilog.ecus.push_back(s.first);
+
+    std::vector<Uptane::Target> installed_versions;
+    std::vector<Uptane::Target*> log;
+    storage_->loadInstallationLog(s.first.ToString(), &installed_versions, &log);
+
+    std::vector<Uptane::Target> iv;
+    for (const auto &i : log) {
+      iv.push_back(*i);
+    }
+    ilog.installs.at(s.first) = std::move(iv);
+  }
+
+  return ilog;
+}
+
 std::vector<Uptane::Target> Aktualizr::GetStoredTargets() { return storage_->getTargetFiles(); }
 
 void Aktualizr::DeleteStoredTarget(const Uptane::Target &target) { storage_->removeTargetFile(target.filename()); }

src/libaktualizr/primary/aktualizr.h

@@ -82,6 +82,16 @@ class Aktualizr {
    */
   std::future<result::Download> Download(const std::vector<Uptane::Target>& updates);
 
+  /**
+   * Get log of installations
+   * @return installation log
+   */
+  struct InstallationLog {
+    std::vector<Uptane::EcuSerial> ecus;
+    std::map<Uptane::EcuSerial, std::vector<Uptane::Target>> installs;
+  };
+  InstallationLog GetInstallationLog();
+
   /**
    * Get list of targets currently in storage. This is intended to be used with
    * DeleteStoredTarget and targets are not guaranteed to be verified and

src/libaktualizr/primary/aktualizr_helpers.cc

@@ -1,29 +1,39 @@
+#include <set>
+
 #include "aktualizr_helpers.h"
 
 void targets_autoclean_cb(Aktualizr &aktualizr, const std::shared_ptr<event::BaseEvent> &event) {
   if (!event->isTypeOf<event::AllInstallsComplete>()) {
     return;
   }
 
-  const auto targets_event = dynamic_cast<event::AllInstallsComplete *>(event.get());
-
   std::vector<Uptane::Target> installed_targets = aktualizr.GetStoredTargets();
   std::vector<bool> to_remove(installed_targets.size(), true);
 
-  // do not remove targets that were just installed
-  for (const result::Install::EcuReport &er : targets_event->result.ecu_reports) {
-    const Uptane::Target t = er.update;
-    auto it = std::find_if(installed_targets.begin(), installed_targets.end(),
-                           [&t](const Uptane::Target &t2) { return t.sha256Hash() == t2.sha256Hash(); });
-    if (it == installed_targets.end()) {
-      continue;
+  std::set<Uptane::EcuSerial> affected_ecus;
+  for (const Uptane::Target &t : installed_targets) {
+    Uptane::EcuMap em = t.ecus();
+    for (const auto &ecu : em) {
+      affected_ecus.insert(ecu.first);
     }
-
-    size_t rem_idx = static_cast<size_t>(it - installed_targets.begin());
-    to_remove[rem_idx] = false;
   }
 
-  // TODO: more specific check
+  for (const Uptane::EcuSerial &ecu : affected_ecus) {
+    Aktualizr::InstallationLog log = aktualizr.GetInstallationLog();
+
+    auto ecu_log = log.installs.at(ecu);
+    for (auto it = ecu_log.end() - 2; it != ecu_log.end(); it++) {
+      auto fit = std::find_if(installed_targets.begin(), installed_targets.end(),
+          [&it](const Uptane::Target &t2) { return it->sha256Hash() == t2.sha256Hash(); });
+
+      if (fit == installed_targets.end()) {
+        continue;
+      }
+
+      size_t rem_idx = static_cast<size_t>(fit - installed_targets.begin());
+      to_remove[rem_idx] = false;
+    }
+  }
 
   for (size_t k = 0; k < installed_targets.size(); k++) {
     if (to_remove[k]) {