From 2d6db51465054c044e97b13d26e3cdd93b34bdc2 Mon Sep 17 00:00:00 2001 From: lotodore Date: Mon, 7 Oct 2013 22:43:03 +0200 Subject: [PATCH] Origin check tolerates http:// and http://www. --- src/net/common/serveracceptwebhelper.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/net/common/serveracceptwebhelper.cpp b/src/net/common/serveracceptwebhelper.cpp index 1eb57b74..3143fde6 100644 --- a/src/net/common/serveracceptwebhelper.cpp +++ b/src/net/common/serveracceptwebhelper.cpp @@ -78,7 +78,9 @@ ServerAcceptWebHelper::validate(websocketpp::connection_hdl hdl) bool retVal = false; server::connection_ptr con = m_webSocketServer->get_con_from_hdl(hdl); if ((m_webSocketResource.empty() || con->get_resource() == m_webSocketResource) - && (m_webSocketOrigin.empty() || (con->get_origin() != "null" && con->get_origin() == m_webSocketOrigin))) { + && (m_webSocketOrigin.empty() || + (con->get_origin() != "null" && + (con->get_origin() == "http://" + m_webSocketOrigin || con->get_origin() == "http://www." + m_webSocketOrigin)))) { retVal = true; } return retVal;