From e1934a9f2e05305eaf6cf470d3df6899f167aadc Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Sat, 14 Jan 2023 10:41:25 +0000
Subject: Fix building the pgsql connection DSN in some rare cases.

These values need to be escaped or they will be malformed.

Ref: https://www.postgresql.org/docs/15/libpq-connect.html#id-1.7.3.8.3.5
---
 src/modules/extra/m_pgsql.cpp | 37 ++++++++++++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 5 deletions(-)

(limited to 'src/modules')

diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp
index d2558b750..6bae8c38f 100644
--- a/src/modules/extra/m_pgsql.cpp
+++ b/src/modules/extra/m_pgsql.cpp
@@ -239,25 +239,52 @@ class SQLConn : public SQL::Provider, public EventHandler
 		DelayReconnect();
 	}
 
+	std::string EscapeDSN(const std::string& str)
+	{
+		std::string out;
+		out.reserve(str.size());
+
+		for (std::string::const_iterator it = str.begin(); it != str.end(); ++it)
+		{
+			char chr = *it;
+			switch (chr)
+			{
+				case '\\':
+					out.append("\\\\");
+					break;
+
+				case '\'':
+					out.append("\\'");
+					break;
+
+				default:
+					out.push_back(chr);
+					break;
+			}
+		}
+
+		return out;
+	}
+
 	std::string GetDSN()
 	{
 		std::ostringstream conninfo("connect_timeout = '5'");
 		std::string item;
 
 		if (conf->readString("host", item))
-			conninfo << " host = '" << item << "'";
+			conninfo << " host = '" << EscapeDSN(item) << "'";
 
 		if (conf->readString("port", item))
-			conninfo << " port = '" << item << "'";
+			conninfo << " port = '" << EscapeDSN(item) << "'";
 
 		if (conf->readString("name", item))
-			conninfo << " dbname = '" << item << "'";
+			conninfo << " dbname = '" << EscapeDSN(item) << "'";
 
 		if (conf->readString("user", item))
-			conninfo << " user = '" << item << "'";
+			conninfo << " user = '" << EscapeDSN(item) << "'";
 
 		if (conf->readString("pass", item))
-			conninfo << " password = '" << item << "'";
+			conninfo << " password = '" << EscapeDSN(item) << "'";
 
 		if (conf->getBool("ssl"))
 			conninfo << " sslmode = 'require'";
-- 
cgit v1.3.1-10-gc9f91