tdeioslave media: safe removal and locking are now avaiable also for

unlocked and mounted medium.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/35/head
Michele Calgaro 3 years ago
parent 800775a5f1
commit 3740009719
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -311,7 +311,6 @@ TQStringVariantMap MediaManager::unlock(const TQString &uid, const TQString &pas
return result;
}
return m_halbackend->unlock(uid, password);
#else
// if (!m_fstabbackend) {
result["errStr"] = i18n("Feature only available with HAL or TDE hardware backend");

@ -40,218 +40,139 @@
#include "dialog.h"
#include "tdeio_media_mounthelper.h"
const Medium MountHelper::findMedium(const KURL &url)
const Medium MountHelper::findMedium(const TQString &device)
{
DCOPRef mediamanager("kded", "mediamanager");
// Try filename first
DCOPReply reply = mediamanager.call("properties", url.fileName());
if (!reply.isValid()) {
m_errorStr = i18n("The TDE mediamanager is not running.")+"\n";
DCOPReply reply = m_mediamanager.call("properties", device);
if (!reply.isValid())
{
m_errorStr = i18n("The TDE mediamanager is not running.\n");
return Medium(TQString::null, TQString::null, TQString::null);
}
const Medium& medium = Medium::create(reply);
if (medium.id().isEmpty()) {
// Try full URL now
reply = mediamanager.call("properties", url.prettyURL());
if (!reply.isValid()) {
m_errorStr = i18n("Internal Error");
return Medium(TQString::null, TQString::null, TQString::null);
}
return Medium::create(reply);
} else {
return medium;
}
const Medium &medium = Medium::create(reply);
return medium;
}
MountHelper::MountHelper() : TDEApplication()
void MountHelper::mount(const Medium &medium)
{
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
m_errorStr = TQString::null;
if (medium.id().isEmpty()) {
m_errorStr = i18n("Try to mount an unknown medium.");
errorAndExit();
}
TQString device = medium.deviceNode();
if (!medium.isMountable()) {
m_errorStr = i18n("%1 is not a mountable media.").arg(device);
errorAndExit();
}
else if (medium.isMounted()) {
m_errorStr = i18n("%1 is already mounted to %2.").arg(device).arg(medium.mountPoint());
errorAndExit();
}
KURL url(args->url(0));
const Medium medium = findMedium(url);
if (medium.id().isEmpty())
{
if (m_errorStr.isEmpty()) {
m_errorStr+= i18n("%1 cannot be found.").arg(url.prettyURL());
}
DCOPReply reply = m_mediamanager.call("mount", medium.id());
TQStringVariantMap mountResult;
if (reply.isValid()) {
reply.get(mountResult);
}
if (!mountResult.contains("result") || !mountResult["result"].toBool()) {
m_errorStr = mountResult.contains("errStr") ? mountResult["errStr"].toString() : i18n("Unknown mount error.");
errorAndExit();
}
}
void MountHelper::unmount(const Medium &medium)
{
if (medium.id().isEmpty()) {
m_errorStr = i18n("Try to unmount an unknown medium.");
errorAndExit();
}
TQString device = medium.deviceNode();
if (!medium.isMountable() && !medium.isEncrypted() && !args->isSet("e") && !args->isSet("s"))
{
m_errorStr = i18n("%1 is not a mountable or encrypted media.").arg(device);
if (!medium.isMountable()) {
m_errorStr = i18n("%1 is not a mountable media.").arg(device);
errorAndExit();
}
else if (!medium.isMounted()) {
m_errorStr = i18n("%1 is already unmounted.").arg(device);
errorAndExit();
}
if (args->isSet("m"))
{
// Mount drive
if (!medium.isMountable()) {
m_errorStr = i18n("%1 is not a mountable media.").arg(device);
errorAndExit();
}
else if (medium.isMounted()) {
m_errorStr = i18n("%1 is already mounted to %2.").arg(device).arg(medium.mountPoint());
errorAndExit();
}
DCOPReply reply = m_mediamanager.call("unmount", medium.id());
TQStringVariantMap unmountResult;
if (reply.isValid()) {
reply.get(unmountResult);
}
if (!unmountResult.contains("result") || !unmountResult["result"].toBool()) {
m_errorStr = unmountResult.contains("errStr") ? unmountResult["errStr"].toString() : i18n("Unknown unmount error.");
kdDebug() << "medium unmount " << m_errorStr << endl;
errorAndExit();
}
}
DCOPRef mediamanager("kded", "mediamanager");
DCOPReply reply = mediamanager.call("mount", medium.id());
TQStringVariantMap mountResult;
if (reply.isValid()) {
reply.get(mountResult);
}
if (mountResult.contains("result") && mountResult["result"].toBool()) {
::exit(0);
}
else {
m_errorStr = mountResult.contains("errStr") ? mountResult["errStr"].toString() : i18n("Unknown mount error.");
errorAndExit();
}
void MountHelper::unlock(const Medium &medium)
{
if (medium.id().isEmpty()) {
m_errorStr = i18n("Try to unlock an unknown medium.");
errorAndExit();
}
else if (args->isSet("u"))
TQString device = medium.deviceNode();
if (!medium.isEncrypted())
{
// Unmount drive
if (!medium.isMountable()) {
m_errorStr = i18n("%1 is not a mountable media.").arg(device);
errorAndExit();
}
else if (!medium.isMounted()) {
m_errorStr = i18n("%1 is already unmounted.").arg(device);
errorAndExit();
}
DCOPRef mediamanager("kded", "mediamanager");
DCOPReply reply = mediamanager.call("unmount", medium.id());
TQStringVariantMap unmountResult;
if (reply.isValid()) {
reply.get(unmountResult);
}
if (unmountResult.contains("result") && unmountResult["result"].toBool()) {
::exit(0);
}
else {
m_errorStr = unmountResult.contains("errStr") ? unmountResult["errStr"].toString() : i18n("Unknown unmount error.");
kdDebug() << "medium unmount " << m_errorStr << endl;
errorAndExit();
}
m_errorStr = i18n("%1 is not an encrypted media.").arg(device);
errorAndExit();
}
else if (args->isSet("k"))
if (!medium.needUnlocking())
{
// Unlock drive
if (!medium.isEncrypted())
{
m_errorStr = i18n("%1 is not an encrypted media.").arg(device);
errorAndExit();
}
if (!medium.needUnlocking())
{
m_errorStr = i18n("%1 is already unlocked.").arg(device);
errorAndExit();
}
TQString iconName = medium.iconName();
if (iconName.isEmpty())
{
TQString mime = medium.mimeType();
iconName = KMimeType::mimeType(mime)->icon(mime, false);
}
m_mediumId = medium.id();
dialog = new Dialog(url.prettyURL(), iconName);
connect(dialog, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotSendPassword()));
connect(dialog, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotCancel()));
dialog->show();
m_errorStr = i18n("%1 is already unlocked.").arg(device);
errorAndExit();
}
else if (args->isSet("l"))
TQString iconName = medium.iconName();
if (iconName.isEmpty())
{
// Lock drive
if (!medium.isEncrypted())
{
m_errorStr = i18n("%1 is not an encrypted media.").arg(device);
errorAndExit();
}
if (medium.needUnlocking())
{
m_errorStr = i18n("%1 is already locked.").arg(device);
errorAndExit();
}
TQString mime = medium.mimeType();
iconName = KMimeType::mimeType(mime)->icon(mime, false);
}
m_mediumId = medium.id();
m_dialog = new Dialog(device, iconName);
connect(m_dialog, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotSendPassword()));
connect(m_dialog, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotCancel()));
m_dialog->show();
}
DCOPRef mediamanager("kded", "mediamanager");
DCOPReply reply = mediamanager.call("lock", medium.id());
TQStringVariantMap lockResult;
if (reply.isValid()) {
reply.get(lockResult);
}
if (lockResult.contains("result") && lockResult["result"].toBool()) {
::exit(0);
}
else {
m_errorStr = lockResult.contains("errStr") ? lockResult["errStr"].toString() : i18n("Unknown lock error.");
kdDebug() << "medium lock " << m_errorStr << endl;
errorAndExit();
}
void MountHelper::lock(const Medium &medium)
{
if (medium.id().isEmpty())
{
m_errorStr = i18n("Try to lock an unknown medium.");
errorAndExit();
}
else if (args->isSet("e"))
TQString device = medium.deviceNode();
if (!medium.isEncrypted())
{
invokeEject(device, true);
m_errorStr = i18n("%1 is not an encrypted media.").arg(device);
errorAndExit();
}
else if (args->isSet("s"))
if (medium.needUnlocking())
{
// Safely remove drive
DCOPRef mediamanager("kded", "mediamanager");
/*
* We want to call mediamanager unmount before invoking eject. That's
* because unmount would provide an informative error message in case of
* failure. However, there are cases when unmount would fail
* (supermount, slackware, see bug#116209) but eject would succeed.
* Thus if unmount fails, save unmount error message and invokeEject()
* anyway. Only if both unmount and eject fail, notify the user by
* displaying the saved error message (see ejectFinished()).
*/
TQStringVariantMap unmountResult;
if (medium.isMounted())
{
DCOPReply reply = mediamanager.call("unmount", medium.id());
if (reply.isValid()) {
reply.get(unmountResult);
if (unmountResult.contains("result") && !unmountResult["result"].toBool()) {
m_errorStr = unmountResult.contains("errStr") ? unmountResult["errStr"].toString() : i18n("Unknown unmount error.");
}
}
}
m_errorStr = i18n("%1 is already locked.").arg(device);
errorAndExit();
}
// If this is an unlocked encrypted volume and there is no error yet, we try to lock it
if (unmountResult.contains("result") && unmountResult["result"].toBool() &&
medium.isEncrypted() && !medium.clearDeviceUdi().isNull())
{
DCOPReply reply = mediamanager.call("lock", medium.id());
if (reply.isValid()) {
TQStringVariantMap lockResult;
reply.get(lockResult);
if (lockResult.contains("result") && !lockResult["result"].toBool()) {
m_errorStr = lockResult.contains("errStr") ? lockResult["errStr"].toString() : i18n("Unknown lock error.");
}
}
}
// Release children devices
releaseHolders(medium);
if (m_errorStr.isEmpty()) {
invokeEject(device, true);
}
else {
errorAndExit();
}
DCOPReply reply = m_mediamanager.call("lock", medium.id());
TQStringVariantMap lockResult;
if (reply.isValid()) {
reply.get(lockResult);
}
else
{
TDECmdLineArgs::usage();
if (!lockResult.contains("result") || !lockResult["result"].toBool()) {
m_errorStr = lockResult.contains("errStr") ? lockResult["errStr"].toString() : i18n("Unknown lock error.");
kdDebug() << "medium lock " << m_errorStr << endl;
errorAndExit();
}
}
void MountHelper::invokeEject(const TQString &device, bool quiet)
void MountHelper::eject(const TQString &device, bool quiet)
{
#ifdef __TDE_HAVE_TDEHWLIB
// Try TDE HW library eject first...
@ -266,7 +187,7 @@ void MountHelper::invokeEject(const TQString &device, bool quiet)
}
#endif
// Then fall back to tdeeject if needed
// Otherwise fall back to tdeeject
TDEProcess *proc = new TDEProcess(TQT_TQOBJECT(this));
*proc << "tdeeject";
if (quiet)
@ -278,6 +199,152 @@ void MountHelper::invokeEject(const TQString &device, bool quiet)
proc->start();
}
void MountHelper::releaseHolders(const Medium &medium, bool handleThis)
{
#ifdef __TDE_HAVE_TDEHWLIB
if (medium.id().isEmpty())
{
m_errorStr = i18n("Try to release holders from an unknown medium.");
return;
}
// Scan the holding devices and unmount/lock them if possible
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
TDEStorageDevice *sdevice = hwdevices->findDiskByUID(medium.id());
if (sdevice)
{
TQStringList holdingDeviceList = sdevice->holdingDevices();
for (TQStringList::Iterator holdingDevIt = holdingDeviceList.begin(); holdingDevIt != holdingDeviceList.end(); ++holdingDevIt)
{
TDEGenericDevice *hwHolderDevice = hwdevices->findBySystemPath(*holdingDevIt);
if (hwHolderDevice->type() == TDEGenericDeviceType::Disk)
{
TDEStorageDevice *holderSDevice = static_cast<TDEStorageDevice*>(hwHolderDevice);
const Medium holderMedium = findMedium(holderSDevice->deviceNode());
if (!holderMedium.id().isEmpty())
{
releaseHolders(holderMedium, true);
}
}
}
}
if (handleThis)
{
// Unmount if necessary
if (medium.isMountable() && medium.isMounted())
{
unmount(medium);
}
// Lock if necessary.
if (medium.isEncrypted() && !medium.isLocked())
{
lock(medium);
}
}
#endif
}
void MountHelper::safeRemoval(const Medium &medium)
{
/*
* Safely remove will performs the following tasks:
* 1) release children devices (if tdehw is available)
* 2) if the medium is mounted, unmount it
* 3) if the medium is encrypted and unlocked, lock it
* 4) invoke eject to release the medium.
* If any of the above steps fails, the procedure will interrupt and an
* error message will be displayed to the user.
*
* Note: previously eject was invoked also in case of unmount failure. This
* could lead to data loss and therefore the behaviour has been changed.
* If a user really wants to eject the medium, he needs to either unmount it
* first or invoke eject manually.
*/
if (medium.id().isEmpty())
{
m_errorStr = i18n("Try to safe remove an unknown medium.");
errorAndExit();
}
// Release children devices
releaseHolders(medium);
TQStringVariantMap opResult;
TQString device = medium.deviceNode();
// Unmount if necessary
if (medium.isMountable() && medium.isMounted())
{
unmount(medium);
}
// Lock if necessary.
if (medium.isEncrypted() && !medium.isLocked())
{
lock(medium);
}
}
MountHelper::MountHelper() : TDEApplication(), m_mediamanager("kded", "mediamanager")
{
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
m_errorStr = TQString::null;
const Medium medium = findMedium(args->arg(0));
if (medium.id().isEmpty())
{
if (m_errorStr.isEmpty()) {
m_errorStr+= i18n("%1 cannot be found.").arg(args->arg(0));
}
errorAndExit();
}
TQString device = medium.deviceNode();
if (!medium.isMountable() && !medium.isEncrypted() && !args->isSet("e") && !args->isSet("s"))
{
m_errorStr = i18n("%1 is not a mountable or encrypted media.").arg(device);
errorAndExit();
}
if (args->isSet("m"))
{
mount(medium);
::exit(0);
}
else if (args->isSet("u"))
{
unmount(medium);
::exit(0);
}
else if (args->isSet("k"))
{
unlock(medium);
// No call to ::exit() here because this will open up the password dialog
// ::exit() is handled in the invoked code.
}
else if (args->isSet("l"))
{
lock(medium);
::exit(0);
}
else if (args->isSet("e"))
{
eject(device, true);
::exit(0);
}
else if (args->isSet("s"))
{
safeRemoval(medium);
eject(device, true);
::exit(0);
}
else
{
TDECmdLineArgs::usage();
::exit(0);
}
}
void MountHelper::ejectFinished(TDEProcess *proc)
{
//If eject failed, report the error stored in m_errorStr
@ -311,9 +378,7 @@ void MountHelper::errorAndExit()
void MountHelper::slotSendPassword()
{
DCOPRef mediamanager("kded", "mediamanager");
DCOPReply reply = mediamanager.call("unlock", m_mediumId, dialog->getPassword());
DCOPReply reply = m_mediamanager.call("unlock", m_mediumId, m_dialog->getPassword());
TQStringVariantMap unlockResult;
if (reply.isValid()) {
reply.get(unlockResult);

@ -37,13 +37,22 @@ public:
MountHelper();
private:
const Medium findMedium(const KURL &url);
void invokeEject(const TQString &device, bool quiet=false);
TQString m_errorStr;
TQString m_mediumId;
Dialog *dialog;
Dialog *m_dialog;
DCOPRef m_mediamanager;
const Medium findMedium(const TQString &device);
void error();
void mount(const Medium &medium);
void unmount(const Medium &medium);
void unlock(const Medium &medium);
void lock(const Medium &medium);
void eject(const TQString &device, bool quiet=false);
void safeRemoval(const Medium &medium);
void releaseHolders(const Medium &medium, bool handleThis = false);
private slots:
void slotSendPassword();
void slotCancel();

@ -1,5 +1,5 @@
[Desktop Entry]
X-TDE-ServiceTypes=media/bluray_mounted,media/bluray_unmounted,media/bluray_encrypted_locked,media/cdrom_mounted,media/cdrom_unmounted,media/cdrom_encrypted_locked,media/cd-r_mounted,media/cd-r_unmounted,media/cd-r_encrypted_locked,media/cd-rw_mounted,media/cd-rw_unmounted,media/cd-rw_encrypted_locked,media/dvd_mounted,media/dvd_unmounted,media/dvd_encrypted_locked,media/audiocd,media/blankcd,media/blankdvd,media/dvdvideo,media/svcd,media/vcd
X-TDE-ServiceTypes=media/bluray_mounted,media/bluray_unmounted,media/bluray_encrypted_locked,media/bluray_encrypted_unlocked,media/cdrom_mounted,media/cdrom_unmounted,media/cdrom_encrypted_locked,media/cdrom_encrypted_unlocked,media/cd-r_mounted,media/cd-r_unmounted,media/cd-r_encrypted_locked,media/cd-r_encrypted_unlocked,media/cd-rw_mounted,media/cd-rw_unmounted,media/cd-rw_encrypted_locked,media/cd-rw_encrypted_unlocked,media/dvd_mounted,media/dvd_unmounted,media/dvd_encrypted_locked,media/dvd_encrypted_unlocked,media/audiocd,media/blankbluray,media/blankcd,media/blankdvd,media/dvdvideo,media/svcd,media/vcd
Actions=MediaEject;
X-TDE-Priority=TopLevel
X-TDE-MediaNotifierHide=true

@ -1,5 +1,5 @@
[Desktop Entry]
X-TDE-ServiceTypes=media/removable_encrypted_unlocked,media/hdd_encrypted_unlocked,media/cdrom_encrypted_unlocked,media/cd-rw_encrypted_unlocked,media/dvd_encrypted_unlocked
X-TDE-ServiceTypes=media/bluray_encrypted_unlocked,media/cdrom_encrypted_unlocked,media/cd-r_encrypted_unlocked,media/cd-rw_encrypted_unlocked,media/dvd_encrypted_unlocked,media/hdd_encrypted_unlocked,media/removable_encrypted_unlocked
Actions=MediaLock;
X-TDE-Priority=TopLevel
X-TDE-MediaNotifierHide=true

@ -1,5 +1,5 @@
[Desktop Entry]
X-TDE-ServiceTypes=media/bluray_unmounted,media/cdrom_unmounted,media/cd-r_unmounted,media/cd-rw_unmounted,media/dvd_unmounted,media/floppy5_unmounted,media/floppy_unmounted,media/hdd_unmounted,media/nfs_unmounted,media/removable_unmounted,media/smb_unmounted,media/zip_unmounted,media/camera_unmounted
X-TDE-ServiceTypes=media/bluray_unmounted,media/camera_unmounted,media/cdrom_unmounted,media/cd-r_unmounted,media/cd-rw_unmounted,media/dvd_unmounted,media/floppy5_unmounted,media/floppy_unmounted,media/hdd_unmounted,media/nfs_unmounted,media/removable_unmounted,media/smb_unmounted,media/zip_unmounted,media/audiocd,media/blurayvideo,media/dvdvideo,media/svcd,media/vcd
Actions=MediaMount;
X-TDE-Priority=TopLevel
X-TDE-MediaNotifierHide=true

@ -1,5 +1,5 @@
[Desktop Entry]
X-TDE-ServiceTypes=media/removable_mounted,media/removable_unmounted,media/camera_mounted,media/camera_unmounted
X-TDE-ServiceTypes=media/bluray_mounted,media/bluray_unmounted,media/bluray_encrypted_locked,media/bluray_encrypted_unlocked,media/cdrom_mounted,media/cdrom_unmounted,media/cdrom_encrypted_locked,media/cdrom_encrypted_unlocked,media/cd-r_mounted,media/cd-r_unmounted,media/cd-r_encrypted_locked,media/cd-r_encrypted_unlocked,media/cd-rw_mounted,media/cd-rw_unmounted,media/cd-rw_encrypted_locked,media/cd-rw_encrypted_unlocked,media/dvd_mounted,media/dvd_unmounted,media/dvd_encrypted_locked,media/dvd_encrypted_unlocked,media/audiocd,media/blankbluray,media/blankcd,media/blankdvd,media/dvdvideo,media/svcd,media/vcd,media/camera_mounted,media/camera_unmounted,media/removable_mounted,media/removable_unmounted,media/removable_encrypted_locked,media/removable_encrypted_unlocked
Actions=MediaSafelyRemove;
X-TDE-Priority=TopLevel
X-TDE-MediaNotifierHide=true

@ -1,5 +1,6 @@
[Desktop Entry]
X-TDE-ServiceTypes=media/removable_encrypted_locked,media/hdd_encrypted_locked,media/bluray_encrypted_locked,media/cdrom_encrypted_locked,media/cd-r_encrypted_locked,media/cd-rw_encrypted_locked,media/dvd_encrypted_locked
X-TDE-ServiceTypes=media/bluray_encrypted_locked,media/cdrom_encrypted_locked,media/cd-r_encrypted_locked,media/cd-rw_encrypted_locked,media/dvd_encrypted_locked,media/hdd_encrypted_locked,media/removable_encrypted_locked
Actions=MediaLock;
Actions=MediaUnlock;
X-TDE-Priority=TopLevel
X-TDE-MediaNotifierHide=true

@ -1,5 +1,5 @@
[Desktop Entry]
X-TDE-ServiceTypes=media/removable_mounted,media/bluray_mounted,media/cdrom_mounted,media/cd-r_mounted,media/cd-rw_mounted,media/dvd_mounted,media/floppy5_mounted,media/floppy_mounted,media/hdd_mounted,media/nfs_mounted,media/smb_mounted,media/zip_mounted,media/blurayvideo,media/dvdvideo,media/svcd,media/vcd,media/camera_mounted
X-TDE-ServiceTypes=media/bluray_mounted,media/camera_mounted,media/cdrom_mounted,media/cd-r_mounted,media/cd-rw_mounted,media/dvd_mounted,media/floppy5_mounted,media/floppy_mounted,media/hdd_mounted,media/nfs_mounted,media/removable_mounted,media/smb_mounted,media/zip_mounted,media/audiocd,media/blurayvideo,media/dvdvideo,media/svcd,media/vcd
Actions=MediaUnmount;
X-TDE-Priority=TopLevel
X-TDE-MediaNotifierHide=true

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-10-16 13:49+0800\n"
"POT-Creation-Date: 2020-10-17 08:51+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -379,7 +379,7 @@ msgid "Safely Remove"
msgstr ""
#. Name
#: media/services/media_unlock.desktop:8
#: media/services/media_unlock.desktop:9
msgid "Unlock"
msgstr ""

Loading…
Cancel
Save