TeaSpeak
/
TeaWeb
1
0
Fork 0
Code Issues 1 Pull Requests Activity

Fixed invalid cursor iteration within the connection history

master
WolverinDEV 2021-06-11 12:15:14 +02:00
parent 253f537bb2
commit 7601ac2e07
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
shared/js/connectionlog/History.ts
View File

@ -479,35 +479,30 @@ export class ConnectionHistory {
const transaction = this.database.transaction(["attempt-history"], "readonly"); const transaction = this.database.transaction(["attempt-history"], "readonly");
const store = transaction.objectStore("attempt-history"); const store = transaction.objectStore("attempt-history");
const cursor = await new Promise<IDBCursorWithValue | null>((resolve, reject) => {
const cursor = store.index(targetType === "server-unique-id" ? "serverUniqueId" : "targetAddress").openCursor(target, "prev"); const cursor = store.index(targetType === "server-unique-id" ? "serverUniqueId" : "targetAddress").openCursor(target, "prev");
while(true) {
const entry = await new Promise<IDBCursorWithValue | null>((resolve, reject) => {
cursor.onsuccess = () => resolve(cursor.result); cursor.onsuccess = () => resolve(cursor.result);
cursor.onerror = () => reject(cursor.error); cursor.onerror = () => reject(cursor.error);
}); });
if(!cursor) { if(!entry) {
/* We did not find any entry */
return undefined; return undefined;
} }
while(true) { if(entry.value.serverUniqueId === kUnknownHistoryServerUniqueId && onlySucceeded) {
if(!cursor.value) { entry.continue();
return undefined;
}
if(cursor.value.serverUniqueId === kUnknownHistoryServerUniqueId && onlySucceeded) {
cursor.continue();
continue; continue;
} }
return { return {
id: cursor.value.id, id: entry.value.id,
timestamp: cursor.value.timestamp, timestamp: entry.value.timestamp,
serverUniqueId: cursor.value.serverUniqueId, serverUniqueId: entry.value.serverUniqueId,
nickname: cursor.value.nickname, nickname: entry.value.nickname,
hashedPassword: cursor.value.hashedPassword, hashedPassword: entry.value.hashedPassword,
targetAddress: cursor.value.targetAddress, targetAddress: entry.value.targetAddress,
}; };
} }
} }