Update local file scheme handler

Author: Warchamp7

CMakeLists.txt

@@ -31,6 +31,7 @@ target_sources(
           cef-headers.hpp
           deps/base64/base64.cpp
           deps/base64/base64.hpp
+          deps/ip-string.hpp
           deps/signal-restore.cpp
           deps/signal-restore.hpp
           deps/wide-string.cpp
@@ -46,10 +47,14 @@ target_link_libraries(obs-browser PRIVATE OBS::libobs OBS::frontend-api OBS::web
 
 if(OS_WINDOWS)
   include(cmake/os-windows.cmake)
+  target_link_libraries(obs-browser PRIVATE Ws2_32)
+  target_sources(obs-browser PRIVATE deps/ip-string-windows.cpp)
 elseif(OS_MACOS)
   include(cmake/os-macos.cmake)
+  target_sources(obs-browser PRIVATE deps/ip-string-posix.cpp)
 elseif(OS_LINUX)
   include(cmake/os-linux.cmake)
+  target_sources(obs-browser PRIVATE deps/ip-string-posix.cpp)
 endif()
 
 if(ENABLE_BROWSER_PANELS)

browser-scheme.cpp

@@ -17,6 +17,7 @@
  ******************************************************************************/
 
 #include "browser-scheme.hpp"
+#include "ip-string.hpp"
 #include "wide-string.hpp"
 #include <include/wrapper/cef_stream_resource_handler.h>
 
@@ -31,8 +32,15 @@ CefRefPtr<CefResourceHandler> BrowserSchemeHandlerFactory::Create(CefRefPtr<CefB
 
 	std::string path = CefString(&parts.path);
 
-	path = CefURIDecode(path, true, cef_uri_unescape_rule_t::UU_SPACES);
-	path = CefURIDecode(path, true, cef_uri_unescape_rule_t::UU_URL_SPECIAL_CHARS_EXCEPT_PATH_SEPARATORS);
+	// An IP address should never be a valid path for CreateForFile normally, but in some cases an OS
+	// can resolve one as such. As an extra safeguard, we prevent any IP addresses in the path.
+	if (checkForIpv4String(path)) {
+		return nullptr;
+	}
+
+	if (checkForIpv6String(path)) {
+		return nullptr;
+	}
 
 	std::string fileExtension = path.substr(path.find_last_of(".") + 1);
 
@@ -41,11 +49,8 @@ CefRefPtr<CefResourceHandler> BrowserSchemeHandlerFactory::Create(CefRefPtr<CefB
 	if (fileExtension.compare("woff2") == 0)
 		fileExtension = "woff";
 
-#ifdef _WIN32
-	CefRefPtr<CefStreamReader> stream = CefStreamReader::CreateForFile(path.substr(1));
-#else
-	CefRefPtr<CefStreamReader> stream = CefStreamReader::CreateForFile(path);
-#endif
+	std::string filePath = path.substr(path.find_first_of("//file") + 7);
+	CefRefPtr<CefStreamReader> stream = CefStreamReader::CreateForFile(filePath);
 
 	if (stream) {
 		CefString mimeType = CefGetMimeType(fileExtension);

deps/ip-string-posix.cpp

@@ -0,0 +1,37 @@
+/******************************************************************************
+ Copyright (C) 2026 by Warchamp7 <[email protected]>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+
+ This program 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 General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+
+#pragma once
+
+#include "ip-string.hpp"
+
+#include <stdio.h>
+#include <arpa/inet.h>
+
+bool checkForIpv4String(std::string path)
+{
+	sockaddr_in sa4;
+
+	return inet_pton(AF_INET, path.c_str(), &sa4.sin_addr) == 1;
+}
+
+bool checkForIpv6String(std::string path)
+{
+	sockaddr_in6 sa6;
+
+	return inet_pton(AF_INET6, path.c_str(), &sa6.sin6_addr) == 1;
+}

deps/ip-string-windows.cpp

@@ -0,0 +1,39 @@
+/******************************************************************************
+ Copyright (C) 2026 by Warchamp7 <[email protected]>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+
+ This program 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 General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+
+#pragma once
+
+#include "ip-string.hpp"
+
+#include <stdio.h>
+#define WIN32_LEAN_AND_MEAN
+#include <winsock2.h>
+#include <ws2tcpip.h>
+
+bool checkForIpv4String(std::string path)
+{
+	sockaddr_in sa4;
+
+	return inet_pton(AF_INET, path.c_str(), &sa4.sin_addr) == 1;
+}
+
+bool checkForIpv6String(std::string path)
+{
+	sockaddr_in6 sa6;
+
+	return inet_pton(AF_INET6, path.c_str(), &sa6.sin6_addr) == 1;
+}

deps/ip-string.hpp

@@ -0,0 +1,23 @@
+/******************************************************************************
+ Copyright (C) 2026 by Warchamp7 <[email protected]>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+
+ This program 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 General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+
+#pragma once
+
+#include <string>
+
+extern bool checkForIpv4String(std::string path);
+extern bool checkForIpv6String(std::string path);

obs-browser-plugin.cpp

@@ -388,9 +388,8 @@ static void BrowserInit(void)
 		return;
 	}
 
-	/* Register http://absolute/ scheme handler for older
-	 * CEF builds which do not support file:// URLs */
-	CefRegisterSchemeHandlerFactory("http", "absolute", new BrowserSchemeHandlerFactory());
+	// Register custom scheme handler for local browser sources
+	CefRegisterSchemeHandlerFactory("obsbrowser", "file", new BrowserSchemeHandlerFactory());
 
 	os_event_signal(cef_started_event);
 }

obs-browser-source.cpp

@@ -498,8 +498,8 @@ void BrowserSource::Update(obs_data_t *settings)
 			while (n_url.find("%2F") != std::string::npos)
 				n_url.replace(n_url.find("%2F"), 3, "/");
 
-			/* http://absolute/ based mapping for older CEF */
-			n_url = "http://absolute/" + n_url;
+			// Local files are routed through our custom scheme handler to give them acess to other local files
+			n_url = "obsbrowser://file/" + n_url;
 		}
 
 		if (n_is_local == is_local && n_fps_custom == fps_custom && n_fps == fps &&