diff options
Diffstat (limited to 'src/modules/m_websocket.cpp')
| -rw-r--r-- | src/modules/m_websocket.cpp | 61 |
1 files changed, 48 insertions, 13 deletions
diff --git a/src/modules/m_websocket.cpp b/src/modules/m_websocket.cpp index fa1188a8f..6cf721424 100644 --- a/src/modules/m_websocket.cpp +++ b/src/modules/m_websocket.cpp @@ -29,7 +29,8 @@ #include <unchecked.h> static const char MagicGUID[] = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"; -static const char whitespace[] = " \t\r\n"; +static const char newline[] = "\r\n"; +static const char whitespace[] = " \t"; static dynamic_reference_nocheck<HashProvider>* sha1; struct WebSocketConfig @@ -67,26 +68,38 @@ class WebSocketHook : public IOHookMiddle { class HTTPHeaderFinder { + private: std::string::size_type bpos; std::string::size_type len; public: bool Find(const std::string& req, const char* header, std::string::size_type headerlen, std::string::size_type maxpos) { - std::string::size_type keybegin = req.find(header); - if ((keybegin == std::string::npos) || (keybegin > maxpos) || (keybegin == 0) || (req[keybegin-1] != '\n')) - return false; + // Skip the GET /wibble HTTP/1.1 line. + size_t startpos = req.find(newline) + sizeof(newline) - 1; + while (startpos < maxpos) + { + size_t endpos = req.find(newline, startpos); + if (req.compare(startpos, headerlen, header)) + { + startpos = endpos + sizeof(newline) - 1; + continue; // Incorrect header. + } - keybegin += headerlen; + bpos = req.find_first_not_of(whitespace, startpos + headerlen); + if (bpos >= endpos) + return false; // Empty value. - bpos = req.find_first_not_of(whitespace, keybegin, sizeof(whitespace)-1); - if ((bpos == std::string::npos) || (bpos > maxpos)) - return false; + size_t epos = std::min(req.find_last_not_of(whitespace), endpos); + if (epos < bpos) + return false; // Should never happen. - const std::string::size_type epos = req.find_first_of(whitespace, bpos, sizeof(whitespace)-1); - len = epos - bpos; + len = epos - bpos; + return true; + } - return true; + // No header found. + return false; } std::string ExtractValue(const std::string& req) const @@ -125,6 +138,7 @@ class WebSocketHook : public IOHookMiddle State state = STATE_HTTPREQ; time_t lastpingpong = 0; WebSocketConfig& config; + bool sendastext; static size_t FillHeader(unsigned char* outbuf, size_t sendlength, OpCode opcode) { @@ -385,6 +399,23 @@ class WebSocketHook : public IOHookMiddle } } + std::string selectedproto; + HTTPHeaderFinder protocolheader; + if (protocolheader.Find(recvq, "Sec-WebSocket-Protocol:", 23, reqend)) + { + irc::spacesepstream protostream(protocolheader.ExtractValue(recvq)); + for (std::string proto; protostream.GetToken(proto); ) + { + bool is_text = stdalgo::string::equalsci(proto, "text.inspircd.org"); + if (stdalgo::string::equalsci(proto, "binary.inspircd.org") || is_text) + { + selectedproto = proto; + sendastext = is_text; + break; + } + } + } + HTTPHeaderFinder keyheader; if (!keyheader.Find(recvq, "Sec-WebSocket-Key:", 18, reqend)) { @@ -404,7 +435,10 @@ class WebSocketHook : public IOHookMiddle key.append(MagicGUID); std::string reply = "HTTP/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: "; - reply.append(Base64::Encode((*sha1)->GenerateRaw(key), nullptr, '=')).append("\r\n\r\n"); + reply.append(Base64::Encode((*sha1)->GenerateRaw(key), NULL, '=')).append(newline); + if (!selectedproto.empty()) + reply.append("Sec-WebSocket-Protocol: ").append(selectedproto).append(newline); + reply.append(newline); GetSendQ().push_back(StreamSocket::SendQueue::Element(reply)); SocketEngine::ChangeEventMask(sock, FD_ADD_TRIAL_WRITE); @@ -418,6 +452,7 @@ class WebSocketHook : public IOHookMiddle WebSocketHook(std::shared_ptr<IOHookProvider> Prov, StreamSocket* sock, WebSocketConfig& cfg) : IOHookMiddle(Prov) , config(cfg) + , sendastext(cfg.sendastext) { sock->AddIOHook(this); } @@ -438,7 +473,7 @@ class WebSocketHook : public IOHookMiddle if (chr == '\n') { // We have found an entire message. Send it in its own frame. - if (config.sendastext) + if (sendastext) { // If we send messages as text then we need to ensure they are valid UTF-8. std::string encoded; |