Disables Wayback Machine infobar on Wayback Machine URLs

Fixes brave/brave-browser#13306
brave · Dec 30, 2020 · bbefe76 · bbefe76
1 parent 4b62389
commit bbefe76
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 0 deletions.
diff --git a/components/brave_wayback_machine/brave_wayback_machine_utils.cc b/components/brave_wayback_machine/brave_wayback_machine_utils.cc
@@ -8,6 +8,7 @@
 #include <string>
 
 #include "base/strings/string_util.h"
+#include "brave/components/brave_wayback_machine/url_constants.h"
 #include "net/base/url_util.h"
 #include "url/gurl.h"
 
@@ -21,5 +22,9 @@ bool IsWaybackMachineDisabledFor(const GURL& url) {
   if (base::EndsWith(url.host(), ".onion", base::CompareCase::SENSITIVE))
     return true;
 
+  // Disable on web.archive.org
+  if (url.host() == kWaybackHost)
+    return true;
+
   return false;
 }
diff --git a/components/brave_wayback_machine/brave_wayback_machine_utils_unittest.cc b/components/brave_wayback_machine/brave_wayback_machine_utils_unittest.cc
@@ -8,6 +8,8 @@
 #include "url/gurl.h"
 
 TEST(BraveWaybackMachineUtilsTest, LocalHostDisabledTest) {
+  EXPECT_TRUE(
+      IsWaybackMachineDisabledFor(GURL("https://web.archive.org/foobar.html")));
   EXPECT_TRUE(IsWaybackMachineDisabledFor(GURL("http://localhost/index.html")));
   EXPECT_TRUE(IsWaybackMachineDisabledFor(GURL("http://abcd.local")));
   EXPECT_TRUE(IsWaybackMachineDisabledFor(GURL("http://abcd.onion")));
@@ -18,4 +20,6 @@ TEST(BraveWaybackMachineUtilsTest, LocalHostDisabledTest) {
   EXPECT_FALSE(IsWaybackMachineDisabledFor(GURL("http://www.local-news.com")));
   EXPECT_FALSE(IsWaybackMachineDisabledFor(GURL("http://www.onion-news.com")));
   EXPECT_FALSE(IsWaybackMachineDisabledFor(GURL("http://www.brave.com")));
+  EXPECT_FALSE(
+      IsWaybackMachineDisabledFor(GURL("https://archive.org/foobar.html")));
 }
diff --git a/components/brave_wayback_machine/url_constants.cc b/components/brave_wayback_machine/url_constants.cc
@@ -7,3 +7,4 @@
 
 const char kWaybackQueryURL[] =
     "https://brave-api.archive.org/wayback/available?url=";
+const char kWaybackHost[] = "web.archive.org";
diff --git a/components/brave_wayback_machine/url_constants.h b/components/brave_wayback_machine/url_constants.h
@@ -7,5 +7,6 @@
 #define BRAVE_COMPONENTS_BRAVE_WAYBACK_MACHINE_URL_CONSTANTS_H_
 
 extern const char kWaybackQueryURL[];
+extern const char kWaybackHost[];
 
 #endif  // BRAVE_COMPONENTS_BRAVE_WAYBACK_MACHINE_URL_CONSTANTS_H_
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,3 +7,4 @@

		const char kWaybackQueryURL[] =
		"https://brave-api.archive.org/wayback/available?url=";
		const char kWaybackHost[] = "web.archive.org";