Added support for locking/unlocking of LUKS disks using pmount/pumount.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/113/head
Michele Calgaro 4 years ago
parent ff35182a73
commit 7bdb6be95c
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -858,10 +858,6 @@ TQStringVariantMap TDEStorageDevice::mountDevice(TQString mediaName, TDEStorageM
// If no other method was found, use 'pmount' command if available // If no other method was found, use 'pmount' command if available
if(command.isEmpty()) { if(command.isEmpty()) {
if (!TDEGlobal::dirs()->findExe("pmount").isEmpty()) { if (!TDEGlobal::dirs()->findExe("pmount").isEmpty()) {
// Create dummy password file
KTempFile passwordFile(TQString::null, "tmp", 0600);
passwordFile.setAutoDelete(true);
TQString optionString; TQString optionString;
if (mountOptions["ro"] == "true") { if (mountOptions["ro"] == "true") {
optionString.append(" -r"); optionString.append(" -r");
@ -897,11 +893,9 @@ TQStringVariantMap TDEStorageDevice::mountDevice(TQString mediaName, TDEStorageM
mountpoint = mediaName; mountpoint = mediaName;
} }
TQString passFileName = passwordFile.name(); // %1 (option string) without quotes, otherwise pmount fails
passFileName.replace("'", "'\\''"); command = TQString("pmount %1 '%2' '%3' 2>&1")
.arg(optionString).arg(devNode).arg(mountpoint);
command = TQString("pmount -p '%1' %2 '%3' '%4' 2>&1")
.arg(passFileName).arg(optionString).arg(devNode).arg(mountpoint);
} }
} }
@ -1068,6 +1062,44 @@ TQStringVariantMap TDEStorageDevice::unlockDevice(const TQString &passphrase)
} }
#endif #endif
// If no other method was found, use 'pmount' command if available
if (!TDEGlobal::dirs()->findExe("pmount").isEmpty()) {
// Create dummy password file
KTempFile passwordFile(TQString::null, "tmp", 0600);
passwordFile.setAutoDelete(true);
TQFile *pwFile = passwordFile.file();
if (!pwFile) {
result["errStr"] = i18n("Cannot create temporary password file");
result["result"] = false;
return result;
}
pwFile->writeBlock(passphrase.local8Bit(), passphrase.length());
pwFile->flush();
TQString passFileName = passwordFile.name();
passFileName.replace("'", "'\\''");
TQString command = TQString("pmount -p '%1' '%2'").arg(passFileName).arg(devNode);
FILE *exepipe = popen(command.local8Bit(), "r");
if (exepipe) {
TQTextStream* ts = new TQTextStream(exepipe, IO_ReadOnly);
TQString unlock_output = ts->read();
delete ts;
int retcode = pclose(exepipe);
if (retcode == 0) {
// Update internal mount data
TDEGlobal::hardwareDevices()->rescanDeviceInformation(this);
TDEGlobal::hardwareDevices()->processModifiedMounts();
result["result"] = true;
}
else {
result["errStr"] = unlock_output;
result["retCode"] = retcode;
result["result"] = false;
}
return result;
}
}
// No supported methods found for unlocking the device // No supported methods found for unlocking the device
result["errStr"] = i18n("No supported unlocking methods were detected on your system."); result["errStr"] = i18n("No supported unlocking methods were detected on your system.");
result["result"] = false; result["result"] = false;
@ -1111,6 +1143,30 @@ TQStringVariantMap TDEStorageDevice::lockDevice()
} }
#endif #endif
// If no other method was found, use 'pumount' command if available
if (!TDEGlobal::dirs()->findExe("pumount").isEmpty()) {
TQString command = TQString("pumount '%1'").arg(devNode);
FILE *exepipe = popen(command.local8Bit(), "r");
if (exepipe) {
TQTextStream* ts = new TQTextStream(exepipe, IO_ReadOnly);
TQString lock_output = ts->read();
delete ts;
int retcode = pclose(exepipe);
if (retcode == 0) {
// Update internal mount data
TDEGlobal::hardwareDevices()->rescanDeviceInformation(this);
TDEGlobal::hardwareDevices()->processModifiedMounts();
result["result"] = true;
}
else {
result["errStr"] = lock_output;
result["retCode"] = retcode;
result["result"] = false;
}
return result;
}
}
// No supported methods found for locking the device // No supported methods found for locking the device
result["errStr"] = i18n("No supported locking methods were detected on your system."); result["errStr"] = i18n("No supported locking methods were detected on your system.");
result["result"] = false; result["result"] = false;

Loading…
Cancel
Save