Timo/auth-server-helper
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

asymmetric keys
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
Timo Hocker 2021-01-06 16:06:03 +01:00
parent 1437316519
commit adfeeaa52c
9 changed files with 207 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -46,9 +46,9 @@ redirect all others to the specified url
const {create_auth_handler} = require('@sapphirecode/auth-server-helper'); const {create_auth_handler} = require('@sapphirecode/auth-server-helper');
const handler = create_auth_handler( const handler = create_auth_handler(
(req) => { async (req) => {
if (req.user === 'foo' && req.password === 'bar') if (req.user === 'foo' && req.password === 'bar')
const {access_token_id, refresh_token_id} = req.allow_access({ const {access_token_id, refresh_token_id} = await req.allow_access({
access_token_expires_in: 600, // seconds until access tokens expire access_token_expires_in: 600, // seconds until access tokens expire
include_refresh_token: true, // should the answer include a refresh token? default: false include_refresh_token: true, // should the answer include a refresh token? default: false
refresh_token_expires_in: 3600, // seconds until refresh tokens expire (required if refresh tokens are generated) refresh_token_expires_in: 3600, // seconds until refresh tokens expire (required if refresh tokens are generated)
@ -56,7 +56,7 @@ const handler = create_auth_handler(
}); });
if (req.user === 'part' && req.password === 'baz') if (req.user === 'part' && req.password === 'baz')
const part_id = req.allow_part( const part_id = await req.allow_part(
60, // seconds until part_token expires 60, // seconds until part_token expires
'some_module', // next module handler (defined below) 'some_module', // next module handler (defined below)
{foo: 'bar'} // custom data to attach to the token {foo: 'bar'} // custom data to attach to the token

20
lib/AuthHandler.ts
View File

@ -21,7 +21,6 @@ interface AccessResult {
refresh_token_id?: string; refresh_token_id?: string;
} }
interface AccessResponse { interface AccessResponse {
token_type: string; token_type: string;
access_token: string; access_token: string;
@ -69,15 +68,20 @@ class AuthRequest {
this.response.setHeader ('Content-Type', 'application/json'); this.response.setHeader ('Content-Type', 'application/json');
} }
public allow_access ({ public async allow_access ({
access_token_expires_in, access_token_expires_in,
include_refresh_token, include_refresh_token,
refresh_token_expires_in, refresh_token_expires_in,
data data
}: AccessSettings): AccessResult { }: AccessSettings): Promise<AccessResult> {
this.default_header (); this.default_header ();
const at = auth.sign ('access_token', access_token_expires_in, { data }); const at = await auth.sign (
'access_token',
access_token_expires_in,
{ data }
);
const result: AccessResult = { access_token_id: at.id }; const result: AccessResult = { access_token_id: at.id };
const res: AccessResponse = { const res: AccessResponse = {
@ -96,7 +100,7 @@ class AuthRequest {
if (include_refresh_token) { if (include_refresh_token) {
if (typeof refresh_token_expires_in !== 'number') if (typeof refresh_token_expires_in !== 'number')
throw new Error ('no expiry time defined for refresh tokens'); throw new Error ('no expiry time defined for refresh tokens');
const rt = auth.sign ( const rt = await auth.sign (
'refresh_token', 'refresh_token',
refresh_token_expires_in, refresh_token_expires_in,
{ data } { data }
@ -111,14 +115,14 @@ class AuthRequest {
return result; return result;
} }
public allow_part ( public async allow_part (
part_token_expires_in: number, part_token_expires_in: number,
next_module: string, next_module: string,
data?: Record<string, unknown> data?: Record<string, unknown>
): string { ): Promise<string> {
this.default_header (); this.default_header ();
const pt = auth.sign ( const pt = await auth.sign (
'part_token', 'part_token',
part_token_expires_in, part_token_expires_in,
{ next_module, data } { next_module, data }

6
lib/Authority.ts
View File

@ -79,13 +79,13 @@ class Authority {
return result; return result;
} }
public sign ( public async sign (
type: TokenType, type: TokenType,
valid_for: number, valid_for: number,
options?: SignatureOptions options?: SignatureOptions
): SignatureResult { ): Promise<SignatureResult> {
const time = Date.now (); const time = Date.now ();
const key = keystore.get_key (time / 1000, valid_for); const key = await keystore.get_sign_key (time / 1000, valid_for);
const attributes = { const attributes = {
id: create_salt (), id: create_salt (),
iat: time, iat: time,

56
lib/KeyStore.ts
View File

@ -5,14 +5,24 @@
* Created by Timo Hocker <timo@scode.ovh>, December 2020 * Created by Timo Hocker <timo@scode.ovh>, December 2020
*/ */
import { create_salt } from '@sapphirecode/crypto-helper'; import { generate_keypair } from '@sapphirecode/crypto-helper';
interface Keypair {
private_key: string;
public_key: string;
}
interface Key { interface Key {
key: string; key: Keypair;
valid_until: number; valid_until: number;
timeout: NodeJS.Timeout; timeout: NodeJS.Timeout;
} }
function get_index (iat: number): string {
return Math.floor (iat / 60)
.toFixed (0);
}
class KeyStore { class KeyStore {
private _keys: Record<string, Key> = {}; private _keys: Record<string, Key> = {};
@ -22,38 +32,46 @@ class KeyStore {
}, (valid_for + 5) * 1000); }, (valid_for + 5) * 1000);
} }
public get_key (iat: number, valid_for = 0): string { public async get_sign_key (iat: number, valid_for: number): Promise<string> {
const index = Math.floor (iat / 60) const index = get_index (iat);
.toFixed (0);
if (valid_for <= 0)
throw new Error ('cannot create infinitely valid key');
if ((iat + 1) * 1000 < (new Date)
.getTime ())
throw new Error ('cannot access already expired keys');
const valid_until = (new Date) const valid_until = (new Date)
.getTime () + (valid_for * 1000); .getTime () + (valid_for * 1000);
if (typeof this._keys[index] !== 'undefined') { if (typeof this._keys[index] !== 'undefined') {
const key = this._keys[index]; const key = this._keys[index];
if (valid_for !== 0 && key.valid_until < valid_until) { if (key.valid_until < valid_until) {
clearTimeout (key.timeout); clearTimeout (key.timeout);
key.timeout = this.set_timeout (index, valid_for); key.timeout = this.set_timeout (index, valid_for);
key.valid_until = valid_until; key.valid_until = valid_until;
} }
return key.key; return key.key.private_key;
} }
if (valid_for !== 0) { this._keys[index] = {
if ((iat + 1) * 1000 < (new Date) key: await generate_keypair (),
.getTime ()) timeout: this.set_timeout (index, valid_for),
throw new Error ('cannot create already expired keys'); valid_until
};
this._keys[index] = { return this._keys[index].key.private_key;
key: create_salt (), }
timeout: this.set_timeout (index, valid_for),
valid_until
};
return this._keys[index].key; public get_key (iat: number): string {
} const index = get_index (iat);
throw new Error ('key could not be found'); if (typeof this._keys[index] === 'undefined')
throw new Error ('key could not be found');
const key = this._keys[index];
return key.key.public_key;
} }
} }

2
package.json
View File

@ -39,7 +39,7 @@
"middleware" "middleware"
], ],
"dependencies": { "dependencies": {
"@sapphirecode/crypto-helper": "^1.2.2", "@sapphirecode/crypto-helper": "^1.3.0",
"@sapphirecode/encoding-helper": "^1.1.0", "@sapphirecode/encoding-helper": "^1.1.0",
"@sapphirecode/utilities": "^1.8.8" "@sapphirecode/utilities": "^1.8.8"
}, },

28
test/spec/Authority.ts
View File

@ -25,8 +25,8 @@ describe ('authority', () => {
.uninstall (); .uninstall ();
}); });
it ('should create an access token', () => { it ('should create an access token', async () => {
const token = auth.sign ('access_token', 60); const token = await auth.sign ('access_token', 60);
jasmine.clock () jasmine.clock ()
.tick (30000); .tick (30000);
const res = auth.verify (token.signature); const res = auth.verify (token.signature);
@ -44,8 +44,8 @@ describe ('authority', () => {
.toBeUndefined (); .toBeUndefined ();
}); });
it ('should create a refresh token', () => { it ('should create a refresh token', async () => {
const token = auth.sign ('refresh_token', 600); const token = await auth.sign ('refresh_token', 600);
jasmine.clock () jasmine.clock ()
.tick (30000); .tick (30000);
const res = auth.verify (token.signature); const res = auth.verify (token.signature);
@ -63,8 +63,8 @@ describe ('authority', () => {
.toBeUndefined (); .toBeUndefined ();
}); });
it ('should create a part token', () => { it ('should create a part token', async () => {
const token = auth.sign ('part_token', 60, { next_module: '2fa' }); const token = await auth.sign ('part_token', 60, { next_module: '2fa' });
jasmine.clock () jasmine.clock ()
.tick (30000); .tick (30000);
const res = auth.verify (token.signature); const res = auth.verify (token.signature);
@ -82,8 +82,8 @@ describe ('authority', () => {
.toBeUndefined (); .toBeUndefined ();
}); });
it ('should reject an invalid access token', () => { it ('should reject an invalid access token', async () => {
const token = auth.sign ('access_token', 60); const token = await auth.sign ('access_token', 60);
token.signature = modify_signature (token.signature); token.signature = modify_signature (token.signature);
jasmine.clock () jasmine.clock ()
.tick (30000); .tick (30000);
@ -102,8 +102,8 @@ describe ('authority', () => {
.toEqual ('invalid signature'); .toEqual ('invalid signature');
}); });
it ('should reject blacklisted access token', () => { it ('should reject blacklisted access token', async () => {
const token = auth.sign ('access_token', 60); const token = await auth.sign ('access_token', 60);
jasmine.clock () jasmine.clock ()
.tick (30000); .tick (30000);
bl.add_signature (token.id); bl.add_signature (token.id);
@ -122,8 +122,8 @@ describe ('authority', () => {
.toEqual ('blacklisted'); .toEqual ('blacklisted');
}); });
it ('should reject an invalid refresh token', () => { it ('should reject an invalid refresh token', async () => {
const token = auth.sign ('refresh_token', 600); const token = await auth.sign ('refresh_token', 600);
token.signature = modify_signature (token.signature); token.signature = modify_signature (token.signature);
jasmine.clock () jasmine.clock ()
.tick (30000); .tick (30000);
@ -142,8 +142,8 @@ describe ('authority', () => {
.toEqual ('invalid signature'); .toEqual ('invalid signature');
}); });
it ('should reject a blacklisted refresh token', () => { it ('should reject a blacklisted refresh token', async () => {
const token = auth.sign ('refresh_token', 600); const token = await auth.sign ('refresh_token', 600);
jasmine.clock () jasmine.clock ()
.tick (30000); .tick (30000);
bl.add_signature (token.id); bl.add_signature (token.id);

16
test/spec/Gateway.ts
View File

@ -57,7 +57,7 @@ describe ('gateway', () => {
}); });
it ('should allow a valid access token', async () => { it ('should allow a valid access token', async () => {
const token = authority.sign ('access_token', 60); const token = await authority.sign ('access_token', 60);
const resp = await get ({ authorization: `Bearer ${token.signature}` }); const resp = await get ({ authorization: `Bearer ${token.signature}` });
expect (resp.statusCode) expect (resp.statusCode)
.toEqual (200); .toEqual (200);
@ -66,7 +66,7 @@ describe ('gateway', () => {
}); });
it ('should allow a valid access token using cookies', async () => { it ('should allow a valid access token using cookies', async () => {
const token = authority.sign ('access_token', 60); const token = await authority.sign ('access_token', 60);
const resp = await get ({ cookie: `cookie_jar=${token.signature}` }); const resp = await get ({ cookie: `cookie_jar=${token.signature}` });
expect (resp.statusCode) expect (resp.statusCode)
.toEqual (200); .toEqual (200);
@ -75,7 +75,7 @@ describe ('gateway', () => {
}); });
it ('should correctly deliver token data', async () => { it ('should correctly deliver token data', async () => {
const token = authority.sign ('access_token', 60, { data: 'foobar' }); const token = await authority.sign ('access_token', 60, { data: 'foobar' });
const resp = await get ({ authorization: `Bearer ${token.signature}` }); const resp = await get ({ authorization: `Bearer ${token.signature}` });
expect (resp.statusCode) expect (resp.statusCode)
.toEqual (200); .toEqual (200);
@ -87,7 +87,7 @@ describe ('gateway', () => {
}); });
it ('should reject an outdated access token', async () => { it ('should reject an outdated access token', async () => {
const token = authority.sign ('access_token', 60); const token = await authority.sign ('access_token', 60);
jasmine.clock () jasmine.clock ()
.tick (70000); .tick (70000);
const resp = await get ({ authorization: `Bearer ${token.signature}` }); const resp = await get ({ authorization: `Bearer ${token.signature}` });
@ -98,7 +98,7 @@ describe ('gateway', () => {
}); });
it ('should reject a blacklisted access token', async () => { it ('should reject a blacklisted access token', async () => {
const token = authority.sign ('access_token', 60); const token = await authority.sign ('access_token', 60);
blacklist.add_signature (token.id); blacklist.add_signature (token.id);
const resp = await get ({ authorization: `Bearer ${token.signature}` }); const resp = await get ({ authorization: `Bearer ${token.signature}` });
expect (resp.statusCode) expect (resp.statusCode)
@ -108,7 +108,7 @@ describe ('gateway', () => {
}); });
it ('should reject any refresh_token', async () => { it ('should reject any refresh_token', async () => {
const token = authority.sign ('refresh_token', 60); const token = await authority.sign ('refresh_token', 60);
const resp = await get ({ authorization: `Bearer ${token.signature}` }); const resp = await get ({ authorization: `Bearer ${token.signature}` });
expect (resp.statusCode) expect (resp.statusCode)
.toEqual (302); .toEqual (302);
@ -117,7 +117,7 @@ describe ('gateway', () => {
}); });
it ('should reject any part_token', async () => { it ('should reject any part_token', async () => {
const token = authority.sign ('part_token', 60); const token = await authority.sign ('part_token', 60);
const resp = await get ({ authorization: `Bearer ${token.signature}` }); const resp = await get ({ authorization: `Bearer ${token.signature}` });
expect (resp.statusCode) expect (resp.statusCode)
.toEqual (302); .toEqual (302);
@ -126,7 +126,7 @@ describe ('gateway', () => {
}); });
it ('should reject any noname token', async () => { it ('should reject any noname token', async () => {
const token = authority.sign ('none', 60); const token = await authority.sign ('none', 60);
const resp = await get ({ authorization: `Bearer ${token.signature}` }); const resp = await get ({ authorization: `Bearer ${token.signature}` });
expect (resp.statusCode) expect (resp.statusCode)
.toEqual (302); .toEqual (302);

88
test/spec/KeyStore.ts
View File

@ -20,54 +20,66 @@ describe ('key store', () => {
.mockDate (base_date); .mockDate (base_date);
}); });
const keys: {key:string, iat:number}[] = []; const keys: {key:string, sign:string, iat:number}[] = [];
it ('should generate a new key', () => { it ('should generate a new key', async () => {
const iat = (new Date) const iat = (new Date)
.getTime () / 1000; .getTime () / 1000;
const duration = 10 * frame; const duration = 10 * frame;
const key = ks.get_key (iat, duration); const key = await ks.get_sign_key (iat, duration);
const sign = ks.get_key (iat);
expect (typeof key) expect (typeof key)
.toEqual ('string'); .toEqual ('string');
expect (key.length) expect (typeof sign)
.toEqual (64); .toEqual ('string');
keys.push ({ iat, key }); keys.push ({ iat, key, sign });
}); });
it ('should return the generated key', () => { it ('should return the generated key', async () => {
const key = ks.get_key (keys[0].iat); const key = await ks.get_sign_key (keys[0].iat, 1);
expect (key) expect (key)
.toEqual (keys[0].key); .toEqual (keys[0].key);
const sign = ks.get_key (keys[0].iat);
expect (sign)
.toEqual (keys[0].sign);
}); });
it ('should return the same key on a different time', () => { it ('should return the same key on a different time', async () => {
const key = ks.get_key (keys[0].iat + (frame / 2)); const key = await ks.get_sign_key (keys[0].iat + (frame / 2), 1);
expect (key) expect (key)
.toEqual (keys[0].key); .toEqual (keys[0].key);
const sign = ks.get_key (keys[0].iat + (frame / 2));
expect (sign)
.toEqual (keys[0].sign);
}); });
it ('should generate a new key after time frame is over', () => { it ('should generate a new key after time frame is over', async () => {
jasmine.clock () jasmine.clock ()
.tick (frame * 1000); .tick (frame * 1000);
const iat = (new Date) const iat = (new Date)
.getTime () / 1000; .getTime () / 1000;
const duration = 10 * frame; const duration = 10 * frame;
const key = ks.get_key (iat, duration); const key = await ks.get_sign_key (iat, duration);
const sign = ks.get_key (iat);
expect (typeof key) expect (typeof key)
.toEqual ('string'); .toEqual ('string');
expect (key.length)
.toEqual (64);
expect (key).not.toEqual (keys[0].key); expect (key).not.toEqual (keys[0].key);
keys.push ({ iat, key }); expect (sign).not.toEqual (keys[0].sign);
keys.push ({ iat, key, sign });
}); });
it ('should return both keys', () => { it ('should return both keys, but not the first sign key', async () => {
const key = ks.get_key (keys[0].iat); const sign = ks.get_key (keys[0].iat);
expect (key) expect (sign)
.toEqual (keys[0].key); .toEqual (keys[0].sign);
const k2 = ks.get_key (keys[1].iat); await expectAsync (ks.get_sign_key (keys[0].iat, 1))
.toBeRejectedWithError ('cannot access already expired keys');
const k2 = await ks.get_sign_key (keys[1].iat, 1);
const s2 = ks.get_key (keys[1].iat);
expect (k2) expect (k2)
.toEqual (keys[1].key); .toEqual (keys[1].key);
expect (s2)
.toEqual (keys[1].sign);
}); });
it ('should throw on non existing key', () => { it ('should throw on non existing key', () => {
@ -82,21 +94,26 @@ describe ('key store', () => {
.toThrowError ('key could not be found'); .toThrowError ('key could not be found');
}); });
it ('should still retrieve the second key', () => { it (
const key = ks.get_key (keys[1].iat); 'should still retrieve the second key, but not its sign key',
expect (key) async () => {
.toEqual (keys[1].key); await expectAsync (ks.get_sign_key (keys[1].iat, 1))
}); .toBeRejectedWithError ('cannot access already expired keys');
const sign = ks.get_key (keys[1].iat);
expect (sign)
.toEqual (keys[1].sign);
}
);
it ('should reject key generation of expired keys', () => { it ('should reject key generation of expired keys', async () => {
const iat = ((new Date) const iat = ((new Date)
.getTime () / 1000) - 2; .getTime () / 1000) - 2;
const duration = 5; const duration = 5;
expect (() => ks.get_key (iat, duration)) await expectAsync (ks.get_sign_key (iat, duration))
.toThrowError ('cannot create already expired keys'); .toBeRejectedWithError ('cannot access already expired keys');
}); });
it ('key should live as long as the longest created token', () => { it ('key should live as long as the longest created token', async () => {
const base = new Date; const base = new Date;
base.setSeconds (2, 0); base.setSeconds (2, 0);
jasmine.clock () jasmine.clock ()
@ -108,21 +125,22 @@ describe ('key store', () => {
const duration1 = frame; const duration1 = frame;
const duration2 = frame * 10; const duration2 = frame * 10;
const key1 = ks.get_key (iat, duration1); const key1 = await ks.get_sign_key (iat, duration1);
const step = 0.9 * frame; const step = 0.9 * frame;
jasmine.clock () jasmine.clock ()
.tick (step * 1000); .tick (step * 1000);
const key2 = ks.get_key (iat + step, duration2); const key2 = await ks.get_sign_key (iat + step, duration2);
const sign = ks.get_key (iat);
expect (key1) expect (key1)
.toEqual (key2); .toEqual (key2);
jasmine.clock () jasmine.clock ()
.tick (5000 * frame); .tick (5000 * frame);
const keyv = ks.get_key (iat + step); const signv = ks.get_key (iat + step);
expect (keyv) expect (signv)
.toEqual (key1); .toEqual (sign);
}); });
// required use case: insert keys for verification of old tokens // TODO: required use case: insert keys for verification of old tokens
afterAll (() => { afterAll (() => {
jasmine.clock () jasmine.clock ()

132
yarn.lock
View File

@ -329,10 +329,10 @@
"@nodelib/fs.scandir" "2.1.4" "@nodelib/fs.scandir" "2.1.4"
fastq "^1.6.0" fastq "^1.6.0"
"@sapphirecode/crypto-helper@^1.2.2": "@sapphirecode/crypto-helper@^1.3.0":
version "1.2.2" version "1.3.0"
resolved "https://registry.yarnpkg.com/@sapphirecode/crypto-helper/-/crypto-helper-1.2.2.tgz#518c763ed069f78850a05c92326672ec8f398ef5" resolved "https://registry.yarnpkg.com/@sapphirecode/crypto-helper/-/crypto-helper-1.3.0.tgz#3d46878475064327af19779afabb6776e3b339c5"
integrity sha512-OOHKrbD+YHriqkLk8snOJWTskmptmImTZH62Q09XeHbit09zSMUSk+B5c5eyPr80L1s7SSETqfNx7iyIAWKQzg== integrity sha512-v3fSYKxYV/QZYGNcb977ZNzTgRrjmAVus8H01Jpc/vJN1mKbR6gwb4mL3oHQWJ0JjWlz2+lTKZ160fTr02le5g==
dependencies: dependencies:
"@sapphirecode/encoding-helper" "^1.1.0" "@sapphirecode/encoding-helper" "^1.1.0"
@ -469,60 +469,60 @@
integrity sha512-vwX+/ija9xKc/z9VqMCdbf4WYcMTGsI0I/L/6shIF3qXURxZOhPQlPRHtjTpiNhAwn0paMJzlOQqw6mAGEQnTA== integrity sha512-vwX+/ija9xKc/z9VqMCdbf4WYcMTGsI0I/L/6shIF3qXURxZOhPQlPRHtjTpiNhAwn0paMJzlOQqw6mAGEQnTA==
"@typescript-eslint/eslint-plugin@^4.1.0": "@typescript-eslint/eslint-plugin@^4.1.0":
version "4.11.1" version "4.12.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.11.1.tgz#7579c6d17ad862154c10bc14b40e5427b729e209" resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.12.0.tgz#00d1b23b40b58031e6d7c04a5bc6c1a30a2e834a"
integrity sha512-fABclAX2QIEDmTMk6Yd7Muv1CzFLwWM4505nETzRHpP3br6jfahD9UUJkhnJ/g2m7lwfz8IlswcwGGPGiq9exw== integrity sha512-wHKj6q8s70sO5i39H2g1gtpCXCvjVszzj6FFygneNFyIAxRvNSVz9GML7XpqrB9t7hNutXw+MHnLN/Ih6uyB8Q==
dependencies: dependencies:
"@typescript-eslint/experimental-utils" "4.11.1" "@typescript-eslint/experimental-utils" "4.12.0"
"@typescript-eslint/scope-manager" "4.11.1" "@typescript-eslint/scope-manager" "4.12.0"
debug "^4.1.1" debug "^4.1.1"
functional-red-black-tree "^1.0.1" functional-red-black-tree "^1.0.1"
regexpp "^3.0.0" regexpp "^3.0.0"
semver "^7.3.2" semver "^7.3.2"
tsutils "^3.17.1" tsutils "^3.17.1"
"@typescript-eslint/experimental-utils@4.11.1": "@typescript-eslint/experimental-utils@4.12.0":
version "4.11.1" version "4.12.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.11.1.tgz#2dad3535b878c25c7424e40bfa79d899f3f485bc" resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.12.0.tgz#372838e76db76c9a56959217b768a19f7129546b"
integrity sha512-mAlWowT4A6h0TC9F+J5pdbEhjNiEMO+kqPKQ4sc3fVieKL71dEqfkKgtcFVSX3cjSBwYwhImaQ/mXQF0oaI38g== integrity sha512-MpXZXUAvHt99c9ScXijx7i061o5HEjXltO+sbYfZAAHxv3XankQkPaNi5myy0Yh0Tyea3Hdq1pi7Vsh0GJb0fA==
dependencies: dependencies:
"@types/json-schema" "^7.0.3" "@types/json-schema" "^7.0.3"
"@typescript-eslint/scope-manager" "4.11.1" "@typescript-eslint/scope-manager" "4.12.0"
"@typescript-eslint/types" "4.11.1" "@typescript-eslint/types" "4.12.0"
"@typescript-eslint/typescript-estree" "4.11.1" "@typescript-eslint/typescript-estree" "4.12.0"
eslint-scope "^5.0.0" eslint-scope "^5.0.0"
eslint-utils "^2.0.0" eslint-utils "^2.0.0"
"@typescript-eslint/parser@^4.1.0": "@typescript-eslint/parser@^4.1.0":
version "4.11.1" version "4.12.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.11.1.tgz#981e18de2e019d6ca312596615f92e8f6f6598ed" resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.12.0.tgz#e1cf30436e4f916c31fcc962158917bd9e9d460a"
integrity sha512-BJ3jwPQu1jeynJ5BrjLuGfK/UJu6uwHxJ/di7sanqmUmxzmyIcd3vz58PMR7wpi8k3iWq2Q11KMYgZbUpRoIPw== integrity sha512-9XxVADAo9vlfjfoxnjboBTxYOiNY93/QuvcPgsiKvHxW6tOZx1W4TvkIQ2jB3k5M0pbFP5FlXihLK49TjZXhuQ==
dependencies: dependencies:
"@typescript-eslint/scope-manager" "4.11.1" "@typescript-eslint/scope-manager" "4.12.0"
"@typescript-eslint/types" "4.11.1" "@typescript-eslint/types" "4.12.0"
"@typescript-eslint/typescript-estree" "4.11.1" "@typescript-eslint/typescript-estree" "4.12.0"
debug "^4.1.1" debug "^4.1.1"
"@typescript-eslint/scope-manager@4.11.1": "@typescript-eslint/scope-manager@4.12.0":
version "4.11.1" version "4.12.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.11.1.tgz#72dc2b60b0029ab0888479b12bf83034920b4b69" resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.12.0.tgz#beeb8beca895a07b10c593185a5612f1085ef279"
integrity sha512-Al2P394dx+kXCl61fhrrZ1FTI7qsRDIUiVSuN6rTwss6lUn8uVO2+nnF4AvO0ug8vMsy3ShkbxLu/uWZdTtJMQ== integrity sha512-QVf9oCSVLte/8jvOsxmgBdOaoe2J0wtEmBr13Yz0rkBNkl5D8bfnf6G4Vhox9qqMIoG7QQoVwd2eG9DM/ge4Qg==
dependencies: dependencies:
"@typescript-eslint/types" "4.11.1" "@typescript-eslint/types" "4.12.0"
"@typescript-eslint/visitor-keys" "4.11.1" "@typescript-eslint/visitor-keys" "4.12.0"
"@typescript-eslint/types@4.11.1": "@typescript-eslint/types@4.12.0":
version "4.11.1" version "4.12.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.11.1.tgz#3ba30c965963ef9f8ced5a29938dd0c465bd3e05" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.12.0.tgz#fb891fe7ccc9ea8b2bbd2780e36da45d0dc055e5"
integrity sha512-5kvd38wZpqGY4yP/6W3qhYX6Hz0NwUbijVsX2rxczpY6OXaMxh0+5E5uLJKVFwaBM7PJe1wnMym85NfKYIh6CA== integrity sha512-N2RhGeheVLGtyy+CxRmxdsniB7sMSCfsnbh8K/+RUIXYYq3Ub5+sukRCjVE80QerrUBvuEvs4fDhz5AW/pcL6g==
"@typescript-eslint/typescript-estree@4.11.1": "@typescript-eslint/typescript-estree@4.12.0":
version "4.11.1" version "4.12.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.11.1.tgz#a4416b4a65872a48773b9e47afabdf7519eb10bc" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.12.0.tgz#3963418c850f564bdab3882ae23795d115d6d32e"
integrity sha512-tC7MKZIMRTYxQhrVAFoJq/DlRwv1bnqA4/S2r3+HuHibqvbrPcyf858lNzU7bFmy4mLeIHFYr34ar/1KumwyRw== integrity sha512-gZkFcmmp/CnzqD2RKMich2/FjBTsYopjiwJCroxqHZIY11IIoN0l5lKqcgoAPKHt33H2mAkSfvzj8i44Jm7F4w==
dependencies: dependencies:
"@typescript-eslint/types" "4.11.1" "@typescript-eslint/types" "4.12.0"
"@typescript-eslint/visitor-keys" "4.11.1" "@typescript-eslint/visitor-keys" "4.12.0"
debug "^4.1.1" debug "^4.1.1"
globby "^11.0.1" globby "^11.0.1"
is-glob "^4.0.1" is-glob "^4.0.1"
@ -530,12 +530,12 @@
semver "^7.3.2" semver "^7.3.2"
tsutils "^3.17.1" tsutils "^3.17.1"
"@typescript-eslint/visitor-keys@4.11.1": "@typescript-eslint/visitor-keys@4.12.0":
version "4.11.1" version "4.12.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.11.1.tgz#4c050a4c1f7239786e2dd4e69691436143024e05" resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.12.0.tgz#a470a79be6958075fa91c725371a83baf428a67a"
integrity sha512-IrlBhD9bm4bdYcS8xpWarazkKXlE7iYb1HzRuyBP114mIaj5DJPo11Us1HgH60dTt41TCZXMaTCAW+OILIYPOg== integrity sha512-hVpsLARbDh4B9TKYz5cLbcdMIOAoBYgFPCSP9FFS/liSF+b33gVNq8JHY3QGhHNVz85hObvL7BEYLlgx553WCw==
dependencies: dependencies:
"@typescript-eslint/types" "4.11.1" "@typescript-eslint/types" "4.12.0"
eslint-visitor-keys "^2.0.0" eslint-visitor-keys "^2.0.0"
acorn-jsx@^5.3.1: acorn-jsx@^5.3.1:
@ -566,6 +566,16 @@ ajv@^6.10.0, ajv@^6.12.4, ajv@~6.12.0, ajv@~6.12.6:
json-schema-traverse "^0.4.1" json-schema-traverse "^0.4.1"
uri-js "^4.2.2" uri-js "^4.2.2"
ajv@^7.0.2:
version "7.0.3"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-7.0.3.tgz#13ae747eff125cafb230ac504b2406cf371eece2"
integrity sha512-R50QRlXSxqXcQP5SvKUrw8VZeypvo12i2IX0EeR5PiZ7bEKeHWgzgo264LDadUsCU42lTJVhFikTqJwNeH34gQ==
dependencies:
fast-deep-equal "^3.1.1"
json-schema-traverse "^1.0.0"
require-from-string "^2.0.2"
uri-js "^4.2.2"
angular-html-parser@~1.7.0: angular-html-parser@~1.7.0:
version "1.7.1" version "1.7.1"
resolved "https://registry.yarnpkg.com/angular-html-parser/-/angular-html-parser-1.7.1.tgz#735cb9f2f01151e6d612b580812256a289e728a4" resolved "https://registry.yarnpkg.com/angular-html-parser/-/angular-html-parser-1.7.1.tgz#735cb9f2f01151e6d612b580812256a289e728a4"
@ -1077,9 +1087,9 @@ eslint-visitor-keys@^2.0.0:
integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
eslint@^7.14.0: eslint@^7.14.0:
version "7.16.0" version "7.17.0"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.16.0.tgz#a761605bf9a7b32d24bb7cde59aeb0fd76f06092" resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.17.0.tgz#4ccda5bf12572ad3bf760e6f195886f50569adb0"
integrity sha512-iVWPS785RuDA4dWuhhgXTNrGxHHK3a8HLSMBgbbU59ruJDubUraXN8N5rn7kb8tG6sjg74eE0RA3YWT51eusEw== integrity sha512-zJk08MiBgwuGoxes5sSQhOtibZ75pz0J35XTRlZOk9xMffhpA9BTbQZxoXZzOl5zMbleShbGwtw+1kGferfFwQ==
dependencies: dependencies:
"@babel/code-frame" "^7.0.0" "@babel/code-frame" "^7.0.0"
"@eslint/eslintrc" "^0.2.2" "@eslint/eslintrc" "^0.2.2"
@ -1393,9 +1403,9 @@ globals@^12.1.0:
type-fest "^0.8.1" type-fest "^0.8.1"
globby@^11.0.1: globby@^11.0.1:
version "11.0.1" version "11.0.2"
resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz#9a2bf107a068f3ffeabc49ad702c79ede8cfd357" resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.2.tgz#1af538b766a3b540ebfb58a32b2e2d5897321d83"
integrity sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ== integrity sha512-2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og==
dependencies: dependencies:
array-union "^2.1.0" array-union "^2.1.0"
dir-glob "^3.0.1" dir-glob "^3.0.1"
@ -1716,6 +1726,11 @@ json-schema-traverse@^0.4.1:
resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
json-schema-traverse@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
json-stable-stringify-without-jsonify@^1.0.1: json-stable-stringify-without-jsonify@^1.0.1:
version "1.0.1" version "1.0.1"
resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
@ -2211,6 +2226,11 @@ require-directory@^2.1.1:
resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
require-from-string@^2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
require-main-filename@^2.0.0: require-main-filename@^2.0.0:
version "2.0.0" version "2.0.0"
resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
@ -2491,11 +2511,11 @@ surrial@~2.0.2:
integrity sha512-YQ0XyrdBI8Kx10lIK81zOGXdGtc0P+3FTqEtCdaKzfEJKJWDju2QPp+XhzihmN2KOTRDtkKSyQQXZHYP+SqapA== integrity sha512-YQ0XyrdBI8Kx10lIK81zOGXdGtc0P+3FTqEtCdaKzfEJKJWDju2QPp+XhzihmN2KOTRDtkKSyQQXZHYP+SqapA==
table@^6.0.4: table@^6.0.4:
version "6.0.4" version "6.0.7"
resolved "https://registry.yarnpkg.com/table/-/table-6.0.4.tgz#c523dd182177e926c723eb20e1b341238188aa0d" resolved "https://registry.yarnpkg.com/table/-/table-6.0.7.tgz#e45897ffbcc1bcf9e8a87bf420f2c9e5a7a52a34"
integrity sha512-sBT4xRLdALd+NFBvwOz8bw4b15htyythha+q+DVZqy2RS08PPC8O2sZFgJYEY7bJvbCFKccs+WIZ/cd+xxTWCw== integrity sha512-rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g==
dependencies: dependencies:
ajv "^6.12.4" ajv "^7.0.2"
lodash "^4.17.20" lodash "^4.17.20"
slice-ansi "^4.0.0" slice-ansi "^4.0.0"
string-width "^4.2.0" string-width "^4.2.0"
@ -2576,9 +2596,9 @@ tslib@~2.0.0:
integrity sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ== integrity sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==
tsutils@^3.17.1: tsutils@^3.17.1:
version "3.17.1" version "3.18.0"
resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759" resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.18.0.tgz#38add50a28ec97e988cb43c5b32e55d1ff4a222a"
integrity sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g== integrity sha512-D9Tu8nE3E7D1Bsf/V29oMHceMf+gnVO+pDguk/A5YRo1cLpkiQ48ZnbbS57pvvHeY+OIeNQx1vf4ASPlEtRpcA==
dependencies: dependencies:
tslib "^1.8.1" tslib "^1.8.1"