Merge pull request #45 from electerious/master

Fix "Missing single quote escaping"
leoek · Nov 8, 2022 · 43698c4 · 43698c4
2 parents a7e34b2 + 4884579
commit 43698c4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/src/main.js b/src/main.js
@@ -80,23 +80,29 @@ export const generateHeader = (options = {}) => {
 }
 
 /**
- *
- *
+ * @export
+ * @param {Object} body
+ * @returns {string}
+ */
+export function escapeBody(body) {
+  if (typeof body !== 'string') return body
+  return body.replace(/'/g, `'\\''`)
+}
+
+/**
  * @export
  * @param {Object} body
  * @returns {string}
  */
 export function generateBody(body) {
   if (!body) return '';
   if (typeof body === "object"){
-    return ` --data-binary '${JSON.stringify(body)}'`;
+    return ` --data-binary '${escapeBody(JSON.stringify(body))}'`;
   }
-  return ` --data-binary '${body}'`;
+  return ` --data-binary '${escapeBody(body)}'`;
 }
 
 /**
- *
- *
  * @export
  * @param {boolean} isEncode
  * @return {string}
@@ -106,8 +112,6 @@ export function generateCompress(isEncode) {
 }
 
 /**
- *
- *
  * @export
  * @param {string|object} requestInfo
  * @param {object={}} requestInit

diff --git a/test/main.test.js b/test/main.test.js
@@ -180,10 +180,11 @@ describe('Generate body param', () => {
     const options = {
       test: 'test:',
       testNumber: 12345,
-      testDate: new Date(1609251707077)
+      testDate: new Date(1609251707077),
+      testQuotes: `'test'`
     };
     expect(generateBody(options)).toEqual(
-      ' --data-binary \'{"test":"test:","testNumber":12345,"testDate":"2020-12-29T14:21:47.077Z"}\''
+      ` --data-binary '{"test":"test:","testNumber":12345,"testDate":"2020-12-29T14:21:47.077Z","testQuotes":"'\\''test'\\''"}'`
     );
   });
 });