new switches to set the HTTP Content-Type header

Author: willamowius

Routing.cxx

@@ -2249,6 +2249,7 @@ void HttpPolicy::LoadConfig(const PString & instance)
 	m_url = GkConfig()->GetString(m_iniSection, "URL", "");
 	m_body = GkConfig()->GetString(m_iniSection, "Body", "");
 	m_method = GkConfig()->GetString(m_iniSection, "Method", "POST");
+	m_contentType = GkConfig()->GetString(m_iniSection, "ContentType", "text/plain");
 	PString resultRegex = GkConfig()->GetString(m_iniSection, "ResultRegex", ".*"); // match everything
 	m_resultRegex = PRegularExpression(resultRegex, PRegularExpression::Extended);
 	m_resultRegex = PRegularExpression(resultRegex);
@@ -2342,7 +2343,8 @@ void HttpPolicy::RunPolicy(
                 url = parts[0];
                 body = parts[1];
             } else {
-                headerlist = curl_slist_append(headerlist, "Content-Type: text/plain");
+                PString header = PString("Content-Type: ") + m_contentType;
+                headerlist = curl_slist_append(headerlist, (const char *)header);
                 (void)curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headerlist);
             }
             (void)curl_easy_setopt(curl, CURLOPT_POSTFIELDS, (const char *)body);
@@ -2379,7 +2381,7 @@ void HttpPolicy::RunPolicy(
             body = parts[1];
         }
         PMIMEInfo outMIME;
-        outMIME.SetAt(PMIMEInfo::ContentTypeTag(), "text/plain");
+        outMIME.SetAt(PMIMEInfo::ContentTypeTag(), (const char *)m_contentType);
         PMIMEInfo replyMIME;
         if (!http.PostData(url, outMIME, body, replyMIME, result)) {
             PTRACE(2, m_name << "\tCould not POST to " << host);

Routing.h

@@ -601,6 +601,7 @@ class HttpPolicy : public DynamicPolicy {
 	PString m_url;
 	PString m_body;
 	PCaselessString m_method;
+	PString m_contentType;
 	PRegularExpression m_resultRegex;
 	PRegularExpression m_deleteRegex;
 	PRegularExpression m_errorRegex;

changes.txt

@@ -1,5 +1,7 @@
 Changes from 5.7 to 5.8
 =======================
+- new switches to set the HTTP Content-Type header: [HttpAcct] ContentType=, [HttpPasswordAuth] ContentType=
+  and [Routing::Http] ContentType=
 - new switch [Proxy] AllowAnyRTPSourcePortForH239From= to handle incorrect RTCP addresses in H.239 OLC (EdgeProtect interop)
 - new switch [RoutedMode] MatchH239SessionsByIDOnly= to never attempt to match a H.239 reverse channel by type
   for improved interoperability with EdgeProtect

docs/manual/acct.sgml

@@ -1057,6 +1057,11 @@ Default: <tt>N/A</tt>
 <p>
 HTTP method to use. Currently GET and POST are supported.
 
+<item><tt>ContentType=application/json</tt><newline>
+Default: <tt>text/plain</tt><newline>
+<p>
+The content type header to send in POST requests.
+
 <item><tt/TimestampFormat=MySQL/<newline>
 Default: <tt>N/A</tt><newline>
 <p>

docs/manual/auth.sgml

@@ -1815,6 +1815,11 @@ Default: <tt>POST</tt>
 <p>
 HTTP method to use. Currently GET and POST are supported.
 
+<item><tt>ContentType=application/json</tt><newline>
+Default: <tt>text/plain</tt><newline>
+<p>
+The content type header to send in POST requests.
+
 <item><tt/ResultRegex=[0-9]+/<newline>
 Default: <tt>.*</tt>
 <p>

docs/manual/routing.sgml

@@ -641,6 +641,11 @@ Default: <tt>POST</tt>
 <p>
 HTTP method to use. Currently GET and POST are supported.
 
+<item><tt>ContentType=application/json</tt><newline>
+Default: <tt>text/plain</tt><newline>
+<p>
+The content type header to send in POST requests.
+
 <item><tt/ResultRegex=[0-9]+/<newline>
 Default: <tt>.*</tt>
 <p>

gk.cxx

@@ -398,6 +398,7 @@ const char * KnownConfigEntries[][2] = {
 	{ "HttpAcct", "AlertURL" },
 	{ "HttpAcct", "ConnectBody" },
 	{ "HttpAcct", "ConnectURL" },
+	{ "HttpAcct", "ContentType" },
 	{ "HttpAcct", "MediaFailBody" },
 	{ "HttpAcct", "MediaFailURL" },
 	{ "HttpAcct", "Method" },
@@ -419,6 +420,7 @@ const char * KnownConfigEntries[][2] = {
 	{ "HttpAcct", "UnregisterBody" },
 	{ "HttpAcct", "UnregisterURL" },
 	{ "HttpPasswordAuth", "Body" },
+	{ "HttpPasswordAuth", "ContentType" },
 	{ "HttpPasswordAuth", "DeleteRegex" },
 	{ "HttpPasswordAuth", "ErrorRegex" },
 	{ "HttpPasswordAuth", "Method" },
@@ -764,6 +766,7 @@ const char * KnownConfigEntries[][2] = {
 	{ "Routing::Forwarding", "Username" },
 #if defined (P_HTTP) || defined (HAS_LIBCURL)
 	{ "Routing::Http", "Body" },
+	{ "Routing::Http", "ContentType" },
 	{ "Routing::Http", "DeleteRegex" },
 	{ "Routing::Http", "ErrorRegex" },
 #ifdef HAS_JSON

gkauth.cxx

@@ -2,7 +2,7 @@
 //
 // gkauth.cxx
 //
-// Copyright (c) 2001-2019, Jan Willamowius
+// Copyright (c) 2001-2021, Jan Willamowius
 //
 // This work is published under the GNU Public License version 2 (GPLv2)
 // see file COPYING for details.
@@ -2352,6 +2352,7 @@ class HttpPasswordAuth : public SimplePasswordAuth
 	PString m_url;
 	PString m_body;
 	PCaselessString m_method;
+	PString m_contentType;
 	PRegularExpression m_resultRegex;
 	PRegularExpression m_deleteRegex;
 	PRegularExpression m_errorRegex;
@@ -2363,6 +2364,7 @@ HttpPasswordAuth::HttpPasswordAuth(const char* authName)
 	m_url = GkConfig()->GetString("HttpPasswordAuth", "URL", "");
 	m_body = GkConfig()->GetString("HttpPasswordAuth", "Body", "");
 	m_method = GkConfig()->GetString("HttpPasswordAuth", "Method", "POST");
+	m_contentType = GkConfig()->GetString("HttpPasswordAuth", "ContentType", "text/plain");
 	PString resultRegex = GkConfig()->GetString("HttpPasswordAuth", "ResultRegex", ".*"); // match everything
 	m_resultRegex = PRegularExpression(resultRegex, PRegularExpression::Extended);
 	m_resultRegex = PRegularExpression(resultRegex);
@@ -2429,7 +2431,8 @@ bool HttpPasswordAuth::GetPassword(const PString & alias, PString & password, st
                 url = parts[0];
                 body = parts[1];
             } else {
-                headerlist = curl_slist_append(headerlist, "Content-Type: text/plain");
+                PString header = PString("Content-Type: ") + m_contentType;
+                headerlist = curl_slist_append(headerlist, (const char *)header);
                 (void)curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headerlist);
             }
             (void)curl_easy_setopt(curl, CURLOPT_POSTFIELDS, (const char *)body);
@@ -2466,7 +2469,7 @@ bool HttpPasswordAuth::GetPassword(const PString & alias, PString & password, st
             body = parts[1];
         }
         PMIMEInfo outMIME;
-        outMIME.SetAt(PMIMEInfo::ContentTypeTag(), "text/plain");
+        outMIME.SetAt(PMIMEInfo::ContentTypeTag(), (const char *)m_contentType);
         PMIMEInfo replyMIME;
         if (!http.PostData(url, outMIME, body, replyMIME, result)) {
             PTRACE(2, "HttpPasswordAuth\tCould not POST to " << host);

httpacct.cxx

@@ -3,7 +3,7 @@
  *
  * accounting module for GNU Gatekeeper that sends it's messages over HTTP
  *
- * Copyright (c) 2018, Jan Willamowius
+ * Copyright (c) 2018-2021, Jan Willamowius
  *
  * This work is published under the GNU Public License version 2 (GPLv2)
  * see file COPYING for details.
@@ -37,6 +37,7 @@ HttpAcct::HttpAcct(const char* moduleName, const char* cfgSecName)
 	const PString & cfgSec = GetConfigSectionName();
 	m_timestampFormat = cfg->GetString(cfgSec, "TimestampFormat", "");
     m_method = GkConfig()->GetString(cfgSec, "Method", "POST");
+    m_contentType = cfg->GetString(cfgSec, "ContentType", "text/plain");
 	m_startURL = cfg->GetString(cfgSec, "StartURL", "");
 	m_startBody = cfg->GetString(cfgSec, "StartBody", "");
 	m_stopURL = cfg->GetString(cfgSec, "StopURL", "");
@@ -187,6 +188,7 @@ GkAcctLogger::Status HttpAcct::HttpLog(PString url, PString body)
     CURLcode curl_res = CURLE_FAILED_INIT;
     CURL * curl = curl_easy_init();
     if (curl) {
+        struct curl_slist *headerlist = NULL;
         if (m_method == "GET") {
             // nothing special to do
         } else if (m_method == "POST") {
@@ -195,6 +197,9 @@ GkAcctLogger::Status HttpAcct::HttpLog(PString url, PString body)
                 url = parts[0];
                 body = parts[1];
             }
+            PString header = PString("Content-Type: ") + m_contentType;
+            headerlist = curl_slist_append(headerlist, (const char *)header);
+            (void)curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headerlist);
             (void)curl_easy_setopt(curl, CURLOPT_POSTFIELDS, (const char *)body);
         } else {
             PTRACE(2, "HttpAcct\tUnsupported method " << m_method);
@@ -209,6 +214,7 @@ GkAcctLogger::Status HttpAcct::HttpLog(PString url, PString body)
             (void)curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
         }
         curl_res = curl_easy_perform(curl);
+        curl_slist_free_all(headerlist);
         curl_easy_cleanup(curl);
     }
 
@@ -230,7 +236,7 @@ GkAcctLogger::Status HttpAcct::HttpLog(PString url, PString body)
             body = parts[1];
         }
         PMIMEInfo outMIME;
-        outMIME.SetAt(PMIMEInfo::ContentTypeTag(), "text/plain");
+        outMIME.SetAt(PMIMEInfo::ContentTypeTag(), (const char *)m_contentType);
         PMIMEInfo replyMIME;
         if (!http.PostData(url, outMIME, body, replyMIME, result)) {
             PTRACE(2, "HttpAcct\tCould not POST to " << host);

httpacct.h

@@ -3,7 +3,7 @@
  *
  * accounting module for GNU Gatekeeper that sends it's messages over HTTP
  *
- * Copyright (c) 2018, Jan Willamowius
+ * Copyright (c) 2018-2021, Jan Willamowius
  *
  * This work is published under the GNU Public License version 2 (GPLv2)
  * see file COPYING for details.
@@ -94,6 +94,8 @@ class HttpAcct : public GkAcctLogger
 	PString m_mediaFailBody;
 	/// HTTP method: GET or POST
 	PString m_method;
+	/// HTTP Content-Type used for POSTs
+	PString m_contentType;
 	/// timestamp formatting string
 	PString m_timestampFormat;
 };