revert encoding 'fix' and add unit test.
This commit is contained in:
parent
bb78723ce8
commit
dca7f66c6f
@ -13,17 +13,12 @@ String base64UrlNoPadEncode(List<int> bytes) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Uint8List base64UrlNoPadDecode(String source) {
|
Uint8List base64UrlNoPadDecode(String source) {
|
||||||
if(source.length % 4 != 0) {
|
source = base64Url.normalize(source);
|
||||||
source = base64.normalize(source);
|
return base64Url.decode(source);
|
||||||
}
|
|
||||||
return base64.decode(source);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Uint8List base64UrlNoPadDecodeDynamic(dynamic source) {
|
Uint8List base64UrlNoPadDecodeDynamic(dynamic source) =>
|
||||||
source = source as String;
|
base64UrlNoPadDecode(source as String);
|
||||||
source = base64.normalize(source);
|
|
||||||
return base64.decode(source);
|
|
||||||
}
|
|
||||||
|
|
||||||
class Uint8ListJsonConverter implements JsonConverter<Uint8List, String> {
|
class Uint8ListJsonConverter implements JsonConverter<Uint8List, String> {
|
||||||
const Uint8ListJsonConverter();
|
const Uint8ListJsonConverter();
|
||||||
@ -36,7 +31,6 @@ class Uint8ListJsonConverter implements JsonConverter<Uint8List, String> {
|
|||||||
|
|
||||||
@immutable
|
@immutable
|
||||||
abstract class EncodedString extends Equatable {
|
abstract class EncodedString extends Equatable {
|
||||||
|
|
||||||
const EncodedString(String s) : contents = s;
|
const EncodedString(String s) : contents = s;
|
||||||
final String contents;
|
final String contents;
|
||||||
@override
|
@override
|
||||||
@ -76,7 +70,6 @@ abstract class EncodedString extends Equatable {
|
|||||||
|
|
||||||
@immutable
|
@immutable
|
||||||
class FixedEncodedString32 extends EncodedString {
|
class FixedEncodedString32 extends EncodedString {
|
||||||
|
|
||||||
factory FixedEncodedString32.fromBytes(Uint8List bytes) {
|
factory FixedEncodedString32.fromBytes(Uint8List bytes) {
|
||||||
if (bytes.length != decodedLength()) {
|
if (bytes.length != decodedLength()) {
|
||||||
throw Exception('length ${bytes.length} should be ${decodedLength()}');
|
throw Exception('length ${bytes.length} should be ${decodedLength()}');
|
||||||
@ -103,7 +96,6 @@ class FixedEncodedString32 extends EncodedString {
|
|||||||
|
|
||||||
@immutable
|
@immutable
|
||||||
class FixedEncodedString43 extends EncodedString {
|
class FixedEncodedString43 extends EncodedString {
|
||||||
|
|
||||||
factory FixedEncodedString43.fromBytes(Uint8List bytes) {
|
factory FixedEncodedString43.fromBytes(Uint8List bytes) {
|
||||||
if (bytes.length != decodedLength()) {
|
if (bytes.length != decodedLength()) {
|
||||||
throw Exception('length ${bytes.length} should be ${decodedLength()}');
|
throw Exception('length ${bytes.length} should be ${decodedLength()}');
|
||||||
@ -130,7 +122,6 @@ class FixedEncodedString43 extends EncodedString {
|
|||||||
|
|
||||||
@immutable
|
@immutable
|
||||||
class FixedEncodedString86 extends EncodedString {
|
class FixedEncodedString86 extends EncodedString {
|
||||||
|
|
||||||
factory FixedEncodedString86.fromBytes(Uint8List bytes) {
|
factory FixedEncodedString86.fromBytes(Uint8List bytes) {
|
||||||
if (bytes.length != decodedLength()) {
|
if (bytes.length != decodedLength()) {
|
||||||
throw Exception('length ${bytes.length} should be ${decodedLength()}');
|
throw Exception('length ${bytes.length} should be ${decodedLength()}');
|
||||||
|
70
veilid-flutter/test/test_encoding.dart
Normal file
70
veilid-flutter/test/test_encoding.dart
Normal file
@ -0,0 +1,70 @@
|
|||||||
|
import 'dart:convert';
|
||||||
|
import 'dart:math';
|
||||||
|
import 'dart:typed_data';
|
||||||
|
|
||||||
|
import 'package:flutter_test/flutter_test.dart';
|
||||||
|
import 'package:veilid/veilid_encoding.dart';
|
||||||
|
|
||||||
|
const knownVectors = [
|
||||||
|
['', ''],
|
||||||
|
['f', 'Zg'],
|
||||||
|
['fo', 'Zm8'],
|
||||||
|
['foo', 'Zm9v'],
|
||||||
|
['foob', 'Zm9vYg'],
|
||||||
|
['fooba', 'Zm9vYmE'],
|
||||||
|
['foobar', 'Zm9vYmFy']
|
||||||
|
];
|
||||||
|
|
||||||
|
Future<void> _testEncodingKnownVector(Uint8List k, String v) async {
|
||||||
|
final e = base64UrlNoPadEncode(k);
|
||||||
|
expect(e, v, reason: 'encode mismatch');
|
||||||
|
|
||||||
|
final d = base64UrlNoPadDecode(v);
|
||||||
|
expect(d, k, reason: 'decode mismatch');
|
||||||
|
|
||||||
|
final r = base64UrlNoPadDecode(e);
|
||||||
|
expect(r, k, reason: 'round trip mismatch');
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> testEncodingKnownVectors() async {
|
||||||
|
for (final kv in knownVectors) {
|
||||||
|
final k = Uint8List.fromList(kv[0].codeUnits);
|
||||||
|
final v = kv[1];
|
||||||
|
|
||||||
|
await _testEncodingKnownVector(k, v);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> testEncodeDecodeGarbage() async {
|
||||||
|
final random = Random(0);
|
||||||
|
for (var n = 0; n < 8192; n++) {
|
||||||
|
final kl = List<int>.empty(growable: true);
|
||||||
|
for (var p = 0; p < n; p++) {
|
||||||
|
final v = random.nextInt(256);
|
||||||
|
kl.add(v);
|
||||||
|
}
|
||||||
|
final k = Uint8List.fromList(kl);
|
||||||
|
|
||||||
|
final e = base64UrlNoPadEncode(k);
|
||||||
|
final r = base64UrlNoPadDecode(e);
|
||||||
|
|
||||||
|
expect(r, k, reason: 'garbage round trip mismatch');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> testEncodeDecodeGarbagePad() async {
|
||||||
|
final random = Random(0);
|
||||||
|
for (var n = 0; n < 8192; n++) {
|
||||||
|
final kl = List<int>.empty(growable: true);
|
||||||
|
for (var p = 0; p < n; p++) {
|
||||||
|
final v = random.nextInt(256);
|
||||||
|
kl.add(v);
|
||||||
|
}
|
||||||
|
final k = Uint8List.fromList(kl);
|
||||||
|
|
||||||
|
final e = base64Url.encode(k);
|
||||||
|
final r = base64UrlNoPadDecode(e);
|
||||||
|
|
||||||
|
expect(r, k, reason: 'garbage w/pad round trip mismatch');
|
||||||
|
}
|
||||||
|
}
|
@ -1,16 +1,14 @@
|
|||||||
import 'package:flutter_test/flutter_test.dart';
|
import 'package:flutter_test/flutter_test.dart';
|
||||||
import 'package:veilid/veilid.dart';
|
import 'test_encoding.dart';
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
final api = Veilid.instance;
|
|
||||||
|
|
||||||
TestWidgetsFlutterBinding.ensureInitialized();
|
TestWidgetsFlutterBinding.ensureInitialized();
|
||||||
|
|
||||||
setUp(() {});
|
setUp(() {});
|
||||||
|
|
||||||
tearDown(() {});
|
tearDown(() {});
|
||||||
|
|
||||||
test('veilidVersionString', () async {
|
test('testEncodingKnownVectors', testEncodingKnownVectors);
|
||||||
expect(api.veilidVersionString(), '0.1.0');
|
test('testEncodeDecodeGarbage', testEncodeDecodeGarbage);
|
||||||
});
|
test('testEncodeDecodeGarbagePad', testEncodeDecodeGarbagePad);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user