status-im
/
qtkeychain
mirror of https://github.com/status-im/qtkeychain.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #13 from xhochy/fix-kwallet-earlier-dbus-fallback 

Fallback earlier if D-Bus is not available
This commit is contained in:
Frank Osterfeld 2013-06-15 02:32:38 -07:00
parent fc3567574d 4556eb0e4f
commit dcfebad35d
2 changed files with 93 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

141
keychain_dbus.cpp
View File

@ -15,10 +15,49 @@
using namespace QKeychain; using namespace QKeychain;
void ReadPasswordJobPrivate::scheduledStart() { void ReadPasswordJobPrivate::scheduledStart() {
iface = new org::kde::KWallet( QLatin1String("org.kde.kwalletd"), QLatin1String("/modules/kwalletd"), QDBusConnection::sessionBus(), this ); if ( QDBusConnection::sessionBus().isConnected() )
const QDBusPendingReply<int> reply = iface->open( QLatin1String("kdewallet"), 0, q->service() ); {
QDBusPendingCallWatcher* watcher = new QDBusPendingCallWatcher( reply, this ); iface = new org::kde::KWallet( QLatin1String("org.kde.kwalletd"), QLatin1String("/modules/kwalletd"), QDBusConnection::sessionBus(), this );
connect( watcher, SIGNAL(finished(QDBusPendingCallWatcher*)), this, SLOT(kwalletOpenFinished(QDBusPendingCallWatcher*)) ); const QDBusPendingReply<int> reply = iface->open( QLatin1String("kdewallet"), 0, q->service() );
QDBusPendingCallWatcher* watcher = new QDBusPendingCallWatcher( reply, this );
connect( watcher, SIGNAL(finished(QDBusPendingCallWatcher*)), this, SLOT(kwalletOpenFinished(QDBusPendingCallWatcher*)) );
}
else
{
// D-Bus is not reachable so none can tell us something about KWalletd
QDBusError err( QDBusError::NoServer, "D-Bus is not running" );
fallbackOnError( err );
}
}
void ReadPasswordJobPrivate::fallbackOnError(const QDBusError& err )
{
std::auto_ptr<QSettings> local( !q->settings() ? new QSettings( q->service() ) : 0 );
QSettings* actual = q->settings() ? q->settings() : local.get();
WritePasswordJobPrivate::Mode mode;
if ( q->insecureFallback() && actual->contains( dataKey() ) ) {
mode = (WritePasswordJobPrivate::Mode)actual->value( typeKey() ).toInt();
data = actual->value( dataKey() ).toByteArray();
q->emitFinished();
} else {
if ( err.type() == QDBusError::ServiceUnknown ) //KWalletd not running
q->emitFinishedWithError( NoBackendAvailable, tr("No keychain service available") );
else
q->emitFinishedWithError( OtherError, tr("Could not open wallet: %1; %2").arg( QDBusError::errorString( err.type() ), err.message() ) );
}
}
const QString ReadPasswordJobPrivate::typeKey()
{
return QString( "%1/type" ).arg( key );
}
const QString ReadPasswordJobPrivate::dataKey()
{
return QString( "%1/data" ).arg( key );
} }
void ReadPasswordJobPrivate::kwalletOpenFinished( QDBusPendingCallWatcher* watcher ) { void ReadPasswordJobPrivate::kwalletOpenFinished( QDBusPendingCallWatcher* watcher ) {
@ -29,35 +68,17 @@ void ReadPasswordJobPrivate::kwalletOpenFinished( QDBusPendingCallWatcher* watch
QSettings* actual = q->settings() ? q->settings() : local.get(); QSettings* actual = q->settings() ? q->settings() : local.get();
WritePasswordJobPrivate::Mode mode; WritePasswordJobPrivate::Mode mode;
const QString typeKey = QString( "%1/type" ).arg( key );
const QString dataKey = QString( "%1/data" ).arg( key );
if ( reply.isError() ) { if ( reply.isError() ) {
const QDBusError err = reply.error(); fallbackOnError( reply.error() );
return;
if ( q->insecureFallback() && actual->contains( dataKey ) ) {
mode = (WritePasswordJobPrivate::Mode)actual->value( typeKey ).toInt();
data = actual->value( dataKey ).toByteArray();
q->emitFinished();
return;
} else {
if ( err.type() == QDBusError::ServiceUnknown ) //KWalletd not running
q->emitFinishedWithError( NoBackendAvailable, tr("No keychain service available") );
else
q->emitFinishedWithError( OtherError, tr("Could not open wallet: %1; %2").arg( QDBusError::errorString( err.type() ), err.message() ) );
return;
}
} }
if ( actual->contains( dataKey ) ) { if ( actual->contains( dataKey() ) ) {
// We previously stored data in the insecure QSettings, but now have KWallet available. // We previously stored data in the insecure QSettings, but now have KWallet available.
// Do the migration // Do the migration
data = actual->value( dataKey ).toByteArray(); data = actual->value( dataKey() ).toByteArray();
mode = (WritePasswordJobPrivate::Mode)actual->value( typeKey ).toInt(); mode = (WritePasswordJobPrivate::Mode)actual->value( typeKey() ).toInt();
actual->remove( key ); actual->remove( key );
q->emitFinished(); q->emitFinished();
@ -129,10 +150,46 @@ void ReadPasswordJobPrivate::kwalletReadFinished( QDBusPendingCallWatcher* watch
} }
void WritePasswordJobPrivate::scheduledStart() { void WritePasswordJobPrivate::scheduledStart() {
iface = new org::kde::KWallet( QLatin1String("org.kde.kwalletd"), QLatin1String("/modules/kwalletd"), QDBusConnection::sessionBus(), this ); if ( QDBusConnection::sessionBus().isConnected() )
const QDBusPendingReply<int> reply = iface->open( QLatin1String("kdewallet"), 0, q->service() ); {
QDBusPendingCallWatcher* watcher = new QDBusPendingCallWatcher( reply, this ); iface = new org::kde::KWallet( QLatin1String("org.kde.kwalletd"), QLatin1String("/modules/kwalletd"), QDBusConnection::sessionBus(), this );
connect( watcher, SIGNAL(finished(QDBusPendingCallWatcher*)), this, SLOT(kwalletOpenFinished(QDBusPendingCallWatcher*)) ); const QDBusPendingReply<int> reply = iface->open( QLatin1String("kdewallet"), 0, q->service() );
QDBusPendingCallWatcher* watcher = new QDBusPendingCallWatcher( reply, this );
connect( watcher, SIGNAL(finished(QDBusPendingCallWatcher*)), this, SLOT(kwalletOpenFinished(QDBusPendingCallWatcher*)) );
}
else
{
// D-Bus is not reachable so none can tell us something about KWalletd
QDBusError err( QDBusError::NoServer, "D-Bus is not running" );
fallbackOnError( err );
}
}
void WritePasswordJobPrivate::fallbackOnError(const QDBusError &err)
{
std::auto_ptr<QSettings> local( !q->settings() ? new QSettings( q->service() ) : 0 );
QSettings* actual = q->settings() ? q->settings() : local.get();
if ( q->insecureFallback() ) {
if ( mode == Delete ) {
actual->remove( key );
actual->sync();
q->emitFinished();
return;
}
actual->setValue( QString( "%1/type" ).arg( key ), (int)mode );
if ( mode == Text )
actual->setValue( QString( "%1/data" ).arg( key ), textData.toUtf8() );
else if ( mode == Binary )
actual->setValue( QString( "%1/data" ).arg( key ), binaryData );
actual->sync();
q->emitFinished();
} else {
q->emitFinishedWithError( OtherError, tr("Could not open wallet: %1; %2").arg( QDBusError::errorString( err.type() ), err.message() ) );
}
} }
void WritePasswordJobPrivate::kwalletOpenFinished( QDBusPendingCallWatcher* watcher ) { void WritePasswordJobPrivate::kwalletOpenFinished( QDBusPendingCallWatcher* watcher ) {
@ -143,27 +200,7 @@ void WritePasswordJobPrivate::kwalletOpenFinished( QDBusPendingCallWatcher* watc
QSettings* actual = q->settings() ? q->settings() : local.get(); QSettings* actual = q->settings() ? q->settings() : local.get();
if ( reply.isError() ) { if ( reply.isError() ) {
if ( q->insecureFallback() ) { fallbackOnError( reply.error() );
if ( mode == Delete ) {
actual->remove( key );
actual->sync();
q->emitFinished();
return;
}
actual->setValue( QString( "%1/type" ).arg( key ), (int)mode );
if ( mode == Text )
actual->setValue( QString( "%1/data" ).arg( key ), textData.toUtf8() );
else if ( mode == Binary )
actual->setValue( QString( "%1/data" ).arg( key ), binaryData );
actual->sync();
q->emitFinished();
} else {
const QDBusError err = reply.error();
q->emitFinishedWithError( OtherError, tr("Could not open wallet: %1; %2").arg( QDBusError::errorString( err.type() ), err.message() ) );
}
return; return;
} }

5
keychain_p.h
View File

@ -68,7 +68,10 @@ public:
#if defined(Q_OS_UNIX) && !defined(Q_OS_DARWIN) #if defined(Q_OS_UNIX) && !defined(Q_OS_DARWIN)
org::kde::KWallet* iface; org::kde::KWallet* iface;
friend class QKeychain::JobExecutor; friend class QKeychain::JobExecutor;
void fallbackOnError(const QDBusError& err);
const QString typeKey();
const QString dataKey();
private Q_SLOTS: private Q_SLOTS:
void kwalletOpenFinished( QDBusPendingCallWatcher* watcher ); void kwalletOpenFinished( QDBusPendingCallWatcher* watcher );
void kwalletEntryTypeFinished( QDBusPendingCallWatcher* watcher ); void kwalletEntryTypeFinished( QDBusPendingCallWatcher* watcher );
@ -102,7 +105,7 @@ public:
#if defined(Q_OS_UNIX) && !defined(Q_OS_DARWIN) #if defined(Q_OS_UNIX) && !defined(Q_OS_DARWIN)
org::kde::KWallet* iface; org::kde::KWallet* iface;
friend class QKeychain::JobExecutor; friend class QKeychain::JobExecutor;
void fallbackOnError(const QDBusError& err);
private Q_SLOTS: private Q_SLOTS:
void kwalletOpenFinished( QDBusPendingCallWatcher* watcher ); void kwalletOpenFinished( QDBusPendingCallWatcher* watcher );