TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-04-02 21:01:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
rustdesk
2022-01-27 13:24:40 +08:00
parent 6c0030bbe2
commit 74c53f17ae
4 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/connection.ts
View File

@@ -60,7 +60,7 @@ export default class Connection {
const ws = new Websock(uri);
this._ws = ws;
this._id = id;
console.log(new Date() + ": Conntecting to rendezvoous server: " + uri);
console.log(new Date() + ": Conntecting to rendezvoous server: " + uri + ", for " + id);
await ws.open();
console.log(new Date() + ": Connected to rendezvoous server");
const connType = rendezvous.ConnType.DEFAULT_CONN;
@@ -197,8 +197,8 @@ export default class Connection {
const msg = this._ws?.parseMessage(await this._ws?.next());
if (msg?.hash) {
this._hash = msg?.hash;
if (!this._password) this.msgbox("input-password", "Password Required", "");
await this.login(this._password);
this.msgbox("input-password", "Password Required", "");
} else if (msg?.testDelay) {
const testDelay = msg?.testDelay;
if (!testDelay.fromClient) {
@@ -266,15 +266,13 @@ export default class Connection {
async login(password: string | undefined, _remember: Boolean = false) {
this._password = password;
this.msgbox("connecting", "Connecting...", "Logging in...");
const salt = this._hash?.salt;
if (salt && password) {
let p = hash([password, salt]);
if (password) {
const salt = this._hash?.salt;
let p = hash([password, salt!]);
const challenge = this._hash?.challenge;
if (challenge) {
p = hash([p, challenge]);
await this._sendLoginMessage(p);
}
p = hash([p, challenge!]);
this.msgbox("connecting", "Connecting...", "Logging in...");
await this._sendLoginMessage(p);
} else {
await this._sendLoginMessage();
}