extern/bruno
1
0
Fork 1
mirror of https://github.com/usebruno/bruno.git synced 2024-11-22 16:03:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1136 from BrandonGillis/main

Browse Source 
fix(#124): Improve localhost handling, add cache for ipv6 & ipv4 check
This commit is contained in:
Anoop M D 2023-12-04 19:21:13 +05:30 committed by GitHub
commit 6d3a518043
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
packages/bruno-electron/src/ipc/network/axios-instance.js
View File

@ -1,6 +1,11 @@
const URL = require('url');
const Socket = require('net').Socket;
const axios = require('axios');
const connectionCache = new Map(); // Cache to store checkConnection() results
const LOCAL_IPV6 = '::1';
const LOCAL_IPV4 = '127.0.0.1';
const LOCALHOST = 'localhost';
const getTld = (hostname) => {
if (!hostname) {
@ -12,19 +17,28 @@ const getTld = (hostname) => {
const checkConnection = (host, port) =>
new Promise((resolve) => {
const socket = new Socket();
const key = `${host}:${port}`;
const cachedResult = connectionCache.get(key);
socket.once('connect', () => {
socket.end();
resolve(true);
});
if (cachedResult !== undefined) {
resolve(cachedResult);
} else {
const socket = new Socket();
socket.once('error', () => {
resolve(false);
});
socket.once('connect', () => {
socket.end();
connectionCache.set(key, true); // Cache successful connection
resolve(true);
});
// Try to connect to the host and port
socket.connect(port, host);
socket.once('error', () => {
connectionCache.set(key, false); // Cache failed connection
resolve(false);
});
// Try to connect to the host and port
socket.connect(port, host);
}
});
/**
@ -43,16 +57,16 @@ function makeAxiosInstance() {
// Resolve all *.localhost to localhost and check if it should use IPv6 or IPv4
// RFC: 6761 section 6.3 (https://tools.ietf.org/html/rfc6761#section-6.3)
// @see https://github.com/usebruno/bruno/issues/124
// temporarily disabling the fix (- Anoop)
// if (getTld(url.hostname) === 'localhost') {
// config.headers.Host = url.hostname; // Put original hostname in Host
// const portNumber = Number(url.port) || (url.protocol.includes('https') ? 443 : 80);
// const useIpv6 = await checkConnection('::1', portNumber);
// url.hostname = useIpv6 ? '::1' : '127.0.0.1';
// delete url.host; // Clear hostname cache
// config.url = URL.format(url);
// }
if (getTld(url.hostname) === LOCALHOST || url.hostname === LOCAL_IPV4 || url.hostname === LOCAL_IPV6) {
// use custom DNS lookup for localhost
config.lookup = (hostname, options, callback) => {
const portNumber = Number(url.port) || (url.protocol.includes('https') ? 443 : 80);
checkConnection(LOCAL_IPV6, portNumber).then((useIpv6) => {
const ip = useIpv6 ? LOCAL_IPV6 : LOCAL_IPV4;
callback(null, ip, useIpv6 ? 6 : 4);
});
};
}
config.headers['request-start-time'] = Date.now();
return config;