Skip to content

Commit 74d631c

Browse files
a3957273a3957273
authored
Merge pull request #1991 from peterc-s/master
Add Base32 Hex Extended Alphabet and Base32 Tests.
2 parents 305a02c + 3057a20 commit 74d631c

File tree

5 files changed

+214
-4
lines changed

5 files changed

+214
-4
lines changed

‎src/core/lib/Base32.mjs

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
// import Utils from "../Utils.mjs";
2+
3+
/**
4+
* Base32 resources.
5+
*
6+
* @author Peter C-S [[email protected]]
7+
* @license Apache-2.0
8+
*/
9+
10+
/**
11+
* Base32 alphabets.
12+
*/
13+
export const ALPHABET_OPTIONS = [
14+
{
15+
name: "Standard", // https://www.rfc-editor.org/rfc/rfc4648#section-6
16+
value: "A-Z2-7=",
17+
},
18+
{
19+
name: "Hex Extended", // https://www.rfc-editor.org/rfc/rfc4648#section-7
20+
value: "0-9A-V=",
21+
},
22+
];
23+

‎src/core/operations/FromBase32.mjs

+10-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
import Operation from "../Operation.mjs";
88
import Utils from "../Utils.mjs";
9+
import {ALPHABET_OPTIONS} from "../lib/Base32.mjs";
10+
911

1012
/**
1113
* From Base32 operation
@@ -27,8 +29,8 @@ class FromBase32 extends Operation {
2729
this.args = [
2830
{
2931
name: "Alphabet",
30-
type: "binaryString",
31-
value: "A-Z2-7="
32+
type: "editableOption",
33+
value: ALPHABET_OPTIONS
3234
},
3335
{
3436
name: "Remove non-alphabet chars",
@@ -41,6 +43,11 @@ class FromBase32 extends Operation {
4143
pattern: "^(?:[A-Z2-7]{8})+(?:[A-Z2-7]{2}={6}|[A-Z2-7]{4}={4}|[A-Z2-7]{5}={3}|[A-Z2-7]{7}={1})?$",
4244
flags: "",
4345
args: ["A-Z2-7=", false]
46+
},
47+
{
48+
pattern: "^(?:[0-9A-V]{8})+(?:[0-9A-V]{2}={6}|[0-9A-V]{4}={4}|[0-9A-V]{5}={3}|[0-9A-V]{7}={1})?$",
49+
flags: "",
50+
args: ["0-9A-V=", false]
4451
}
4552
];
4653
}
@@ -96,3 +103,4 @@ class FromBase32 extends Operation {
96103
}
97104

98105
export default FromBase32;
106+

‎src/core/operations/ToBase32.mjs

+4-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import Operation from "../Operation.mjs";
88
import Utils from "../Utils.mjs";
9+
import {ALPHABET_OPTIONS} from "../lib/Base32.mjs";
910

1011
/**
1112
* To Base32 operation
@@ -27,8 +28,8 @@ class ToBase32 extends Operation {
2728
this.args = [
2829
{
2930
name: "Alphabet",
30-
type: "binaryString",
31-
value: "A-Z2-7="
31+
type: "editableOption",
32+
value: ALPHABET_OPTIONS
3233
}
3334
];
3435
}
@@ -83,3 +84,4 @@ class ToBase32 extends Operation {
8384
}
8485

8586
export default ToBase32;
87+

‎tests/operations/index.mjs

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import TestRegister from "../lib/TestRegister.mjs";
2020
import "./tests/AESKeyWrap.mjs";
2121
import "./tests/AvroToJSON.mjs";
2222
import "./tests/BaconCipher.mjs";
23+
import "./tests/Base32.mjs";
2324
import "./tests/Base45.mjs";
2425
import "./tests/Base58.mjs";
2526
import "./tests/Base62.mjs";

‎tests/operations/tests/Base32.mjs

+176
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,176 @@
1+
/**
2+
* Base32 Tests
3+
*
4+
* @author Peter C-S [[email protected]]
5+
* @license Apache-2.0
6+
*/
7+
8+
import TestRegister from "../../lib/TestRegister.mjs";
9+
import {ALPHABET_OPTIONS} from "../../../src/core/lib/Base32.mjs";
10+
11+
// Example Standard Base32 Tests
12+
const STANDARD_INP = "HELLO BASE32";
13+
const STANDARD_OUT = "JBCUYTCPEBBECU2FGMZA====";
14+
15+
// Example Hex Extended Base32 Tests
16+
const EXTENDED_INP = "HELLO BASE32 EXTENDED";
17+
const EXTENDED_OUT = "912KOJ2F41142KQ56CP20HAOAH2KSH258G======";
18+
19+
// All Bytes
20+
const ALL_BYTES = [
21+
"\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
22+
"\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",
23+
"\x20\x21\x22\x23\x24\x25\x26\x27\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f",
24+
"\x30\x31\x32\x33\x34\x35\x36\x37\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f",
25+
"\x40\x41\x42\x43\x44\x45\x46\x47\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f",
26+
"\x50\x51\x52\x53\x54\x55\x56\x57\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f",
27+
"\x60\x61\x62\x63\x64\x65\x66\x67\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f",
28+
"\x70\x71\x72\x73\x74\x75\x76\x77\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f",
29+
"\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f",
30+
"\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f",
31+
"\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf",
32+
"\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf",
33+
"\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",
34+
"\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf",
35+
"\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef",
36+
"\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",
37+
].join("");
38+
39+
const ALL_BYTES_EXTENDED_OUT = "000G40O40K30E209185GO38E1S8124GJ2GAHC5OO34D1M70T3OFI08924CI2A9H750KIKAPC5KN2UC1H68PJ8D9M6SS3IEHR7GUJSFQ085146H258P3KGIAA9D64QJIFA18L4KQKALB5EM2PB9DLONAUBTG62OJ3CHIMCPR8D5L6MR3DDPNN0SBIEDQ7ATJNF1SNKURSFLV7V041GA1O91C6GU48J2KBHI6OT3SGI699754LIQBPH6CQJEE9R7KVK2GQ58T4KMJAFA59LALQPBDELUOB3CLJMIQRDDTON6TBNF5TNQVS1GE2OF2CBHM7P34SLIUCPN7CVK6HQB9T9LEMQVCDJMMRRJETTNV0S7HE7P75SRJUHQFATFMERRNFU3OV5SVKUNRFFU7PVBTVPVFUVS======";
40+
const ALL_BYTES_STANDARD_OUT = "AAAQEAYEAUDAOCAJBIFQYDIOB4IBCEQTCQKRMFYYDENBWHA5DYPSAIJCEMSCKJRHFAUSUKZMFUXC6MBRGIZTINJWG44DSOR3HQ6T4P2AIFBEGRCFIZDUQSKKJNGE2TSPKBIVEU2UKVLFOWCZLJNVYXK6L5QGCYTDMRSWMZ3INFVGW3DNNZXXA4LSON2HK5TXPB4XU634PV7H7AEBQKBYJBMGQ6EITCULRSGY5D4QSGJJHFEVS2LZRGM2TOOJ3HU7UCQ2FI5EUWTKPKFJVKV2ZLNOV6YLDMVTWS23NN5YXG5LXPF5X274BQOCYPCMLRWHZDE4VS6MZXHM7UGR2LJ5JVOW27MNTWW33TO55X7A4HROHZHF43T6R2PK5PWO33XP6DY7F47U6X3PP6HZ7L57Z7P674======";
41+
42+
TestRegister.addTests([
43+
{
44+
name: "To Base32 Standard: nothing",
45+
input: "",
46+
expectedOutput: "",
47+
recipeConfig: [
48+
{
49+
op: "To Base32",
50+
args: [ALPHABET_OPTIONS[0].value],
51+
},
52+
],
53+
},
54+
{
55+
name: "To Base32 Hex Extended: nothing",
56+
input: "",
57+
expectedOutput: "",
58+
recipeConfig: [
59+
{
60+
op: "To Base32",
61+
args: [ALPHABET_OPTIONS[1].value],
62+
},
63+
],
64+
},
65+
{
66+
name: "From Base32 Standard: nothing",
67+
input: "",
68+
expectedOutput: "",
69+
recipeConfig: [
70+
{
71+
op: "From Base32",
72+
args: [ALPHABET_OPTIONS[0].value, false],
73+
},
74+
],
75+
},
76+
{
77+
name: "From Base32 Hex Extended: nothing",
78+
input: "",
79+
expectedOutput: "",
80+
recipeConfig: [
81+
{
82+
op: "From Base32",
83+
args: [ALPHABET_OPTIONS[1].value, false],
84+
},
85+
],
86+
},
87+
{
88+
name: "To Base32 Standard: " + STANDARD_INP,
89+
input: STANDARD_INP,
90+
expectedOutput: STANDARD_OUT,
91+
recipeConfig: [
92+
{
93+
op: "To Base32",
94+
args: [ALPHABET_OPTIONS[0].value],
95+
},
96+
],
97+
},
98+
{
99+
name: "To Base32 Hex Extended: " + EXTENDED_INP,
100+
input: EXTENDED_INP,
101+
expectedOutput: EXTENDED_OUT,
102+
recipeConfig: [
103+
{
104+
op: "To Base32",
105+
args: [ALPHABET_OPTIONS[1].value],
106+
},
107+
],
108+
},
109+
{
110+
name: "From Base32 Standard: " + STANDARD_OUT,
111+
input: STANDARD_OUT,
112+
expectedOutput: STANDARD_INP,
113+
recipeConfig: [
114+
{
115+
op: "From Base32",
116+
args: [ALPHABET_OPTIONS[0].value, false],
117+
},
118+
],
119+
},
120+
{
121+
name: "From Base32 Hex Extended: " + EXTENDED_OUT,
122+
input: EXTENDED_OUT,
123+
expectedOutput: EXTENDED_INP,
124+
recipeConfig: [
125+
{
126+
op: "From Base32",
127+
args: [ALPHABET_OPTIONS[1].value, false],
128+
},
129+
],
130+
},
131+
{
132+
name: "To Base32 Hex Standard: All Bytes",
133+
input: ALL_BYTES,
134+
expectedOutput: ALL_BYTES_STANDARD_OUT,
135+
recipeConfig: [
136+
{
137+
op: "To Base32",
138+
args: [ALPHABET_OPTIONS[0].value],
139+
},
140+
],
141+
},
142+
{
143+
name: "To Base32 Hex Extended: All Bytes",
144+
input: ALL_BYTES,
145+
expectedOutput: ALL_BYTES_EXTENDED_OUT,
146+
recipeConfig: [
147+
{
148+
op: "To Base32",
149+
args: [ALPHABET_OPTIONS[1].value],
150+
},
151+
],
152+
},
153+
{
154+
name: "From Base32 Hex Standard: All Bytes",
155+
input: ALL_BYTES_STANDARD_OUT,
156+
expectedOutput: ALL_BYTES,
157+
recipeConfig: [
158+
{
159+
op: "From Base32",
160+
args: [ALPHABET_OPTIONS[0].value, false],
161+
},
162+
],
163+
},
164+
{
165+
name: "From Base32 Hex Extended: All Bytes",
166+
input: ALL_BYTES_EXTENDED_OUT,
167+
expectedOutput: ALL_BYTES,
168+
recipeConfig: [
169+
{
170+
op: "From Base32",
171+
args: [ALPHABET_OPTIONS[1].value, false],
172+
},
173+
],
174+
},
175+
]);
176+

0 commit comments

Comments
 (0)