fix(osi): 加固 Phase 0 验收实现(T-006)
This commit is contained in:
+2
-7
@@ -23,7 +23,6 @@ type TransportConfig struct {
|
||||
}
|
||||
|
||||
type Transport struct {
|
||||
client *http.Client
|
||||
timeout time.Duration
|
||||
dialer proxy.Dialer
|
||||
}
|
||||
@@ -35,19 +34,15 @@ func NewTransport(config TransportConfig) (*Transport, error) {
|
||||
}
|
||||
|
||||
dialer := proxy.Dialer(proxy.Direct)
|
||||
roundTripper := http.DefaultTransport.(*http.Transport).Clone()
|
||||
if strings.TrimSpace(config.Socks5Proxy) != "" {
|
||||
proxyDialer, err := socks5Dialer(config.Socks5Proxy)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
dialer = proxyDialer
|
||||
roundTripper.DialContext = func(ctx context.Context, network, address string) (net.Conn, error) {
|
||||
return dialWithContext(ctx, proxyDialer, network, address)
|
||||
}
|
||||
}
|
||||
|
||||
return &Transport{client: &http.Client{Timeout: timeout, Transport: roundTripper}, timeout: timeout, dialer: dialer}, nil
|
||||
return &Transport{timeout: timeout, dialer: dialer}, nil
|
||||
}
|
||||
|
||||
func (t *Transport) PostJSON(ctx context.Context, targetURL string, payload any, headers map[string]string) (int, []byte, error) {
|
||||
@@ -107,7 +102,7 @@ func writeJSONRequest(w io.Writer, target *url.URL, body []byte, headers map[str
|
||||
fmt.Fprintf(&buf, "POST %s HTTP/1.1\r\n", path)
|
||||
writeHeader(&buf, "Host", target.Host)
|
||||
writeHeader(&buf, "User-Agent", headerValue(headers, "User-Agent", "python-requests/2.32.4"))
|
||||
writeHeader(&buf, "Accept-Encoding", headerValue(headers, "Accept-Encoding", "gzip, deflate, br"))
|
||||
writeHeader(&buf, "Accept-Encoding", headerValue(headers, "Accept-Encoding", "identity"))
|
||||
writeHeader(&buf, "Accept", headerValue(headers, "Accept", "*/*"))
|
||||
writeHeader(&buf, "Connection", headerValue(headers, "Connection", "keep-alive"))
|
||||
writeHeader(&buf, "Content-Length", fmt.Sprintf("%d", len(body)))
|
||||
|
||||
+40
-2
@@ -69,8 +69,8 @@ func TestNewTransportKeepsTimeout(t *testing.T) {
|
||||
if err != nil {
|
||||
t.Fatalf("NewTransport: %v", err)
|
||||
}
|
||||
if transport.client.Timeout != 3*time.Second {
|
||||
t.Fatalf("timeout = %s, want 3s", transport.client.Timeout)
|
||||
if transport.timeout != 3*time.Second {
|
||||
t.Fatalf("timeout = %s, want 3s", transport.timeout)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -79,6 +79,7 @@ func TestNewTransportRejectsInvalidSOCKS5Proxy(t *testing.T) {
|
||||
t.Fatal("NewTransport accepted invalid SOCKS5 proxy")
|
||||
}
|
||||
}
|
||||
|
||||
func TestTransportPreservesHeaderNameCasing(t *testing.T) {
|
||||
listener, err := net.Listen("tcp", "127.0.0.1:0")
|
||||
if err != nil {
|
||||
@@ -121,6 +122,7 @@ func TestTransportPreservesHeaderNameCasing(t *testing.T) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestTransportAddsRequestsCompatibleBaseHeaders(t *testing.T) {
|
||||
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Header.Get("User-Agent") == "" {
|
||||
@@ -144,3 +146,39 @@ func TestTransportAddsRequestsCompatibleBaseHeaders(t *testing.T) {
|
||||
t.Fatalf("PostJSON: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestTransportRequestsIdentityEncoding(t *testing.T) {
|
||||
listener, err := net.Listen("tcp", "127.0.0.1:0")
|
||||
if err != nil {
|
||||
t.Fatalf("listen: %v", err)
|
||||
}
|
||||
defer listener.Close()
|
||||
|
||||
received := make(chan string, 1)
|
||||
go func() {
|
||||
conn, err := listener.Accept()
|
||||
if err != nil {
|
||||
received <- ""
|
||||
return
|
||||
}
|
||||
defer conn.Close()
|
||||
buf := make([]byte, 4096)
|
||||
n, _ := conn.Read(buf)
|
||||
received <- string(buf[:n])
|
||||
_, _ = conn.Write([]byte("HTTP/1.1 200 OK\r\nContent-Length: 2\r\n\r\n{}"))
|
||||
}()
|
||||
|
||||
transport, err := NewTransport(TransportConfig{Timeout: time.Second})
|
||||
if err != nil {
|
||||
t.Fatalf("NewTransport: %v", err)
|
||||
}
|
||||
_, _, err = transport.PostJSON(context.Background(), "http://"+listener.Addr().String(), map[string]string{"serviceId": "JKDA00002"}, nil)
|
||||
if err != nil {
|
||||
t.Fatalf("PostJSON: %v", err)
|
||||
}
|
||||
|
||||
raw := <-received
|
||||
if !strings.Contains(raw, "\r\nAccept-Encoding: identity\r\n") {
|
||||
t.Fatalf("raw request missing identity Accept-Encoding:\n%s", raw)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user