Fuzz Base64 and Base64URL (OpenZeppelin#4853)

Co-authored-by: Hadrien Croubois <[email protected]>
baoshilong · Jan 24, 2024 · 6b30d2d · 6b30d2d
1 parent e86bb45
commit 6b30d2d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 49 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -83,8 +83,7 @@ jobs:
       - name: Set up environment
         uses: ./.github/actions/setup
       - name: Run tests
-        # Base64Test requires `--ffi`. See test/utils/Base64.t.sol
-        run: forge test -vv --no-match-contract Base64Test
+        run: forge test -vv
 
   coverage:
     runs-on: ubuntu-latest

diff --git a/lib/forge-std b/lib/forge-std
diff --git a/scripts/tests/base64.sh b/scripts/tests/base64.sh
diff --git a/test/utils/Base64.t.sol b/test/utils/Base64.t.sol
@@ -6,27 +6,30 @@ import {Test} from "forge-std/Test.sol";
 
 import {Base64} from "@openzeppelin/contracts/utils/Base64.sol";
 
-/// NOTE: This test requires `ffi` to be enabled. It does not run in the CI
-/// environment given `ffi` is not recommended.
-/// See: https://github.com/foundry-rs/foundry/issues/6744
 contract Base64Test is Test {
     function testEncode(bytes memory input) external {
-        string memory output = Base64.encode(input);
-        assertEq(output, _base64Ffi(input, "encode"));
+        assertEq(Base64.encode(input), vm.toBase64(input));
     }
 
     function testEncodeURL(bytes memory input) external {
-        string memory output = Base64.encodeURL(input);
-        assertEq(output, _base64Ffi(input, "encodeURL"));
+        assertEq(Base64.encodeURL(input), _removePadding(vm.toBase64URL(input)));
     }
 
-    function _base64Ffi(bytes memory input, string memory fn) internal returns (string memory) {
-        string[] memory command = new string[](4);
-        command[0] = "bash";
-        command[1] = "scripts/tests/base64.sh";
-        command[2] = fn;
-        command[3] = vm.toString(input);
-        bytes memory retData = vm.ffi(command);
-        return string(retData);
+    function _removePadding(string memory inputStr) internal pure returns (string memory) {
+        bytes memory input = bytes(inputStr);
+        bytes memory output;
+
+        for (uint256 i = 0; i < input.length; ++i) {
+            if (input[input.length - i - 1] != 0x3d) {
+                output = new bytes(input.length - i);
+                break;
+            }
+        }
+
+        for (uint256 i = 0; i < output.length; ++i) {
+            output[i] = input[i];
+        }
+
+        return string(output);
     }
 }
+1 −0		.gitattributes
+48 −6		.github/workflows/ci.yml
+29 −0		.github/workflows/sync.yml
+1 −1		foundry.toml
+1 −1		lib/ds-test
+2 −2		package.json
+635 −0		scripts/vm.py
+5 −3		src/Base.sol
+4 −3		src/Script.sol
+8 −8		src/StdAssertions.sol
+40 −25		src/StdChains.sol
+210 −17		src/StdCheats.sol
+16 −1		src/StdInvariant.sol
+18 −14		src/StdJson.sol
+54 −3		src/StdStorage.sol
+2 −2		src/StdStyle.sol
+72 −35		src/StdUtils.sol
+4 −3		src/Test.sol
+1,004 −299		src/Vm.sol
+394 −382		src/console2.sol
+216 −0		src/mocks/MockERC20.sol
+221 −0		src/mocks/MockERC721.sol
+13,248 −0		src/safeconsole.sol
+145 −84		test/StdAssertions.t.sol
+114 −58		test/StdChains.t.sol
+252 −43		test/StdCheats.t.sol
+13 −11		test/StdError.t.sol
+27 −12		test/StdMath.t.sol
+66 −34		test/StdStorage.t.sol
+4 −4		test/StdStyle.t.sol
+80 −35		test/StdUtils.t.sol
+15 −0		test/Vm.t.sol
+441 −0		test/mocks/MockERC20.t.sol
+721 −0		test/mocks/MockERC721.t.sol