From afcbb6751b91f3f37ed8771cf1866da0e40f904f Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Wed, 14 Mar 2018 15:53:35 -0700
Subject: [PATCH] disable loading of serverless-domains over http(s), for now

---
 interface/src/Application.cpp               |  9 ++++++---
 libraries/networking/src/AddressManager.cpp | 12 ++++++++----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 660bffcebd..89d6ab51fd 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -516,9 +516,12 @@ bool isDomainURL(QUrl url) {
     if (url.scheme() == URL_SCHEME_HIFI) {
         return true;
     }
-    if (url.scheme() != URL_SCHEME_FILE &&
-        url.scheme() != URL_SCHEME_HTTP &&
-        url.scheme() != URL_SCHEME_HTTPS) {
+    if (url.scheme() != URL_SCHEME_FILE
+        // TODO -- once Octree::readFromURL no-longer takes over the main event-loop, serverless-domain urls can
+        // be loaded over http(s)
+        // && url.scheme() != URL_SCHEME_HTTP &&
+        // url.scheme() != URL_SCHEME_HTTPS
+        ) {
         return false;
     }
     if (url.path().endsWith(".json", Qt::CaseInsensitive) ||
diff --git a/libraries/networking/src/AddressManager.cpp b/libraries/networking/src/AddressManager.cpp
index 3107f1cafe..57a047f7ca 100644
--- a/libraries/networking/src/AddressManager.cpp
+++ b/libraries/networking/src/AddressManager.cpp
@@ -133,8 +133,10 @@ void AddressManager::storeCurrentAddress() {
     auto url = currentAddress();
 
     if (url.scheme() == URL_SCHEME_FILE ||
-        url.scheme() == URL_SCHEME_HTTP ||
-        url.scheme() == URL_SCHEME_HTTPS ||
+        // TODO -- once Octree::readFromURL no-longer takes over the main event-loop, serverless-domain urls can
+        // be loaded over http(s)
+        // url.scheme() == URL_SCHEME_HTTP ||
+        // url.scheme() == URL_SCHEME_HTTPS ||
         !url.host().isEmpty()) {
         currentAddressHandle.set(url);
     } else {
@@ -286,8 +288,10 @@ bool AddressManager::handleUrl(const QUrl& lookupUrl, LookupTrigger trigger) {
         emit lookupResultsFinished();
 
         return true;
-    } else if (lookupUrl.scheme() == URL_SCHEME_HTTP ||
-               lookupUrl.scheme() == URL_SCHEME_HTTPS ||
+    } else if (// TODO -- once Octree::readFromURL no-longer takes over the main event-loop, serverless-domain urls can
+               // be loaded over http(s)
+               // lookupUrl.scheme() == URL_SCHEME_HTTP ||
+               // lookupUrl.scheme() == URL_SCHEME_HTTPS ||
                lookupUrl.scheme() == URL_SCHEME_FILE) {
         _previousLookup.clear();
         QUrl domainUrl = PathUtils::expandToLocalDataAbsolutePath(lookupUrl);