-
Notifications
You must be signed in to change notification settings - Fork 52
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #11 from phith0n/overlong-encoding
Support UTF-8 overlong encoding
- Loading branch information
Showing
6 changed files
with
166 additions
and
46 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,21 @@ | ||
| module github.com/phith0n/zkar | ||
|
|
||
| go 1.16 | ||
| go 1.18 | ||
|
|
||
| require ( | ||
| github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect | ||
| github.com/kr/pretty v0.1.0 // indirect | ||
| github.com/phith0n/litter v1.5.3 | ||
| github.com/stretchr/testify v1.7.0 | ||
| github.com/thoas/go-funk v0.9.0 | ||
| github.com/urfave/cli/v2 v2.3.0 | ||
| github.com/stretchr/testify v1.9.0 | ||
| github.com/thoas/go-funk v0.9.3 | ||
| github.com/urfave/cli/v2 v2.27.1 | ||
| ) | ||
|
|
||
| require ( | ||
| github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect | ||
| github.com/davecgh/go-spew v1.1.1 // indirect | ||
| github.com/kr/pretty v0.1.0 // indirect | ||
| github.com/pmezard/go-difflib v1.0.0 // indirect | ||
| github.com/russross/blackfriday/v2 v2.1.0 // indirect | ||
| github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect | ||
| gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect | ||
| gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect | ||
| gopkg.in/yaml.v3 v3.0.1 // indirect | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| package serz | ||
|
|
||
| import ( | ||
| "os" | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| // TestCC6WithOverlongEncoding show how to read an exist payload and modify it to a UTF-8 overlong encoding payload. | ||
| func TestCC6WithOverlongEncoding(t *testing.T) { | ||
| // read original CommonsCollections6 payload | ||
| data, err := os.ReadFile("../testcases/ysoserial/CommonsCollections6.ser") | ||
| require.NoError(t, err) | ||
| ser, err := FromBytes(data) | ||
| require.NoError(t, err) | ||
|
|
||
| // enable UTF-8 overlong encoding feature | ||
| err = ser.Walk(func(obj Object) error { | ||
| if u, ok := obj.(*TCUtf); ok { | ||
| u.SetOverlongSize(OverlongEncodingTwoBytes) | ||
| } | ||
|
|
||
| return nil | ||
| }) | ||
| require.NoError(t, err) | ||
|
|
||
| // generate new payload | ||
| data2 := ser.ToBytes() | ||
|
|
||
| // read new payload | ||
| _, err = FromBytes(data2) | ||
| require.NoError(t, err) | ||
| } | ||
|
|
||
| func TestToOverlongEncoding(t *testing.T) { | ||
| require.Equal(t, []byte("\xC0\xAE"), toOverlongEncoding([]byte("."), OverlongEncodingTwoBytes)) | ||
| require.Equal(t, []byte("\xE0\x80\xAE"), toOverlongEncoding([]byte("."), OverlongEncodingThreeBytes)) | ||
| require.Equal(t, []byte("\xc1\xaf\xc1\xb2\xc1\xa7\xc0\xae\xc1\xa5\xc1\xb8\xc1\xa1\xc1\xad\xc1\xb0\xc1"+ | ||
| "\xac\xc1\xa5\xc0\xae\xc1\x85\xc1\xb6\xc1\xa9\xc1\xac"), | ||
| toOverlongEncoding([]byte("org.example.Evil"), OverlongEncodingTwoBytes)) | ||
|
|
||
| require.Equal(t, []byte("."), fromOverlongEncoding(toOverlongEncoding([]byte("."), OverlongEncodingTwoBytes))) | ||
| require.Equal(t, []byte("."), fromOverlongEncoding(toOverlongEncoding([]byte("."), OverlongEncodingThreeBytes))) | ||
| require.Equal(t, []byte("org.example.Evil"), fromOverlongEncoding(toOverlongEncoding([]byte("org.example.Evil"), OverlongEncodingTwoBytes))) | ||
| require.Equal(t, []byte("org.example.Evil"), fromOverlongEncoding(toOverlongEncoding([]byte("org.example.Evil"), OverlongEncodingThreeBytes))) | ||
|
|
||
| require.Equal(t, []byte{0xC0, 0xFF}, fromOverlongEncoding([]byte{0xC0, 0xFF})) | ||
| require.Equal(t, []byte{0xE0, 0xAE, 0x38}, fromOverlongEncoding([]byte{0xE0, 0xAE, 0x38})) | ||
| require.Equal(t, []byte("org.example.Evil"), fromOverlongEncoding([]byte("org.example.Evil"))) | ||
| } |