Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions common/protocol/grpc/metadata.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package grpc

import (
"strings"

"google.golang.org/grpc/metadata"

"github.com/v2fly/v2ray-core/v4/common/net"

Check failure on line 8 in common/protocol/grpc/metadata.go

View workflow job for this annotation

GitHub Actions / test (windows-latest)

no required module provides package github.com/v2fly/v2ray-core/v4/common/net; to add it:
)

// ParseXForwardedFor parses X-Forwarded-For metadata in gRPC metadata, and return the IP list in it.
func ParseXForwardedFor(md metadata.MD) []net.Address {
xff := md.Get("X-Forwarded-For")
if len(xff) == 0 {
return nil
}
list := strings.Split(xff[0], ",")
addrs := make([]net.Address, 0, len(list))
for _, proxy := range list {
addrs = append(addrs, net.ParseAddress(proxy))
}
return addrs
}
19 changes: 19 additions & 0 deletions common/protocol/grpc/metadata_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package grpc_test

import (
"testing"

"github.com/google/go-cmp/cmp"
"google.golang.org/grpc/metadata"

"github.com/v2fly/v2ray-core/v4/common/net"
. "github.com/v2fly/v2ray-core/v4/common/protocol/grpc"
)

func TestParseXForwardedFor(t *testing.T) {
md := metadata.Pairs("X-Forwarded-For", "129.78.138.66, 129.78.64.103")
addrs := ParseXForwardedFor(md)
if r := cmp.Diff(addrs, []net.Address{net.ParseAddress("129.78.138.66"), net.ParseAddress("129.78.64.103")}); r != "" {
t.Error(r)
}
}
13 changes: 13 additions & 0 deletions transport/internet/grpc/encoding/conn.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,11 @@
"net"
"time"

"google.golang.org/grpc/metadata"
"google.golang.org/grpc/peer"

grpc_proto "github.com/v2fly/v2ray-core/v4/common/protocol/grpc"
)

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / build (freebsd, 386)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / build (linux, mipsle)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / build (windows, arm64)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / build (linux, arm, 5)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / build (linux, 386)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / build (openbsd, amd64)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / build (linux, arm, 7)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / build (dragonfly, amd64)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / build (linux, arm64)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / build (windows, arm, 7)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / build (linux, amd64)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / build (freebsd, arm, 7)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / build (android, arm64)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / build (darwin, amd64)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / build (freebsd, arm, 6)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / build (windows, 386)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / build (linux, loong64)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / build (linux, mips64)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / build (windows, amd64)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / build (linux, arm, 6)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / build (openbsd, 386)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / build (freebsd, amd64)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / build (linux, arm64, pie)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / build (freebsd, arm64)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / build (darwin, arm64)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / build (linux, mips64le)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / build (openbsd, arm, 7)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / build (linux, amd64, pie)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / build (openbsd, arm, 6)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / build (openbsd, arm64)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / build (linux, mips)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / build (linux, riscv64)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / test (windows-latest)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / test (windows-latest)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / test (windows-latest)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / test (windows-latest)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / test (windows-latest)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / test (windows-latest)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / test (windows-latest)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / test (windows-latest)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

Check failure on line 16 in transport/internet/grpc/encoding/conn.go

View workflow job for this annotation

GitHub Actions / test (windows-latest)

no required module provides package github.com/v2fly/v2ray-core/v4/common/protocol/grpc; to add it:

// GunService is the abstract interface of GunService_TunClient and GunService_TunServer
type GunService interface {
Expand Down Expand Up @@ -108,6 +111,16 @@
Port: 0,
}
}
if _, isServer := service.(*gunServiceTunServer); isServer {
if md, ok := metadata.FromIncomingContext(service.Context()); ok {
if forwardedAddrs := grpc_proto.ParseXForwardedFor(md); len(forwardedAddrs) > 0 && forwardedAddrs[0].Family().IsIP() {
conn.remote = &net.TCPAddr{
IP: forwardedAddrs[0].IP(),
Port: int(0),
}
}
}
}

return conn
}
Loading