Browse Source

delay check of remote address

Darien Raymond 9 years ago
parent
commit
76776ddf99
2 changed files with 9 additions and 1 deletions
  1. 5 1
      proxy/shadowsocks/protocol.go
  2. 4 0
      proxy/vmess/encoding/server.go

+ 5 - 1
proxy/shadowsocks/protocol.go

@@ -97,7 +97,7 @@ func ReadTCPSession(user *protocol.User, reader io.Reader) (*protocol.RequestHea
 		}
 		request.Address = v2net.DomainAddress(string(buffer.BytesFrom(-domainLength)))
 	default:
-		return nil, nil, errors.New("Shadowsocks|TCP: Unknown address type: ", addrType)
+		// Check address validity after OTA verification.
 	}
 
 	err = buffer.AppendSupplier(buf.ReadFullFrom(reader, 2))
@@ -120,6 +120,10 @@ func ReadTCPSession(user *protocol.User, reader io.Reader) (*protocol.RequestHea
 		}
 	}
 
+	if request.Address == nil {
+		return nil, nil, errors.New("Shadowsocks|TCP: Invalid remote address.")
+	}
+
 	var chunkReader buf.Reader
 	if request.Option.Has(RequestOptionOneTimeAuth) {
 		chunkReader = NewChunkReader(reader, NewAuthenticator(ChunkKeyGenerator(iv)))

+ 4 - 0
proxy/vmess/encoding/server.go

@@ -152,6 +152,10 @@ func (v *ServerSession) DecodeRequestHeader(reader io.Reader) (*protocol.Request
 		return nil, errors.New("VMess|Server: Invalid auth.")
 	}
 
+	if request.Address == nil {
+		return nil, errors.New("VMess|Server: Invalid remote address.")
+	}
+
 	return request, nil
 }