Skip to content

Commit 44477a6

Browse files
committed
refactor(http): remove deprecated remote_ip_header fallback
Signed-off-by: ABHAY PANDEY <pandeyabhay967@gmail.com>
1 parent 54139ed commit 44477a6

3 files changed

Lines changed: 9 additions & 12 deletions

File tree

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"nostream": patch
3+
---
4+
5+
refactor(http): remove deprecated network.remote_ip_header fallback and rely on network.remoteIpHeader

src/utils/http.ts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,7 @@ const isTrustedProxy = (ipAddress: string, settings: Settings): boolean => {
2828
}
2929

3030
export const getRemoteAddress = (request: IncomingMessage, settings: Settings): string => {
31-
let header: string | undefined
32-
// TODO: Remove deprecation warning
33-
if ('network' in settings && 'remote_ip_header' in settings.network) {
34-
logger.warn(`WARNING: Setting network.remote_ip_header is deprecated and will be removed in a future version.
35-
Use network.remoteIpHeader instead.`)
36-
header = settings.network['remote_ip_header'] as string
37-
} else {
38-
header = settings.network.remoteIpHeader as string
39-
}
31+
const header = settings.network.remoteIpHeader as string
4032

4133
const trustedProxies = settings.network?.trustedProxies
4234
if (header && (!Array.isArray(trustedProxies) || trustedProxies.length === 0)) {

test/unit/utils/http.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@ describe('getRemoteAddress', () => {
2121
} as any
2222
})
2323

24-
it('returns address using network.remote_ip_address when set', () => {
24+
it('returns address using network.remoteIpHeader when set', () => {
2525
expect(
2626
getRemoteAddress(
2727
request,
28-
{ network: { 'remote_ip_header': header, trustedProxies: [socketAddress] } } as any,
28+
{ network: { remoteIpHeader: header, trustedProxies: [socketAddress] } } as any,
2929
)
3030
).to.equal(address)
3131
})
3232

33-
it('returns address using network.remoteIpAddress when set', () => {
33+
it('returns address using network.remoteIpHeader when set (duplicate shape)', () => {
3434
expect(
3535
getRemoteAddress(
3636
request,

0 commit comments

Comments
 (0)