Merge branch 'jb36304' into 'master'

[buteo-sync-plugins-social] Ensure backup blobs have url-safe names. Contributes to JB#36304 Base64 encoded names are not URL safe (they can contain / and + etc). This commit ensures that we use the URL-safe encoding for backup blobs. Contributes to JB#36304 See merge request !20
sailfishos · Sep 20, 2016 · 050d860 · 050d860
2 parents 4e71880 + b6220c4
commit 050d860
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/dropbox/dropbox-backup/dropboxbackupsyncadaptor.cpp b/src/dropbox/dropbox-backup/dropboxbackupsyncadaptor.cpp
@@ -74,7 +74,7 @@ void DropboxBackupSyncAdaptor::beginSync(int accountId, const QString &accessTok
     SsuDeviceInfo deviceInfo;
     QString deviceId = deviceInfo.deviceUid();
     QByteArray hashedDeviceId = QCryptographicHash::hash(deviceId.toUtf8(), QCryptographicHash::Sha256);
-    QString encodedDeviceId = QString::fromUtf8(hashedDeviceId.toBase64()).mid(0,12);
+    QString encodedDeviceId = QString::fromUtf8(hashedDeviceId.toBase64(QByteArray::Base64UrlEncoding)).mid(0,12);
     if (deviceId.isEmpty()) {
         SOCIALD_LOG_ERROR("Could not determine device identifier; cannot create remote per-device backup directory!");
         setStatus(SocialNetworkSyncAdaptor::Error);

diff --git a/src/onedrive/onedrive-backup/onedrivebackupsyncadaptor.cpp b/src/onedrive/onedrive-backup/onedrivebackupsyncadaptor.cpp
@@ -108,7 +108,7 @@ void OneDriveBackupSyncAdaptor::beginSync(int accountId, const QString &accessTo
     SsuDeviceInfo deviceInfo;
     QString deviceId = deviceInfo.deviceUid();
     QByteArray hashedDeviceId = QCryptographicHash::hash(deviceId.toUtf8(), QCryptographicHash::Sha256);
-    QString encodedDeviceId = QString::fromUtf8(hashedDeviceId.toBase64()).mid(0,12);
+    QString encodedDeviceId = QString::fromUtf8(hashedDeviceId.toBase64(QByteArray::Base64UrlEncoding)).mid(0,12);
     if (deviceId.isEmpty()) {
         SOCIALD_LOG_ERROR("Could not determine device identifier; cannot create remote per-device backup directory!");
         setStatus(SocialNetworkSyncAdaptor::Error);