-
Notifications
You must be signed in to change notification settings - Fork 5
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
CAS-6139/ip headers #96
Merged
Merged
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
c3e2104
Add new config attributes
6c8d7e0
Update the README.md
6978677
Add basic implementation of ips extract
594df08
Prettier fixes
66d33cc
Add ip headers related tests
e6e01b3
Remove bitwise operator
c2c2b6b
Fix tests
9c4bb45
Add missing header
b6d9b53
Remove unneeded check
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
export * from './default-allowlist'; | ||
export * from './configuration'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
export * from './services'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
export * from './ips-extract.service'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
import { IncomingHttpHeaders } from 'http'; | ||
import { Configuration } from '../../models'; | ||
import { TRUSTED_PROXIES } from '../../constants'; | ||
|
||
// ordered list of ip headers for ip extraction | ||
const DEFAULT = ['x-forwarded-for', 'remote-addr']; | ||
// list of header which are used with proxy depth setting | ||
const DEPTH_RELATED = ['x-forwarded-for']; | ||
|
||
const checkInternal = (ipAddress: string, proxies: any[]) => { | ||
return proxies.some((proxyRegexp) => proxyRegexp.test(ipAddress)); | ||
}; | ||
|
||
const limitProxyDepth = (ips, ipHeader, trustedProxyDepth) => { | ||
if (DEPTH_RELATED.includes(ipHeader)) { | ||
ips.splice(ips.length - 1, trustedProxyDepth); | ||
} | ||
return ips; | ||
}; | ||
|
||
const IPsFrom = (ipHeader, headers, trustedProxyDepth) => { | ||
if (!headers) { | ||
return []; | ||
} | ||
const headerValue = headers[ipHeader]; | ||
|
||
if (!headerValue) { | ||
return []; | ||
} | ||
const ips = headerValue.trim().split(/[,\s]+/); | ||
return limitProxyDepth(ips, ipHeader, trustedProxyDepth); | ||
}; | ||
|
||
const removeProxies = (ips, trustProxyChain, proxiesList) => { | ||
if (trustProxyChain) { | ||
return ips[0]; | ||
} | ||
const filteredIps = ips.filter((ip) => !checkInternal(ip, proxiesList)); | ||
return filteredIps[filteredIps.length - 1]; | ||
}; | ||
|
||
export const IPsExtractService = { | ||
call: ( | ||
headers: IncomingHttpHeaders, | ||
{ | ||
ipHeaders = [], | ||
trustedProxies = [], | ||
trustProxyChain = false, | ||
trustedProxyDepth = 0, | ||
}: Configuration | ||
) => { | ||
const ipHeadersList = ipHeaders.length ? ipHeaders : DEFAULT; | ||
const proxiesList = trustedProxies.concat(TRUSTED_PROXIES); | ||
let allIPs = []; | ||
for (const ipHeader of ipHeadersList) { | ||
const IPs = IPsFrom(ipHeader, headers, trustedProxyDepth); | ||
const IPValue = removeProxies(IPs, trustProxyChain, proxiesList); | ||
if (IPValue) { | ||
return IPValue; | ||
} | ||
allIPs = [...allIPs, ...IPs]; | ||
} | ||
|
||
// fallback to first listed ip | ||
return allIPs[0]; | ||
}, | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why do we need to check this ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we don't thanks for catching!