From 020410f964f3be0b85fe62078281a43f75fa9585 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Thu, 24 Sep 2026 13:53:34 -0700 Subject: Issue websocket hardening. --- indra/newview/tests/llscripteditorws_test.cpp | 130 ++++++++++++++++++++++++++ 1 file changed, 130 insertions(+) create mode 100644 indra/newview/tests/llscripteditorws_test.cpp (limited to 'indra/newview/tests/llscripteditorws_test.cpp') diff --git a/indra/newview/tests/llscripteditorws_test.cpp b/indra/newview/tests/llscripteditorws_test.cpp new file mode 100644 index 0000000000..79de2dd9a6 --- /dev/null +++ b/indra/newview/tests/llscripteditorws_test.cpp @@ -0,0 +1,130 @@ +/** + * @file llscripteditorws_test.cpp + * @brief Headless test fixture for LLScriptEditorWSServer with fake connection + * + * $LicenseInfo:firstyear=2026&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2026, Linden Research, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * $/LicenseInfo$ + */ + +#include "../llviewerprecompiledheaders.h" +#include "../llscripteditorws.h" +#include "../test/lltut.h" + +namespace +{ +class FakeScriptEditorWSConnection : public LLScriptEditorWSConnection +{ +public: + explicit FakeScriptEditorWSConnection(const LLWebsocketMgr::WSServer::ptr_t& server) + : LLScriptEditorWSConnection(server, LLWebsocketMgr::connection_h()) + { + } + + using LLJSONRPCConnection::processMessage; +}; + +class HeadlessScriptEditorWSServer : public LLScriptEditorWSServer +{ +public: + HeadlessScriptEditorWSServer() + : LLScriptEditorWSServer("script_editor_ws_test_server", 0, true) + { + } + + using LLScriptEditorWSServer::setupConnectionMethods; +}; +} + +namespace tut +{ + struct script_editor_ws_test_data + { + std::shared_ptr mServer; + std::shared_ptr mConnection; + + script_editor_ws_test_data() + { + mServer = std::make_shared(); + mConnection = std::make_shared(mServer); + mServer->setupConnectionMethods(mConnection); + } + }; + + typedef test_group script_editor_ws_test_group; + typedef script_editor_ws_test_group::object script_editor_ws_test_object; + script_editor_ws_test_group script_editor_ws_tests("LLScriptEditorWSServer"); + + template<> template<> + void script_editor_ws_test_object::test<1>() + { + set_test_name("headless fixture constructs server and fake connection"); + ensure("server should be created", mServer != nullptr); + ensure("fake connection should be created", mConnection != nullptr); + } + + template<> template<> + void script_editor_ws_test_object::test<2>() + { + set_test_name("fake connection can drive JSON-RPC notification dispatch"); + + bool called = false; + mConnection->registerMethod( + "fixture.echo", + [&](const std::string& method, const LLSD& id, const LLSD& params) -> LLSD + { + called = true; + ensure_equals("method should match", method, "fixture.echo"); + ensure("notification id should be undefined", id.isUndefined()); + ensure_equals("payload should be forwarded", params["value"].asString(), "ok"); + return LLSD(); + }); + + LLSD params; + params["value"] = "ok"; + LLSD notification = LLJSONRPCConnection::makeEnvelope( + LLSD(), + "fixture.echo", + params, + LLSD(), + LLSD()); + + mConnection->processMessage(notification); + ensure("fixture handler should be invoked", called); + } + + template<> template<> + void script_editor_ws_test_object::test<3>() + { + set_test_name("fixture includes default session.ping handler"); + + LLSD params; + params["timestamp"] = 123; + LLSD notification = LLJSONRPCConnection::makeEnvelope( + LLSD(), + "session.ping", + params, + LLSD(), + LLSD()); + + mConnection->processMessage(notification); + ensure("session.ping dispatch should complete in headless mode", true); + } +} -- cgit v1.3 From e1bd4cb857ccbdccac45477fe661eab8ddde3490 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Thu, 1 Oct 2026 13:52:31 -0700 Subject: Change session.ping to system.ping in test Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- indra/newview/tests/llscripteditorws_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/tests/llscripteditorws_test.cpp') diff --git a/indra/newview/tests/llscripteditorws_test.cpp b/indra/newview/tests/llscripteditorws_test.cpp index 79de2dd9a6..4cf1bde034 100644 --- a/indra/newview/tests/llscripteditorws_test.cpp +++ b/indra/newview/tests/llscripteditorws_test.cpp @@ -119,7 +119,7 @@ namespace tut params["timestamp"] = 123; LLSD notification = LLJSONRPCConnection::makeEnvelope( LLSD(), - "session.ping", + "system.ping", params, LLSD(), LLSD()); -- cgit v1.3