Skip to content

Commit 0d81d17

Browse files
committed
✨ api, httpproxy: use real program version
1 parent 2662eb8 commit 0d81d17

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

api/ssm/ssm.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ package ssm
44
import (
55
"errors"
66

7+
"github.com/database64128/shadowsocks-go"
78
"github.com/database64128/shadowsocks-go/cred"
89
"github.com/database64128/shadowsocks-go/stats"
910
"github.com/gofiber/fiber/v2"
@@ -21,7 +22,7 @@ type ServerInfo struct {
2122
}
2223

2324
var serverInfo = ServerInfo{
24-
Name: "shadowsocks-go",
25+
Name: "shadowsocks-go " + shadowsocks.Version,
2526
APIVersion: "v1",
2627
}
2728

httpproxy/client.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"io"
77
"net/http"
88

9+
"github.com/database64128/shadowsocks-go"
910
"github.com/database64128/shadowsocks-go/conn"
1011
"github.com/database64128/shadowsocks-go/direct"
1112
"github.com/database64128/shadowsocks-go/zerocopy"
@@ -33,7 +34,7 @@ func NewHttpStreamClientReadWriter(rw zerocopy.DirectReadWriteCloser, targetAddr
3334
//
3435
// Some clients include Proxy-Connection: Keep-Alive in proxy requests.
3536
// This is discouraged by RFC 9112 as stated in appendix C.2.2, so we don't include it.
36-
_, err := fmt.Fprintf(rw, "CONNECT %s HTTP/1.1\r\nHost: %s\r\nUser-Agent: shadowsocks-go/0.0.0%s\r\n\r\n", targetAddress, targetAddress, proxyAuthHeader)
37+
_, err := fmt.Fprintf(rw, "CONNECT %s HTTP/1.1\r\nHost: %s\r\nUser-Agent: shadowsocks-go/"+shadowsocks.Version+"%s\r\n\r\n", targetAddress, targetAddress, proxyAuthHeader)
3738
if err != nil {
3839
return nil, err
3940
}

httpproxy/stream_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"sync"
1111
"testing"
1212

13+
"github.com/database64128/shadowsocks-go"
1314
"github.com/database64128/shadowsocks-go/conn"
1415
"github.com/database64128/shadowsocks-go/direct"
1516
"github.com/database64128/shadowsocks-go/pipe"
@@ -155,7 +156,7 @@ func TestHttpStreamClientReadWriterServerSpeaksFirst(t *testing.T) {
155156

156157
clientTargetAddr := conn.AddrFromIPPort(netip.AddrPortFrom(netip.IPv6Loopback(), 80))
157158
clientTargetAddrString := clientTargetAddr.String()
158-
expectedRequest := fmt.Sprintf("CONNECT %s HTTP/1.1\r\nHost: %s\r\nUser-Agent: shadowsocks-go/0.0.0\r\n\r\n", clientTargetAddrString, clientTargetAddrString)
159+
expectedRequest := fmt.Sprintf("CONNECT %s HTTP/1.1\r\nHost: %s\r\nUser-Agent: shadowsocks-go/"+shadowsocks.Version+"\r\n\r\n", clientTargetAddrString, clientTargetAddrString)
159160

160161
var (
161162
wg sync.WaitGroup

0 commit comments

Comments
 (0)