Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3848)

Unified Diff: chrome/browser/chromeos/arc/arc_util.cc

Issue 2788383003: ChromeOS: Disable ARC when incompatible filesystem is detected. (Closed)
Patch Set: Addressed review comments Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/arc/arc_util.cc
diff --git a/chrome/browser/chromeos/arc/arc_util.cc b/chrome/browser/chromeos/arc/arc_util.cc
index 3c40a7c2f950b82644f66845c0aada8f88eee9d2..b785728a93a13293dcb8185ff9fea389b21fa197 100644
--- a/chrome/browser/chromeos/arc/arc_util.cc
+++ b/chrome/browser/chromeos/arc/arc_util.cc
@@ -4,7 +4,13 @@
#include "chrome/browser/chromeos/arc/arc_util.h"
+#include <linux/magic.h>
+#include <sys/statfs.h>
+
+#include "base/files/file_path.h"
#include "base/logging.h"
+#include "base/sys_info.h"
+#include "base/threading/thread_restrictions.h"
#include "chrome/browser/chromeos/arc/arc_session_manager.h"
#include "chrome/browser/chromeos/login/user_flow.h"
#include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
@@ -20,6 +26,9 @@ namespace arc {
namespace {
+constexpr char kLsbReleaseArcVersionKey[] = "CHROMEOS_ARC_ANDROID_SDK_VERSION";
+constexpr char kAndroidMSdkVersion[] = "23";
+
// Let IsAllowedForProfile() return "false" for any profile.
bool g_disallow_for_testing = false;
@@ -92,6 +101,30 @@ bool IsArcAllowedForProfile(const Profile* profile) {
return false;
}
+ // Do not allow newer version of ARC on old filesystem.
+ // Check this condition only on real Chrome OS devices. Test runs on Linux
+ // workstation does not have expected /etc/lsb-release field nor profile
+ // creation step.
+ if (base::SysInfo::IsRunningOnChromeOS()) {
+ // chromeos::UserSessionManager::PrepareProfile does the actual file system
+ // check and stores the result to prefs, so that it survives crash-restart.
+ const bool is_filesystem_compatible =
+ profile->GetPrefs()->GetBoolean(prefs::kArcCompatibleFilesystemChosen);
+ std::string arc_sdk_version;
+ const bool is_M = base::SysInfo::GetLsbReleaseValue(
+ kLsbReleaseArcVersionKey, &arc_sdk_version) &&
+ arc_sdk_version == kAndroidMSdkVersion;
+ // To run ARC we want to make sure either
+ // - Underlying file system is compatible with ARC, or
+ // - SDK version is M.
+ if (!is_filesystem_compatible && !is_M) {
+ VLOG(1)
+ << "Users with SDK version (" << arc_sdk_version
+ << ") are not supported when they postponed to migrate to dircrypto.";
+ return false;
+ }
+ }
+
return true;
}
@@ -141,4 +174,14 @@ bool AreArcAllOptInPreferencesManagedForProfile(const Profile* profile) {
prefs::kArcLocationServiceEnabled);
}
+bool IsArcCompatibleFilesystem(const base::FilePath& path) {
+ base::ThreadRestrictions::AssertIOAllowed();
+
+ // If it can be verified it is not on ecryptfs, then it is ok.
+ struct statfs statfs_buf;
+ if (statfs(path.value().c_str(), &statfs_buf) < 0)
+ return false;
+ return statfs_buf.f_type != ECRYPTFS_SUPER_MAGIC;
+}
+
} // namespace arc
« no previous file with comments | « chrome/browser/chromeos/arc/arc_util.h ('k') | chrome/browser/chromeos/login/session/user_session_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698