Skip to content

Commit

Permalink
fix: allow requests from electron renderer (#201)
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
achingbrain authored Sep 7, 2020
1 parent df39339 commit bb36028
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 0 deletions.
7 changes: 7 additions & 0 deletions http/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
9 changes: 9 additions & 0 deletions http/errors_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit bb36028

Please sign in to comment.