cadence/Carbon
3
9
Fork 1
Code Issues 14 Pull requests 1 Releases Wiki Activity

Refactor homeserver lookup code #12

Merged
bad merged 10 commits from refactor-homeserver-lookup into princess 2020-10-23 08:57:01 +00:00
Conversation 0 Commits 10 Files changed 1 +47 -31
1 changed files with 47 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
src/js/login.js
View file

@ -77,40 +77,16 @@ class Form extends ElemJS {
if (!username.isValid()) return this.cancel("Username is not valid.") if (!username.isValid()) return this.cancel("Username is not valid.")
// Resolve homeserver address // Resolve homeserver address
let currentAddress = homeserver.value let domain
let ok = false
while (!ok) {
if (!currentAddress.match(/^https?:\/\//)) {
console.warn(`${currentAddress} doesn't specify the protocol, assuming https`)
currentAddress = "https://" + currentAddress
}
currentAddress = currentAddress.replace(/\/*$/, "")
this.status(`Looking up homeserver... trying ${currentAddress}`)
try { try {
// check if we found the actual matrix server domain = await this.findHomeserver(homeserver.value)
try {
const versions = await fetch(`${currentAddress}/_matrix/client/versions`).then(res => res.json())
if (Array.isArray(versions.versions)) {
ok = true
break
}
} catch (e) {}
// find the next matrix server in the chain
const root = await fetch(`${currentAddress}/.well-known/matrix/client`).then(res => res.json())
let nextAddress = root["m.homeserver"].base_url
nextAddress = nextAddress.replace(/\/*$/, "")
if (currentAddress === nextAddress) {
ok = true
}
currentAddress = nextAddress
} catch(e) { } catch(e) {
return this.cancel(`Failed to look up server ${currentAddress}`) return this.cancel(e.message)
}
} }
// Request access token // Request access token
this.status("Logging in...") this.status("Logging in...")
const root = await fetch(`${currentAddress}/_matrix/client/r0/login`, { const root = await fetch(`${domain}/_matrix/client/r0/login`, {
method: "POST", method: "POST",
body: JSON.stringify({ body: JSON.stringify({
type: "m.login.password", type: "m.login.password",
@ -130,12 +106,52 @@ class Form extends ElemJS {
} }
localStorage.setItem("mx_user_id", root.user_id) localStorage.setItem("mx_user_id", root.user_id)
localStorage.setItem("domain", currentAddress) localStorage.setItem("domain", domain)
localStorage.setItem("access_token", root.access_token) localStorage.setItem("access_token", root.access_token)
location.assign("../") location.assign("../")
} }
async findHomeserver(address, maxDepth = 5) {
//Protects from servers sending us on a redirect loop
maxDepth--
if (maxDepth <= 0) throw new Error(`Failed to look up homeserver, maximum search depth reached`)
//Normalise the address
if (!address.match(/^https?:\/\//)) {
console.warn(`${address} doesn't specify the protocol, assuming https`)
address = "https://" + address
}
address = address.replace(/\/*$/, "")
this.status(`Looking up homeserver... trying ${address}`)
// Check if we found the actual matrix server
try {
const versionsReq = await fetch(`${address}/_matrix/client/versions`)
if (versionsReq.ok) {
const versions = await versionsReq.json()
if (Array.isArray(versions.versions)) return address
}
} catch(e) {}
// Find the next matrix server in the chain
const root = await fetch(`${address}/.well-known/matrix/client`).then(res => res.json()).catch(e => {
console.error(e)
bad marked this conversation as resolved Outdated
cadence commented 2020-10-22 04:45:27 +00:00
Outdated
Review
Copy link

Why chain a promise catch here? I don't have a problem with promise chaining, it's just weird considering that we used the try/catch syntax 3 lines up. IMO they should be made consistent?

Why chain a promise catch here? I don't have a problem with promise chaining, it's just weird considering that we used the try/catch syntax 3 lines up. IMO they should be made consistent?
bad commented 2020-10-22 05:52:18 +00:00
Outdated
Review
Copy link

It was shorter. I actually wanted to write the code like it's written now but jshint errored on the optional chain. It's fixed now

It was shorter. I actually wanted to write the code like it's written now but jshint errored on the optional chain. It's fixed now
throw new Error(`Failed to look up server ${address}`)
})
let nextAddress = root["m.homeserver"].base_url
nextAddress = nextAddress.replace(/\/*$/, "")
if (address === nextAddress) {
throw new Error(`Failed to look up server ${address}, /.well-known/matrix/client found a redirect loop`);
}
return this.findHomeserver(nextAddress, maxDepth)
}
status(message) { status(message) {
feedback.setLoading(true) feedback.setLoading(true)
feedback.message(message) feedback.message(message)