fix(app): radix64 decode issue

ssgnh · May 7, 2022 · 48e140e · 48e140e
1 parent e88d656
commit 48e140e
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 2 deletions.
diff --git a/app/src/main/kotlin/me/leon/encode/base/Base64.kt b/app/src/main/kotlin/me/leon/encode/base/Base64.kt
@@ -27,8 +27,7 @@ fun ByteArray.base64(dict: String = BASE64_DICT, needPadding: Boolean = true) =
 fun String.base64Decode(dict: String = BASE64_DICT) =
     stripAllSpace() // remove all space  RFC 2045定义，每行为76个字符，行末加入\r\n
         .toCharArray()
-        // bc url base64不遵守 RFC 2045,Commons Codec 遵守 RFC 2045,没有padding
-        .filter { it != '=' && it != '.' }
+        .filter { dict.contains(".") || !dict.contains(".") && it != '=' && it != '.' }
         .joinToString("") {
             dict
                 .ifEmpty { BASE64_DICT }

diff --git a/testdata/encode/urlbase64.txt → testdata/encode/base64Url.txt b/testdata/encode/urlbase64.txt → testdata/encode/base64Url.txt
diff --git a/testdata/encode/radix10.txt b/testdata/encode/radix10.txt
@@ -0,0 +1 @@
+1916850967896681345870693862611931789614436539962913401095350402234325684881885811965102220272494
diff --git a/testdata/encode/radix32.txt b/testdata/encode/radix32.txt
@@ -0,0 +1 @@
+smu81pcfi7irf9f5gmruj6s6sm88g832f4g6opbfdoq30di06kp70rrad5iisore
diff --git a/testdata/encode/radix64.txt b/testdata/encode/radix64.txt
@@ -0,0 +1 @@
+3Zw.3W8P3Zcj3WU14XsE3XAGGEH3GEvjZ02yKBX.LRHuZ0nnXQ3hZe
diff --git a/testdata/encode/radix8.txt b/testdata/encode/radix8.txt
@@ -0,0 +1 @@
+34557100345437107455572274541333751467033454410404030474440330625573343206015440065144701573246454513461556