Merge pull request #9609 from nextcloud/backport/9605/stable-33.0

[stable-33.0] Bugfix/use display name for e2ee shares

Author: mgallien

src/gui/sharemanager.cpp

@@ -521,6 +521,7 @@ void ShareManager::createE2EeShareJob(const QString &fullRemotePath,
                                                                          UpdateE2eeFolderUsersMetadataJob::Add,
                                                                          fullRemotePath,
                                                                          sharee->shareWith(),
+                                                                         sharee->displayName(),
                                                                          QSslCertificate{},
                                                                          this);
 

src/libsync/updatee2eefolderusersmetadatajob.cpp

@@ -16,21 +16,23 @@ namespace OCC
 Q_LOGGING_CATEGORY(lcUpdateE2eeFolderUsersMetadataJob, "nextcloud.gui.updatee2eefolderusersmetadatajob", QtInfoMsg)
 
 UpdateE2eeFolderUsersMetadataJob::UpdateE2eeFolderUsersMetadataJob(const AccountPtr &account,
-                                                       SyncJournalDb *journalDb,
-                                                       const QString &syncFolderRemotePath,
-                                                       const Operation operation,
-                                                       const QString &fullRemotePath,
-                                                       const QString &folderUserId,
-                                                       const QSslCertificate &certificate,
-                                                       QObject *parent)
-    : QObject(parent)
-    , _account(account)
-    , _journalDb(journalDb)
-    , _syncFolderRemotePath(Utility::noLeadingSlashPath(Utility::noTrailingSlashPath(syncFolderRemotePath)))
-    , _operation(operation)
-    , _fullRemotePath(Utility::noLeadingSlashPath(fullRemotePath))
-    , _folderUserId(folderUserId)
-    , _folderUserCertificate(certificate)
+                                                                   SyncJournalDb *journalDb,
+                                                                   const QString &syncFolderRemotePath,
+                                                                   const Operation operation,
+                                                                   const QString &fullRemotePath,
+                                                                   const QString &folderUserId,
+                                                                   const QString &folderUserDisplayName,
+                                                                   const QSslCertificate &certificate,
+                                                                   QObject *parent)
+    : QObject{parent}
+    , _account{account}
+    , _journalDb{journalDb}
+    , _syncFolderRemotePath{Utility::noLeadingSlashPath(Utility::noTrailingSlashPath(syncFolderRemotePath))}
+    , _operation{operation}
+    , _fullRemotePath{Utility::noLeadingSlashPath(fullRemotePath)}
+    , _folderUserId{folderUserId}
+    , _folderUserDisplayName{folderUserDisplayName}
+    , _folderUserCertificate{certificate}
 {
     Q_ASSERT(_syncFolderRemotePath == QStringLiteral("/") || _fullRemotePath.startsWith(_syncFolderRemotePath));
     SyncJournalFileRecord rec;
@@ -78,7 +80,7 @@ void UpdateE2eeFolderUsersMetadataJob::start(const bool keepLock)
 void UpdateE2eeFolderUsersMetadataJob::slotStartE2eeMetadataJobs()
 {
     if (_operation == Operation::Add && _folderUserCertificate.isNull()) {
-        emit finished(404, tr("Could not fetch public key for user %1").arg(_folderUserId));
+        emit finished(404, tr("Could not fetch public key for user %1").arg(_folderUserDisplayName));
         return;
     }
 
@@ -106,7 +108,7 @@ void UpdateE2eeFolderUsersMetadataJob::slotFetchMetadataJobFinished(int statusCo
     }
 
     if (!_encryptedFolderMetadataHandler->folderMetadata() || !_encryptedFolderMetadataHandler->folderMetadata()->isValid()) {
-        emit finished(403, tr("Could not add or remove user %1 to access folder %2").arg(_folderUserId).arg(_fullRemotePath));
+        emit finished(403, tr("Could not add or remove user %1 to access folder %2").arg(_folderUserDisplayName).arg(_fullRemotePath));
         return;
     }
     startUpdate();

src/libsync/updatee2eefolderusersmetadatajob.h

@@ -33,7 +33,15 @@ class OWNCLOUDSYNC_EXPORT UpdateE2eeFolderUsersMetadataJob : public QObject
         QString password;
     };
 
-    explicit UpdateE2eeFolderUsersMetadataJob(const AccountPtr &account, SyncJournalDb *journalDb,const QString &syncFolderRemotePath, const Operation operation, const QString &fullRemotePath = {}, const QString &folderUserId = {}, const QSslCertificate &certificate = QSslCertificate{}, QObject *parent = nullptr);
+    explicit UpdateE2eeFolderUsersMetadataJob(const AccountPtr &account,
+                                              SyncJournalDb *journalDb,
+                                              const QString &syncFolderRemotePath,
+                                              const Operation operation,
+                                              const QString &fullRemotePath = {},
+                                              const QString &folderUserId = {},
+                                              const QString &folderUserDisplayName = {},
+                                              const QSslCertificate &certificate = QSslCertificate{},
+                                              QObject *parent = nullptr);
     ~UpdateE2eeFolderUsersMetadataJob() override = default;
 
 public:
@@ -84,6 +92,7 @@ private: signals:
     Operation _operation = Invalid;
     QString _fullRemotePath;
     QString _folderUserId;
+    QString _folderUserDisplayName;
     QSslCertificate _folderUserCertificate;
     QByteArray _folderToken;
     // needed when re-encrypting nested folders' metadata after top-level folder's metadata has changed

src/libsync/updatemigratede2eemetadatajob.cpp

@@ -38,6 +38,7 @@ void UpdateMigratedE2eeMetadataJob::start()
                                                                                      UpdateE2eeFolderUsersMetadataJob::Add,
                                                                                      _fullRemotePath,
                                                                                      propagator()->account()->davUser(),
+                                                                                     propagator()->account()->displayName(),
                                                                                      propagator()->account()->e2e()->getCertificate());
     updateMedatadaAndSubfoldersJob->setParent(this);
     updateMedatadaAndSubfoldersJob->setSubJobSyncItems(_subJobItems);