Skip to content

Commit ff7edeb

Browse files
mgallienmgallien
committed
addd a cmake option to enable single account desktop client
Signed-off-by: Matthieu Gallien <[email protected]>
1 parent 8c1eec0 commit ff7edeb

13 files changed

+247
-10
lines changed

‎NEXTCLOUD.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,3 +80,5 @@ endif()
8080
if (APPLE)
8181
option( BUILD_FILE_PROVIDER_MODULE "Build the macOS virtual files File Provider module" OFF )
8282
endif()
83+
84+
set (CLIENTSIDEENCRYPTION_ENFORCE_USB_TOKEN true)

‎config.h.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,6 @@
6161

6262
#cmakedefine CFAPI_SHELL_EXTENSIONS_LIB_NAME "@CFAPI_SHELL_EXTENSIONS_LIB_NAME@"
6363

64+
#cmakedefine CLIENTSIDEENCRYPTION_ENFORCE_USB_TOKEN @CLIENTSIDEENCRYPTION_ENFORCE_USB_TOKEN@
65+
6466
#endif

‎src/gui/accountsettings.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,7 @@ void AccountSettings::slotE2eEncryptionMnemonicReady()
283283
void AccountSettings::slotE2eEncryptionGenerateKeys()
284284
{
285285
connect(_accountState->account()->e2e(), &ClientSideEncryption::initializationFinished, this, &AccountSettings::slotE2eEncryptionInitializationFinished);
286+
connect(_accountState->account()->e2e(), &ClientSideEncryption::displayTokenInitDialog, this, &AccountSettings::slotDisplayTokenInitDialog);
286287
_accountState->account()->setE2eEncryptionKeysGenerationAllowed(true);
287288
_accountState->account()->setAskUserForMnemonic(true);
288289
_accountState->account()->e2e()->initialize(_accountState->account());
@@ -291,6 +292,7 @@ void AccountSettings::slotE2eEncryptionGenerateKeys()
291292
void AccountSettings::slotE2eEncryptionInitializationFinished(bool isNewMnemonicGenerated)
292293
{
293294
disconnect(_accountState->account()->e2e(), &ClientSideEncryption::initializationFinished, this, &AccountSettings::slotE2eEncryptionInitializationFinished);
295+
disconnect(_accountState->account()->e2e(), &ClientSideEncryption::displayTokenInitDialog, this, &AccountSettings::slotDisplayTokenInitDialog);
294296
if (_accountState->account()->e2e()->isInitialized()) {
295297
removeActionFromEncryptionMessage(e2EeUiActionEnableEncryptionId);
296298
slotE2eEncryptionMnemonicReady();
@@ -301,6 +303,13 @@ void AccountSettings::slotE2eEncryptionInitializationFinished(bool isNewMnemonic
301303
_accountState->account()->setAskUserForMnemonic(false);
302304
}
303305

306+
void AccountSettings::slotDisplayTokenInitDialog()
307+
{
308+
disconnect(_accountState->account()->e2e(), &ClientSideEncryption::initializationFinished, this, &AccountSettings::slotE2eEncryptionInitializationFinished);
309+
disconnect(_accountState->account()->e2e(), &ClientSideEncryption::displayTokenInitDialog, this, &AccountSettings::slotDisplayTokenInitDialog);
310+
Systray::instance()->createTokenInitDialog(_accountState->account()->e2e()->discoveredTokens());
311+
}
312+
304313
void AccountSettings::slotEncryptFolderFinished(int status)
305314
{
306315
qCInfo(lcAccountSettings) << "Current folder encryption status code:" << status;

‎src/gui/accountsettings.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ protected slots:
106106
void slotE2eEncryptionMnemonicReady();
107107
void slotE2eEncryptionGenerateKeys();
108108
void slotE2eEncryptionInitializationFinished(bool isNewMnemonicGenerated);
109+
void slotDisplayTokenInitDialog();
109110
void slotEncryptFolderFinished(int status);
110111

111112
void slotSelectiveSyncChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight,

‎src/gui/systray.cpp

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,45 @@ void Systray::createFileActivityDialog(const QString &localPath)
412412
Q_EMIT showFileDetailsPage(localPath, FileDetailsPage::Activity);
413413
}
414414

415+
void Systray::createTokenInitDialog(const QVariantList &tokensInfo)
416+
{
417+
if(_tokenInitDialog) {
418+
destroyDialog(_tokenInitDialog);
419+
_tokenInitDialog = nullptr;
420+
}
421+
422+
qCDebug(lcSystray) << "Opening new token init dialog with " << tokensInfo.size() << "possible tokens";
423+
424+
if (!_trayEngine) {
425+
qCWarning(lcSystray) << "Could not open token init dialog as no tray engine was available";
426+
return;
427+
}
428+
429+
const QVariantMap initialProperties{
430+
{"tokensInfo", tokensInfo},
431+
};
432+
433+
QQmlComponent tokenInitDialogComponent(_trayEngine, QStringLiteral("qrc:/qml/src/gui/filedetails/FileDetailsWindow.qml"));
434+
435+
if (!tokenInitDialogComponent.isError()) {
436+
const auto createdDialog = tokenInitDialogComponent.createWithInitialProperties(initialProperties);
437+
const auto dialog = qobject_cast<QQuickWindow*>(createdDialog);
438+
439+
if(!dialog) {
440+
qCWarning(lcSystray) << "Token init dialog window resulted in creation of object that was not a window!";
441+
return;
442+
}
443+
444+
_tokenInitDialog = dialog;
445+
446+
_tokenInitDialog->show();
447+
_tokenInitDialog->raise();
448+
_tokenInitDialog->requestActivate();
449+
} else {
450+
qCWarning(lcSystray) << tokenInitDialogComponent.errorString();
451+
}
452+
}
453+
415454
void Systray::presentShareViewInTray(const QString &localPath)
416455
{
417456
const auto folder = FolderMan::instance()->folderForPath(localPath);

‎src/gui/systray.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
#ifndef SYSTRAY_H
1616
#define SYSTRAY_H
1717

18-
#include <QSystemTrayIcon>
19-
2018
#include "accountmanager.h"
2119
#include "tray/usermodel.h"
2220

21+
#include <QSystemTrayIcon>
22+
#include <QQuickImageProvider>
2323
#include <QQmlNetworkAccessManagerFactory>
2424

2525
class QScreen;
@@ -145,6 +145,7 @@ public slots:
145145

146146
void createShareDialog(const QString &localPath);
147147
void createFileActivityDialog(const QString &localPath);
148+
void createTokenInitDialog(const QVariantList &tokensInfo);
148149

149150
void presentShareViewInTray(const QString &localPath);
150151

@@ -185,6 +186,7 @@ private slots:
185186
QSet<qlonglong> _callsAlreadyNotified;
186187
QPointer<QObject> _editFileLocallyLoadingDialog;
187188
QVector<QQuickWindow*> _fileDetailDialogs;
189+
QQuickWindow* _tokenInitDialog = nullptr;
188190
};
189191

190192
} // namespace OCC

‎src/libsync/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,8 @@ set(libsync_SRCS
105105
clientsideencryption.cpp
106106
clientsideencryptionjobs.h
107107
clientsideencryptionjobs.cpp
108+
clientsidetokenselector.h
109+
clientsidetokenselector.cpp
108110
datetimeprovider.h
109111
datetimeprovider.cpp
110112
ocsuserstatusconnector.h

‎src/libsync/account.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
#include "clientsideencryption.h"
3434
#include "ocsuserstatusconnector.h"
3535

36+
#include "config.h"
37+
3638
#include <QLoggingCategory>
3739
#include <QNetworkReply>
3840
#include <QNetworkAccessManager>
@@ -1023,9 +1025,9 @@ bool Account::askUserForMnemonic() const
10231025
return _e2eAskUserForMnemonic;
10241026
}
10251027

1026-
bool Account::useHardwareTokenEncryption() const
1028+
bool Account::enforceUseHardwareTokenEncryption() const
10271029
{
1028-
return !encryptionHardwareTokenDriverPath().isEmpty();
1030+
return CLIENTSIDEENCRYPTION_ENFORCE_USB_TOKEN;
10291031
}
10301032

10311033
QString Account::encryptionHardwareTokenDriverPath() const

‎src/libsync/account.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class OWNCLOUDSYNC_EXPORT Account : public QObject
8888
Q_PROPERTY(QUrl url MEMBER _url)
8989
Q_PROPERTY(bool e2eEncryptionKeysGenerationAllowed MEMBER _e2eEncryptionKeysGenerationAllowed)
9090
Q_PROPERTY(bool askUserForMnemonic READ askUserForMnemonic WRITE setAskUserForMnemonic NOTIFY askUserForMnemonicChanged)
91-
Q_PROPERTY(bool useHardwareTokenEncryption READ useHardwareTokenEncryption NOTIFY useHardwareTokenEncryptionChanged)
91+
Q_PROPERTY(bool enforceUseHardwareTokenEncryption READ enforceUseHardwareTokenEncryption NOTIFY enforceUseHardwareTokenEncryptionChanged)
9292
Q_PROPERTY(QString encryptionHardwareTokenDriverPath READ encryptionHardwareTokenDriverPath NOTIFY encryptionHardwareTokenDriverPathChanged)
9393

9494
public:
@@ -328,7 +328,7 @@ class OWNCLOUDSYNC_EXPORT Account : public QObject
328328

329329
[[nodiscard]] bool askUserForMnemonic() const;
330330

331-
[[nodiscard]] bool useHardwareTokenEncryption() const;
331+
[[nodiscard]] bool enforceUseHardwareTokenEncryption() const;
332332

333333
[[nodiscard]] QString encryptionHardwareTokenDriverPath() const;
334334

@@ -360,7 +360,7 @@ public slots:
360360
void accountChangedDisplayName();
361361
void prettyNameChanged();
362362
void askUserForMnemonicChanged();
363-
void useHardwareTokenEncryptionChanged();
363+
void enforceUseHardwareTokenEncryptionChanged();
364364
void encryptionHardwareTokenDriverPathChanged();
365365

366366
/// Used in RemoteWipe

‎src/libsync/clientsideencryption.cpp

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,13 +1012,22 @@ std::optional<QByteArray> decryptStringAsymmetricWithToken(ENGINE *sslEngine,
10121012
}
10131013

10141014

1015-
ClientSideEncryption::ClientSideEncryption() = default;
1015+
ClientSideEncryption::ClientSideEncryption()
1016+
{
1017+
connect(&_usbTokenInformation, &ClientSideTokenSelector::discoveredTokensChanged,
1018+
this, &ClientSideEncryption::displayTokenInitDialog);
1019+
}
10161020

10171021
bool ClientSideEncryption::isInitialized() const
10181022
{
10191023
return !getMnemonic().isEmpty();
10201024
}
10211025

1026+
QVariantList ClientSideEncryption::discoveredTokens() const
1027+
{
1028+
return _usbTokenInformation.discoveredTokens();
1029+
}
1030+
10221031
const QSslKey &ClientSideEncryption::getPublicKey() const
10231032
{
10241033
return _publicKey;
@@ -1080,8 +1089,19 @@ void ClientSideEncryption::initialize(const AccountPtr &account)
10801089
return;
10811090
}
10821091

1083-
if (account->useHardwareTokenEncryption()) {
1084-
initializeHardwareTokenEncryption(account);
1092+
if (account->enforceUseHardwareTokenEncryption()) {
1093+
if (_usbTokenInformation.isSetup()) {
1094+
initializeHardwareTokenEncryption(account);
1095+
} else if (account->e2eEncryptionKeysGenerationAllowed() && account->askUserForMnemonic()) {
1096+
_usbTokenInformation.searchForToken();
1097+
if (_usbTokenInformation.isSetup()) {
1098+
initializeHardwareTokenEncryption(account);
1099+
} else {
1100+
emit initializationFinished();
1101+
}
1102+
} else {
1103+
emit initializationFinished();
1104+
}
10851105
} else {
10861106
fetchCertificateFromKeyChain(account);
10871107
}

0 commit comments

Comments
 (0)