Mirrors/keyoxide-web
1
0
Fork 1
mirror of https://codeberg.org/keyoxide/keyoxide-web.git synced 2024-12-22 14:59:29 -07:00
Code Issues Projects Releases Packages Wiki Activity

return from rejects

Browse source
This commit is contained in:
Preston Maness 2023-09-06 23:29:54 -05:00 committed by Yarmo Mackenbach
parent ae6a3b0fdb
commit cc343198b4
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/server/openpgpProfiles.js
View file

@ -44,12 +44,12 @@ const fetchWKD = (id) => {
let fetchURL = null
if (!id.includes('@')) {
reject(new Error(`The WKD identifier "${id}" is invalid`))
return reject(new Error(`The WKD identifier "${id}" is invalid`))
}
const [, localPart, domain] = /([^@]*)@(.*)/.exec(id)
if (!(localPart && domain)) {
reject(new Error(`The WKD identifier "${id}" is invalid`))
return reject(new Error(`The WKD identifier "${id}" is invalid`))
}
const localEncoded = await computeWKDLocalPart(localPart)
const urlAdvanced = `https://openpgpkey.${domain}/.well-known/openpgpkey/${domain}/hu/${localEncoded}`
@ -82,12 +82,12 @@ const fetchWKD = (id) => {
}
})
} catch (error) {
reject(new Error('No public keys could be fetched using WKD'))
return reject(new Error('No public keys could be fetched using WKD'))
}
}
if (!plaintext) {
reject(new Error('No public keys could be fetched using WKD'))
return reject(new Error('No public keys could be fetched using WKD'))
}
try {
@ -95,18 +95,17 @@ const fetchWKD = (id) => {
binaryKey: plaintext
})
} catch (error) {
reject(new Error('No public keys could be read from the data fetched using WKD'))
return reject(new Error('No public keys could be read from the data fetched using WKD'))
}
if (!publicKey) {
reject(new Error('No public keys could be read from the data fetched using WKD'))
return reject(new Error('No public keys could be read from the data fetched using WKD'))
}
try {
profile = await doipjs.openpgp.parsePublicKey(publicKey)
} catch (error) {
reject(new Error('No public keys could be fetched using WKD'))
return
return reject(new Error('No public keys could be fetched using WKD'))
}
profile.publicKey.fetch.method = 'wkd'
@ -160,8 +159,7 @@ const fetchHKP = (id, keyserverDomain) => {
}
if (!profile) {
reject(new Error('No public keys could be fetched using HKP'))
return
return reject(new Error('No public keys could be fetched using HKP'))
}
profile.publicKey.fetch.method = 'hkp'
@ -187,12 +185,12 @@ const fetchSignature = (signature) => {
profile = await doipjs.signatures.parse(signature)
// TODO Find the URL to the key
} catch (error) {
reject(new Error(`Signature could not be properly read (${error.message})`))
return reject(new Error(`Signature could not be properly read (${error.message})`))
}
// Check if a key was fetched
if (!profile) {
reject(new Error('No profile could be fetched'))
return reject(new Error('No profile could be fetched'))
}
resolve(profile)
@ -210,11 +208,11 @@ const fetchKeybase = (username, fingerprint) => {
profile = await doipjs.openpgp.fetchKeybase(username, fingerprint)
fetchURL = `https://keybase.io/${username}/pgp_keys.asc?fingerprint=${fingerprint}`
} catch (error) {
reject(new Error('No public keys could be fetched from Keybase'))
return reject(new Error('No public keys could be fetched from Keybase'))
}
if (!profile) {
reject(new Error('No public keys could be fetched from Keybase'))
return reject(new Error('No public keys could be fetched from Keybase'))
}
profile.publicKey.fetch.method = 'http'