beta 3

Author: alessiodionisi

.gitignore

@@ -1 +1 @@
-node_modules
+/node_modules

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "insomnia-plugin-http-signature",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.3",
   "author": "Alessio Dionisi <hello@adns.io>",
   "description": "HTTP Signature for Insomnia REST Client",
   "repository": "github:adnsio/insomnia-plugin-http-signature",
@@ -11,8 +11,5 @@
   "insomnia": {
     "name": "http-signature",
     "description": "HTTP Signature"
-  },
-  "dependencies": {
-    "luxon": "^1.3.3"
   }
 }

package.json

@@ -1,51 +1,6 @@
 const crypto = require('crypto')
-const { DateTime } = require('luxon')
 const { parse: parseUrl } = require('url')
 
-module.exports.requestHooks = [
-  async context => {
-    console.log(context)
-    const { store, request } = context
-    const keyId = await store.getItem('keyId')
-    let privateKey = await store.getItem('privateKey')
-    privateKey = `-----BEGIN PRIVATE KEY-----\n${privateKey}\n-----END PRIVATE KEY-----`
-    const signRequest = await store.getItem('signRequest')
-
-    if (signRequest) {
-      const parsedUrl = parseUrl(request.getUrl())
-
-      const algorithmBits = 256
-      const hashAlgorithm = `sha${algorithmBits}`
-      const digestAlgorithm = `SHA-${algorithmBits}`
-      const signAlgorithm = `RSA-SHA${algorithmBits}`
-
-      const date = DateTime.utc().toRFC2822()
-
-      const digestHash = crypto.createHash(hashAlgorithm)
-      const digest = digestHash.update(request.getBodyText()).digest('base64')
-
-      const signatureString = []
-      signatureString.push(`(request-target): ${request.getMethod().toLowerCase()} ${parsedUrl.path}`)
-      signatureString.push(`host: ${parsedUrl.hostname}`)
-      signatureString.push(`digest: ${digestAlgorithm}=${digest}`)
-      signatureString.push(`date: ${date}`)
-      if (request.hasHeader('Content-Type')) signatureString.push(`content-type: ${request.getHeader('Content-Type')}`)
-      const signature = signatureString.join('\n')
-
-      const signatureSign = crypto.createSign(signAlgorithm)
-      const signedSignature = signatureSign.update(signature).sign(privateKey, 'base64')
-
-      const authorization = `Signature keyId="${keyId}", algorithm="${signAlgorithm.toLowerCase()}", headers="(request-target) host digest date${request.hasHeader('Content-Type') ? ' content-type' : ''}", signature="${signedSignature}"`
-
-      request.setHeader('Digest', `${digestAlgorithm}=${digest}`)
-      request.setHeader('Date', date)
-      request.setHeader('Authorization', authorization)
-    }
-
-    await store.clear()
-  }
-]
-
 module.exports.templateTags = [{
   name: 'httpsignature',
   displayName: 'HTTP Signature',
@@ -62,12 +17,28 @@ module.exports.templateTags = [{
     }
   ],
 
-  async run (context, keyId, privateKey) {
-    const { store } = context
-    await store.clear()
-    await store.setItem('keyId', keyId)
-    await store.setItem('privateKey', privateKey)
-    await store.setItem('signRequest', true)
-    return ' '
+  async run(context, keyId, privateKey) {
+    console.log(context)
+    const request = await context.util.models.request.getById(context.meta.requestId)
+    const requestUrl = await context.util.render(request.url)
+
+    if (!keyId) throw new Error('missing keyId')
+    if (!privateKey) throw new Error('missing privateKey')
+
+    const parsedUrl = parseUrl(requestUrl)
+
+    const algorithmBits = 256
+    const signAlgorithm = `RSA-SHA${algorithmBits}`
+
+    const signatureString = []
+    signatureString.push(`(request-target): ${request.method.toLowerCase()} ${parsedUrl.path}`)
+    signatureString.push(`host: ${parsedUrl.hostname}`)
+    const signature = signatureString.join('\n')
+
+    const signatureSign = crypto.createSign(signAlgorithm)
+    const signedSignature = signatureSign.update(signature).sign(`-----BEGIN RSA PRIVATE KEY-----\n${privateKey}\n-----END RSA PRIVATE KEY-----`, 'base64')
+
+    const authorization = `keyId="${keyId}", algorithm="${signAlgorithm.toLowerCase()}", headers="(request-target) host", signature="${signedSignature}"`
+    return authorization
   }
 }]