fix: pass headers to request (#3018)

Somewhere along the line we stopped passing headers to the underlying
request library which means people can't use http auth etc to try to
secure their API servers.

Fixes #3017

Author: achingbrain

package.json

@@ -47,7 +47,7 @@
     "form-data": "^3.0.0",
     "ipfs-block": "^0.8.1",
     "ipfs-core-utils": "^0.2.0",
-    "ipfs-utils": "^2.2.0",
+    "ipfs-utils": "^2.2.2",
     "ipld-dag-cbor": "^0.15.1",
     "ipld-dag-pb": "^0.18.3",
     "ipld-raw": "^4.0.1",
@@ -67,7 +67,7 @@
     "stream-to-it": "^0.2.0"
   },
   "devDependencies": {
-    "aegir": "21.4.5",
+    "aegir": "^21.10.0",
     "browser-process-platform": "^0.1.1",
     "cross-env": "^7.0.0",
     "go-ipfs-dep": "0.4.23-3",

src/add.js

@@ -19,7 +19,7 @@ module.exports = configure((api) => {
       timeout: options.timeout,
       signal: options.signal,
       ...(
-        await multipartRequest(input)
+        await multipartRequest(input, options.headers)
       )
     })
 

src/bitswap/stat.js

@@ -10,7 +10,8 @@ module.exports = configure(api => {
     const res = await api.post('bitswap/stat', {
       searchParams: toUrlSearchParams(options),
       timeout: options.timeout,
-      signal: options.signal
+      signal: options.signal,
+      headers: options.headers
     })
 
     return toCoreInterface(await res.json())

src/bitswap/unwant.js

@@ -12,7 +12,8 @@ module.exports = configure(api => {
       searchParams: toUrlSearchParams({
         arg: typeof cid === 'string' ? cid : new CID(cid).toString(),
         ...options
-      })
+      }),
+      headers: options.headers
     })
 
     return res.json()

src/bitswap/wantlist.js

@@ -13,7 +13,8 @@ module.exports = configure(api => {
     const res = await (await api.post('bitswap/wantlist', {
       timeout: options.timeout,
       signal: options.signal,
-      searchParams: toUrlSearchParams(options)
+      searchParams: toUrlSearchParams(options),
+      headers: options.headers
     })).json()
 
     return (res.Keys || []).map(k => new CID(k['/']))

src/block/get.js

@@ -16,7 +16,8 @@ module.exports = configure(api => {
       searchParams: toUrlSearchParams({
         arg: cid.toString(),
         ...options
-      })
+      }),
+      headers: options.headers
     })
 
     return new Block(Buffer.from(await res.arrayBuffer()), cid)

src/block/put.js

@@ -39,7 +39,7 @@ module.exports = configure(api => {
         signal: options.signal,
         searchParams: toUrlSearchParams(options),
         ...(
-          await multipartRequest(data)
+          await multipartRequest(data, options.headers)
         )
       })
       res = await response.json()

src/block/rm.js

@@ -17,7 +17,8 @@ module.exports = configure(api => {
         arg: cid.map(cid => new CID(cid).toString()),
         'stream-channels': true,
         ...options
-      })
+      }),
+      headers: options.headers
     })
 
     for await (const removed of res.ndjson()) {

src/block/stat.js

@@ -12,7 +12,8 @@ module.exports = configure(api => {
       searchParams: toUrlSearchParams({
         arg: new CID(cid).toString(),
         ...options
-      })
+      }),
+      headers: options.headers
     })
     const data = await res.json()
 

src/bootstrap/add.js

@@ -17,7 +17,8 @@ module.exports = configure(api => {
       searchParams: toUrlSearchParams({
         arg: addr,
         ...options
-      })
+      }),
+      headers: options.headers
     })
 
     return res.json()

src/bootstrap/list.js

@@ -8,7 +8,8 @@ module.exports = configure(api => {
     const res = await api.post('bootstrap/list', {
       timeout: options.timeout,
       signal: options.signal,
-      searchParams: toUrlSearchParams(options)
+      searchParams: toUrlSearchParams(options),
+      headers: options.headers
     })
 
     return res.json()

src/bootstrap/rm.js

@@ -17,7 +17,8 @@ module.exports = configure(api => {
       searchParams: toUrlSearchParams({
         arg: addr,
         ...options
-      })
+      }),
+      headers: options.headers
     })
 
     return res.json()

src/cat.js

@@ -12,7 +12,8 @@ module.exports = configure(api => {
       searchParams: toUrlSearchParams({
         arg: typeof path === 'string' ? path : new CID(path).toString(),
         ...options
-      })
+      }),
+      headers: options.headers
     })
 
     yield * res.iterator()

src/commands.js

@@ -8,7 +8,8 @@ module.exports = configure(api => {
     const res = await api.post('commands', {
       timeout: options.timeout,
       signal: options.signal,
-      searchParams: toUrlSearchParams(options)
+      searchParams: toUrlSearchParams(options),
+      headers: options.headers
     })
 
     return res.json()

src/config/get.js

@@ -17,7 +17,8 @@ module.exports = configure(api => {
       searchParams: toUrlSearchParams({
         arg: key,
         ...options
-      })
+      }),
+      headers: options.headers
     })
     const data = await res.json()
 

src/config/profiles/apply.js

@@ -11,7 +11,8 @@ module.exports = configure(api => {
       searchParams: toUrlSearchParams({
         arg: profile,
         ...options
-      })
+      }),
+      headers: options.headers
     })
     const data = await res.json()
 

src/config/profiles/list.js

@@ -9,7 +9,8 @@ module.exports = configure(api => {
     const res = await api.post('config/profile/list', {
       timeout: options.timeout,
       signal: options.signal,
-      searchParams: toUrlSearchParams(options)
+      searchParams: toUrlSearchParams(options),
+      headers: options.headers
     })
 
     const data = await res.json()

src/config/replace.js

@@ -12,7 +12,7 @@ module.exports = configure(api => {
       signal: options.signal,
       searchParams: toUrlSearchParams(options),
       ...(
-        await multipartRequest(Buffer.from(JSON.stringify(config)))
+        await multipartRequest(Buffer.from(JSON.stringify(config)), options.headers)
       )
     })
 

src/config/set.js

@@ -29,7 +29,8 @@ module.exports = configure(api => {
     const res = await api.post('config', {
       timeout: options.timeout,
       signal: options.signal,
-      searchParams: toUrlSearchParams(params)
+      searchParams: toUrlSearchParams(params),
+      headers: options.headers
     })
 
     return toCamel(await res.json())

src/dag/put.js

@@ -48,7 +48,7 @@ module.exports = configure(api => {
       signal: options.signal,
       searchParams: toUrlSearchParams(options),
       ...(
-        await multipartRequest(serialized)
+        await multipartRequest(serialized, options.headers)
       )
     })
     const data = await res.json()

src/dag/resolve.js

@@ -17,7 +17,8 @@ module.exports = configure(api => {
       searchParams: toUrlSearchParams({
         arg: path ? [cid, path].join(path.startsWith('/') ? '' : '/') : `${cid}`,
         ...options
-      })
+      }),
+      headers: options.headers
     })
 
     const data = await res.json()

src/dht/find-peer.js

@@ -15,7 +15,8 @@ module.exports = configure(api => {
       searchParams: toUrlSearchParams({
         arg: `${Buffer.isBuffer(peerId) ? new CID(peerId) : peerId}`,
         ...options
-      })
+      }),
+      headers: options.headers
     })
 
     for await (const data of res.ndjson()) {

src/dht/find-provs.js

@@ -14,7 +14,8 @@ module.exports = configure(api => {
       searchParams: toUrlSearchParams({
         arg: `${new CID(cid)}`,
         ...options
-      })
+      }),
+      headers: options.headers
     })
 
     for await (const message of res.ndjson()) {

src/dht/get.js

@@ -18,7 +18,8 @@ module.exports = configure(api => {
       searchParams: toUrlSearchParams({
         key: encodeBufferURIComponent(key),
         ...options
-      })
+      }),
+      headers: options.headers
     })
 
     for await (const message of res.ndjson()) {

src/dht/provide.js

@@ -16,7 +16,8 @@ module.exports = configure(api => {
       searchParams: toUrlSearchParams({
         arg: cids.map(cid => new CID(cid).toString()),
         ...options
-      })
+      }),
+      headers: options.headers
     })
 
     for await (let message of res.ndjson()) {

src/dht/put.js

@@ -17,7 +17,8 @@ module.exports = configure(api => {
           value
         ],
         ...options
-      })
+      }),
+      headers: options.headers
     })
 
     for await (let message of res.ndjson()) {

src/dht/query.js

@@ -14,7 +14,8 @@ module.exports = configure(api => {
       searchParams: toUrlSearchParams({
         arg: new CID(peerId),
         ...options
-      })
+      }),
+      headers: options.headers
     })
 
     for await (let message of res.ndjson()) {

src/diag/cmds.js

@@ -8,7 +8,8 @@ module.exports = configure(api => {
     const res = await api.post('diag/cmds', {
       timeout: options.timeout,
       signal: options.signal,
-      searchParams: toUrlSearchParams(options)
+      searchParams: toUrlSearchParams(options),
+      headers: options.headers
     })
 
     return res.json()

src/diag/net.js

@@ -8,7 +8,8 @@ module.exports = configure(api => {
     const res = await api.post('diag/net', {
       timeout: options.timeout,
       signal: options.signal,
-      searchParams: toUrlSearchParams(options)
+      searchParams: toUrlSearchParams(options),
+      headers: options.headers
     })
     return res.json()
   }

src/diag/sys.js

@@ -8,7 +8,8 @@ module.exports = configure(api => {
     const res = await api.post('diag/sys', {
       timeout: options.timeout,
       signal: options.signal,
-      searchParams: toUrlSearchParams(options)
+      searchParams: toUrlSearchParams(options),
+      headers: options.headers
     })
 
     return res.json()

src/dns.js

@@ -11,7 +11,8 @@ module.exports = configure(api => {
       searchParams: toUrlSearchParams({
         arg: domain,
         ...options
-      })
+      }),
+      headers: options.headers
     })
     const data = await res.json()
 

src/files/chmod.js

@@ -12,7 +12,8 @@ module.exports = configure(api => {
         arg: path,
         mode,
         ...options
-      })
+      }),
+      headers: options.headers
     })
 
     await res.text()

src/files/cp.js

@@ -15,7 +15,8 @@ module.exports = configure(api => {
       searchParams: toUrlSearchParams({
         arg: sources.map(src => CID.isCID(src) ? `/ipfs/${src}` : src),
         ...options
-      })
+      }),
+      headers: options.headers
     })
 
     await res.text()

src/files/flush.js

@@ -17,7 +17,8 @@ module.exports = configure(api => {
       searchParams: toUrlSearchParams({
         arg: path,
         ...options
-      })
+      }),
+      headers: options.headers
     })
     const data = await res.json()
 

src/files/ls.js

@@ -25,7 +25,8 @@ module.exports = configure(api => {
         l: options.long == null ? true : options.long,
         ...options,
         stream: true
-      })
+      }),
+      headers: options.headers
     })
 
     for await (const result of res.ndjson()) {

src/files/mkdir.js

@@ -11,7 +11,8 @@ module.exports = configure(api => {
       searchParams: toUrlSearchParams({
         arg: path,
         ...options
-      })
+      }),
+      headers: options.headers
     })
 
     await res.text()

src/files/mv.js

@@ -15,7 +15,8 @@ module.exports = configure(api => {
       searchParams: toUrlSearchParams({
         arg: sources.map(src => CID.isCID(src) ? `/ipfs/${src}` : src),
         ...options
-      })
+      }),
+      headers: options.headers
     })
 
     await res.text()

src/files/read.js

@@ -14,7 +14,8 @@ module.exports = configure(api => {
         arg: path,
         count: options.count || options.length,
         ...options
-      })
+      }),
+      headers: options.headers
     })
 
     for await (const chunk of toIterable(res.body)) {

src/files/rm.js

@@ -14,7 +14,8 @@ module.exports = configure(api => {
       searchParams: toUrlSearchParams({
         arg: sources,
         ...options
-      })
+      }),
+      headers: options.headers
     })
 
     await res.text()