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

Added sorting functionality

Browse source
This commit is contained in:
Michael Rowley 2021-12-29 23:31:39 +00:00
parent 8ae5fd084c
commit 588cd93900
2 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/core/lib/IP.mjs
View file

@ -351,6 +351,7 @@ export function ipv4ToStr(ipInt) {
*/
export function strToIpv6(ipStr, retArr=true) {
if (retArr === false) {
// TODO: Expand address.
if (ipStr.length % 2 === 1) {
ipStr = "0" + ipStr;
}

23
src/core/operations/Sort.mjs
View file

@ -38,7 +38,7 @@ class Sort extends Operation {
{
"name": "Order",
"type": "option",
"value": ["Alphabetical (case sensitive)", "Alphabetical (case insensitive)", "IP address", "Numeric", "Numeric (hexadecimal)"]
"value": ["Alphabetical (case sensitive)", "Alphabetical (case insensitive)", "IPv4 address", "IPv6 address", "Numeric", "Numeric (hexadecimal)"]
}
];
}
@ -58,8 +58,10 @@ class Sort extends Operation {
sorted = sorted.sort();
} else if (order === "Alphabetical (case insensitive)") {
sorted = sorted.sort(Sort._caseInsensitiveSort);
} else if (order === "IP address") {
sorted = sorted.sort(Sort._ipSort);
} else if (order === "IPv4 address") {
sorted = sorted.sort(Sort._ipv4Sort);
} else if (order == "IPv6 address") {
sorted = sorted.sort(Sort._ipv6Sort);
} else if (order === "Numeric") {
sorted = sorted.sort(Sort._numericSort);
} else if (order === "Numeric (hexadecimal)") {
@ -91,7 +93,7 @@ class Sort extends Operation {
* @param {string} b
* @returns {number}
*/
static _ipSort(a, b) {
static _ipv4Sort(a, b) {
let a_ = a.split("."),
b_ = b.split(".");
@ -105,6 +107,19 @@ class Sort extends Operation {
return a_ - b_;
}
/**
* Comparison operator for sorting of IPv6 addresses.
*
* @param {string} a
* @param {string} b
* @returns {number}
*/
static _ipv6Sort(a, b) {
const numericalA = strToIpv6(a, false),
numericalB = strToIpv6(b, false);
return numericalA < numericalB ? -1 : 1;
}
/**
* Comparison operation for sorting of numeric values.
*