From ce6c915647e60974c41a67ccc56d5b06c081848b Mon Sep 17 00:00:00 2001 From: Frank Rotermund Date: Tue, 22 Aug 2023 08:10:13 +0200 Subject: [PATCH] MESSENGER-4549 strict check for mapstyle url --- .../HomeserverConfigurationBuilder.swift | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Riot/Model/HomeserverConfiguration/HomeserverConfigurationBuilder.swift b/Riot/Model/HomeserverConfiguration/HomeserverConfigurationBuilder.swift index 8ef9107f3..f1f409f65 100644 --- a/Riot/Model/HomeserverConfiguration/HomeserverConfigurationBuilder.swift +++ b/Riot/Model/HomeserverConfiguration/HomeserverConfigurationBuilder.swift @@ -73,15 +73,16 @@ final class HomeserverConfigurationBuilder: NSObject { // Tile server configuration - let tileServerMapStyleURL: URL + + + var tileServerMapStyleURL: URL = URL(string: BWIBuildSettings.shared.serverConfigDefaultMapstyleURLString)! if let mapStyleURLString = wellKnown?.tileServer?.mapStyleURLString, let mapStyleURL = URL(string: mapStyleURLString) { - tileServerMapStyleURL = mapStyleURL - } else { - tileServerMapStyleURL = URL(string: BWIBuildSettings.shared.serverConfigDefaultMapstyleURLString)! + if verifyUrl(url: mapStyleURL) { + tileServerMapStyleURL = mapStyleURL + } } - let tileServerConfiguration = HomeserverTileServerConfiguration(mapStyleURL: tileServerMapStyleURL) // Create HomeserverConfiguration @@ -145,4 +146,8 @@ final class HomeserverConfigurationBuilder: NSObject { return jitsiServerURL } + + private func verifyUrl (url: URL) -> Bool { + return UIApplication.shared.canOpenURL(url) + } }