From 0727cf8474f5a449b43b75ce29cf3bae457a1ed5 Mon Sep 17 00:00:00 2001 From: Errietta Kostala Date: Tue, 26 Feb 2019 13:28:49 +0000 Subject: [PATCH 1/4] HKP types --- types/openpgp/common/index.d.ts | 5 +++++ types/openpgp/common/tsconfig.json | 22 ++++++++++++++++++++++ types/openpgp/index.d.ts | 2 ++ types/openpgp/openpgp-tests.ts | 17 +++++++++++++++++ types/openpgp/ts3.2/index.d.ts | 2 ++ 5 files changed, 48 insertions(+) create mode 100644 types/openpgp/common/index.d.ts create mode 100644 types/openpgp/common/tsconfig.json diff --git a/types/openpgp/common/index.d.ts b/types/openpgp/common/index.d.ts new file mode 100644 index 0000000000..88796dea9d --- /dev/null +++ b/types/openpgp/common/index.d.ts @@ -0,0 +1,5 @@ +export class HKP { + constructor(keyServerUrl?: string); + lookup(options: {keyId?: string, query?: string }): Promise; + upload(publicKeyArmored: string): Promise; +} diff --git a/types/openpgp/common/tsconfig.json b/types/openpgp/common/tsconfig.json new file mode 100644 index 0000000000..f7e7d1970b --- /dev/null +++ b/types/openpgp/common/tsconfig.json @@ -0,0 +1,22 @@ +{ + "compilerOptions": { + "module": "commonjs", + "lib": [ + "es6", "dom" + ], + "noImplicitAny": true, + "noImplicitThis": true, + "strictNullChecks": false, + "strictFunctionTypes": true, + "baseUrl": "../../", + "typeRoots": [ + "../../" + ], + "types": [], + "noEmit": true, + "forceConsistentCasingInFileNames": true + }, + "files": [ + "index.d.ts" + ] +} diff --git a/types/openpgp/index.d.ts b/types/openpgp/index.d.ts index d564c6df6d..6558e26eb2 100644 --- a/types/openpgp/index.d.ts +++ b/types/openpgp/index.d.ts @@ -10,6 +10,8 @@ export as namespace openpgp; +export * from './common'; + export interface UserId { name?: string, email?: string, diff --git a/types/openpgp/openpgp-tests.ts b/types/openpgp/openpgp-tests.ts index 19e305cb26..3c8f19681f 100644 --- a/types/openpgp/openpgp-tests.ts +++ b/types/openpgp/openpgp-tests.ts @@ -193,3 +193,20 @@ openpgp.util.shiftRight("", 1); openpgp.util.str2bin(""); openpgp.util.str2Uint8Array(""); openpgp.util.Uint8Array2str(openpgp.util.str2Uint8Array("")); + +async () => { + let hkp = new openpgp.HKP(); // Defaults to https://keyserver.ubuntu.com, or pass another keyserver URL as a string + + let hkpOptions = { + query: 'alice@example.com' + }; + + let armoredPubkey = await hkp.lookup(hkpOptions); + await openpgp.key.readArmored(armoredPubkey); + + hkp = new openpgp.HKP('https://pgp.mit.edu'); + + let pubkey = '-----BEGIN PGP PUBLIC KEY BLOCK ... END PGP PUBLIC KEY BLOCK-----'; + + await hkp.upload(pubkey); +} diff --git a/types/openpgp/ts3.2/index.d.ts b/types/openpgp/ts3.2/index.d.ts index 428f785dbe..7342f5f928 100644 --- a/types/openpgp/ts3.2/index.d.ts +++ b/types/openpgp/ts3.2/index.d.ts @@ -9,6 +9,8 @@ export as namespace openpgp; +export * from '../common'; + export interface UserId { name?: string, email?: string, From f3c884d79d4291a20090609c7cc92955f66db395 Mon Sep 17 00:00:00 2001 From: Errietta Kostala Date: Tue, 26 Feb 2019 13:59:40 +0000 Subject: [PATCH 2/4] move definitions --- types/openpgp/index.d.ts | 2 +- types/openpgp/openpgp-tests.ts | 34 +++++++++++++++++----------------- types/openpgp/ts3.2/index.d.ts | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/types/openpgp/index.d.ts b/types/openpgp/index.d.ts index 6558e26eb2..628663a9ec 100644 --- a/types/openpgp/index.d.ts +++ b/types/openpgp/index.d.ts @@ -1,4 +1,4 @@ -// Type definitions for openpgp 4.0.1 +// Type definitions for openpgp 4.4.8 // Project: http://openpgpjs.org/ // Definitions by: Guillaume Lacasa // Errietta Kostala diff --git a/types/openpgp/openpgp-tests.ts b/types/openpgp/openpgp-tests.ts index 3c8f19681f..09795ce630 100644 --- a/types/openpgp/openpgp-tests.ts +++ b/types/openpgp/openpgp-tests.ts @@ -135,6 +135,23 @@ openpgp.initWorker({ path:'openpgp.worker.js' }); return verified.signatures[0].valid; })(); +async () => { + let hkp = new openpgp.HKP(); // Defaults to https://keyserver.ubuntu.com, or pass another keyserver URL as a string + + let hkpOptions = { + query: 'alice@example.com' + }; + + let armoredPubkey = await hkp.lookup(hkpOptions); + await openpgp.key.readArmored(armoredPubkey); + + hkp = new openpgp.HKP('https://pgp.mit.edu'); + + let pubkey = '-----BEGIN PGP PUBLIC KEY BLOCK ... END PGP PUBLIC KEY BLOCK-----'; + + await hkp.upload(pubkey); +} + // Open PGP Tests @@ -193,20 +210,3 @@ openpgp.util.shiftRight("", 1); openpgp.util.str2bin(""); openpgp.util.str2Uint8Array(""); openpgp.util.Uint8Array2str(openpgp.util.str2Uint8Array("")); - -async () => { - let hkp = new openpgp.HKP(); // Defaults to https://keyserver.ubuntu.com, or pass another keyserver URL as a string - - let hkpOptions = { - query: 'alice@example.com' - }; - - let armoredPubkey = await hkp.lookup(hkpOptions); - await openpgp.key.readArmored(armoredPubkey); - - hkp = new openpgp.HKP('https://pgp.mit.edu'); - - let pubkey = '-----BEGIN PGP PUBLIC KEY BLOCK ... END PGP PUBLIC KEY BLOCK-----'; - - await hkp.upload(pubkey); -} diff --git a/types/openpgp/ts3.2/index.d.ts b/types/openpgp/ts3.2/index.d.ts index 7342f5f928..e7f8cdd714 100644 --- a/types/openpgp/ts3.2/index.d.ts +++ b/types/openpgp/ts3.2/index.d.ts @@ -1,4 +1,4 @@ -// Type definitions for openpgp 4.0.1 +// Type definitions for openpgp 4.4.8 // Project: http://openpgpjs.org/ // Definitions by: Guillaume Lacasa // Errietta Kostala From e6787c6405df266fe49d94bf8330a519c016a70d Mon Sep 17 00:00:00 2001 From: Errietta Kostala Date: Tue, 26 Feb 2019 14:02:06 +0000 Subject: [PATCH 3/4] unused file --- types/openpgp/common/tsconfig.json | 22 ---------------------- types/openpgp/openpgp-tests.ts | 2 +- 2 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 types/openpgp/common/tsconfig.json diff --git a/types/openpgp/common/tsconfig.json b/types/openpgp/common/tsconfig.json deleted file mode 100644 index f7e7d1970b..0000000000 --- a/types/openpgp/common/tsconfig.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "compilerOptions": { - "module": "commonjs", - "lib": [ - "es6", "dom" - ], - "noImplicitAny": true, - "noImplicitThis": true, - "strictNullChecks": false, - "strictFunctionTypes": true, - "baseUrl": "../../", - "typeRoots": [ - "../../" - ], - "types": [], - "noEmit": true, - "forceConsistentCasingInFileNames": true - }, - "files": [ - "index.d.ts" - ] -} diff --git a/types/openpgp/openpgp-tests.ts b/types/openpgp/openpgp-tests.ts index 09795ce630..98e326b876 100644 --- a/types/openpgp/openpgp-tests.ts +++ b/types/openpgp/openpgp-tests.ts @@ -136,7 +136,7 @@ openpgp.initWorker({ path:'openpgp.worker.js' }); })(); async () => { - let hkp = new openpgp.HKP(); // Defaults to https://keyserver.ubuntu.com, or pass another keyserver URL as a string + let hkp = new openpgp.HKP(); let hkpOptions = { query: 'alice@example.com' From 31a924b4f32f5dd6842d24d866df46241596fc59 Mon Sep 17 00:00:00 2001 From: Errietta Kostala Date: Tue, 26 Feb 2019 18:54:37 +0000 Subject: [PATCH 4/4] use const --- types/openpgp/openpgp-tests.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/types/openpgp/openpgp-tests.ts b/types/openpgp/openpgp-tests.ts index 98e326b876..100941074a 100644 --- a/types/openpgp/openpgp-tests.ts +++ b/types/openpgp/openpgp-tests.ts @@ -138,16 +138,16 @@ openpgp.initWorker({ path:'openpgp.worker.js' }); async () => { let hkp = new openpgp.HKP(); - let hkpOptions = { + const hkpOptions = { query: 'alice@example.com' }; - let armoredPubkey = await hkp.lookup(hkpOptions); + const armoredPubkey = await hkp.lookup(hkpOptions); await openpgp.key.readArmored(armoredPubkey); hkp = new openpgp.HKP('https://pgp.mit.edu'); - let pubkey = '-----BEGIN PGP PUBLIC KEY BLOCK ... END PGP PUBLIC KEY BLOCK-----'; + const pubkey = '-----BEGIN PGP PUBLIC KEY BLOCK ... END PGP PUBLIC KEY BLOCK-----'; await hkp.upload(pubkey); }