From bb36028e48e4260cf733ddb63eb803cfb24c1ebc Mon Sep 17 00:00:00 2001 From: Alex Potsides Date: Mon, 7 Sep 2020 17:40:40 +0100 Subject: [PATCH] fix: allow requests from electron renderer (#201) * fix: allow requests from electron renderer The Electron Renderer process runs in an embedded browser window so has access to browser-native `fetch`. If this is used by `ipfs-http-client` to make requests against the HTTP API, the `User-Agent` header is set to a value that looks similar to a browser but no `Origin` or `Referer` headers are sent. The change here is to relax the user agent check to allow through requests from clients with `'Electron'` in their user agents. --- http/config.go | 7 +++++++ http/errors_test.go | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/http/config.go b/http/config.go index 7c661871..69a02636 100644 --- a/http/config.go +++ b/http/config.go @@ -176,5 +176,12 @@ func allowUserAgent(r *http.Request, cfg *ServerConfig) bool { // This means the request probably came from a browser and thus, it // should have included Origin or referer headers. ua := r.Header.Get("User-agent") + + // The fetch API in the Electron Renderer process sends no referer or + // origin but should be allowed + if strings.Contains(ua, "Electron") { + return true + } + return !strings.HasPrefix(ua, "Mozilla") } diff --git a/http/errors_test.go b/http/errors_test.go index e0ece23e..2cef1b04 100644 --- a/http/errors_test.go +++ b/http/errors_test.go @@ -203,6 +203,15 @@ func TestDisallowedUserAgents(t *testing.T) { "User-Agent": "Mozilla/5.0 (Linux; U; Android 4.1.1; en-gb; Build/KLP) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30", }, }, + { + // Do not block the Electron Renderer process + Method: "POST", + AllowGet: false, + Code: http.StatusOK, + ReqHeaders: map[string]string{ + "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.104 Electron/9.0.4 Safari/537.36", + }, + }, } for _, tc := range tcs {