refactor(status): reorganize container state into per-container directories

Replace flat JSON file storage with per-container directories containing
status.json and config.json. Introduces status_directory_manager for
container discovery and enables exec to dynamically enter namespaces
based on stored config.

Signed-off-by: ComixHe <ComixHe1895@outlook.com>

Author: ComixHe

CMakeLists.txt

@@ -152,15 +152,13 @@ set(linyaps-box_LIBRARY_SOURCE
     src/linyaps_box/container_ref.cpp
     src/linyaps_box/container_ref.h
     src/linyaps_box/container_status.cpp
-    src/linyaps_box/container_status.h
-    src/linyaps_box/impl/disabled_cgroup_manager.cpp
-    src/linyaps_box/impl/disabled_cgroup_manager.h
-    src/linyaps_box/impl/json_printer.cpp
-    src/linyaps_box/impl/json_printer.h
-    src/linyaps_box/impl/status_directory.cpp
-    src/linyaps_box/impl/status_directory.h
-    src/linyaps_box/impl/table_printer.cpp
-    src/linyaps_box/impl/table_printer.h
+     src/linyaps_box/container_status.h
+     src/linyaps_box/impl/disabled_cgroup_manager.cpp
+     src/linyaps_box/impl/disabled_cgroup_manager.h
+     src/linyaps_box/impl/json_printer.cpp
+     src/linyaps_box/impl/json_printer.h
+     src/linyaps_box/impl/table_printer.cpp
+     src/linyaps_box/impl/table_printer.h
     src/linyaps_box/interface.cpp
     src/linyaps_box/interface.h
     src/linyaps_box/io/epoll.cpp
@@ -173,8 +171,10 @@ set(linyaps-box_LIBRARY_SOURCE
     src/linyaps_box/runtime.h
     src/linyaps_box/socket.cpp
     src/linyaps_box/socket.h
-    src/linyaps_box/status_directory.cpp
-    src/linyaps_box/status_directory.h
+     src/linyaps_box/status_directory.cpp
+     src/linyaps_box/status_directory.h
+     src/linyaps_box/status_directory_manager.cpp
+     src/linyaps_box/status_directory_manager.h
     src/linyaps_box/terminal.cpp
     src/linyaps_box/terminal.h
     src/linyaps_box/unix_socket.cpp

src/linyaps_box/command/exec.cpp

@@ -1,18 +1,16 @@
-// SPDX-FileCopyrightText: 2022-2026 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2022 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
 #include "linyaps_box/command/exec.h"
 
-#include "linyaps_box/impl/status_directory.h"
 #include "linyaps_box/runtime.h"
-#include "linyaps_box/status_directory.h"
+#include "linyaps_box/status_directory_manager.h"
 
 auto linyaps_box::command::exec(const struct exec_options &options) -> int
 {
-    std::unique_ptr<status_directory> dir =
-            std::make_unique<impl::status_directory>(options.global_.get().root);
-    runtime_t runtime(std::move(dir));
+    status_directory_manager mgr(options.global_.get().root);
+    runtime_t runtime(std::move(mgr));
 
     auto container_refs = runtime.containers();
     auto container = container_refs.find(options.ID);
@@ -25,7 +23,7 @@ auto linyaps_box::command::exec(const struct exec_options &options) -> int
     option.proc.args = options.command;
     option.proc.terminal = options.tty;
     option.proc.no_new_privileges = options.no_new_privs;
-    option.proc.env = options.envs.value_or(std::vector<std::string>{ });
+    option.proc.env = options.envs.value_or(std::vector<std::string>{});
     option.preserve_fds = options.preserve_fds;
 
     if (option.proc.terminal && options.console_socket) {
@@ -41,7 +39,7 @@ auto linyaps_box::command::exec(const struct exec_options &options) -> int
                     caps.cend(),
                     std::back_inserter(cap_set),
                     [](const std::string &cap) {
-                        cap_value_t val{ 0 };
+                        cap_value_t val{0};
                         if (cap_from_name(cap.c_str(), &val) < 0) {
                             throw std::system_error(errno, std::system_category(), "cap_from_name");
                         }
@@ -57,7 +55,5 @@ auto linyaps_box::command::exec(const struct exec_options &options) -> int
     }
 #endif
 
-    // TODO: support exec fully
-
     return container->second.exec(std::move(option));
 }

src/linyaps_box/command/kill.cpp

@@ -1,11 +1,11 @@
-// SPDX-FileCopyrightText: 2022-2025 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2022 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
 #include "linyaps_box/command/kill.h"
 
-#include "linyaps_box/impl/status_directory.h"
 #include "linyaps_box/runtime.h"
+#include "linyaps_box/status_directory_manager.h"
 #include "linyaps_box/utils/platform.h"
 
 #include <algorithm>
@@ -28,12 +28,8 @@ void linyaps_box::command::kill(const struct kill_options &options)
         break;
     }
 
-    auto status_dir = std::make_unique<impl::status_directory>(options.global_.get().root);
-    if (!status_dir) {
-        throw std::runtime_error("failed to create status directory");
-    }
-
-    runtime_t runtime(std::move(status_dir));
+    status_directory_manager mgr(options.global_.get().root);
+    runtime_t runtime(std::move(mgr));
     const auto &containers = runtime.containers();
     for (const auto &[id, ref] : containers) {
         if (id != options.container) {

src/linyaps_box/command/list.cpp

@@ -1,24 +1,18 @@
-// SPDX-FileCopyrightText: 2022-2025 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2022 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
 #include "linyaps_box/command/list.h"
 
 #include "linyaps_box/impl/json_printer.h"
-#include "linyaps_box/impl/status_directory.h"
 #include "linyaps_box/impl/table_printer.h"
 #include "linyaps_box/runtime.h"
-
-#include <memory>
+#include "linyaps_box/status_directory_manager.h"
 
 void linyaps_box::command::list(const struct list_options &options)
 {
-    auto status_dir = std::make_unique<impl::status_directory>(options.global_.get().root);
-    if (!status_dir) {
-        throw std::runtime_error("failed to create status directory");
-    }
-
-    runtime_t runtime(std::move(status_dir));
+    status_directory_manager mgr(options.global_.get().root);
+    runtime_t runtime(std::move(mgr));
 
     std::unique_ptr<printer> printer;
     if (options.output_format == list_options::output_format_t::json) {

src/linyaps_box/command/run.cpp

@@ -1,18 +1,16 @@
-// SPDX-FileCopyrightText: 2022-2026 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2022 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
 #include "linyaps_box/command/run.h"
 
-#include "linyaps_box/impl/status_directory.h"
 #include "linyaps_box/runtime.h"
-#include "linyaps_box/status_directory.h"
+#include "linyaps_box/status_directory_manager.h"
 
 auto linyaps_box::command::run(const struct run_options &options) -> int
 {
-    std::unique_ptr<status_directory> dir =
-            std::make_unique<impl::status_directory>(options.global_.get().root);
-    runtime_t runtime(std::move(dir));
+    status_directory_manager mgr(options.global_.get().root);
+    runtime_t runtime(std::move(mgr));
     const create_container_options_t create_container_options{ options.global_.get().manager,
                                                                options.ID,
                                                                options.bundle,

src/linyaps_box/container.cpp

@@ -2401,9 +2401,9 @@ void poststop_hooks(const linyaps_box::container &container) noexcept
 
 } // namespace
 
-linyaps_box::container::container(const status_directory &status_dir,
-                                  const create_container_options_t &options)
-    : container_ref(status_dir, options.ID)
+linyaps_box::container::container(status_directory status_dir,
+                                   const create_container_options_t &options)
+    : container_ref(std::move(status_dir), options.ID)
     , bundle(options.bundle)
 {
     auto config = options.config;
@@ -2419,7 +2419,6 @@ linyaps_box::container::container(const status_directory &status_dir,
     host_uid_ = ::geteuid();
     host_gid_ = ::getegid();
 
-    // TODO: maybe find another way to get user name
 #ifndef LINYAPS_BOX_STATIC_LINK
     auto *pw = getpwuid(host_uid_);
     if (pw == nullptr) {
@@ -2442,6 +2441,8 @@ linyaps_box::container::container(const status_directory &status_dir,
         this->status_dir().write(status);
     }
 
+    this->status_dir().write_config(config_str);
+
     switch (options.manager) {
     case cgroup_manager_t::disabled: {
         this->manager = std::make_unique<disabled_cgroup_manager>();
@@ -2550,7 +2551,7 @@ int linyaps_box::container::run(run_container_options_t options)
         LINYAPS_BOX_ERR() << "failed to run a container, caused by: " << e.what();
     }
 
-    this->status_dir().remove(this->get_id());
+    this->status_dir().remove();
 
     // TODO: cleanup cgroup
 

src/linyaps_box/container.h

@@ -31,7 +31,7 @@ struct run_container_options_t
 class container final : public container_ref
 {
 public:
-    container(const status_directory &status_dir, const create_container_options_t &options);
+    container(status_directory status_dir, const create_container_options_t &options);
 
     container(const container &) = delete;
     auto operator=(const container &) -> container & = delete;

src/linyaps_box/container_ref.cpp

@@ -10,23 +10,24 @@
 #include "linyaps_box/utils/log.h"
 #include "linyaps_box/utils/process.h"
 #include "linyaps_box/utils/session.h"
+#include "nlohmann/json.hpp"
 
 #include <csignal> // IWYU pragma: keep
 #include <utility>
 
 #include <unistd.h>
 
-linyaps_box::container_ref::container_ref(const status_directory &status_dir, std::string id)
+linyaps_box::container_ref::container_ref(status_directory status_dir, std::string id)
     : id_(std::move(id))
-    , status_dir_(status_dir)
+    , status_dir_(std::move(status_dir))
 {
 }
 
 linyaps_box::container_ref::~container_ref() noexcept = default;
 
 linyaps_box::container_status_t linyaps_box::container_ref::status() const
 {
-    return this->status_dir_.read(this->id_);
+    return status_dir_.read();
 }
 
 void linyaps_box::container_ref::kill(int signal) const
@@ -47,7 +48,6 @@ auto linyaps_box::container_ref::exec(exec_container_option option) -> int
 {
     auto target = std::to_string(this->status().PID);
 
-    // TODO: support detach later
     std::ignore = utils::prctl(PR_SET_CHILD_SUBREAPER, 1, 0, 0, 0);
 
     std::optional<unix_socket> recv_socketpair;
@@ -63,31 +63,45 @@ auto linyaps_box::container_ref::exec(exec_container_option option) -> int
     }
 
     if (child == 0) {
-        // TODO: create terminal after rewrite exec. it should be created in the container namespace
         if (option.console_socket) {
             utils::setsid();
             auto [master, slave] = create_pty_pair();
 
             slave.setup_stdio();
-            // TODO: use fchown after we implement exec option `--user`
             slave.set_size({ });
 
             option.console_socket->send_fd(std::move(master).take());
             option.console_socket.reset();
         }
 
-        std::vector<const char *> argv{
-            "nsenter",
-            "--target",
-            target.c_str(),
-            "--user",
-            "--mount",
-            "--pid",
-            // FIXME:
-            // Old nsenter command do not support --wdns,
-            // so we have to implement nsenter by ourself in the future.
-            "--preserve-credentials",
-        };
+        std::vector<const char *> argv{ "nsenter", "--target", target.c_str() };
+
+        auto config_str = status_dir_.read_config();
+        auto config = nlohmann::json::parse(config_str);
+        const auto &linux = config.at("linux");
+        assert(!linux.is_null());
+
+        // FIXME: we assume that container always unshare some namespaces for now
+        // support exec commands without setns in the future
+        for (const auto &ns : linux.at("namespaces")) {
+            const auto &type = ns.at("type");
+            if (type == "pid") {
+                argv.push_back("--pid");
+            } else if (type == "mount") {
+                argv.push_back("--mount");
+            } else if (type == "uts") {
+                argv.push_back("--uts");
+            } else if (type == "ipc") {
+                argv.push_back("--ipc");
+            } else if (type == "network") {
+                argv.push_back("--net");
+            } else if (type == "user") {
+                argv.push_back("--user");
+            } else if (type == "cgroup") {
+                argv.push_back("--cgroup");
+            }
+        }
+        argv.push_back("--preserve-credentials");
 
         for (const auto &arg : option.proc.args) {
             argv.push_back(arg.c_str());
@@ -101,20 +115,6 @@ auto linyaps_box::container_ref::exec(exec_container_option option) -> int
         }
         c_env.push_back(nullptr);
 
-        // FIXME:
-        // We only handle the command arguments for now
-        // here are some other fields in process we need to consider:
-        // terminal
-        // console.height
-        // console.width
-        // cwd
-        // env
-        // rlimits
-        // apparmor_profile
-        // capabilities
-        // no_new_privileges
-        // oom_score_adj
-
         ::execvpe("nsenter", const_cast<char **>(argv.data()), const_cast<char **>(c_env.data()));
         _exit(EXIT_FAILURE);
     }
@@ -148,10 +148,10 @@ auto linyaps_box::container_ref::exec(exec_container_option option) -> int
 
 const linyaps_box::status_directory &linyaps_box::container_ref::status_dir() const
 {
-    return this->status_dir_;
+    return status_dir_;
 }
 
 const std::string &linyaps_box::container_ref::get_id() const
 {
-    return this->id_;
+    return id_;
 }

src/linyaps_box/container_ref.h

@@ -9,6 +9,8 @@
 #include "linyaps_box/status_directory.h"
 #include "linyaps_box/unix_socket.h"
 
+#include <string>
+
 namespace linyaps_box {
 
 struct exec_container_option
@@ -21,13 +23,13 @@ struct exec_container_option
 class container_ref
 {
 public:
-    container_ref(const status_directory &status_dir, std::string id);
+    container_ref(status_directory status_dir, std::string id);
     virtual ~container_ref() noexcept;
 
     container_ref(const container_ref &) = delete;
     auto operator=(const container_ref &) -> container_ref & = delete;
-    container_ref(container_ref &&) = delete;
-    auto operator=(container_ref &&) -> container_ref & = delete;
+    container_ref(container_ref &&) = default;
+    auto operator=(container_ref &&) -> container_ref & = default;
 
     [[nodiscard]] auto status() const -> container_status_t;
     void kill(int signal) const;
@@ -39,7 +41,7 @@ class container_ref
 
 private:
     std::string id_;
-    const status_directory &status_dir_;
+    status_directory status_dir_;
 };
 
 } // namespace linyaps_box