StarMirror/sandboxed-api
1
0
Fork 0
mirror of https://github.com/google/sandboxed-api.git synced 2024-03-22 13:11:30 +08:00
Code Issues Projects Releases Wiki Activity

Rewrite IsEquivalentNode without the use of MessageDifferencer

Browse Source 
PiperOrigin-RevId: 433422767
Change-Id: I891a8f5f027115898590a43bed5d25c51c1db944
This commit is contained in:
Oliver Kunz 2022-03-09 01:55:58 -08:00 committed by Copybara-Service
parent 612ff57913
commit c5565241c1
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sandboxed_api/sandbox2/mounts.cc
View File

@ -37,6 +37,7 @@
#include "absl/strings/string_view.h" #include "absl/strings/string_view.h"
#include "absl/strings/strip.h" #include "absl/strings/strip.h"
#include "sandboxed_api/config.h" #include "sandboxed_api/config.h"
#include "sandboxed_api/sandbox2/mounttree.pb.h"
#include "sandboxed_api/sandbox2/util/minielf.h" #include "sandboxed_api/sandbox2/util/minielf.h"
#include "sandboxed_api/util/fileops.h" #include "sandboxed_api/util/fileops.h"
#include "sandboxed_api/util/path.h" #include "sandboxed_api/util/path.h"
@ -128,6 +129,10 @@ std::string GetPlatform(absl::string_view interpreter) {
namespace internal { namespace internal {
bool IsSameFile(const std::string& path1, const std::string& path2) { bool IsSameFile(const std::string& path1, const std::string& path2) {
if (path1 == path2) {
return true;
}
struct stat stat1, stat2; struct stat stat1, stat2;
if (stat(path1.c_str(), &stat1) == -1) { if (stat(path1.c_str(), &stat1) == -1) {
return false; return false;
@ -140,25 +145,26 @@ bool IsSameFile(const std::string& path1, const std::string& path2) {
return stat1.st_dev == stat2.st_dev && stat1.st_ino == stat2.st_ino; return stat1.st_dev == stat2.st_dev && stat1.st_ino == stat2.st_ino;
} }
bool IsEquivalentNode(const sandbox2::MountTree::Node& n1, bool IsEquivalentNode(const MountTree::Node& n1, const MountTree::Node& n2) {
const sandbox2::MountTree::Node& n2) { // Return early when node types are different
// Node equals 1:1
if (google::protobuf::util::MessageDifferencer::Equals(n1, n2)) {
return true;
}
if (n1.node_case() != n2.node_case()) { if (n1.node_case() != n2.node_case()) {
return false; return false;
} }
// Check whether files/dirs are the same (e.g symlinks / hardlinks) // Compare proto fileds
switch (n1.node_case()) { switch (n1.node_case()) {
case sandbox2::MountTree::Node::kFileNode: case MountTree::Node::kFileNode:
// Check whether files are the same (e.g. symlinks / hardlinks)
return n1.file_node().is_ro() == n2.file_node().is_ro() && return n1.file_node().is_ro() == n2.file_node().is_ro() &&
IsSameFile(n1.file_node().outside(), n2.file_node().outside()); IsSameFile(n1.file_node().outside(), n2.file_node().outside());
case sandbox2::MountTree::Node::kDirNode: case MountTree::Node::kDirNode:
// Check whether dirs are the same (e.g. symlinks / hardlinks)
return n1.dir_node().is_ro() == n2.dir_node().is_ro() && return n1.dir_node().is_ro() == n2.dir_node().is_ro() &&
IsSameFile(n1.dir_node().outside(), n2.dir_node().outside()); IsSameFile(n1.dir_node().outside(), n2.dir_node().outside());
case MountTree::Node::kTmpfsNode:
return n1.tmpfs_node().tmpfs_options() == n2.tmpfs_node().tmpfs_options();
case MountTree::Node::kRootNode:
return n1.root_node().is_ro() == n2.root_node().is_ro();
default: default:
return false; return false;
} }