Fix signature for no body.

navied · Oct 28, 2020 · d229718 · d229718
1 parent a2fd1bf
commit d229718
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 18 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -2946,7 +2946,6 @@ module.exports.wrap = wrap;
 const axios = __webpack_require__(545);
 const crypto = __webpack_require__(417);
 const core = __webpack_require__(186);
-
 const hmacSecret = core.getInput('hmacSecret');
 
 if (!hmacSecret || hmacSecret === "" || hmacSecret.trim() === "") {
@@ -2960,9 +2959,11 @@ if (hmacSecret.length < 32) {
 
 const createHmacSignature = body => {
   const hmac = crypto.createHmac("sha256", hmacSecret);
-  const bodySignature = hmac.update(JSON.stringify(body)).digest("hex");
-
-  return `${bodySignature}`;
+  if (body === "") {
+    return hmac.digest("hex");
+  } else {
+    return hmac.update(JSON.stringify(body)).digest("hex");
+  }
 };
 
 function isJsonString(str) {
@@ -2976,21 +2977,18 @@ function isJsonString(str) {
 
 const url = core.getInput('url');
 const dataInput = core.getInput('data');
-
 const data = isJsonString(dataInput) ? JSON.parse(dataInput) : dataInput;
-
-
 const signature = createHmacSignature(data);
 
 axios.post(url, data, {
   headers: {
     "X-Hub-Signature": signature,
     "X-Hub-SHA": process.env.GITHUB_SHA
   }
-}).then(function (res) {
+}).then(function () {
   core.info(`Webhook sent sucessfully`)
 }).catch(function (error) {
-  core.setFailed(`Request failed with status code ${error.response.status}!`);
+  core.setFailed(`Request failed with status code ${error.response.status}`);
 });
 
 /***/ }),

diff --git a/src/index.js b/src/index.js
@@ -1,7 +1,6 @@
 const axios = require("axios");
 const crypto = require("crypto");
 const core = require('@actions/core');
-
 const hmacSecret = core.getInput('hmacSecret');
 
 if (!hmacSecret || hmacSecret === "" || hmacSecret.trim() === "") {
@@ -15,9 +14,11 @@ if (hmacSecret.length < 32) {
 
 const createHmacSignature = body => {
   const hmac = crypto.createHmac("sha256", hmacSecret);
-  const bodySignature = hmac.update(JSON.stringify(body)).digest("hex");
-
-  return `${bodySignature}`;
+  if (body === "") {
+    return hmac.digest("hex");
+  } else {
+    return hmac.update(JSON.stringify(body)).digest("hex");
+  }
 };
 
 function isJsonString(str) {
@@ -31,19 +32,16 @@ function isJsonString(str) {
 
 const url = core.getInput('url');
 const dataInput = core.getInput('data');
-
 const data = isJsonString(dataInput) ? JSON.parse(dataInput) : dataInput;
-
-
 const signature = createHmacSignature(data);
 
 axios.post(url, data, {
   headers: {
     "X-Hub-Signature": signature,
     "X-Hub-SHA": process.env.GITHUB_SHA
   }
-}).then(function (res) {
+}).then(function () {
   core.info(`Webhook sent sucessfully`)
 }).catch(function (error) {
-  core.setFailed(`Request failed with status code ${error.response.status}!`);
+  core.setFailed(`Request failed with status code ${error.response.status}`);
 });