Revert "[DO NOT MERGE] btif/osi: move I/O to OSI layer. disable for multi-user." (997f25c0) · Commits · e / os / android_packages_modules_Bluetooth

system/btif/include/btif_keystore.h

+7 −5

Original line number	Diff line number	Diff line
		@@ -42,20 +42,22 @@ class BtifKeystore {
		BtifKeystore(keystore::KeystoreClient* keystore_client);

		/**
		* Encrypts given data
		* Stores encrypted data to disk.
		*
		* <p>Returns a string representation of the encrypted data
		* <p>Returns true on success.
		*
		* @param data to be encrypted
		* @param flags for keystore
		* @param output_filename location to write the file
		* @param flags
		*/
		std::string Encrypt(const std::string& data, int32_t flags);
		bool Encrypt(const std::string& data, const std::string& output_filename,
		int32_t flags);

		/**
		* Returns a decrypted string representation of the encrypted data or empty
		* string on error.
		*
		* @param input encrypted data
		* @param input_filename location of file to read and decrypt
		*/
		std::string Decrypt(const std::string& input_filename);

system/btif/src/btif_config.cc

+7 −30

Original line number	Diff line number	Diff line
		@@ -24,15 +24,15 @@
		#include <ctype.h>
		#include <openssl/rand.h>
		#include <openssl/sha.h>
		#include <private/android_filesystem_config.h>
		#include <stdio.h>
		#include <string.h>
		#include <time.h>
		#include <unistd.h>
		#include <mutex>
		#include <sstream>
		#include <string>

		#include <mutex>

		#include "bt_types.h"
		#include "btcore/include/module.h"
		#include "btif_api.h"
		@@ -54,13 +54,10 @@
		#define FILE_TIMESTAMP "TimeCreated"
		#define FILE_SOURCE "FileSource"
		#define TIME_STRING_LENGTH sizeof("YYYY-MM-DD HH:MM:SS")
		#define DISABLED "disabled"
		static const char* TIME_STRING_FORMAT = "%Y-%m-%d %H:%M:%S";

		constexpr int kBufferSize = 400 * 10; // initial file is ~400B

		static bool use_key_attestation() { return getuid() == AID_BLUETOOTH; }

		using bluetooth::BtifKeystore;

		// TODO(armansito): Find a better way than searching by a hardcoded path.
		@@ -582,10 +579,6 @@ static void delete_config_files(void) {
		}

		static std::string hash_file(const char* filename) {
		if (!use_key_attestation()) {
		LOG(INFO) << __func__ << ": Disabled for multi-user";
		return DISABLED;
		}
		FILE* fp = fopen(filename, "rb");
		if (!fp) {
		LOG(ERROR) << __func__ << ": unable to open config file: '" << filename
		@@ -610,31 +603,15 @@ static std::string hash_file(const char* filename) {
		}

		static std::string read_checksum_file(const char* checksum_filename) {
		if (!use_key_attestation()) {
		LOG(INFO) << __func__ << ": Disabled for multi-user";
		return DISABLED;
		}
		std::string encrypted_hash = checksum_read(checksum_filename);
		if (encrypted_hash.empty()) {
		LOG(INFO) << __func__ << ": read empty hash.";
		// Ensure file exists
		if (access(checksum_filename, R_OK) != 0) {
		return "";
		}
		return btif_keystore.Decrypt(encrypted_hash);
		return btif_keystore.Decrypt(checksum_filename);
		}

		static void write_checksum_file(const char* checksum_filename,
		const std::string& hash) {
		if (!use_key_attestation()) {
		LOG(INFO) << __func__
		<< ": Disabled for multi-user, since config changed removing "
		"checksums.";
		remove(CONFIG_FILE_CHECKSUM_PATH);
		remove(CONFIG_BACKUP_CHECKSUM_PATH);
		return;
		}
		std::string encrypted_checksum = btif_keystore.Encrypt(hash, 0);
		CHECK(!encrypted_checksum.empty())
		<< __func__ << ": Failed encrypting checksum";
		CHECK(checksum_save(encrypted_checksum, checksum_filename))
		<< __func__ << ": Failed to save checksum!";
		bool result = btif_keystore.Encrypt(hash, checksum_filename, 0);
		CHECK(result) << "Failed writing checksum";
		}

system/btif/src/btif_keystore.cc

+46 −9

Original line number	Diff line number	Diff line
		@@ -31,41 +31,78 @@ using namespace bluetooth;

		constexpr char kKeyStore[] = "AndroidKeystore";

		static std::string ReadFile(const std::string& filename) {
		CHECK(!filename.empty()) << __func__ << ": filename should not be empty";

		std::string content;
		base::FilePath path(filename);
		if (!base::PathExists(path)) {
		// Config file checksum file doesn't exist on first run after OTA.
		LOG(ERROR) << "file '" << filename.c_str() << "'doesn't exists yet";
		}
		if (!base::ReadFileToString(path, &content)) {
		LOG(ERROR) << "ReadFile failed: " << filename.c_str();
		}
		return content;
		}

		static void WriteFile(const std::string& filename, const std::string& content) {
		CHECK(!filename.empty()) << __func__ << ": filename should not be empty";
		CHECK(!content.empty()) << __func__ << ": content should not be empty";

		base::FilePath path(filename);
		int size = content.size();
		if (base::WriteFile(path, content.data(), size) != size) {
		LOG(FATAL) << "WriteFile failed.\n" << filename.c_str();
		}
		}

		namespace bluetooth {

		BtifKeystore::BtifKeystore(keystore::KeystoreClient* keystore_client)
		: keystore_client_(keystore_client) {}

		std::string BtifKeystore::Encrypt(const std::string& data, int32_t flags) {
		bool BtifKeystore::Encrypt(const std::string& data,
		const std::string& output_filename, int32_t flags) {
		std::lock_guard<std::mutex> lock(api_mutex_);
		std::string output;
		if (data.empty()) {
		LOG(ERROR) << __func__ << ": empty data";
		return output;
		return false;
		}
		if (output_filename.empty()) {
		LOG(ERROR) << __func__ << ": empty output filename";
		return false;
		}
		std::string output;
		if (!keystore_client_->doesKeyExist(kKeyStore)) {
		auto gen_result = GenerateKey(kKeyStore, 0, false);
		if (!gen_result.isOk()) {
		LOG(FATAL) << "EncryptWithAuthentication Failed: generateKey response="
		<< gen_result;
		return output;
		return false;
		}
		}
		if (!keystore_client_->encryptWithAuthentication(kKeyStore, data, flags,
		&output)) {
		LOG(FATAL) << "EncryptWithAuthentication failed.";
		return output;
		return false;
		}
		return output;
		WriteFile(output_filename, output);
		return true;
		}

		std::string BtifKeystore::Decrypt(const std::string& input) {
		std::string BtifKeystore::Decrypt(const std::string& input_filename) {
		std::lock_guard<std::mutex> lock(api_mutex_);
		std::string output;
		if (input_filename.empty()) {
		LOG(ERROR) << __func__ << ": empty input filename";
		return output;
		}
		std::string input = ReadFile(input_filename);
		if (input.empty()) {
		LOG(ERROR) << __func__ << ": empty input data";
		return "";
		return output;
		}
		std::string output;
		if (!keystore_client_->decryptWithAuthentication(kKeyStore, input, &output)) {
		LOG(FATAL) << "DecryptWithAuthentication failed.\n";
		}

system/btif/test/btif_keystore_test.cc

+41 −7

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@
		*
		******************************************************************************/

		#include <base/files/file_util.h>
		#include <base/logging.h>
		#include <binder/ProcessState.h>
		#include <gtest/gtest.h>
		@@ -25,40 +26,73 @@

		using namespace bluetooth;

		constexpr char kFilename[] = "/data/misc/bluedroid/testfile.txt";

		class BtifKeystoreTest : public ::testing::Test {
		protected:
		std::unique_ptr<BtifKeystore> btif_keystore_;
		base::FilePath file_path_;
		BtifKeystoreTest() : file_path_(kFilename) {}
		void SetUp() override {
		android::ProcessState::self()->startThreadPool();
		btif_keystore_ =
		std::make_unique<BtifKeystore>(static_cast<keystore::KeystoreClient*>(
		new keystore::KeystoreClientImpl));
		base::DeleteFile(file_path_, true);
		};
		void TearDown() override { btif_keystore_ = nullptr; };
		};

		// Encrypt
		TEST_F(BtifKeystoreTest, test_encrypt_decrypt) {
		std::string hash = "test";

		std::string encrypted_hash = btif_keystore_->Encrypt(hash, 0);
		std::string decrypted_hash = btif_keystore_->Decrypt(encrypted_hash);
		EXPECT_TRUE(btif_keystore_->Encrypt(hash, kFilename, 0));
		std::string decrypted_hash = btif_keystore_->Decrypt(kFilename);

		EXPECT_FALSE(encrypted_hash.empty());
		EXPECT_TRUE(base::PathExists(file_path_));
		EXPECT_EQ(hash, decrypted_hash);
		}

		TEST_F(BtifKeystoreTest, test_encrypt_empty_hash) {
		std::string hash = "";

		std::string encrypted_hash = btif_keystore_->Encrypt(hash, 0);
		EXPECT_FALSE(btif_keystore_->Encrypt(hash, kFilename, 0));

		EXPECT_FALSE(base::PathExists(file_path_));
		}

		TEST_F(BtifKeystoreTest, test_encrypt_empty_filename) {
		std::string hash = "test";

		EXPECT_FALSE(btif_keystore_->Encrypt(hash, "", 0));

		EXPECT_TRUE(encrypted_hash.empty());
		EXPECT_FALSE(base::PathExists(file_path_));
		}

		// Decrypt
		TEST_F(BtifKeystoreTest, test_decrypt_empty_hash) {
		std::string hash = "";
		// Only way to get the hash to decrypt is to read it from the file
		// So make empty file manually
		std::ofstream outfile(kFilename);
		outfile.close();

		std::string decrypted_hash = btif_keystore_->Decrypt(kFilename);

		EXPECT_TRUE(decrypted_hash.empty());
		}

		TEST_F(BtifKeystoreTest, test_decrypt_file_not_exist) {
		// Ensure file doesn't exist, then decrypt
		EXPECT_FALSE(base::PathExists(file_path_));

		std::string decrypted_hash = btif_keystore_->Decrypt(kFilename);

		EXPECT_TRUE(decrypted_hash.empty());
		}

		std::string decrypted_hash = btif_keystore_->Decrypt(hash);
		TEST_F(BtifKeystoreTest, test_decrypt_empty_filename) {
		std::string decrypted_hash = btif_keystore_->Decrypt("");

		EXPECT_TRUE(decrypted_hash.empty());
		}

system/osi/include/config.h

+0 −8

Original line number	Diff line number	Diff line
		@@ -49,9 +49,6 @@ std::unique_ptr<config_t> config_new_empty(void);
		// file on the filesystem.
		std::unique_ptr<config_t> config_new(const char* filename);

		// Read the checksum from the \|filename\|
		std::string checksum_read(const char* filename);

		// Clones \|src\|, including all of it's sections, keys, and values.
		// Returns a new config which is a copy and separated from the original;
		// changes to the new config are not reflected in any way in the original.
		@@ -136,8 +133,3 @@ bool config_remove_key(config_t* config, const std::string& section,
		// \|config_save\|, all comments and special formatting in the original file will
		// be lost. Neither \|config\| nor \|filename\| may be NULL.
		bool config_save(const config_t& config, const std::string& filename);

		// Saves the encrypted \|checksum\| of config file to a given \|filename\| Note
		// that this could be a destructive operation: if \|filename\| already exists,
		// it will be overwritten.
		bool checksum_save(const std::string& checksum, const std::string& filename);