ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 07:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

encoding/base32: Add custom validation support

Browse Source 
Add support for custom alphabet validation through an optional validation
function parameter. The default validation follows RFC 4648 base32
alphabet rules (A-Z, 2-7).

This properly supports the documented ability to use custom alphabets.
This commit is contained in:
Zoltán Kéri
2024-12-25 16:15:41 +01:00
parent 8211a911db
commit e7fb02a84a
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/encoding/base32/base32.odin
+16 -5
View File
@@ -7,18 +7,25 @@ import "core:bytes"
// A secondary param can be used to supply a custom alphabet to // A secondary param can be used to supply a custom alphabet to
// @link(encode) and a matching decoding table to @link(decode). // @link(encode) and a matching decoding table to @link(decode).
// If none is supplied it just uses the standard Base32 alphabet. // If none is supplied it just uses the standard Base32 alphabet.
// Incase your specific version does not use padding, you may // In case your specific version does not use padding, you may
// truncate it from the encoded output. // truncate it from the encoded output.
// Error represents errors that can occur during base32 decoding operations. // Error represents errors that can occur during base32 decoding operations.
// See RFC 4648 sections 3.2, 4 and 6. // See RFC 4648 sections 3.2, 4 and 6.
Error :: enum { Error :: enum {
None, None,
Invalid_Character, // Input contains characters outside of base32 alphabet (A-Z, 2-7) Invalid_Character, // Input contains characters outside the specified alphabet
Invalid_Length, // Input length is not valid for base32 (must be a multiple of 8 with proper padding) Invalid_Length, // Input length is not valid for base32 (must be a multiple of 8 with proper padding)
Malformed_Input, // Input has improper structure (wrong padding position or incomplete groups) Malformed_Input, // Input has improper structure (wrong padding position or incomplete groups)
} }
Validate_Proc :: #type proc(c: byte) -> bool
@private
_validate_default :: proc(c: byte) -> bool {
return (c >= 'A' && c <= 'Z') || (c >= '2' && c <= '7')
}
ENC_TABLE := [32]byte { ENC_TABLE := [32]byte {
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
@@ -105,7 +112,11 @@ _encode :: proc(out, data: []byte, ENC_TBL := ENC_TABLE, allocator := context.al
} }
@(optimization_mode="favor_size") @(optimization_mode="favor_size")
decode :: proc(data: string, DEC_TBL := DEC_TABLE, allocator := context.allocator) -> (out: []byte, err: Error) { decode :: proc(
data: string,
DEC_TBL := DEC_TABLE,
validate: Validate_Proc = _validate_default,
allocator := context.allocator) -> (out: []byte, err: Error) {
if len(data) == 0 { if len(data) == 0 {
return nil, .None return nil, .None
} }
@@ -115,13 +126,13 @@ decode :: proc(data: string, DEC_TBL := DEC_TABLE, allocator := context.allocato
return nil, .Invalid_Length return nil, .Invalid_Length
} }
// Validate characters - only A-Z and 2-7 allowed before padding // Validate characters using provided validation function
for i := 0; i < len(data); i += 1 { for i := 0; i < len(data); i += 1 {
c := data[i] c := data[i]
if c == byte(PADDING) { if c == byte(PADDING) {
break break
} }
if !((c >= 'A' && c <= 'Z') || (c >= '2' && c <= '7')) { if !validate(c) {
return nil, .Invalid_Character return nil, .Invalid_Character
} }
} }