From ad2c3f08e667bd21a9a7c5a3498e9db3a806e87e Mon Sep 17 00:00:00 2001 From: Kasen IO Date: Fri, 10 Jul 2020 18:50:58 -0400 Subject: [PATCH] Update further links. --- libraries/networking/src/NetworkingConstants.h | 5 +++++ libraries/ui/src/ui/types/FileTypeProfile.cpp | 4 ++-- libraries/ui/src/ui/types/RequestFilters.cpp | 10 +++++----- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/libraries/networking/src/NetworkingConstants.h b/libraries/networking/src/NetworkingConstants.h index 5805b9c30a..edc1c1a1ef 100644 --- a/libraries/networking/src/NetworkingConstants.h +++ b/libraries/networking/src/NetworkingConstants.h @@ -30,9 +30,14 @@ namespace NetworkingConstants { // Web Engine requests to this parent domain have an account authorization header added const QString AUTH_HOSTNAME_BASE = "highfidelity.com"; + const QStringList IS_AUTHABLE_HOSTNAME = { "highfidelity.com", "highfidelity.io" }; // Use a custom User-Agent to avoid ModSecurity filtering, e.g. by hosting providers. const QByteArray VIRCADIA_USER_AGENT = "Mozilla/5.0 (VircadiaInterface)"; + + const QString WEB_ENGINE_USER_AGENT = "Chrome/48.0 (VircadiaInterface)"; + const QString METAVERSE_USER_AGENT = "Chrome/48.0 (VircadiaInterface)"; + const QString MOBILE_USER_AGENT = "Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Mobile Safari/537.36"; const QUrl BUILDS_XML_URL("https://highfidelity.com/builds.xml"); const QUrl MASTER_BUILDS_XML_URL("https://highfidelity.com/dev-builds.xml"); diff --git a/libraries/ui/src/ui/types/FileTypeProfile.cpp b/libraries/ui/src/ui/types/FileTypeProfile.cpp index 3b9ed74200..9fca1be436 100644 --- a/libraries/ui/src/ui/types/FileTypeProfile.cpp +++ b/libraries/ui/src/ui/types/FileTypeProfile.cpp @@ -16,6 +16,7 @@ #include #include "RequestFilters.h" +#include "NetworkingConstants.h" #if !defined(Q_OS_ANDROID) static const QString QML_WEB_ENGINE_STORAGE_NAME = "qmlWebEngine"; @@ -26,8 +27,7 @@ static std::mutex FileTypeProfile_mutex; FileTypeProfile::FileTypeProfile(QQmlContext* parent) : ContextAwareProfile(parent) { - static const QString WEB_ENGINE_USER_AGENT = "Chrome/48.0 (HighFidelityInterface)"; - setHttpUserAgent(WEB_ENGINE_USER_AGENT); + setHttpUserAgent(NetworkingConstants::WEB_ENGINE_USER_AGENT); setStorageName(QML_WEB_ENGINE_STORAGE_NAME); setOffTheRecord(false); diff --git a/libraries/ui/src/ui/types/RequestFilters.cpp b/libraries/ui/src/ui/types/RequestFilters.cpp index 9287559289..66ddd7e6c7 100644 --- a/libraries/ui/src/ui/types/RequestFilters.cpp +++ b/libraries/ui/src/ui/types/RequestFilters.cpp @@ -27,10 +27,10 @@ namespace { bool isAuthableHighFidelityURL(const QUrl& url) { auto metaverseServerURL = MetaverseAPI::getCurrentMetaverseServerURL(); - static const QStringList HF_HOSTS = { - "highfidelity.com", "highfidelity.io", - metaverseServerURL.toString(), + static QStringList HF_HOSTS = { + metaverseServerURL.toString() }; + HF_HOSTS << NetworkingConstants::IS_AUTHABLE_HOSTNAME; const auto& scheme = url.scheme(); const auto& host = url.host(); @@ -83,8 +83,8 @@ void RequestFilters::interceptHFWebEngineRequest(QWebEngineUrlRequestInfo& info, } } static const QString USER_AGENT = "User-Agent"; - const QString tokenStringMobile{ "Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Mobile Safari/537.36" }; - const QString tokenStringMetaverse{ "Chrome/48.0 (HighFidelityInterface)" }; + const QString tokenStringMobile{ NetworkingConstants::MOBILE_USER_AGENT }; + const QString tokenStringMetaverse{ NetworkingConstants::METAVERSE_USER_AGENT }; const QString tokenStringLimitedCommerce{ "Chrome/48.0 (HighFidelityInterface limitedCommerce)" }; const QString tokenString = !isAuthable ? tokenStringMobile : (accountManager->getLimitedCommerce() ? tokenStringLimitedCommerce : tokenStringMetaverse);