From 017b8bdd70cc40d68698fe948eb8c983cfc90161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20M=C3=BCller?= Date: Fri, 1 Mar 2019 11:16:20 +0100 Subject: [PATCH 1/5] Fix spelling of a setting The "D" of "Domains" should be written in uppercase according to the docs: https://helmetjs.github.io/docs/hsts/ --- types/helmet/index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/helmet/index.d.ts b/types/helmet/index.d.ts index b0a50c901e..82ad12929b 100644 --- a/types/helmet/index.d.ts +++ b/types/helmet/index.d.ts @@ -134,7 +134,7 @@ declare namespace helmet { export interface IHelmetHpkpConfiguration { maxAge: number; sha256s: string[]; - includeSubdomains?: boolean; + includeSubDomains?: boolean; reportUri?: string; reportOnly?: boolean; setIf?: IHelmetSetIfFunction; From f257e0ca0fb86fa449fdb52ad7d5e9961afcf28a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20M=C3=BCller?= Date: Fri, 1 Mar 2019 11:35:26 +0100 Subject: [PATCH 2/5] Add blameable person --- types/helmet/index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/helmet/index.d.ts b/types/helmet/index.d.ts index 82ad12929b..565dda9ebf 100644 --- a/types/helmet/index.d.ts +++ b/types/helmet/index.d.ts @@ -1,6 +1,6 @@ // Type definitions for helmet // Project: https://github.com/helmetjs/helmet -// Definitions by: Cyril Schumacher , Evan Hahn , Elliot Blackburn +// Definitions by: Cyril Schumacher , Evan Hahn , Elliot Blackburn , Daniel Müller // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped // TypeScript Version: 2.3 From ca6acc7eb2a594e5dd70fc203dd34f667789dbc6 Mon Sep 17 00:00:00 2001 From: chdanielmueller Date: Fri, 1 Mar 2019 11:43:05 +0100 Subject: [PATCH 3/5] Fix Tests --- types/helmet/helmet-tests.ts | 6 +++--- types/helmet/index.d.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/types/helmet/helmet-tests.ts b/types/helmet/helmet-tests.ts index 8b4c5634ac..f73095b714 100644 --- a/types/helmet/helmet-tests.ts +++ b/types/helmet/helmet-tests.ts @@ -122,13 +122,13 @@ function hpkpTest() { app.use(helmet.hpkp({ maxAge: 7776000000, sha256s: ['AbCdEf123=', 'ZyXwVu456='], - includeSubdomains: false + includeSubDomains: false })); app.use(helmet.hpkp({ maxAge: 7776000000, sha256s: ['AbCdEf123=', 'ZyXwVu456='], - includeSubdomains: true + includeSubDomains: true })); app.use(helmet.hpkp({ @@ -164,7 +164,7 @@ function hstsTest() { app.use(helmet.hsts({ maxAge: 7776000000, - includeSubdomains: true + includeSubDomains: true })); app.use(helmet.hsts({ diff --git a/types/helmet/index.d.ts b/types/helmet/index.d.ts index 565dda9ebf..573395831b 100644 --- a/types/helmet/index.d.ts +++ b/types/helmet/index.d.ts @@ -142,7 +142,7 @@ declare namespace helmet { export interface IHelmetHstsConfiguration { maxAge?: number; - includeSubdomains?: boolean; + includeSubDomains?: boolean; preload?: boolean; setIf?: IHelmetSetIfFunction; force?: boolean; From 2203ddb799a7581e69b7f1a0693be7891c810d42 Mon Sep 17 00:00:00 2001 From: chdanielmueller Date: Fri, 1 Mar 2019 11:49:56 +0100 Subject: [PATCH 4/5] Koa Tests --- types/koa-helmet/koa-helmet-tests.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/types/koa-helmet/koa-helmet-tests.ts b/types/koa-helmet/koa-helmet-tests.ts index 2290ab07fa..34bca1958a 100644 --- a/types/koa-helmet/koa-helmet-tests.ts +++ b/types/koa-helmet/koa-helmet-tests.ts @@ -95,13 +95,13 @@ function hpkpTest() { app.use(helmet.hpkp({ maxAge: 7776000000, sha256s: ['AbCdEf123=', 'ZyXwVu456='], - includeSubdomains: false + includeSubDomains: false })); app.use(helmet.hpkp({ maxAge: 7776000000, sha256s: ['AbCdEf123=', 'ZyXwVu456='], - includeSubdomains: true + includeSubDomains: true })); app.use(helmet.hpkp({ @@ -137,7 +137,7 @@ function hstsTest() { app.use(helmet.hsts({ maxAge: 7776000000, - includeSubdomains: true + includeSubDomains: true })); app.use(helmet.hsts({ From e06aadbe407509674cef01261556c3b1714eb849 Mon Sep 17 00:00:00 2001 From: chdanielmueller Date: Thu, 7 Mar 2019 16:45:40 +0100 Subject: [PATCH 5/5] Including both options --- types/helmet/helmet-tests.ts | 13 +++++++++++++ types/helmet/index.d.ts | 8 ++++++++ 2 files changed, 21 insertions(+) diff --git a/types/helmet/helmet-tests.ts b/types/helmet/helmet-tests.ts index f73095b714..39414a7d5f 100644 --- a/types/helmet/helmet-tests.ts +++ b/types/helmet/helmet-tests.ts @@ -125,6 +125,13 @@ function hpkpTest() { includeSubDomains: false })); + // Deprecated: Use includeSubDomains instead. (Uppercase "D") + app.use(helmet.hpkp({ + maxAge: 7776000000, + sha256s: ['AbCdEf123=', 'ZyXwVu456='], + includeSubdomains: false + })); + app.use(helmet.hpkp({ maxAge: 7776000000, sha256s: ['AbCdEf123=', 'ZyXwVu456='], @@ -167,6 +174,12 @@ function hstsTest() { includeSubDomains: true })); + // Deprecated: Use includeSubDomains instead. (Uppercase "D") + app.use(helmet.hsts({ + maxAge: 7776000000, + includeSubdomains: true + })); + app.use(helmet.hsts({ maxAge: 7776000000, preload: true diff --git a/types/helmet/index.d.ts b/types/helmet/index.d.ts index 573395831b..1a8c713da1 100644 --- a/types/helmet/index.d.ts +++ b/types/helmet/index.d.ts @@ -134,6 +134,10 @@ declare namespace helmet { export interface IHelmetHpkpConfiguration { maxAge: number; sha256s: string[]; + /** + * @deprecated Use includeSubDomains instead. (Uppercase "D") + */ + includeSubdomains?: boolean; includeSubDomains?: boolean; reportUri?: string; reportOnly?: boolean; @@ -142,6 +146,10 @@ declare namespace helmet { export interface IHelmetHstsConfiguration { maxAge?: number; + /** + * @deprecated Use includeSubDomains instead. (Uppercase "D") + */ + includeSubdomains?: boolean; includeSubDomains?: boolean; preload?: boolean; setIf?: IHelmetSetIfFunction;