From 2b9bf095a609bbf2f2c517209b13cb57dbd1e1b1 Mon Sep 17 00:00:00 2001
From: Justin Tisdale <justin@justintisdale.com>
Date: Thu, 11 Aug 2022 20:57:03 -0400
Subject: [PATCH] Add non-json support for http body

---
 db/patch-http-body-encoding.sql |  6 ++++++
 server/database.js              |  1 +
 server/model/monitor.js         | 20 +++++++++++++++++++-
 server/server.js                |  1 +
 src/pages/EditMonitor.vue       | 13 +++++++------
 5 files changed, 34 insertions(+), 7 deletions(-)
 create mode 100644 db/patch-http-body-encoding.sql

diff --git a/db/patch-http-body-encoding.sql b/db/patch-http-body-encoding.sql
new file mode 100644
index 00000000..de02bede
--- /dev/null
+++ b/db/patch-http-body-encoding.sql
@@ -0,0 +1,6 @@
+-- You should not modify if this have pushed to Github, unless it does serious wrong with the db.
+BEGIN TRANSACTION;
+
+ALTER TABLE [monitor] ADD http_body_encoding TEXT;
+
+COMMIT;
diff --git a/server/database.js b/server/database.js
index b234d67d..ecf6af72 100644
--- a/server/database.js
+++ b/server/database.js
@@ -62,6 +62,7 @@ class Database {
         "patch-add-clickable-status-page-link.sql": true,
         "patch-add-sqlserver-monitor.sql": true,
         "patch-add-other-auth.sql": { parents: [ "patch-monitor-basic-auth.sql" ] },
+        "patch-http-body-encoding.sql": true
     };
 
     /**
diff --git a/server/model/monitor.js b/server/model/monitor.js
index 2feef135..af3d162a 100644
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -103,6 +103,7 @@ class Monitor extends BeanModel {
             authMethod: this.authMethod,
             authWorkstation: this.authWorkstation,
             authDomain: this.authDomain,
+            httpBodyEncoding: this.httpBodyEncoding
         };
 
         if (includeSensitiveData) {
@@ -241,16 +242,33 @@ class Monitor extends BeanModel {
 
                     log.debug("monitor", `[${this.name}] Prepare Options for axios`);
 
+                    // Set content-type header and body values based on the httpBodyEncoding type selected
+                    // TODO: Check if this.headers already contains a content-type header set by the user; if so, don't inject one
+                    let bodyValue = null;
+                    let contentType = null;
+
+                    if (this.body && !this.httpBodyEncoding || this.httpBodyEncoding === "json"){
+                        bodyValue = JSON.parse(this.body);
+                        contentType = "application/json";
+                    } else if (this.body && (this.httpBodyEncoding === "xml")) {
+                        bodyValue = this.body;
+                        contentType = "text/xml";
+                    } else if (this.body && (this.httpBodyEncoding === "form")) {
+                        bodyValue = this.body;
+                        contentType = "application/x-www-form-urlencoded";
+                    }
+
                     const options = {
                         url: this.url,
                         method: (this.method || "get").toLowerCase(),
-                        ...(this.body ? { data: JSON.parse(this.body) } : {}),
+                        ...(bodyValue ? { data: bodyValue } : {}),
                         timeout: this.interval * 1000 * 0.8,
                         headers: {
                             "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9",
                             "User-Agent": "Uptime-Kuma/" + version,
                             ...(this.headers ? JSON.parse(this.headers) : {}),
                             ...(basicAuthHeader),
+                            ...(contentType ? { "Content-Type": contentType } : {})
                         },
                         maxRedirects: this.maxredirects,
                         validateStatus: (status) => {
diff --git a/server/server.js b/server/server.js
index 2a2c4bf6..616a10cd 100644
--- a/server/server.js
+++ b/server/server.js
@@ -693,6 +693,7 @@ let needSetup = false;
                 bean.authMethod = monitor.authMethod;
                 bean.authWorkstation = monitor.authWorkstation;
                 bean.authDomain = monitor.authDomain;
+                bean.httpBodyEncoding = monitor.httpBodyEncoding;
 
                 await R.store(bean);
 
diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue
index 7dcc7d64..b4aceba7 100644
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@@ -398,8 +398,8 @@
 
                                 <!-- Encoding -->
                                 <div class="my-3">
-                                    <label for="bodyEncoding" class="form-label">{{ $t("Body Encoding") }}</label>
-                                    <select id="bodyEncoding" v-model="monitor.bodyEncoding" class="form-select">
+                                    <label for="httpBodyEncoding" class="form-label">{{ $t("Body Encoding") }}</label>
+                                    <select id="httpBodyEncoding" v-model="monitor.httpBodyEncoding" class="form-select">
                                         <option value="json">
                                             JSON
                                         </option>
@@ -660,7 +660,7 @@ export default {
                     mqttTopic: "",
                     mqttSuccessMessage: "",
                     authMethod: null,
-                    bodyEncoding: null
+                    httpBodyEncoding: "json"
                 };
 
                 if (this.$root.proxyList && !this.monitor.proxyId) {
@@ -698,7 +698,8 @@ export default {
          * @returns {boolean} Is the form input valid?
          */
         isInputValid() {
-            if (this.monitor.body) {
+            //TODO: Handle validation for all 3 possible options + null value
+            if (this.monitor.body && (!this.monitor.httpBodyEncoding || this.monitor.httpBodyEncoding === "json")) {
                 try {
                     JSON.parse(this.monitor.body);
                 } catch (err) {
@@ -729,8 +730,8 @@ export default {
                 return;
             }
 
-            // Beautify the JSON format
-            if (this.monitor.body) {
+            // Beautify the JSON format (only if httpBodyEncoding is not set or === json)
+            if (this.monitor.body && (!this.monitor.httpBodyEncoding || this.monitor.httpBodyEncoding === "json")) {
                 this.monitor.body = JSON.stringify(JSON.parse(this.monitor.body), null, 4);
             }