Skip to content

Commit

Permalink
fix: try base64 legacy decoding for maximum compatibility (#298)
Browse files Browse the repository at this point in the history
* fix: try base64 legacy decoding as backup

* Tests: add tests for legacy encoding
  • Loading branch information
amircybersec authored Oct 14, 2024
1 parent f521e2b commit c7e1aea
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 0 deletions.
4 changes: 4 additions & 0 deletions x/configurl/shadowsocks.go
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,10 @@ func parseShadowsocksSIP002URL(url *url.URL) (*shadowsocksConfig, error) {
// Cipher info can be optionally encoded with Base64URL.
encoding := base64.URLEncoding.WithPadding(base64.NoPadding)
decodedUserInfo, err := encoding.DecodeString(userInfo)
if err != nil {
// Try base64 decoding in legacy mode
decodedUserInfo, err = base64.StdEncoding.DecodeString(userInfo)
}
var cipherInfo string
if err == nil {
cipherInfo = string(decodedUserInfo)
Expand Down
25 changes: 25 additions & 0 deletions x/configurl/shadowsocks_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,31 @@ func TestParseShadowsocksURLUserInfoEncoded(t *testing.T) {
require.Equal(t, "HTTP/1.1 ", string(config.prefix))
}

func TestParseShadowsocksURLUserInfoLegacyEncoded(t *testing.T) {
encoded := base64.StdEncoding.EncodeToString([]byte("aes-256-gcm:shadowsocks"))
urls, err := parseConfig("ss://" + string(encoded) + "@example.com:1234?prefix=HTTP%2F1.1%20" + "#outline-123")
require.NoError(t, err)
require.Equal(t, 1, len(urls))

config, err := parseShadowsocksURL(urls[0])

require.NoError(t, err)
require.Equal(t, "example.com:1234", config.serverAddress)
require.Equal(t, "HTTP/1.1 ", string(config.prefix))
}

func TestLegacyEncodedShadowsocksURL(t *testing.T) {
configString := "ss://YWVzLTEyOC1nY206c2hhZG93c29ja3M=@example.com:1234"
urls, err := parseConfig(configString)
require.NoError(t, err)
require.Equal(t, 1, len(urls))

config, err := parseShadowsocksURL(urls[0])

require.NoError(t, err)
require.Equal(t, "example.com:1234", config.serverAddress)
}

func TestParseShadowsocksURLNoEncoding(t *testing.T) {
configString := "ss://aes-256-gcm:1234567@example.com:1234"
urls, err := parseConfig(configString)
Expand Down

0 comments on commit c7e1aea

Please sign in to comment.