pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add support tls & no tls in socketio (double code)

Browse Source
This commit is contained in:
Oleg.Korshul
2023-01-31 18:07:33 +05:00
parent bbf661e74e
commit 1b84274673
6 changed files with 484 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Common/Network/WebSocket/src/socketio/make.py Executable file
View File

@ -0,0 +1,21 @@
#!/usr/bin/env python
import sys
sys.path.append('../../../../../../build_tools/scripts')
import base
file_path = "./socketio_internal_private_no_tls.h"
if not base.is_file(file_path):
file.delete_file(file_path)
base.copy_file("./socketio_internal_private.h", file_path)
header = "///////////////////////////////////////////////////////////\n"
header += "/// auto generated file. please use generator (make.py) ///\n"
header += "///////////////////////////////////////////////////////////\n"
header += "\n#pragma once"
base.replaceInFile(file_path, "#pragma once", header)
base.replaceInFile(file_path, "/socket.io-client-cpp/src/", "/socket.io-client-cpp/src_no_tls/")
base.replaceInFile(file_path, "sio::", "sio_no_tls::")
base.replaceInFile(file_path, "CIOWebSocket_private_tls", "CIOWebSocket_private_no_tls")

170
Common/Network/WebSocket/src/socketio/socketio_internal.cpp
View File

@ -30,149 +30,19 @@
*
*/
#include "socketio_internal.h"
#include <iostream>
#include "../../../../3dParty/socketio/socket.io-client-cpp/src/internal/sio_packet.h"
#include "../../../../3dParty/socketio/socket.io-client-cpp/src/sio_client.h"
#include "../../../../../DesktopEditor/graphics/TemporaryCS.h"
#include "socketio_internal_private.h"
#include "socketio_internal_private_no_tls.h"
namespace NSNetwork
{
namespace NSWebSocket
{
class CIOWebSocket_private
{
public:
sio::client m_socket;
NSCriticalSection::CRITICAL_SECTION m_oCS;
CIOWebSocket* m_base;
public:
CIOWebSocket_private(CIOWebSocket* base)
{
m_base = base;
m_oCS.InitializeCriticalSection();
}
~CIOWebSocket_private()
{
m_socket.close();
m_oCS.DeleteCriticalSection();
}
public:
void event_onConnected()
{
m_base->listener->onOpen();
}
void event_onClose(sio::client::close_reason const& reason)
{
m_base->listener->onClose(0, "");
}
void event_onFail()
{
m_base->listener->onError("");
}
public:
void open(const std::map<std::string, std::string>& query)
{
m_socket.set_open_listener (std::bind(&CIOWebSocket_private::event_onConnected, this));
m_socket.set_close_listener(std::bind(&CIOWebSocket_private::event_onClose, this, std::placeholders::_1));
m_socket.set_fail_listener (std::bind(&CIOWebSocket_private::event_onFail, this));
sio::message::ptr objAuth = sio::object_message::create();
//std::string sAuth;
std::map<std::string, std::string> queryDst = query;
std::map<std::string, std::string>::iterator iterAuth = queryDst.find("token");
if (iterAuth != queryDst.end())
{
objAuth->get_map()["token"] = sio::string_message::create(iterAuth->second);
//sAuth = "{\"token\":\"" + iterAuth->second + "\"}";
queryDst.erase(iterAuth);
}
//webSocket.connect(url, queryDst, sio::string_message::create(sAuth));
m_socket.connect(m_base->url, queryDst, objAuth);
m_socket.socket()->on("message", [&](sio::event& event){
CTemporaryCS oCS(&m_oCS);
const sio::message::ptr& message = event.get_message();
if (!message)
return;
// TODO: пока только текстовые и json команды
switch (message->get_flag())
{
case sio::message::flag_null:
{
m_base->listener->onMessage("null");
break;
}
case sio::message::flag_integer:
case sio::message::flag_double:
case sio::message::flag_boolean:
{
m_base->listener->onMessage("");
break;
}
case sio::message::flag_binary:
{
m_base->listener->onMessage("");
break;
}
case sio::message::flag_array:
{
m_base->listener->onMessage("");
break;
}
case sio::message::flag_object:
{
sio::packet_manager manager;
std::stringstream ss;
sio::packet packet("/", message);
manager.encode( packet, [&](bool isBinary, std::shared_ptr<const std::string> const& json)
{
ss << *json;
});
manager.reset();
std::string result = ss.str();
std::size_t indexList = result.find('[');
std::size_t indexObject = result.find('{');
std::size_t indexString = result.find('"');
std::size_t index = indexList;
if (indexObject != std::string::npos && indexObject < index)
index = indexObject;
if (indexString != std::string::npos && indexString < index)
index = indexString;
if (index != std::string::npos)
result = result.substr(index);
else
result = "";
m_base->listener->onMessage(result);
break;
}
case sio::message::flag_string:
{
m_base->listener->onMessage(message->get_string());
break;
}
default:
break;
}
});
}
};
CIOWebSocket::CIOWebSocket(const std::string& url, std::shared_ptr<IListener> listener): CWebWorkerBase(url, listener)
{
m_internal = new CIOWebSocket_private(this);
if (0 == url.find("http://"))
m_internal = new CIOWebSocket_private_no_tls(this);
else
m_internal = new CIOWebSocket_private_tls(this);
}
void CIOWebSocket::open(const std::map<std::string, std::string>& query)
@ -182,36 +52,12 @@ namespace NSNetwork
void CIOWebSocket::send(const std::string& message_str)
{
//CTemporaryCS (&m_internal->m_oCS);
// если json -то надо объект
if (0 == message_str.find("{") ||
0 == message_str.find("["))
{
sio::packet_manager manager;
sio::message::ptr message;
manager.set_decode_callback([&](sio::packet const& p)
{
message = p.get_message();
});
// Magic message type / ID
manager.put_payload("42" + message_str);
manager.reset();
m_internal->m_socket.socket()->emit("message", message);
}
else
{
m_internal->m_socket.socket()->emit("message", sio::string_message::create(message_str));
}
m_internal->send(message_str);
}
void CIOWebSocket::close()
{
//CTemporaryCS (&m_internal->m_oCS);
m_internal->m_socket.socket()->off_all();
m_internal->m_socket.close();
m_internal->close();
}
CIOWebSocket::~CIOWebSocket()

26
Common/Network/WebSocket/src/socketio/socketio_internal.h
View File

@ -34,12 +34,34 @@
#define _IO_WEB_SOCKET_H_
#include "../websocketbase.h"
#include "../../../../../DesktopEditor/graphics/TemporaryCS.h"
namespace NSNetwork
{
namespace NSWebSocket
{
class CIOWebSocket_private;
class CIOWebSocket;
class CIOWebSocket_private
{
protected:
CIOWebSocket* m_base;
NSCriticalSection::CRITICAL_SECTION m_oCS;
public:
CIOWebSocket_private(CIOWebSocket* base)
{
m_base = base;
m_oCS.InitializeCriticalSection();
}
virtual ~CIOWebSocket_private()
{
m_oCS.DeleteCriticalSection();
}
virtual void open(const std::map<std::string, std::string>& query) = 0;
virtual void send(const std::string& message) = 0;
virtual void close() = 0;
};
class CIOWebSocket: public CWebWorkerBase
{
private:
@ -55,6 +77,8 @@ namespace NSNetwork
virtual void close() override;
friend class CIOWebSocket_private;
friend class CIOWebSocket_private_tls;
friend class CIOWebSocket_private_no_tls;
};
}
}

203
Common/Network/WebSocket/src/socketio/socketio_internal_private.h Normal file
View File

@ -0,0 +1,203 @@
/*
* (c) Copyright Ascensio System SIA 2010-2021
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
* version 3 as published by the Free Software Foundation. In accordance with
* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
* that Ascensio System SIA expressly excludes the warranty of non-infringement
* of any third-party rights.
*
* This program is distributed WITHOUT ANY WARRANTY; without even the implied
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
*
* You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
* street, Riga, Latvia, EU, LV-1050.
*
* The interactive user interfaces in modified source and object code versions
* of the Program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU AGPL version 3.
*
* Pursuant to Section 7(b) of the License you must retain the original Product
* logo when distributing the program. Pursuant to Section 7(e) we decline to
* grant you any rights under trademark law for use of our trademarks.
*
* All the Product's GUI elements, including illustrations and icon sets, as
* well as technical writing content are licensed under the terms of the
* Creative Commons Attribution-ShareAlike 4.0 International. See the License
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
*
*/
#pragma once
#include "socketio_internal.h"
#include <iostream>
#include "../../../../3dParty/socketio/socket.io-client-cpp/src/internal/sio_packet.h"
#include "../../../../3dParty/socketio/socket.io-client-cpp/src/sio_client.h"
namespace NSNetwork
{
namespace NSWebSocket
{
class CIOWebSocket_private_tls : public CIOWebSocket_private
{
public:
sio::client m_socket;
public:
CIOWebSocket_private_tls(CIOWebSocket* base) : CIOWebSocket_private(base)
{
m_base = base;
}
~CIOWebSocket_private_tls()
{
m_socket.close();
}
public:
void event_onConnected()
{
m_base->listener->onOpen();
}
void event_onClose(sio::client::close_reason const& reason)
{
m_base->listener->onClose(0, "");
}
void event_onFail()
{
m_base->listener->onError("");
}
public:
virtual void open(const std::map<std::string, std::string>& query) override
{
m_socket.set_open_listener (std::bind(&CIOWebSocket_private_tls::event_onConnected, this));
m_socket.set_close_listener(std::bind(&CIOWebSocket_private_tls::event_onClose, this, std::placeholders::_1));
m_socket.set_fail_listener (std::bind(&CIOWebSocket_private_tls::event_onFail, this));
sio::message::ptr objAuth = sio::object_message::create();
//std::string sAuth;
std::map<std::string, std::string> queryDst = query;
std::map<std::string, std::string>::iterator iterAuth = queryDst.find("token");
if (iterAuth != queryDst.end())
{
objAuth->get_map()["token"] = sio::string_message::create(iterAuth->second);
//sAuth = "{\"token\":\"" + iterAuth->second + "\"}";
queryDst.erase(iterAuth);
}
//webSocket.connect(url, queryDst, sio::string_message::create(sAuth));
m_socket.connect(m_base->url, queryDst, objAuth);
m_socket.socket()->on("message", [&](sio::event& event){
CTemporaryCS oCS(&m_oCS);
const sio::message::ptr& message = event.get_message();
if (!message)
return;
// TODO: пока только текстовые и json команды
switch (message->get_flag())
{
case sio::message::flag_null:
{
m_base->listener->onMessage("null");
break;
}
case sio::message::flag_integer:
case sio::message::flag_double:
case sio::message::flag_boolean:
{
m_base->listener->onMessage("");
break;
}
case sio::message::flag_binary:
{
m_base->listener->onMessage("");
break;
}
case sio::message::flag_array:
{
m_base->listener->onMessage("");
break;
}
case sio::message::flag_object:
{
sio::packet_manager manager;
std::stringstream ss;
sio::packet packet("/", message);
manager.encode( packet, [&](bool isBinary, std::shared_ptr<const std::string> const& json)
{
ss << *json;
});
manager.reset();
std::string result = ss.str();
std::size_t indexList = result.find('[');
std::size_t indexObject = result.find('{');
std::size_t indexString = result.find('"');
std::size_t index = indexList;
if (indexObject != std::string::npos && indexObject < index)
index = indexObject;
if (indexString != std::string::npos && indexString < index)
index = indexString;
if (index != std::string::npos)
result = result.substr(index);
else
result = "";
m_base->listener->onMessage(result);
break;
}
case sio::message::flag_string:
{
m_base->listener->onMessage(message->get_string());
break;
}
default:
break;
}
});
}
virtual void send(const std::string& message_str) override
{
//CTemporaryCS (&m_internal->m_oCS);
// если json -то надо объект
if (0 == message_str.find("{") ||
0 == message_str.find("["))
{
sio::packet_manager manager;
sio::message::ptr message;
manager.set_decode_callback([&](sio::packet const& p)
{
message = p.get_message();
});
// Magic message type / ID
manager.put_payload("42" + message_str);
manager.reset();
m_socket.socket()->emit("message", message);
}
else
{
m_socket.socket()->emit("message", sio::string_message::create(message_str));
}
}
virtual void close() override
{
//CTemporaryCS (&m_internal->m_oCS);
m_socket.socket()->off_all();
m_socket.close();
}
};
}
}

207
Common/Network/WebSocket/src/socketio/socketio_internal_private_no_tls.h Normal file
View File

@ -0,0 +1,207 @@
/*
* (c) Copyright Ascensio System SIA 2010-2021
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
* version 3 as published by the Free Software Foundation. In accordance with
* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
* that Ascensio System SIA expressly excludes the warranty of non-infringement
* of any third-party rights.
*
* This program is distributed WITHOUT ANY WARRANTY; without even the implied
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
*
* You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
* street, Riga, Latvia, EU, LV-1050.
*
* The interactive user interfaces in modified source and object code versions
* of the Program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU AGPL version 3.
*
* Pursuant to Section 7(b) of the License you must retain the original Product
* logo when distributing the program. Pursuant to Section 7(e) we decline to
* grant you any rights under trademark law for use of our trademarks.
*
* All the Product's GUI elements, including illustrations and icon sets, as
* well as technical writing content are licensed under the terms of the
* Creative Commons Attribution-ShareAlike 4.0 International. See the License
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
*
*/
///////////////////////////////////////////////////////////
/// auto generated file. please use generator (make.py) ///
///////////////////////////////////////////////////////////
#pragma once
#include "socketio_internal.h"
#include <iostream>
#include "../../../../3dParty/socketio/socket.io-client-cpp/src_no_tls/internal/sio_packet.h"
#include "../../../../3dParty/socketio/socket.io-client-cpp/src_no_tls/sio_client.h"
namespace NSNetwork
{
namespace NSWebSocket
{
class CIOWebSocket_private_no_tls : public CIOWebSocket_private
{
public:
sio_no_tls::client m_socket;
public:
CIOWebSocket_private_no_tls(CIOWebSocket* base) : CIOWebSocket_private(base)
{
m_base = base;
}
~CIOWebSocket_private_no_tls()
{
m_socket.close();
}
public:
void event_onConnected()
{
m_base->listener->onOpen();
}
void event_onClose(sio_no_tls::client::close_reason const& reason)
{
m_base->listener->onClose(0, "");
}
void event_onFail()
{
m_base->listener->onError("");
}
public:
virtual void open(const std::map<std::string, std::string>& query) override
{
m_socket.set_open_listener (std::bind(&CIOWebSocket_private_no_tls::event_onConnected, this));
m_socket.set_close_listener(std::bind(&CIOWebSocket_private_no_tls::event_onClose, this, std::placeholders::_1));
m_socket.set_fail_listener (std::bind(&CIOWebSocket_private_no_tls::event_onFail, this));
sio_no_tls::message::ptr objAuth = sio_no_tls::object_message::create();
//std::string sAuth;
std::map<std::string, std::string> queryDst = query;
std::map<std::string, std::string>::iterator iterAuth = queryDst.find("token");
if (iterAuth != queryDst.end())
{
objAuth->get_map()["token"] = sio_no_tls::string_message::create(iterAuth->second);
//sAuth = "{\"token\":\"" + iterAuth->second + "\"}";
queryDst.erase(iterAuth);
}
//webSocket.connect(url, queryDst, sio_no_tls::string_message::create(sAuth));
m_socket.connect(m_base->url, queryDst, objAuth);
m_socket.socket()->on("message", [&](sio_no_tls::event& event){
CTemporaryCS oCS(&m_oCS);
const sio_no_tls::message::ptr& message = event.get_message();
if (!message)
return;
// TODO: пока только текстовые и json команды
switch (message->get_flag())
{
case sio_no_tls::message::flag_null:
{
m_base->listener->onMessage("null");
break;
}
case sio_no_tls::message::flag_integer:
case sio_no_tls::message::flag_double:
case sio_no_tls::message::flag_boolean:
{
m_base->listener->onMessage("");
break;
}
case sio_no_tls::message::flag_binary:
{
m_base->listener->onMessage("");
break;
}
case sio_no_tls::message::flag_array:
{
m_base->listener->onMessage("");
break;
}
case sio_no_tls::message::flag_object:
{
sio_no_tls::packet_manager manager;
std::stringstream ss;
sio_no_tls::packet packet("/", message);
manager.encode( packet, [&](bool isBinary, std::shared_ptr<const std::string> const& json)
{
ss << *json;
});
manager.reset();
std::string result = ss.str();
std::size_t indexList = result.find('[');
std::size_t indexObject = result.find('{');
std::size_t indexString = result.find('"');
std::size_t index = indexList;
if (indexObject != std::string::npos && indexObject < index)
index = indexObject;
if (indexString != std::string::npos && indexString < index)
index = indexString;
if (index != std::string::npos)
result = result.substr(index);
else
result = "";
m_base->listener->onMessage(result);
break;
}
case sio_no_tls::message::flag_string:
{
m_base->listener->onMessage(message->get_string());
break;
}
default:
break;
}
});
}
virtual void send(const std::string& message_str) override
{
//CTemporaryCS (&m_internal->m_oCS);
// если json -то надо объект
if (0 == message_str.find("{") ||
0 == message_str.find("["))
{
sio_no_tls::packet_manager manager;
sio_no_tls::message::ptr message;
manager.set_decode_callback([&](sio_no_tls::packet const& p)
{
message = p.get_message();
});
// Magic message type / ID
manager.put_payload("42" + message_str);
manager.reset();
m_socket.socket()->emit("message", message);
}
else
{
m_socket.socket()->emit("message", sio_no_tls::string_message::create(message_str));
}
}
virtual void close() override
{
//CTemporaryCS (&m_internal->m_oCS);
m_socket.socket()->off_all();
m_socket.close();
}
};
}
}

22
Common/Network/WebSocket/websocket.pri
View File

@ -35,6 +35,19 @@ libsocketio {
$$SOCKET_IO_LIB/src/sio_socket.cpp \
$$SOCKET_IO_LIB/src/sio_client.cpp
HEADERS += \
$$SOCKET_IO_LIB/src_no_tls/internal/sio_client_impl.h \
$$SOCKET_IO_LIB/src_no_tls/internal/sio_packet.h \
$$SOCKET_IO_LIB/src_no_tls/sio_message.h \
$$SOCKET_IO_LIB/src_no_tls/sio_socket.h \
$$SOCKET_IO_LIB/src_no_tls/sio_client.h
SOURCES += \
$$SOCKET_IO_LIB/src_no_tls/internal/sio_client_impl.cpp \
$$SOCKET_IO_LIB/src_no_tls/internal/sio_packet.cpp \
$$SOCKET_IO_LIB/src_no_tls/sio_socket.cpp \
$$SOCKET_IO_LIB/src_no_tls/sio_client.cpp
DEFINES += \
BOOST_DATE_TIME_NO_LIB \
BOOST_REGEX_NO_LIB \
@ -45,13 +58,18 @@ libsocketio {
_WEBSOCKETPP_CPP11_TYPE_TRAITS_ \
_WEBSOCKETPP_CPP11_CHRONO_ \
\
"SIO_TLS=1"
"SIO_TLS=1" \
"SIO_TLS_NO=0"
include($$PWD/../../3dParty/boost/boost.pri)
DEFINES += USE_IOWEBSOCKET
HEADERS += $$PWD/src/socketio/socketio_internal.h
HEADERS += \
$$PWD/src/socketio/socketio_internal.h \
$$PWD/src/socketio/socketio_internal_private.h \
$$PWD/src/socketio/socketio_internal_private_no_tls.h
SOURCES += $$PWD/src/socketio/socketio_internal.cpp
}