mirrors/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2025-05-08 07:21:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update ExtractIPAddresses.mjs to include Defanged IPv4 Addresses

Browse source
This commit is contained in:
h45h-1nclud3 2023-06-22 17:35:31 +03:00 • committed by GitHub
parent 1bc88728f0
commit 4fd8865e0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/core/operations/ExtractIPAddresses.mjs
View file

@ -40,6 +40,12 @@ class ExtractIPAddresses extends Operation {
type: "boolean", type: "boolean",
value: false value: false
}, },
,
{
name: "Defanged IPv4 Addresses",
type: "boolean",
value: false
},
{ {
name: "Display total", name: "Display total",
type: "boolean", type: "boolean",
@ -64,8 +70,9 @@ class ExtractIPAddresses extends Operation {
* @returns {string} * @returns {string}
*/ */
run(input, args) { run(input, args) {
const [includeIpv4, includeIpv6, removeLocal, displayTotal, sort, unique] = args, const [includeIpv4, includeIpv6, removeLocal, includeDefangedIpv4, displayTotal, sort, unique] = args,
ipv4 = "(?:(?:\\d|[01]?\\d\\d|2[0-4]\\d|25[0-5])\\.){3}(?:25[0-5]|2[0-4]\\d|[01]?\\d\\d|\\d)(?:\\/\\d{1,2})?", ipv4 = "(?:(?:\\d|[01]?\\d\\d|2[0-4]\\d|25[0-5])\\.){3}(?:25[0-5]|2[0-4]\\d|[01]?\\d\\d|\\d)(?:\\/\\d{1,2})?",
ipv4_defanged = "(?:(?:\\d|[01]?\\d\\d|2[0-4]\\d|25[0-5])\\[\\.\\]){3}(?:25[0-5]|2[0-4]\\d|[01]?\\d\\d|\\d)(?:\\/\\d{1,2})?",
ipv6 = "((?=.*::)(?!.*::.+::)(::)?([\\dA-F]{1,4}:(:|\\b)|){5}|([\\dA-F]{1,4}:){6})((([\\dA-F]{1,4}((?!\\3)::|:\\b|(?![\\dA-F])))|(?!\\2\\3)){2}|(((2[0-4]|1\\d|[1-9])?\\d|25[0-5])\\.?\\b){4})"; ipv6 = "((?=.*::)(?!.*::.+::)(::)?([\\dA-F]{1,4}:(:|\\b)|){5}|([\\dA-F]{1,4}:){6})((([\\dA-F]{1,4}((?!\\3)::|:\\b|(?![\\dA-F])))|(?!\\2\\3)){2}|(((2[0-4]|1\\d|[1-9])?\\d|25[0-5])\\.?\\b){4})";
let ips = ""; let ips = "";
@ -73,6 +80,10 @@ class ExtractIPAddresses extends Operation {
ips = ipv4 + "|" + ipv6; ips = ipv4 + "|" + ipv6;
} else if (includeIpv4) { } else if (includeIpv4) {
ips = ipv4; ips = ipv4;
} else if (includeIpv4 && includeDefangedIpv4){
ips = ipv4 + "|" + ipv4_defanged
} else if (includeIpv4 && includeDefangedIpv4 && includeIpv6){
ips = ipv4 + "|" + ipv4_defanged + "|" + ipv6
} else if (includeIpv6) { } else if (includeIpv6) {
ips = ipv6; ips = ipv6;
} }