fec0c0e472
vold creates some directories for storing encryption keys if they don't
already exist, potentially including parent directories:
/metadata/vold/metadata_encryption
/data/misc/vold/volume_keys/$volume_uuid
/data/misc_de/$user/vold/volume_keys/$volume_uuid
/data/misc_ce/$user/vold/volume_keys/$volume_uuid
Currently fs_mkdirs() is used for this. However, fs_mkdirs() doesn't
include the fsync()s of the parent directories that are needed to ensure
that the new directories are persisted to disk right away -- which is
important for encryption keys.
Add a utility function MkdirsSync() which does what is needed, and make
the appropriate places call it.
Test: Booted and checked log for "Created directory" message.
Also ran 'atest vold_tests' to run the new unit test.
Change-Id: Ie9917b616433080139b8db3fd6877203ee6faf77
66 lines
2.1 KiB
C++
66 lines
2.1 KiB
C++
/*
|
|
* Copyright (C) 2017 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include <android-base/file.h>
|
|
#include <gtest/gtest.h>
|
|
|
|
#include "../Utils.h"
|
|
|
|
namespace android {
|
|
namespace vold {
|
|
|
|
class UtilsTest : public testing::Test {};
|
|
|
|
TEST_F(UtilsTest, FindValueTest) {
|
|
std::string tmp;
|
|
|
|
ASSERT_FALSE(FindValue("", "KEY", &tmp));
|
|
ASSERT_FALSE(FindValue("NOTMATCH=\"VALUE\"", "KEY", &tmp));
|
|
ASSERT_FALSE(FindValue("BADKEY=\"VALUE\"", "KEY", &tmp));
|
|
|
|
ASSERT_TRUE(FindValue("KEY=\"VALUE\"", "KEY", &tmp));
|
|
ASSERT_EQ("VALUE", tmp);
|
|
|
|
ASSERT_TRUE(FindValue("FOO=\"BAR\" KEY=\"VALUE VALUE\" BAR=\"BAZ\"", "KEY", &tmp));
|
|
ASSERT_EQ("VALUE VALUE", tmp);
|
|
|
|
ASSERT_TRUE(FindValue("BADKEY=\"VALUE\" KEY=\"BAZ\"", "KEY", &tmp));
|
|
ASSERT_EQ("BAZ", tmp);
|
|
|
|
ASSERT_TRUE(FindValue("BADKEY=\"VALUE\" NOTKEY=\"OTHER\" KEY=\"QUUX\"", "KEY", &tmp));
|
|
ASSERT_EQ("QUUX", tmp);
|
|
}
|
|
|
|
TEST_F(UtilsTest, MkdirsSyncTest) {
|
|
TemporaryDir temp_dir;
|
|
std::string temp_dir_path;
|
|
|
|
ASSERT_TRUE(android::base::Realpath(temp_dir.path, &temp_dir_path));
|
|
|
|
ASSERT_FALSE(pathExists(temp_dir_path + "/a"));
|
|
ASSERT_TRUE(MkdirsSync(temp_dir_path + "/a/b/c", 0700));
|
|
ASSERT_TRUE(pathExists(temp_dir_path + "/a"));
|
|
ASSERT_TRUE(pathExists(temp_dir_path + "/a/b"));
|
|
// The final component of the path should not be created; only the previous
|
|
// components should be.
|
|
ASSERT_FALSE(pathExists(temp_dir_path + "/a/b/c"));
|
|
|
|
// Currently, MkdirsSync() only supports absolute paths.
|
|
ASSERT_FALSE(MkdirsSync("foo", 0700));
|
|
}
|
|
|
|
} // namespace vold
|
|
} // namespace android
|