suzanne.soy/fork-openpgpjs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle CORS errors during WKD lookup (#1125)

Browse Source 
Also, throw an error instead of returning null when the server returned
an error status.
This commit is contained in:
Yarmo Mackenbach 2020-07-17 14:22:54 +02:00 committed by GitHub
parent 8783caa828
commit de360e200c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/wkd.js
View File

@ -60,11 +60,17 @@ WKD.prototype.lookup = async function(options) {
const urlAdvanced = `https://openpgpkey.${domain}/.well-known/openpgpkey/${domain}/hu/${localEncoded}`; const urlAdvanced = `https://openpgpkey.${domain}/.well-known/openpgpkey/${domain}/hu/${localEncoded}`;
const urlDirect = `https://${domain}/.well-known/openpgpkey/hu/${localEncoded}`; const urlDirect = `https://${domain}/.well-known/openpgpkey/hu/${localEncoded}`;
let response = await fetch(urlAdvanced); let response;
if (response.status !== 200) { try {
response = await fetch(urlAdvanced);
if (response.status !== 200) {
throw new Error('Advanced WKD lookup failed: ' + response.statusText);
}
} catch (err) {
util.print_debug_error(err);
response = await fetch(urlDirect); response = await fetch(urlDirect);
if (response.status !== 200) { if (response.status !== 200) {
return; throw new Error('Direct WKD lookup failed: ' + response.statusText);
} }
} }