Skip to content

Commit

Permalink
fix: IPv6 literal parsing
Browse files Browse the repository at this point in the history
  • Loading branch information
serverwentdown committed Sep 3, 2021
1 parent 2603c67 commit d3cf8f6
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 22 deletions.
12 changes: 6 additions & 6 deletions src/index.js
Expand Up @@ -35,20 +35,20 @@ export default async function fetch(url, options_) {
return new Promise((resolve, reject) => {
// Build request object
const request = new Request(url, options_);
const options = getNodeRequestOptions(request);
if (!supportedSchemas.has(options.protocol)) {
throw new TypeError(`node-fetch cannot load ${url}. URL scheme "${options.protocol.replace(/:$/, '')}" is not supported.`);
const { parsedURL, options } = getNodeRequestOptions(request);
if (!supportedSchemas.has(parsedURL.protocol)) {
throw new TypeError(`node-fetch cannot load ${url}. URL scheme "${parsedURL.protocol.replace(/:$/, '')}" is not supported.`);
}

if (options.protocol === 'data:') {
if (parsedURL.protocol === 'data:') {
const data = dataUriToBuffer(request.url);
const response = new Response(data, {headers: {'Content-Type': data.typeFull}});
resolve(response);
return;
}

// Wrap http.request into fetch
const send = (options.protocol === 'https:' ? https : http).request;
const send = (parsedURL.protocol === 'https:' ? https : http).request;
const {signal} = request;
let response = null;

Expand Down Expand Up @@ -77,7 +77,7 @@ export default async function fetch(url, options_) {
};

// Send request
const request_ = send(options);
const request_ = send(parsedURL, options);

if (signal) {
signal.addEventListener('abort', abortAndFinalize);
Expand Down
16 changes: 6 additions & 10 deletions src/request.js
Expand Up @@ -204,24 +204,20 @@ export const getNodeRequestOptions = request => {
// HTTP-network fetch step 4.2
// chunked encoding is handled by Node.js

// Overwrite search to force request() to retain trailing ? (issue #776)
const search = getSearch(parsedURL);

// Manually spread the URL object instead of spread syntax
const requestOptions = {
const options = {
path: parsedURL.pathname + search,
pathname: parsedURL.pathname,
hostname: parsedURL.hostname,
protocol: parsedURL.protocol,
port: parsedURL.port,
hash: parsedURL.hash,
search: parsedURL.search,
query: parsedURL.query,
href: parsedURL.href,
method: request.method,
headers: headers[Symbol.for('nodejs.util.inspect.custom')](),
insecureHTTPParser: request.insecureHTTPParser,
agent
};

return requestOptions;
return {
parsedURL,
options
};
};
30 changes: 30 additions & 0 deletions test/main.js
Expand Up @@ -2334,3 +2334,33 @@ describe('node-fetch', () => {
expect(res.url).to.equal(`${base}m%C3%B6bius`);
});
});

describe('node-fetch using IPv6', () => {
const local = new TestServer('[::1]');
let base;

before(async () => {
await local.start();
base = `http://${local.hostname}:${local.port}/`;
});

after(async () => {
return local.stop();
});

it('should resolve into response', () => {
const url = `${base}hello`;
expect(url).to.contain('[::1]');
return fetch(url).then(res => {
expect(res).to.be.an.instanceof(Response);
expect(res.headers).to.be.an.instanceof(Headers);
expect(res.body).to.be.an.instanceof(stream.Transform);
expect(res.bodyUsed).to.be.false;

expect(res.url).to.equal(url);
expect(res.ok).to.be.true;
expect(res.status).to.equal(200);
expect(res.statusText).to.equal('OK');
});
});
});
13 changes: 7 additions & 6 deletions test/utils/server.js
Expand Up @@ -4,7 +4,7 @@ import {once} from 'events';
import Busboy from 'busboy';

export default class TestServer {
constructor() {
constructor(hostname) {
this.server = http.createServer(this.router);
// Node 8 default keepalive timeout is 5000ms
// make it shorter here as we want to close server quickly at the end of tests
Expand All @@ -15,10 +15,15 @@ export default class TestServer {
this.server.on('connection', socket => {
socket.setTimeout(1500);
});
this.hostname = hostname || 'localhost';
}

async start() {
this.server.listen(0, 'localhost');
let host = this.hostname;
if (host.startsWith('[')) {
host = host.slice(1, -1);
}
this.server.listen(0, host);
return once(this.server, 'listening');
}

Expand All @@ -31,10 +36,6 @@ export default class TestServer {
return this.server.address().port;
}

get hostname() {
return 'localhost';
}

mockResponse(responseHandler) {
this.server.nextResponseHandler = responseHandler;
return `http://${this.hostname}:${this.port}/mocked`;
Expand Down

0 comments on commit d3cf8f6

Please sign in to comment.