mirror/galene
1
Fork 0
mirror of https://github.com/jech/galene.git synced 2024-11-22 16:45:58 +01:00
Code Activity

Check MIME type in auth server response.

Browse source
This commit is contained in:
Juliusz Chroboczek 2022-08-03 15:00:50 +02:00
parent d69c517137
commit b821cd71a9
1 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
static/protocol.js
View file

@ -475,15 +475,36 @@ ServerConnection.prototype.join = async function(group, username, credentials, d
}); });
if(!r.ok) if(!r.ok)
throw new Error( throw new Error(
`The authorisation server said: ${r.status} ${r.statusText}`, `The authorisation server said ${r.status} ${r.statusText}`,
); );
if(r.status === 204) {
// no data, fallback to password auth
m.password = credentials.password;
break;
}
let ctype = r.headers.get("Content-Type");
if(!ctype)
throw new Error(
"The authorisation server didn't return a content type",
);
let semi = ctype.indexOf(";");
if(semi >= 0)
ctype = ctype.slice(0, semi);
ctype = ctype.trim();
switch(ctype.toLowerCase()) {
case 'application/jwt':
let data = await r.text(); let data = await r.text();
if(!data) if(!data)
// empty data, continue with password auth throw new Error(
m.password = credentials.password; "The authorisation server returned empty token",
else );
m.token = data; m.token = data;
break; break;
default:
throw new Error(`The authorisation server returned ${ctype}`);
break;
}
break;
default: default:
throw new Error(`Unknown credentials type ${credentials.type}`); throw new Error(`Unknown credentials type ${credentials.type}`);
} }