TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

tdeioslave media: mount/unmount/unlock/lock are only allowed on devices

Browse Source 
for which those operations make sense.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/35/head
Michele Calgaro 6 years ago
parent 7c6e00a43c
commit 1a089178fa
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
6 changed files with 126 additions and 83 deletions
Show Stats Download Patch File Download Diff File

10
tdeioslave/media/libmediacommon/medium.cpp
Unescape Escape View File

@ -252,16 +252,6 @@ void Medium::setLocked(bool locked)
m_properties[LOCKED] = locked ? "true" : "false"; m_properties[LOCKED] = locked ? "true" : "false";
} }
bool Medium::needMounting() const
{
return isMountable() && !isMounted();
}
bool Medium::needUnlocking() const
{
return isEncrypted() && isLocked();
}
KURL Medium::prettyBaseURL() const KURL Medium::prettyBaseURL() const
{ {
if (!baseURL().isEmpty()) if (!baseURL().isEmpty())

4
tdeioslave/media/libmediacommon/medium.h
Unescape Escape View File

@ -75,8 +75,8 @@ public:
bool softHidden() const { return m_properties[SOFT_HIDDEN] == "true"; }; bool softHidden() const { return m_properties[SOFT_HIDDEN] == "true"; };
bool isLocked() const { return m_properties[LOCKED] == "true"; }; bool isLocked() const { return m_properties[LOCKED] == "true"; };
bool needMounting() const; bool needMounting() const { return isMountable() && !isMounted(); };
bool needUnlocking() const; bool needUnlocking() const { return isEncrypted() && isLocked(); }
KURL prettyBaseURL() const; KURL prettyBaseURL() const;
TQString prettyLabel() const; TQString prettyLabel() const;

45
tdeioslave/media/mediamanager/halbackend.cpp
Unescape Escape View File

@ -1488,8 +1488,14 @@ TQString HALBackend::isInFstab(const Medium *medium)
TQStringVariantMap HALBackend::mount(const Medium *medium) TQStringVariantMap HALBackend::mount(const Medium *medium)
{ {
TQStringVariantMap result; TQStringVariantMap result;
if (medium->isMounted()) { if (!medium->isMountable()) {
result["result"] = true; result["errStr"] = i18n("%1 is not a mountable media.").arg(medium->deviceNode());
result["result"] = false;
return result;
}
else if (medium->isMounted()) {
result["errStr"] = i18n("%1 is already mounted to %2.").arg(medium->deviceNode()).arg(medium->mountPoint());
result["result"] = false;
return result; return result;
} }
@ -1666,14 +1672,19 @@ TQStringVariantMap HALBackend::unmount(const TQString &id)
result["result"] = false; result["result"] = false;
return result; return result;
} }
else if (!medium->isMountable()) {
if (!medium->isMounted()) { result["errStr"] = i18n("%1 is not a mountable media.").arg(medium->deviceNode());
result["result"] = true; result["result"] = false;
return result;
}
else if (!medium->isMounted()) {
result["errStr"] = i18n("%1 is already unmounted.").arg(medium->deviceNode());
result["result"] = false;
return result; return result;
} }
TQString mountPoint = isInFstab(medium); TQString mountPoint = isInFstab(medium);
if (!mountPoint.isNull()) if (!mountPoint.isEmpty())
{ {
struct mount_job_data data; struct mount_job_data data;
data.completed = false; data.completed = false;
@ -1848,9 +1859,14 @@ TQStringVariantMap HALBackend::unlock(const TQString &id, const TQString &passwo
result["result"] = false; result["result"] = false;
return result; return result;
} }
else if (!medium->isEncrypted()) {
if (!medium->isEncrypted() || !medium->clearDeviceUdi().isNull()) { result["errStr"] = i18n("%1 is not an encrypted media.").arg(medium->deviceNode());
result["result"] = true; result["result"] = false;
return result;
}
else if (!medium->needUnlocking()) {
result["errStr"] = i18n("%1 is already unlocked.").arg(medium->deviceNode());
result["result"] = false;
return result; return result;
} }
@ -1917,9 +1933,14 @@ TQStringVariantMap HALBackend::lock(const TQString &id)
result["result"] = false; result["result"] = false;
return result; return result;
} }
else if (!medium->isEncrypted()) {
if (!medium->isEncrypted() || !medium->clearDeviceUdi().isNull()) { result["errStr"] = i18n("%1 is not an encrypted media.").arg(medium->deviceNode());
result["result"] = true; result["result"] = false;
return result;
}
else if (medium->needUnlocking()) {
result["errStr"] = i18n("%1 is already locked.").arg(medium->deviceNode());
result["result"] = false;
return result; return result;
} }

59
tdeioslave/media/mediamanager/tdehardwarebackend.cpp
Unescape Escape View File

@ -1216,8 +1216,14 @@ TQStringVariantMap TDEBackend::mount(const Medium *medium)
kdDebug(1219) << "TDEBackend::mount for medium " << medium->name() << endl; kdDebug(1219) << "TDEBackend::mount for medium " << medium->name() << endl;
TQStringVariantMap result; TQStringVariantMap result;
if (medium->isMounted()) { if (!medium->isMountable()) {
result["result"] = true; result["errStr"] = i18n("%1 is not a mountable media.").arg(medium->deviceNode());
result["result"] = false;
return result;
}
else if (medium->isMounted()) {
result["errStr"] = i18n("%1 is already mounted to %2.").arg(medium->deviceNode()).arg(medium->mountPoint());
result["result"] = false;
return result; return result;
} }
@ -1250,7 +1256,7 @@ TQStringVariantMap TDEBackend::mount(const Medium *medium)
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
TDEStorageDevice *sdevice = hwdevices->findDiskByUID(medium->id()); TDEStorageDevice *sdevice = hwdevices->findDiskByUID(medium->id());
if (!sdevice) { if (!sdevice) {
result["errStr"] = i18n("Internal error. Couldn't find medium."); result["errStr"] = i18n("Internal error. Couldn't find medium id %1.").arg(medium->id());
result["result"] = false; result["result"] = false;
return result; return result;
} }
@ -1270,8 +1276,6 @@ TQStringVariantMap TDEBackend::mount(const Medium *medium)
} }
TQString qerror; TQString qerror;
if (!medium->isEncrypted()) {
// normal volume
TQStringVariantMap mountResult = sdevice->mountDevice(diskLabel, valids); TQStringVariantMap mountResult = sdevice->mountDevice(diskLabel, valids);
TQString mountedPath = mountResult.contains("mountPath") ? mountResult["mountPath"].toString() : TQString::null; TQString mountedPath = mountResult.contains("mountPath") ? mountResult["mountPath"].toString() : TQString::null;
if (mountedPath.isEmpty()) { if (mountedPath.isEmpty()) {
@ -1281,10 +1285,6 @@ TQStringVariantMap TDEBackend::mount(const Medium *medium)
qerror.append(i18n("<p>Technical details:<br>").append(errStr)); qerror.append(i18n("<p>Technical details:<br>").append(errStr));
} }
} }
}
else {
qerror = i18n("Unable to mount an encrypted device.");
}
if (!qerror.isEmpty()) { if (!qerror.isEmpty()) {
result["errStr"] = qerror; result["errStr"] = qerror;
@ -1321,16 +1321,20 @@ TQStringVariantMap TDEBackend::unmount(const TQString &id)
kdDebug(1219) << "TDEBackend::unmount for id " << id << endl; kdDebug(1219) << "TDEBackend::unmount for id " << id << endl;
TQStringVariantMap result; TQStringVariantMap result;
const Medium *medium = m_mediaList.findById(id); const Medium *medium = m_mediaList.findById(id);
if (!medium) { if (!medium) {
result["errStr"] = i18n("No such medium: %1").arg(id); result["errStr"] = i18n("No such medium: %1").arg(id);
result["result"] = false; result["result"] = false;
return result; return result;
} }
else if (!medium->isMountable()) {
if (!medium->isMounted()) { result["errStr"] = i18n("%1 is not a mountable media.").arg(medium->deviceNode());
result["result"] = true; result["result"] = false;
return result;
}
else if (!medium->isMounted()) {
result["errStr"] = i18n("%1 is already unmounted.").arg(medium->deviceNode());
result["result"] = false;
return result; return result;
} }
@ -1363,7 +1367,7 @@ TQStringVariantMap TDEBackend::unmount(const TQString &id)
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
TDEStorageDevice *sdevice = hwdevices->findDiskByUID(medium->id()); TDEStorageDevice *sdevice = hwdevices->findDiskByUID(medium->id());
if (!sdevice) { if (!sdevice) {
result["errStr"] = i18n("Internal error. Couldn't find medium."); result["errStr"] = i18n("Internal error. Couldn't find medium id %1.").arg(medium->id());
result["result"] = false; result["result"] = false;
return result; return result;
} }
@ -1433,23 +1437,27 @@ TQStringVariantMap TDEBackend::unlock(const TQString &id, const TQString &passwo
kdDebug(1219) << "TDEBackend::unlock for id " << id << endl; kdDebug(1219) << "TDEBackend::unlock for id " << id << endl;
TQStringVariantMap result; TQStringVariantMap result;
const Medium *medium = m_mediaList.findById(id); const Medium *medium = m_mediaList.findById(id);
if (!medium) { if (!medium) {
result["errStr"] = i18n("No such medium: %1").arg(id); result["errStr"] = i18n("No such medium: %1").arg(id);
result["result"] = false; result["result"] = false;
return result; return result;
} }
else if (!medium->isEncrypted()) {
if (!medium->isEncrypted() || !medium->clearDeviceUdi().isNull()) { result["errStr"] = i18n("%1 is not an encrypted media.").arg(medium->deviceNode());
result["result"] = true; result["result"] = false;
return result;
}
else if (!medium->needUnlocking()) {
result["errStr"] = i18n("%1 is already unlocked.").arg(medium->deviceNode());
result["result"] = false;
return result; return result;
} }
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
TDEStorageDevice *sdevice = hwdevices->findDiskByUID(medium->id()); TDEStorageDevice *sdevice = hwdevices->findDiskByUID(medium->id());
if (!sdevice) { if (!sdevice) {
result["errStr"] = i18n("Internal error. Couldn't find medium."); result["errStr"] = i18n("Internal error. Couldn't find medium id %1.").arg(medium->id());
result["result"] = false; result["result"] = false;
return result; return result;
} }
@ -1484,16 +1492,21 @@ TQStringVariantMap TDEBackend::lock(const TQString &id)
result["result"] = false; result["result"] = false;
return result; return result;
} }
else if (!medium->isEncrypted()) {
if (!medium->isEncrypted() || !medium->clearDeviceUdi().isNull()) { result["errStr"] = i18n("%1 is not an encrypted media.").arg(medium->deviceNode());
result["result"] = true; result["result"] = false;
return result;
}
else if (medium->needUnlocking()) {
result["errStr"] = i18n("%1 is already locked.").arg(medium->deviceNode());
result["result"] = false;
return result; return result;
} }
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
TDEStorageDevice *sdevice = hwdevices->findDiskByUID(medium->id()); TDEStorageDevice *sdevice = hwdevices->findDiskByUID(medium->id());
if (!sdevice) { if (!sdevice) {
result["errStr"] = i18n("Internal error. Couldn't find medium."); result["errStr"] = i18n("Internal error. Couldn't find medium id %1.").arg(medium->id());
result["result"] = false; result["result"] = false;
return result; return result;
} }

68
tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
Unescape Escape View File

@ -67,7 +67,6 @@ const Medium MountHelper::findMedium(const KURL &url)
MountHelper::MountHelper() : TDEApplication() MountHelper::MountHelper() : TDEApplication()
{ {
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
m_errorStr = TQString::null; m_errorStr = TQString::null;
KURL url(args->url(0)); KURL url(args->url(0));
@ -77,25 +76,28 @@ MountHelper::MountHelper() : TDEApplication()
if (m_errorStr.isEmpty()) { if (m_errorStr.isEmpty()) {
m_errorStr+= i18n("%1 cannot be found.").arg(url.prettyURL()); m_errorStr+= i18n("%1 cannot be found.").arg(url.prettyURL());
} }
TQTimer::singleShot(0, this, TQT_SLOT(error())); errorAndExit();
return;
} }
TQString device = medium.deviceNode();
if (!medium.isMountable() && !medium.isEncrypted() && !args->isSet("e") && !args->isSet("s")) if (!medium.isMountable() && !medium.isEncrypted() && !args->isSet("e") && !args->isSet("s"))
{ {
m_errorStr = i18n("%1 is not a mountable or encrypted media.").arg(url.prettyURL()); m_errorStr = i18n("%1 is not a mountable or encrypted media.").arg(device);
TQTimer::singleShot(0, this, TQT_SLOT(error())); errorAndExit();
return;
} }
TQString device = medium.deviceNode();
TQString mount_point = medium.mountPoint();
m_isCdrom = medium.mimeType().find("dvd") != -1 || medium.mimeType().find("cd") != -1;
if (args->isSet("m")) if (args->isSet("m"))
{ {
// Mount drive // 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();
}
DCOPRef mediamanager("kded", "mediamanager"); DCOPRef mediamanager("kded", "mediamanager");
DCOPReply reply = mediamanager.call("mount", medium.id()); DCOPReply reply = mediamanager.call("mount", medium.id());
TQStringVariantMap mountResult; TQStringVariantMap mountResult;
@ -107,12 +109,21 @@ MountHelper::MountHelper() : TDEApplication()
} }
else { else {
m_errorStr = mountResult.contains("errStr") ? mountResult["errStr"].toString() : i18n("Unknown mount error."); m_errorStr = mountResult.contains("errStr") ? mountResult["errStr"].toString() : i18n("Unknown mount error.");
TQTimer::singleShot(0, this, TQT_SLOT(error())); errorAndExit();
} }
} }
else if (args->isSet("u")) else if (args->isSet("u"))
{ {
// Unmount drive // 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"); DCOPRef mediamanager("kded", "mediamanager");
DCOPReply reply = mediamanager.call("unmount", medium.id()); DCOPReply reply = mediamanager.call("unmount", medium.id());
TQStringVariantMap unmountResult; TQStringVariantMap unmountResult;
@ -125,7 +136,7 @@ MountHelper::MountHelper() : TDEApplication()
else { else {
m_errorStr = unmountResult.contains("errStr") ? unmountResult["errStr"].toString() : i18n("Unknown unmount error."); m_errorStr = unmountResult.contains("errStr") ? unmountResult["errStr"].toString() : i18n("Unknown unmount error.");
kdDebug() << "medium unmount " << m_errorStr << endl; kdDebug() << "medium unmount " << m_errorStr << endl;
TQTimer::singleShot(0, this, TQT_SLOT(error())); errorAndExit();
} }
} }
else if (args->isSet("k")) else if (args->isSet("k"))
@ -133,15 +144,13 @@ MountHelper::MountHelper() : TDEApplication()
// Unlock drive // Unlock drive
if (!medium.isEncrypted()) if (!medium.isEncrypted())
{ {
m_errorStr = i18n("%1 is not an encrypted media.").arg(url.prettyURL()); m_errorStr = i18n("%1 is not an encrypted media.").arg(device);
TQTimer::singleShot(0, this, TQT_SLOT(error())); errorAndExit();
return;
} }
if (!medium.needUnlocking()) if (!medium.needUnlocking())
{ {
m_errorStr = i18n("%1 is already unlocked.").arg(url.prettyURL()); m_errorStr = i18n("%1 is already unlocked.").arg(device);
TQTimer::singleShot(0, this, TQT_SLOT(error())); errorAndExit();
return;
} }
TQString iconName = medium.iconName(); TQString iconName = medium.iconName();
@ -160,6 +169,17 @@ MountHelper::MountHelper() : TDEApplication()
else if (args->isSet("l")) else if (args->isSet("l"))
{ {
// Lock drive // 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();
}
DCOPRef mediamanager("kded", "mediamanager"); DCOPRef mediamanager("kded", "mediamanager");
DCOPReply reply = mediamanager.call("lock", medium.id()); DCOPReply reply = mediamanager.call("lock", medium.id());
TQStringVariantMap lockResult; TQStringVariantMap lockResult;
@ -172,7 +192,7 @@ MountHelper::MountHelper() : TDEApplication()
else { else {
m_errorStr = lockResult.contains("errStr") ? lockResult["errStr"].toString() : i18n("Unknown lock error."); m_errorStr = lockResult.contains("errStr") ? lockResult["errStr"].toString() : i18n("Unknown lock error.");
kdDebug() << "medium lock " << m_errorStr << endl; kdDebug() << "medium lock " << m_errorStr << endl;
TQTimer::singleShot(0, this, TQT_SLOT(error())); errorAndExit();
} }
} }
else if (args->isSet("e")) else if (args->isSet("e"))
@ -223,7 +243,7 @@ MountHelper::MountHelper() : TDEApplication()
invokeEject(device, true); invokeEject(device, true);
} }
else { else {
TQTimer::singleShot(0, this, TQT_SLOT(error())); errorAndExit();
} }
} }
else else
@ -267,13 +287,13 @@ void MountHelper::ejectFinished(TDEProcess *proc)
} }
else { else {
if (!m_errorStr.isEmpty()) { if (!m_errorStr.isEmpty()) {
TQTimer::singleShot(0, this, TQT_SLOT(error())); errorAndExit();
} }
::exit(0); ::exit(0);
} }
} }
void MountHelper::error() void MountHelper::errorAndExit()
{ {
TQString prettyErrorString = m_errorStr; TQString prettyErrorString = m_errorStr;
if (m_errorStr.contains("<") && m_errorStr.contains(">")) { if (m_errorStr.contains("<") && m_errorStr.contains(">")) {
@ -301,7 +321,7 @@ void MountHelper::slotSendPassword()
m_errorStr = unlockResult.contains("errStr") ? unlockResult["errStr"].toString() : i18n("Unknown unlock error."); m_errorStr = unlockResult.contains("errStr") ? unlockResult["errStr"].toString() : i18n("Unknown unlock error.");
kdDebug() << "medium unlock " << m_errorStr << endl; kdDebug() << "medium unlock " << m_errorStr << endl;
emit signalPasswordError(m_errorStr); emit signalPasswordError(m_errorStr);
TQTimer::singleShot(0, this, TQT_SLOT(error())); errorAndExit();
} }
} }

3
tdeioslave/media/mounthelper/tdeio_media_mounthelper.h
Unescape Escape View File

@ -40,7 +40,6 @@ private:
const Medium findMedium(const KURL &url); const Medium findMedium(const KURL &url);
void invokeEject(const TQString &device, bool quiet=false); void invokeEject(const TQString &device, bool quiet=false);
TQString m_errorStr; TQString m_errorStr;
bool m_isCdrom;
TQString m_mediumId; TQString m_mediumId;
Dialog *dialog; Dialog *dialog;
@ -48,7 +47,7 @@ private slots:
void slotSendPassword(); void slotSendPassword();
void slotCancel(); void slotCancel();
void ejectFinished(TDEProcess* proc); void ejectFinished(TDEProcess* proc);
void error(); void errorAndExit();
signals: signals:
void signalPasswordError(TQString errorMsg); void signalPasswordError(TQString errorMsg);

Write Preview
Loading…
Cancel
Save