commit b87fde21cbd9af1690793361ccbae5e8d824d614
author Hsin-Yi Chen <hsinyichen@google.com> Fri May 19 08:36:04 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 19 08:36:04 2023 +0000
tree 7ec6ec76348e07dd4a655ed7e55c174199e1e2f2
parent 7d30208d3bbb4d6979fa20d9bc741fae7ab285c9
parent 2fb84f94bbdd5af3fd5e9a53a694a7c40f3615fe

Merge changes I4580e60e,I23b77414

* changes:
  Let DSUEndtoEndTest unsparse super.img if needed
  Clean up temporary files created by DSUEndtoEndTest

gsi_tool.cpp

diff --git a/gsi_tool.cpp b/gsi_tool.cpp
index 5bf69fc..aba9404 100644
--- a/gsi_tool.cpp
+++ b/gsi_tool.cpp
@@ -78,6 +78,10 @@
     return "error code " + std::to_string(error_code);
 }
 
+static inline bool IsRoot() {
+    return getuid() == 0;
+}
+
 class ProgressBar {
   public:
     explicit ProgressBar(sp<IGsiService> gsid) : gsid_(gsid) {}
@@ -210,7 +214,7 @@
     bool reboot = true;
     std::string installDir = "";
     std::string partition = kDefaultPartition;
-    if (getuid() != 0) {
+    if (!IsRoot()) {
         std::cerr << "must be root to install a GSI" << std::endl;
         return EX_NOPERM;
     }
@@ -376,7 +380,7 @@
         }
     }
 
-    if (getuid() != 0) {
+    if (!IsRoot()) {
         std::cerr << "must be root to install a DSU" << std::endl;
         return EX_NOPERM;
     }
@@ -555,7 +559,7 @@
     } else {
         std::cout << "normal" << std::endl;
     }
-    if (getuid() != 0) {
+    if (!IsRoot()) {
         return 0;
     }
 
@@ -676,7 +680,16 @@
         std::cerr << "Unrecognized arguments to disable." << std::endl;
         return EX_USAGE;
     }
-
+    std::string dsuSlot = {};
+    auto status = gsid->getActiveDsuSlot(&dsuSlot);
+    if (!status.isOk()) {
+        std::cerr << "Could not get the active DSU slot: " << ErrorMessage(status) << "\n";
+        return EX_SOFTWARE;
+    }
+    if (android::base::EndsWith(dsuSlot, ".lock") && !IsRoot()) {
+        std::cerr << "must be root to disable a locked DSU" << std::endl;
+        return EX_NOPERM;
+    }
     bool installing = false;
     gsid->isGsiInstallInProgress(&installing);
     if (installing) {

include/libgsi/libgsi.h

diff --git a/include/libgsi/libgsi.h b/include/libgsi/libgsi.h
index 5318341..969ea28 100644
--- a/include/libgsi/libgsi.h
+++ b/include/libgsi/libgsi.h
@@ -76,6 +76,8 @@
 // install_dir "/data/gsi/dsu/dsu2" has a slot name "dsu2"
 std::string GetDsuSlot(const std::string& install_dir);
 
+static constexpr char kDsuSlotProp[] = "ro.gsid.dsu_slot";
+
 static constexpr char kGsiBootedProp[] = "ro.gsid.image_running";
 
 static constexpr char kGsiInstalledProp[] = "gsid.image_installed";