X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_websocket.cpp;h=863362a07b3e71221fdfde8b8fdc3060b2b4f166;hb=8df3d792bc99d9dd73db7a601ebe8d4a397c3522;hp=7458e56b699a113ca40ca0b47c2a239c8e9198ef;hpb=99af213a58946185621b3e4de01970a7c21cce93;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_websocket.cpp b/src/modules/m_websocket.cpp
index 7458e56b6..863362a07 100644
--- a/src/modules/m_websocket.cpp
+++ b/src/modules/m_websocket.cpp
@@ -1,7 +1,9 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2019 iwalkalone <iwalkalone69@gmail.com>
+ *   Copyright (C) 2017-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2016-2017 Attila Molnar <attilamolnar@hush.com>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -16,22 +18,38 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/// $CompilerFlags: -Ivendor_directory("utfcpp")
+
 
 #include "inspircd.h"
 #include "iohook.h"
 #include "modules/hash.h"
 
-typedef std::vector<std::string> OriginList;
+#include <utf8.h>
 
 static const char MagicGUID[] = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
 static const char whitespace[] = " \t\r\n";
 static dynamic_reference_nocheck<HashProvider>* sha1;
 
-class WebSocketHookProvider : public IOHookProvider
+struct WebSocketConfig
 {
- public:
+	typedef std::vector<std::string> OriginList;
+	typedef std::vector<std::string> ProxyRanges;
+
+	// The HTTP origins that can connect to the server.
 	OriginList allowedorigins;
 
+	// The IP ranges which send trustworthy X-Real-IP or X-Forwarded-For headers.
+	ProxyRanges proxyranges;
+
+	// Whether to send as UTF-8 text instead of binary data.
+	bool sendastext;
+};
+
+class WebSocketHookProvider : public IOHookProvider
+{
+ public:
+	WebSocketConfig config;
 	WebSocketHookProvider(Module* mod)
 		: IOHookProvider(mod, "websocket", IOHookProvider::IOH_UNKNOWN, true)
 	{
@@ -105,7 +123,7 @@ class WebSocketHook : public IOHookMiddle
 
 	State state;
 	time_t lastpingpong;
-	OriginList& allowedorigins;
+	WebSocketConfig& config;
 
 	static size_t FillHeader(unsigned char* outbuf, size_t sendlength, OpCode opcode)
 	{
@@ -312,7 +330,7 @@ class WebSocketHook : public IOHookMiddle
 		if (originheader.Find(recvq, "Origin:", 7, reqend))
 		{
 			const std::string origin = originheader.ExtractValue(recvq);
-			for (OriginList::const_iterator iter = allowedorigins.begin(); iter != allowedorigins.end(); ++iter)
+			for (WebSocketConfig::OriginList::const_iterator iter = config.allowedorigins.begin(); iter != config.allowedorigins.end(); ++iter)
 			{
 				if (InspIRCd::Match(origin, *iter, ascii_case_insensitive_map))
 				{
@@ -328,6 +346,36 @@ class WebSocketHook : public IOHookMiddle
 			return -1;
 		}
 
+		if (!config.proxyranges.empty() && sock->type == StreamSocket::SS_USER)
+		{
+			LocalUser* luser = static_cast<UserIOHandler*>(sock)->user;
+			irc::sockets::sockaddrs realsa(luser->client_sa);
+
+			HTTPHeaderFinder proxyheader;
+			if (proxyheader.Find(recvq, "X-Real-IP:", 10, reqend)
+				&& irc::sockets::aptosa(proxyheader.ExtractValue(recvq), realsa.port(), realsa))
+			{
+				// Nothing to do here.
+			}
+			else if (proxyheader.Find(recvq, "X-Forwarded-For:", 16, reqend)
+				&& irc::sockets::aptosa(proxyheader.ExtractValue(recvq), realsa.port(), realsa))
+			{
+				// Nothing to do here.
+			}
+
+			for (WebSocketConfig::ProxyRanges::const_iterator iter = config.proxyranges.begin(); iter != config.proxyranges.end(); ++iter)
+			{
+				if (InspIRCd::MatchCIDR(luser->GetIPString(), *iter, ascii_case_insensitive_map))
+				{
+					// Give the user their real IP address.
+					if (realsa != luser->client_sa)
+						luser->SetClientIP(realsa);
+					break;
+				}
+			}
+		}
+
+
 		HTTPHeaderFinder keyheader;
 		if (!keyheader.Find(recvq, "Sec-WebSocket-Key:", 18, reqend))
 		{
@@ -358,11 +406,11 @@ class WebSocketHook : public IOHookMiddle
 	}
 
  public:
-	WebSocketHook(IOHookProvider* Prov, StreamSocket* sock, OriginList& AllowedOrigins)
+	WebSocketHook(IOHookProvider* Prov, StreamSocket* sock, WebSocketConfig& cfg)
 		: IOHookMiddle(Prov)
 		, state(STATE_HTTPREQ)
 		, lastpingpong(0)
-		, allowedorigins(AllowedOrigins)
+		, config(cfg)
 	{
 		sock->AddIOHook(this);
 	}
@@ -383,8 +431,21 @@ class WebSocketHook : public IOHookMiddle
 				if (*chr == '\n')
 				{
 					// We have found an entire message. Send it in its own frame.
-					mysendq.push_back(PrepareSendQElem(message.length(), OP_BINARY));
-					mysendq.push_back(message);
+					if (config.sendastext)
+					{
+						// If we send messages as text then we need to ensure they are valid UTF-8.
+						std::string encoded;
+						utf8::replace_invalid(message.begin(), message.end(), std::back_inserter(encoded));
+
+						mysendq.push_back(PrepareSendQElem(encoded.length(), OP_TEXT));
+						mysendq.push_back(encoded);
+					}
+					else
+					{
+						// Otherwise, send the raw message as a binary frame.
+						mysendq.push_back(PrepareSendQElem(message.length(), OP_BINARY));
+						mysendq.push_back(message);
+					}
 					message.clear();
 				}
 				else if (*chr != '\r')
@@ -431,7 +492,7 @@ class WebSocketHook : public IOHookMiddle
 
 void WebSocketHookProvider::OnAccept(StreamSocket* sock, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server)
 {
-	new WebSocketHook(this, sock, allowedorigins);
+	new WebSocketHook(this, sock, config);
 }
 
 class ModuleWebSocket : public Module
@@ -453,7 +514,7 @@ class ModuleWebSocket : public Module
 		if (tags.first == tags.second)
 			throw ModuleException("You have loaded the websocket module but not configured any allowed origins!");
 
-		OriginList allowedorigins;
+		WebSocketConfig config;
 		for (ConfigIter i = tags.first; i != tags.second; ++i)
 		{
 			ConfigTag* tag = i->second;
@@ -463,9 +524,18 @@ class ModuleWebSocket : public Module
 			if (allow.empty())
 				throw ModuleException("<wsorigin:allow> is a mandatory field, at " + tag->getTagLocation());
 
-			allowedorigins.push_back(allow);
+			config.allowedorigins.push_back(allow);
 		}
-		hookprov->allowedorigins.swap(allowedorigins);
+
+		ConfigTag* tag = ServerInstance->Config->ConfValue("websocket");
+		config.sendastext = tag->getBool("sendastext", true);
+
+		irc::spacesepstream proxyranges(tag->getString("proxyranges"));
+		for (std::string proxyrange; proxyranges.GetToken(proxyrange); )
+			config.proxyranges.push_back(proxyrange);
+
+		// Everything is okay; apply the new config.
+		hookprov->config = config;
 	}
 
 	void OnCleanup(ExtensionItem::ExtensibleType type, Extensible* item) CXX11_OVERRIDE