Add processing of fstab, mounting, and decrypt
diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index d0821bb..2e50641 100644
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -26,28 +26,139 @@
#include <sys/stat.h>
#include <sys/vfs.h>
#include <unistd.h>
+#include <vector>
#include "variables.h"
#include "common.h"
#include "partitions.hpp"
+#include "data.hpp"
+
+#ifdef TW_INCLUDE_CRYPTO
+ #ifdef TW_INCLUDE_JB_CRYPTO
+ #include "crypto/jb/cryptfs.h"
+ #else
+ #include "crypto/ics/cryptfs.h"
+ #endif
+ #include "cutils/properties.h"
+#endif
int TWPartitionManager::Process_Fstab(string Fstab_Filename, bool Display_Error) {
- LOGI("STUB TWPartitionManager::Process_Fstab, Fstab_Filename: '%s', Display_Error: %i\n", Fstab_Filename.c_str(), Display_Error);
- return 1;
+ FILE *fstabFile;
+ char fstab_line[MAX_FSTAB_LINE_LENGTH];
+
+ fstabFile = fopen(Fstab_Filename.c_str(), "rt");
+ if (fstabFile == NULL) {
+ LOGE("Critical Error: Unable to open fstab at '%s'.\n", Fstab_Filename.c_str());
+ return false;
+ }
+
+ while (fgets(fstab_line, sizeof(fstab_line), fstabFile) != NULL) {
+ if (fstab_line[0] != '/')
+ continue;
+
+ TWPartition* partition = new TWPartition();
+ string line(fstab_line);
+ if (partition->Process_Fstab_Line(line, Display_Error)) {
+ Partitions.push_back(partition);
+ } else {
+ delete partition;
+ }
+ }
+ fclose(fstabFile);
+ if (!Write_Fstab()) {
+ if (Display_Error)
+ LOGE("Error creating fstab\n");
+ else
+ LOGI("Error creating fstab\n");
+ }
+ return true;
+}
+
+int TWPartitionManager::Write_Fstab(void) {
+ FILE *fp;
+ std::vector<TWPartition*>::iterator iter;
+ string Line;
+
+ fp = fopen("/etc/fstab", "w");
+ if (fp == NULL) {
+ LOGI("Can not open /etc/fstab.\n");
+ return false;
+ }
+ for (iter = Partitions.begin(); iter != Partitions.end(); iter++) {
+ if ((*iter)->Can_Be_Mounted && (*iter)->Is_Present) {
+ if ((*iter)->Is_Decrypted)
+ Line = (*iter)->Decrypted_Block_Device + " " + (*iter)->Mount_Point + " " + (*iter)->Current_File_System + " rw\n";
+ else
+ Line = (*iter)->Block_Device + " " + (*iter)->Mount_Point + " " + (*iter)->Current_File_System + " rw\n";
+ fputs(Line.c_str(), fp);
+ }
+ }
+ fclose(fp);
+ return true;
}
int TWPartitionManager::Mount_By_Path(string Path, bool Display_Error) {
- LOGI("STUB TWPartitionManager::Mount_By_Path, Path: '%s', Display_Error: %i\n", Path.c_str(), Display_Error);
- return 1;
+ std::vector<TWPartition*>::iterator iter;
+ int ret = false;
+ bool found = false;
+ string Local_Path = Path;
+
+ // Make sure that we have a leading slash
+ if (Local_Path.substr(0, 1) != "/")
+ Local_Path = "/" + Local_Path;
+
+ // Trim the path to get the root path only
+ size_t position = Local_Path.find("/", 2);
+ if (position != string::npos) {
+ Local_Path.resize(position);
+ }
+
+ // Iterate through all partitions
+ for (iter = Partitions.begin(); iter != Partitions.end(); iter++) {
+ if ((*iter)->Mount_Point == Local_Path) {
+ ret = (*iter)->Mount(Display_Error);
+ found = true;
+ } else if ((*iter)->Is_SubPartition && (*iter)->SubPartition_Of == Local_Path)
+ (*iter)->Mount(Display_Error);
+ }
+ if (found) {
+ return ret;
+ } else if (Display_Error) {
+ LOGE("Unable to find partition for path '%s'\n", Local_Path.c_str());
+ } else {
+ LOGI("Unable to find partition for path '%s'\n", Local_Path.c_str());
+ }
+ return false;
}
int TWPartitionManager::Mount_By_Block(string Block, bool Display_Error) {
- LOGI("STUB TWPartitionManager::Mount_By_Block, Block: '%s', Display_Error: %i\n", Block.c_str(), Display_Error);
- return 1;
+ std::vector<TWPartition*>::iterator iter;
+
+ for (iter = Partitions.begin(); iter != Partitions.end(); iter++) {
+ if ((*iter)->Block_Device == Block)
+ return (*iter)->Mount(Display_Error);
+ else if ((*iter)->Alternate_Block_Device == Block)
+ return (*iter)->Mount(Display_Error);
+ }
+ if (Display_Error)
+ LOGE("Unable to find partition for block '%s'\n", Block.c_str());
+ else
+ LOGI("Unable to find partition for block '%s'\n", Block.c_str());
+ return false;
}
int TWPartitionManager::Mount_By_Name(string Name, bool Display_Error) {
- LOGI("STUB TWPartitionManager::Mount_By_Path, Name: '%s', Display_Error: %i\n", Name.c_str(), Display_Error);
+ std::vector<TWPartition*>::iterator iter;
+
+ for (iter = Partitions.begin(); iter != Partitions.end(); iter++) {
+ if ((*iter)->Display_Name == Name)
+ return (*iter)->Mount(Display_Error);
+ }
+ if (Display_Error)
+ LOGE("Unable to find partition for name '%s'\n", Name.c_str());
+ else
+ LOGI("Unable to find partition for name '%s'\n", Name.c_str());
+ return false;
return 1;
}
@@ -81,20 +192,33 @@
return 1;
}
-int TWPartitionManager::Mount_Current_Storage(void) {
- LOGI("STUB TWPartitionManager::Mount_Current_Storage\n");
- return 1;
+int TWPartitionManager::Mount_Current_Storage(bool Display_Error) {
+ return Mount_By_Path(DataManager::GetCurrentStoragePath(), Display_Error);
}
-/**TWPartition TWPartitionManager::Find_Partition_By_Path(string Path) {
- LOGI("STUB TWPartitionManager::Find_Partition_By_Path, Path: '%s'\n", Path.c_str());
+int TWPartitionManager::Mount_Settings_Storage(bool Display_Error) {
+ return Mount_By_Path(DataManager::GetSettingsStoragePath(), Display_Error);
+}
+
+TWPartition* TWPartitionManager::Find_Partition_By_Path(string Path) {
+ std::vector<TWPartition*>::iterator iter;
+
+ for (iter = Partitions.begin(); iter != Partitions.end(); iter++) {
+ if ((*iter)->Mount_Point == Path)
+ return (*iter);
+ }
return NULL;
}
-*TWPartition TWPartitionManager::Find_Partition_By_Block(string Block) {
+TWPartition* TWPartitionManager::Find_Partition_By_Block(string Block) {
LOGI("STUB TWPartitionManager::Find_Partition_By_Block, Block: '%s'\n", Block.c_str());
return NULL;
-}*/
+}
+
+TWPartition* TWPartitionManager::Find_Partition_By_Name(string Name) {
+ LOGI("STUB TWPartitionManager::Find_Partition_By_Name, Name: '%s'\n", Name.c_str());
+ return NULL;
+}
int TWPartitionManager::Run_Backup(string Backup_Name) {
LOGI("STUB TWPartitionManager::Run_Backup, Backup_Name: '%s'\n", Backup_Name.c_str());
@@ -137,11 +261,61 @@
}
void TWPartitionManager::Update_System_Details(void) {
- LOGI("STUB TWPartitionManager::Update_System_Details\n");
+ std::vector<TWPartition*>::iterator iter;
+
+ LOGI("Updating system details...\n");
+ for (iter = Partitions.begin(); iter != Partitions.end(); iter++) {
+ (*iter)->Check_FS_Type();
+ (*iter)->Update_Size(false);
+ }
+ if (!Write_Fstab())
+ LOGE("Error creating fstab\n");
return;
}
int TWPartitionManager::Decrypt_Device(string Password) {
- LOGI("STUB TWPartitionManager::Decrypt_Device, Password: '%s'\n", Password.c_str());
+#ifdef TW_INCLUDE_CRYPTO
+ int ret_val, password_len;
+ char crypto_blkdev[255], cPassword[255];
+ size_t result;
+
+ property_set("ro.crypto.state", "encrypted");
+#ifdef TW_INCLUDE_JB_CRYPTO
+ // No extra flags needed
+#else
+ property_set("ro.crypto.fs_type", CRYPTO_FS_TYPE);
+ property_set("ro.crypto.fs_real_blkdev", CRYPTO_REAL_BLKDEV);
+ property_set("ro.crypto.fs_mnt_point", CRYPTO_MNT_POINT);
+ property_set("ro.crypto.fs_options", CRYPTO_FS_OPTIONS);
+ property_set("ro.crypto.fs_flags", CRYPTO_FS_FLAGS);
+ property_set("ro.crypto.keyfile.userdata", CRYPTO_KEY_LOC);
+#endif
+ strcpy(cPassword, Password.c_str());
+ if (cryptfs_check_passwd(cPassword) != 0) {
+ LOGE("Failed to decrypt data.\n");
+ return -1;
+ }
+ property_get("ro.crypto.fs_crypto_blkdev", crypto_blkdev, "error");
+ if (strcmp(crypto_blkdev, "error") == 0) {
+ LOGE("Error retrieving decrypted data block device.\n");
+ } else {
+ TWPartition* dat = Find_Partition_By_Path("/data");
+ if (dat != NULL) {
+ DataManager::SetValue(TW_DATA_BLK_DEVICE, dat->Block_Device);
+ DataManager::SetValue(TW_IS_DECRYPTED, 1);
+ dat->Is_Decrypted = true;
+ dat->Decrypted_Block_Device = crypto_blkdev;
+ LOGI("Data successfully decrypted, new block device: '%s'\n", crypto_blkdev);
+ // Sleep for a bit so that the device will be ready
+ sleep(1);
+ Update_System_Details();
+ } else
+ LOGE("Unable to locate data partition.\n");
+ }
+ return 0;
+#else
+ LOGE("No crypto support was compiled into this build.\n");
+ return -1;
+#endif
return 1;
}
\ No newline at end of file