allow buffer for publicKey

Author: felixheck

src/utils.js

@@ -11,7 +11,10 @@ const scheme = joi.object({
   realmUrl: joi.string().uri().required(),
   clientId: joi.string().min(1).required(),
   secret: joi.string().min(1),
-  publicKey: joi.string().regex(/^-----BEGIN(?: RSA)? PUBLIC KEY-----[\s\S]*-----END(?: RSA)? PUBLIC KEY-----$/ig, 'PEM'),
+  publicKey: joi.alternatives().try(
+    joi.string().regex(/^-----BEGIN(?: RSA)? PUBLIC KEY-----[\s\S]*-----END(?: RSA)? PUBLIC KEY-----\s?$/ig, 'PEM'),
+    joi.object().type(Buffer)
+  ),
   verifyOpts: joi.object({
     ignoreExpiration: joi.any().forbidden(),
     ignoreNotBefore: joi.any().forbidden()

test/fixtures/index.js

@@ -8,6 +8,7 @@ const introspectPath = '/protocol/openid-connect/token/introspect'
 const realmUrl = `${baseUrl}${realmPath}`
 const clientId = 'foobar'
 const secret = '1234-bar-4321-foo'
+const publicKeyBuffer = fs.readFileSync('./test/fixtures/public.pem')
 const publicKey = `-----BEGIN RSA PUBLIC KEY-----
 MIICCgKCAgEAur96MoQa/blg5eJFqmN//V4oQjKaBJl6KEvWSGAVgRm2PsnFKzCJ
 K9aJrUjETS473/x6fAHXyF5QKun6avNxpWs2VzwlO4t8Bi2EpSW2w0led2OzR/MF
@@ -42,6 +43,7 @@ const clientConfig = {
  */
 const common = Object.assign({}, clientConfig, {
   publicKey,
+  publicKeyBuffer,
   baseUrl,
   token,
   realmPath,

test/utils.spec.js

@@ -235,7 +235,7 @@ test('throw error if options are invalid – userInfo', (t) => {
   })
 })
 
-test('throw no error if options are valid', (t) => {
+test('throw no error if options are valid – secret', (t) => {
   const valids = [
     {},
     { cache: {} },
@@ -251,11 +251,11 @@ test('throw no error if options are valid', (t) => {
   valids.forEach((valid) => {
     t.notThrows(
       () => utils.verify(helpers.getOptions(valid)),
-      Error, helpers.log('valid', valid))
+      Error, helpers.log('valid.secret', valid))
   })
 })
 
-test('throw no error if options are valid', (t) => {
+test('throw no error if options are valid – publicKey/string', (t) => {
   const valids = [
     {},
     { verifyOpts: undefined },
@@ -277,6 +277,58 @@ test('throw no error if options are valid', (t) => {
         secret: undefined,
         publicKey: fixtures.common.publicKey
       }, valid))),
-      Error, helpers.log('valid with publicKey', valid))
+      Error, helpers.log('valid.publicKey.string', valid))
+  })
+})
+
+test('throw no error if options are valid – publicKey/Buffer', (t) => {
+  const valids = [
+    {},
+    { verifyOpts: undefined },
+    { verifyOpts: {} },
+    { verifyOpts: { audience: 'foobar' } },
+    { cache: {} },
+    { cache: { segment: 'foobar' } },
+    { cache: true },
+    { cache: false },
+    { userInfo: [] },
+    { userInfo: ['string'] }
+  ]
+
+  t.plan(valids.length)
+
+  valids.forEach((valid) => {
+    t.notThrows(
+      () => utils.verify(helpers.getOptions(Object.assign({
+        secret: undefined,
+        publicKey: fixtures.common.publicKeyBuffer
+      }, valid))),
+      Error, helpers.log('valid.publicKey.Buffer', valid))
+  })
+})
+
+test('throw no error if options are valid – publicKey/Buffer/string', (t) => {
+  const valids = [
+    {},
+    { verifyOpts: undefined },
+    { verifyOpts: {} },
+    { verifyOpts: { audience: 'foobar' } },
+    { cache: {} },
+    { cache: { segment: 'foobar' } },
+    { cache: true },
+    { cache: false },
+    { userInfo: [] },
+    { userInfo: ['string'] }
+  ]
+
+  t.plan(valids.length)
+
+  valids.forEach((valid) => {
+    t.notThrows(
+      () => utils.verify(helpers.getOptions(Object.assign({
+        secret: undefined,
+        publicKey: fixtures.common.publicKeyBuffer.toString()
+      }, valid))),
+      Error, helpers.log('valid.publicKey.Buffer.string', valid))
   })
 })