selfhosted
/
pairdrop
mirror of https://github.com/schlagmichdoch/PairDrop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Save current ws-domain alongside peer secrets and never send it to other ws-servers (fixes #269)

This commit is contained in:
schlagmichdoch 2024-02-22 15:28:29 +01:00
parent 9dae6d588d
commit 6f194db843
3 changed files with 67 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/scripts/main.js
View File

@ -118,8 +118,8 @@ class PairDrop {
this.$headerNotificationBtn.removeAttribute('hidden');
}
let roomSecrets = await PersistentStorage.getAllRoomSecrets();
if (roomSecrets.length > 0) {
let roomSecretsCount = await PersistentStorage.getAllRoomSecretsCount();
if (roomSecretsCount > 0) {
this.$headerEditPairedDevicesBtn.removeAttribute('hidden');
this.$footerPairedDevicesBadge.removeAttribute('hidden');
}

80
public/scripts/persistent-storage.js
View File

@ -4,7 +4,7 @@ class PersistentStorage {
PersistentStorage.logBrowserNotCapable();
return;
}
const DBOpenRequest = window.indexedDB.open('pairdrop_store', 5);
const DBOpenRequest = window.indexedDB.open('pairdrop_store', 6);
DBOpenRequest.onerror = e => {
PersistentStorage.logBrowserNotCapable();
Logger.error('Error initializing database:', e);
@ -49,6 +49,28 @@ class PersistentStorage {
await PersistentStorage.delete('editedDisplayName');
}
}
if (e.oldVersion <= 5) {
// migrate to v6
let roomSecretsObjectStore5 = txn.objectStore('room_secrets');
roomSecretsObjectStore5.createIndex('ws_domain', 'ws_domain');
// add current ws_domain to existing peer secret entries once the config has loaded
Events.on('config-loaded', _ => PersistentStorage.addCurrentWsDomainToAllRoomSecrets(), { once: true });
}
}
}
static getCurrentWsDomain() {
return window._config && window._config.signalingServer
? window._config.signalingServer
: location.host + location.pathname;
}
static async addCurrentWsDomainToAllRoomSecrets() {
const wsServerDomain = this.getCurrentWsDomain();
const roomSecrets = await PersistentStorage.getAllRoomSecrets(false);
for (let i = 0; i < roomSecrets.length; i++) {
await PersistentStorage.updateRoomSecret(roomSecrets[i], null, null, null, null, wsServerDomain);
}
}
@ -124,7 +146,8 @@ class PersistentStorage {
'secret': roomSecret,
'display_name': displayName,
'device_name': deviceName,
'auto_accept': false
'auto_accept': false,
'ws_domain': PersistentStorage.getCurrentWsDomain()
});
objectStoreRequest.onsuccess = e => {
Logger.debug(`Request successful. RoomSecret added: ${e.target.result}`);
@ -137,22 +160,28 @@ class PersistentStorage {
})
}
static async getAllRoomSecrets() {
try {
const roomSecrets = await this.getAllRoomSecretEntries();
let secrets = [];
for (let i = 0; i < roomSecrets.length; i++) {
secrets.push(roomSecrets[i].secret);
}
Logger.debug(`Request successful. Retrieved ${secrets.length} room_secrets`);
return(secrets);
} catch (e) {
this.logBrowserNotCapable();
return [];
}
static async getAllRoomSecretsCount(currentWsDomainOnly = true) {
return (await PersistentStorage.getAllRoomSecrets(currentWsDomainOnly)).length;
}
static getAllRoomSecretEntries() {
static async getAllRoomSecrets(currentWsDomainOnly = true) {
let secrets = [];
try {
const roomSecrets = await this.getAllRoomSecretEntries(currentWsDomainOnly);
secrets = roomSecrets.map(roomSecret => roomSecret.secret);
Logger.debug(`Request successful. Retrieved ${secrets.length} room_secrets`);
}
catch (e) {
console.debug(e)
this.logBrowserNotCapable();
}
return secrets;
}
static getAllRoomSecretEntries(currentWsDomainOnly = true) {
return new Promise((resolve, reject) => {
const DBOpenRequest = window.indexedDB.open('pairdrop_store');
DBOpenRequest.onsuccess = (e) => {
@ -161,7 +190,19 @@ class PersistentStorage {
const objectStore = transaction.objectStore('room_secrets');
const objectStoreRequest = objectStore.getAll();
objectStoreRequest.onsuccess = e => {
resolve(e.target.result);
let roomSecrets = e.target.result;
let roomSecretEntries = [];
for (let i = 0; i < roomSecrets.length; i++) {
const currentWsDomainDiffers = roomSecrets[i].ws_domain !== PersistentStorage.getCurrentWsDomain();
// if the saved ws domain differs from the current ws domain and only peers for the current ws domain should be returned -> skip this entry
if (currentWsDomainOnly && currentWsDomainDiffers) continue;
roomSecretEntries.push(roomSecrets[i]);
}
resolve(roomSecretEntries);
}
}
DBOpenRequest.onerror = (e) => {
@ -262,7 +303,7 @@ class PersistentStorage {
return this.updateRoomSecret(roomSecret, null, null, null, autoAccept);
}
static updateRoomSecret(roomSecret, updatedRoomSecret = null, updatedDisplayName = null, updatedDeviceName = null, updatedAutoAccept = null) {
static updateRoomSecret(roomSecret, updatedRoomSecret = null, updatedDisplayName = null, updatedDeviceName = null, updatedAutoAccept = null, wsDomain = null) {
return new Promise((resolve, reject) => {
const DBOpenRequest = window.indexedDB.open('pairdrop_store');
DBOpenRequest.onsuccess = e => {
@ -280,7 +321,8 @@ class PersistentStorage {
'secret': updatedRoomSecret !== null ? updatedRoomSecret : roomSecretEntry.entry.secret,
'display_name': updatedDisplayName !== null ? updatedDisplayName : roomSecretEntry.entry.display_name,
'device_name': updatedDeviceName !== null ? updatedDeviceName : roomSecretEntry.entry.device_name,
'auto_accept': updatedAutoAccept !== null ? updatedAutoAccept : roomSecretEntry.entry.auto_accept
'auto_accept': updatedAutoAccept !== null ? updatedAutoAccept : roomSecretEntry.entry.auto_accept,
'ws_domain': wsDomain !== null ? wsDomain : roomSecretEntry.entry.ws_domain
};
const objectStoreRequestUpdate = objectStore.put(updatedRoomSecretEntry, roomSecretEntry.key);

7
public/scripts/ui.js
View File

@ -1695,6 +1695,7 @@ class PairDeviceDialog extends Dialog {
Events.on('pair-device-join-key-invalid', _ => this._onPublicRoomJoinKeyInvalid());
Events.on('pair-device-canceled', e => this._onPairDeviceCanceled(e.detail));
Events.on('evaluate-number-room-secrets', _ => this._evaluateNumberRoomSecrets())
Events.on('config-loaded', _ => this._evaluateNumberRoomSecrets())
Events.on('secret-room-deleted', e => this._onSecretRoomDeleted(e.detail));
this.$el.addEventListener('paste', e => this._onPaste(e));
this.$qrCode.addEventListener('click', _ => this._copyPairUrl());
@ -1883,9 +1884,9 @@ class PairDeviceDialog extends Dialog {
_evaluateNumberRoomSecrets() {
PersistentStorage
.getAllRoomSecrets()
.then(roomSecrets => {
if (roomSecrets.length > 0) {
.getAllRoomSecretsCount()
.then(roomSecretsCount => {
if (roomSecretsCount > 0) {
this.$editPairedDevicesHeaderBtn.removeAttribute('hidden');
this.$footerInstructionsPairedDevices.removeAttribute('hidden');
}