Closes #81

Doing Redirect inside URLLoader requires some plumbing.
little-bear-labs · Dec 13, 2023 · 4aa8c4a · 4aa8c4a
1 parent 776b98b
commit 4aa8c4a
Show file tree

Hide file tree

Showing 80 changed files with 1,941 additions and 943 deletions.
diff --git a/.github/workflows/tour.yml b/.github/workflows/tour.yml
@@ -1,6 +1,5 @@
 name: Tour de IPFS
-on:
-  pull_request:
+on: push
 jobs:
   tour:
     name: Build clitester and exercize various ipfs_client features
@@ -42,28 +41,43 @@ jobs:
         shell: bash
         run: |
           set -ex
-          ( timeout 120 python3 ./ipfs_chromium/test_data/test_server.py 8080 2>&1 | tee server.log & ) &
-          for t in {0..9}
+          ( timeout 3600 python3 ./ipfs_chromium/test_data/test_server.py 8080 2>&1 | tee server.log & ) &
+          for t in 1{0..9}
           do
             if grep -n . server.log
             then
               break
+            elif curl -m $t 'http://localhost:8080/ping'
+            then
+              sleep 1
             else
-              sleep $t
+              sleep ${t}
             fi
           done
           function url_case() {
-            ./tester_build/clitester trace "${1}://${2}"
-            if cat "_${1}_"* | md5sum | cut -d ' ' -f 1 > actual
+            echo "url_case(" "${@}" ")"
+            timeout 300 ./tester_build/clitester note "${1}://${2}"
+            n=`sed 's,[^A-Za-z0-9\.],_,g' <<< ${2}`
+            if cat "_${1}_${n}" | md5sum | cut -d ' ' -f 1 > actual
             then
-              echo "${3}" > expected
-              diff actual expected
-              rm -v "_${1}_"*
+              ls -lrth _ip?s_*
+              if [ $# -ge 3 ]
+              then
+                echo "${3}" > expected
+                diff actual expected
+              fi
             else
-              grep -n . server.log
+              grep -n . server.log || sleep 1
+              ls -lrth _ip?s_*
               exit 9
             fi
           }
           url_case ipfs bafkqacdjmrsw45djor4q ff483d1ff591898a9942916050d2ca3f
           true the block itself md5s to b92348005af4ae4795e6f312844fb359, but the response is an HTML preview page
           url_case ipfs baguqeerah2nswg7r2pvlpbnsz5y4c4pr4wsgbzixdl632w5qxvedqzryf54q 7750fd7b0928f007e1d181763c0dbdb5
+          url_case ipns blog.ipfs.tech/2023-05-multigateway-chromium-client/ 
+          url_case ipns k51qzi5uqu5dijv526o4z2z10ejylnel0bfvrtw53itcmsecffo8yf0zb4g9gi/ipfs-blog/2023-05-multigateway-chromium-client/ 
+          echo diff _ipns_*multigateway*
+          diff _ipns_*multigateway*
+          killall python3
+          
diff --git a/chromium_edits/121.0.6167.8/chrome/browser/BUILD.gn.patch b/chromium_edits/121.0.6167.8/chrome/browser/BUILD.gn.patch
@@ -0,0 +1,23 @@
+diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
+index 6572022524828..d5956c31511df 100644
+--- a/chrome/browser/BUILD.gn
++++ b/chrome/browser/BUILD.gn
+@@ -40,6 +40,7 @@ import("//rlz/buildflags/buildflags.gni")
+ import("//sandbox/features.gni")
+ import("//testing/libfuzzer/fuzzer_test.gni")
+ import("//third_party/blink/public/public_features.gni")
++import("//third_party/ipfs_client/args.gni")
+ import("//third_party/protobuf/proto_library.gni")
+ import("//third_party/webrtc/webrtc.gni")
+ import("//third_party/widevine/cdm/widevine.gni")
+@@ -2632,6 +2633,10 @@ static_library("browser") {
+       ]
+     }
+
++    if (enable_ipfs) {
++      deps += [ "//components/ipfs" ]
++    }
++
+     if (is_chromeos_ash) {
+       deps += [ "//chrome/browser/screen_ai:screen_ai_dlc_installer" ]
+     }
diff --git a/chromium_edits/121.0.6167.8/chrome/browser/about_flags.cc.patch b/chromium_edits/121.0.6167.8/chrome/browser/about_flags.cc.patch
@@ -0,0 +1,38 @@
+diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
+index b3954a5fec88e..162b64711b3ca 100644
+--- a/chrome/browser/about_flags.cc
++++ b/chrome/browser/about_flags.cc
+@@ -212,6 +212,7 @@
+ #include "third_party/blink/public/common/features_generated.h"
+ #include "third_party/blink/public/common/forcedark/forcedark_switches.h"
+ #include "third_party/blink/public/common/switches.h"
++#include "third_party/ipfs_client/ipfs_buildflags.h"
+ #include "ui/accessibility/accessibility_features.h"
+ #include "ui/accessibility/accessibility_switches.h"
+ #include "ui/base/ui_base_features.h"
+@@ -312,6 +313,10 @@
+ #include "extensions/common/switches.h"
+ #endif  // BUILDFLAG(ENABLE_EXTENSIONS)
+
++#if BUILDFLAG(ENABLE_IPFS)
++#include "components/ipfs/ipfs_features.h"
++#endif
++
+ #if BUILDFLAG(ENABLE_PDF)
+ #include "pdf/pdf_features.h"
+ #endif
+@@ -9846,6 +9851,14 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kOmitCorsClientCertDescription, kOsAll,
+      FEATURE_VALUE_TYPE(network::features::kOmitCorsClientCert)},
+
++#if BUILDFLAG(ENABLE_IPFS)
++    {"enable-ipfs",
++     flag_descriptions::kEnableIpfsName,
++     flag_descriptions::kEnableIpfsDescription,
++     kOsMac | kOsWin | kOsLinux,//TODO: These are the only variants currently getting built, but that is not likely to remain the case
++     FEATURE_VALUE_TYPE(ipfs::kEnableIpfs)},
++#endif
++
+     {"use-idna2008-non-transitional",
+      flag_descriptions::kUseIDNA2008NonTransitionalName,
+      flag_descriptions::kUseIDNA2008NonTransitionalDescription, kOsAll,
diff --git a/...s/121.0.6167.8/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.patch b/...s/121.0.6167.8/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.patch
@@ -0,0 +1,50 @@
+diff --git a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
+index 4c88614c68c25..f8bb12a3b0c2e 100644
+--- a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
++++ b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
+@@ -10,6 +10,8 @@
+ #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
+ #include "chrome/browser/external_protocol/external_protocol_handler.h"
+ #include "chrome/browser/profiles/profile.h"
++#include "third_party/ipfs_client/ipfs_buildflags.h"
++
+ #if BUILDFLAG(IS_ANDROID)
+ #include "chrome/browser/profiles/profile_android.h"
+ #endif
+@@ -18,6 +20,9 @@
+ #include "chrome/browser/ui/android/omnibox/jni_headers/ChromeAutocompleteSchemeClassifier_jni.h"
+ #endif
+ #include "components/custom_handlers/protocol_handler_registry.h"
++#if BUILDFLAG(ENABLE_IPFS)
++#include "components/ipfs/ipfs_features.h"
++#endif
+ #include "content/public/common/url_constants.h"
+ #include "url/url_util.h"
+
+@@ -55,12 +60,20 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForScheme(
+   if (scheme.empty()) {
+     return metrics::OmniboxInputType::EMPTY;
+   }
+-  if (base::IsStringASCII(scheme) &&
+-      (ProfileIOData::IsHandledProtocol(scheme) ||
+-       base::EqualsCaseInsensitiveASCII(scheme, content::kViewSourceScheme) ||
+-       base::EqualsCaseInsensitiveASCII(scheme, url::kJavaScriptScheme) ||
+-       base::EqualsCaseInsensitiveASCII(scheme, url::kDataScheme))) {
+-    return metrics::OmniboxInputType::URL;
++  if (base::IsStringASCII(scheme)) {
++      if (ProfileIOData::IsHandledProtocol(scheme) ||
++          base::EqualsCaseInsensitiveASCII(scheme, content::kViewSourceScheme) ||
++          base::EqualsCaseInsensitiveASCII(scheme, url::kJavaScriptScheme) ||
++          base::EqualsCaseInsensitiveASCII(scheme, url::kDataScheme)) {
++        return metrics::OmniboxInputType::URL;
++      }
++#if BUILDFLAG(ENABLE_IPFS)
++      if (base::FeatureList::IsEnabled(ipfs::kEnableIpfs) &&
++         (base::EqualsCaseInsensitiveASCII(scheme, "ipfs") || base::EqualsCaseInsensitiveASCII(scheme, "ipns"))
++          ) {
++        return metrics::OmniboxInputType::URL;
++      }
++#endif
+   }
+
+   // Also check for schemes registered via registerProtocolHandler(), which
diff --git a/chromium_edits/121.0.6167.8/chrome/browser/chrome_content_browser_client.cc.patch b/chromium_edits/121.0.6167.8/chrome/browser/chrome_content_browser_client.cc.patch
@@ -0,0 +1,63 @@
+diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
+index a9b87ac2fcd74..987686c621664 100644
+--- a/chrome/browser/chrome_content_browser_client.cc
++++ b/chrome/browser/chrome_content_browser_client.cc
+@@ -377,6 +377,7 @@
+ #include "third_party/blink/public/common/switches.h"
+ #include "third_party/blink/public/mojom/browsing_topics/browsing_topics.mojom.h"
+ #include "third_party/blink/public/public_buildflags.h"
++#include "third_party/ipfs_client/ipfs_buildflags.h"
+ #include "third_party/widevine/cdm/buildflags.h"
+ #include "ui/base/clipboard/clipboard_format_type.h"
+ #include "ui/base/l10n/l10n_util.h"
+@@ -499,6 +500,12 @@
+ #include "chrome/browser/fuchsia/chrome_browser_main_parts_fuchsia.h"
+ #endif
+
++#if BUILDFLAG(ENABLE_IPFS)
++#include "components/ipfs/interceptor.h"
++#include "components/ipfs/ipfs_features.h"
++#include "components/ipfs/url_loader_factory.h"
++#endif
++
+ #if BUILDFLAG(IS_CHROMEOS)
+ #include "base/debug/leak_annotations.h"
+ #include "chrome/browser/apps/app_service/app_install/app_install_navigation_throttle.h"
+@@ -6157,12 +6164,23 @@ void ChromeContentBrowserClient::
+         const absl::optional<url::Origin>& request_initiator_origin,
+         NonNetworkURLLoaderFactoryMap* factories) {
+ #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(ENABLE_EXTENSIONS) || \
+-    !BUILDFLAG(IS_ANDROID)
++    !BUILDFLAG(IS_ANDROID) || BUILDFLAG(ENABLE_IPFS)
+   content::RenderFrameHost* frame_host =
+       RenderFrameHost::FromID(render_process_id, render_frame_id);
+   WebContents* web_contents = WebContents::FromRenderFrameHost(frame_host);
+ #endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(ENABLE_EXTENSIONS) || \
+-        // !BUILDFLAG(IS_ANDROID)
++        // !BUILDFLAG(IS_ANDROID) || BUILDFLAG(ENABLE_IPFS)
++#if BUILDFLAG(ENABLE_IPFS)
++  if (base::FeatureList::IsEnabled(ipfs::kEnableIpfs)) {
++    network::mojom::URLLoaderFactory* default_factory = g_browser_process->system_network_context_manager()->GetURLLoaderFactory();
++    ipfs::IpfsURLLoaderFactory::Create(
++      factories,
++      web_contents->GetBrowserContext(),
++      default_factory,
++      GetSystemNetworkContext()
++    );
++  }
++#endif  // BUILDFLAG(ENABLE_IPFS)
+
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
+   if (web_contents) {
+@@ -6304,6 +6322,11 @@ ChromeContentBrowserClient::WillCreateURLLoaderRequestInterceptors(
+     scoped_refptr<base::SequencedTaskRunner> navigation_response_task_runner) {
+   std::vector<std::unique_ptr<content::URLLoaderRequestInterceptor>>
+       interceptors;
++#if BUILDFLAG(ENABLE_IPFS)
++  if (base::FeatureList::IsEnabled(ipfs::kEnableIpfs)) {
++    interceptors.push_back(std::make_unique<ipfs::Interceptor>(g_browser_process->system_network_context_manager()->GetURLLoaderFactory(), GetSystemNetworkContext()));
++  }
++#endif
+ #if BUILDFLAG(ENABLE_OFFLINE_PAGES)
+   interceptors.push_back(
+       std::make_unique<offline_pages::OfflinePageURLLoaderRequestInterceptor>(
diff --git a/chromium_edits/121.0.6167.8/chrome/browser/flag-metadata.json.patch b/chromium_edits/121.0.6167.8/chrome/browser/flag-metadata.json.patch
@@ -0,0 +1,16 @@
+diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
+index 0cdc387bf20b7..10e6b164bfdbf 100644
+--- a/chrome/browser/flag-metadata.json
++++ b/chrome/browser/flag-metadata.json
+@@ -2944,6 +2944,11 @@
+     "owners": [ "[email protected]", "[email protected]" ],
+     "expiry_milestone": 130
+   },
++  {
++    "name": "enable-ipfs",
++    "owners": [ "//components/ipfs/OWNERS" ],
++    "expiry_milestone": 150
++  },
+   {
+     "name": "enable-isolated-sandboxed-iframes",
+     "owners": [ "[email protected]", "[email protected]", "[email protected]" ],
diff --git a/chromium_edits/121.0.6167.8/chrome/browser/flag_descriptions.cc.patch b/chromium_edits/121.0.6167.8/chrome/browser/flag_descriptions.cc.patch
@@ -0,0 +1,16 @@
+diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
+index 879831885f22f..03877bb2c3254 100644
+--- a/chrome/browser/flag_descriptions.cc
++++ b/chrome/browser/flag_descriptions.cc
+@@ -288,6 +288,11 @@ const char kEnableBenchmarkingDescription[] =
+     "after 3 restarts. On the third restart, the flag will appear to be off "
+     "but the effect is still active.";
+
++#if BUILDFLAG(ENABLE_IPFS)
++extern const char kEnableIpfsName[] = "Enable IPFS";
++extern const char kEnableIpfsDescription[] = "Enable ipfs:// and ipns:// URLs";
++#endif
++
+ const char kPreloadingOnPerformancePageName[] =
+     "Preloading Settings on Performance Page";
+ const char kPreloadingOnPerformancePageDescription[] =
diff --git a/chromium_edits/121.0.6167.8/chrome/browser/flag_descriptions.h.patch b/chromium_edits/121.0.6167.8/chrome/browser/flag_descriptions.h.patch
@@ -0,0 +1,24 @@
+diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
+index 067e8d3c0b793..95ceadb06622a 100644
+--- a/chrome/browser/flag_descriptions.h
++++ b/chrome/browser/flag_descriptions.h
+@@ -23,6 +23,7 @@
+ #include "pdf/buildflags.h"
+ #include "printing/buildflags/buildflags.h"
+ #include "third_party/blink/public/common/buildflags.h"
++#include "third_party/ipfs_client/ipfs_buildflags.h"
+
+ // This file declares strings used in chrome://flags. These messages are not
+ // translated, because instead of end-users they target Chromium developers and
+@@ -179,6 +180,11 @@ extern const char kDownloadWarningImprovementsDescription[];
+ extern const char kEnableBenchmarkingName[];
+ extern const char kEnableBenchmarkingDescription[];
+
++#if BUILDFLAG(ENABLE_IPFS)
++extern const char kEnableIpfsName[];
++extern const char kEnableIpfsDescription[];
++#endif
++
+ #if BUILDFLAG(USE_FONTATIONS_BACKEND)
+ extern const char kFontationsFontBackendName[];
+ extern const char kFontationsFontBackendDescription[];
diff --git a/chromium_edits/121.0.6167.8/chrome/common/chrome_content_client.cc.patch b/chromium_edits/121.0.6167.8/chrome/common/chrome_content_client.cc.patch
@@ -0,0 +1,17 @@
+diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
+index 246ec9c5c911f..5d66d133a7907 100644
+--- a/chrome/common/chrome_content_client.cc
++++ b/chrome/common/chrome_content_client.cc
+@@ -296,6 +296,12 @@ void ChromeContentClient::AddAdditionalSchemes(Schemes* schemes) {
+ #if BUILDFLAG(IS_ANDROID)
+   schemes->local_schemes.push_back(url::kContentScheme);
+ #endif
++  for ( const char* ip_s : {"ipfs", "ipns"} ) {
++    schemes->standard_schemes.push_back(ip_s);
++    schemes->cors_enabled_schemes.push_back(ip_s);
++    schemes->secure_schemes.push_back(ip_s);
++    schemes->csp_bypassing_schemes.push_back(ip_s);
++  }
+ }
+
+ std::u16string ChromeContentClient::GetLocalizedString(int message_id) {
diff --git a/chromium_edits/121.0.6167.8/components/cbor/reader.cc.patch b/chromium_edits/121.0.6167.8/components/cbor/reader.cc.patch
@@ -0,0 +1,44 @@
+diff --git a/components/cbor/reader.cc b/components/cbor/reader.cc
+index 306ba52fa4944..6b13b3a679a65 100644
+--- a/components/cbor/reader.cc
++++ b/components/cbor/reader.cc
+@@ -22,7 +22,7 @@
+ namespace cbor {
+
+ namespace constants {
+-const char kUnsupportedMajorType[] = "Unsupported major type.";
++const char kUnsupportedMajorType[] = "Unsupported major type operation.";
+ }
+
+ namespace {
+@@ -156,7 +156,11 @@ absl::optional<Value> Reader::DecodeCompleteDataItem(const Config& config,
+     case Value::Type::FLOAT_VALUE:
+       // Floating point values also go here since they are also type 7.
+       return DecodeToSimpleValueOrFloat(*header, config);
+-    case Value::Type::TAG:  // We explicitly don't support TAG.
++    case Value::Type::TAG:
++      if (config.parse_tags) {
++        return ReadTagContent(*header, config, max_nesting_level);
++      }
++      break;
+     case Value::Type::NONE:
+     case Value::Type::INVALID_UTF8:
+       break;
+@@ -347,6 +351,17 @@ absl::optional<Value> Reader::ReadByteStringContent(
+   return Value(std::move(cbor_byte_string));
+ }
+
++absl::optional<Value> Reader::ReadTagContent(
++    const Reader::DataItemHeader& header,
++    const Config& config,
++    int max_nesting_level) {
++  auto tagged_content = DecodeCompleteDataItem(config, max_nesting_level);
++  if (tagged_content.has_value()) {
++    tagged_content.value().SetTag(header.value);
++  }
++  return tagged_content;
++}
++
+ absl::optional<Value> Reader::ReadArrayContent(
+     const Reader::DataItemHeader& header,
+     const Config& config,
diff --git a/chromium_edits/121.0.6167.8/components/cbor/reader.h.patch b/chromium_edits/121.0.6167.8/components/cbor/reader.h.patch
@@ -0,0 +1,26 @@
+diff --git a/components/cbor/reader.h b/components/cbor/reader.h
+index f0b43a5517528..a57e277a1bc66 100644
+--- a/components/cbor/reader.h
++++ b/components/cbor/reader.h
+@@ -130,6 +130,11 @@ class CBOR_EXPORT Reader {
+     // during decoding will set raise the `UNSUPPORTED_FLOATING_POINT_VALUE`
+     // error.
+     bool allow_floating_point = false;
++
++    // If the parser encounters a TAG element, should it be parsed out and
++    // the tag value saved (true), or should the entire node and its content
++    // be discarded (false)
++    bool parse_tags = false;
+   };
+
+   Reader(const Reader&) = delete;
+@@ -204,6 +209,9 @@ class CBOR_EXPORT Reader {
+   absl::optional<Value> ReadMapContent(const DataItemHeader& header,
+                                        const Config& config,
+                                        int max_nesting_level);
++  absl::optional<Value> ReadTagContent(const DataItemHeader& header,
++                                       const Config& config,
++                                       int max_nesting_level);
+   absl::optional<uint8_t> ReadByte();
+   absl::optional<base::span<const uint8_t>> ReadBytes(uint64_t num_bytes);
+   bool IsKeyInOrder(const Value& new_key,