Do some rename

Author: Fangliding

infra/conf/transport_internet.go

@@ -412,8 +412,7 @@ type TLSConfig struct {
 	MasterKeyLog                         string           `json:"masterKeyLog"`
 	ServerNameToVerify                   string           `json:"serverNameToVerify"`
 	VerifyPeerCertInNames                []string         `json:"verifyPeerCertInNames"`
-	ECHConfig                            string           `json:"echConfig"`
-	ECHDNSServer                         string           `json:"echDnsServer"`
+	ECHConfigList                        string           `json:"echConfigList"`
 	EchKeySets                           string           `json:"echKeySets"`
 }
 
@@ -486,21 +485,15 @@ func (c *TLSConfig) Build() (proto.Message, error) {
 	}
 	config.VerifyPeerCertInNames = c.VerifyPeerCertInNames
 
-	if c.ECHConfig != "" {
-		ECHConfig, err := base64.StdEncoding.DecodeString(c.ECHConfig)
-		if err != nil {
-			return nil, errors.New("invalid ECH Config", c.ECHConfig)
-		}
-		config.EchConfig = ECHConfig
-	}
+	config.EchConfigList = c.ECHConfigList
+
 	if c.EchKeySets != "" {
 		EchPrivateKey, err := base64.StdEncoding.DecodeString(c.EchKeySets)
 		if err != nil {
 			return nil, errors.New("invalid ECH Config", c.EchKeySets)
 		}
 		config.EchKeySets = EchPrivateKey
 	}
-	config.Ech_DNSserver = c.ECHDNSServer
 
 	return config, nil
 }

transport/internet/tls/config.go

@@ -444,7 +444,7 @@ func (c *Config) GetTLSConfig(opts ...Option) *tls.Config {
 			config.KeyLogWriter = writer
 		}
 	}
-	if len(c.EchConfig) > 0 || len(c.Ech_DNSserver) > 0 || len(c.EchKeySets) > 0 {
+	if len(c.EchConfigList) > 0 || len(c.EchKeySets) > 0 {
 		err := ApplyECH(c, config)
 		if err != nil {
 			errors.LogError(context.Background(), err)

transport/internet/tls/config.pb.go

@@ -92,9 +92,7 @@ message Config {
   */
   repeated string verify_peer_cert_in_names = 17;
 
-  bytes ech_config = 18;
+  string ech_config_list = 18;
 
-  string ech_DNSserver = 19;
-
-  bytes ech_key_sets = 20;
+  bytes ech_key_sets = 19;
 }

transport/internet/tls/config.proto

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"context"
 	"crypto/tls"
-	"fmt"
 	"io"
 	"net/http"
 	"strings"
@@ -25,22 +24,28 @@ func ApplyECH(c *Config, config *tls.Config) error {
 	nameToQuery := c.ServerName
 	var DOHServer string
 
-	if len(c.EchConfig) != 0 || len(c.Ech_DNSserver) != 0 {
-		parts := strings.Split(c.Ech_DNSserver, "+")
-		if len(parts) == 2 {
-			// parse ECH DOH server in format of "example.com+https://1.1.1.1/dns-query"
-			nameToQuery = parts[0]
-			DOHServer = parts[1]
-		} else if len(parts) == 1 {
-			// normal format
-			DOHServer = parts[0]
-		} else {
-			return errors.New("Invalid ECH DOH server format: ", c.Ech_DNSserver)
-		}
-
-		if len(c.EchConfig) > 0 {
-			ECHConfig = c.EchConfig
-		} else { // ECH config > DOH lookup
+	// for client
+	if len(c.EchConfigList) != 0 {
+		// direct base64 config
+		if strings.HasPrefix(c.EchConfigList, "base64") {
+			Base64ECHConfigList := c.EchConfigList[len("base64://"):]
+			ECHConfigList, err := goech.ECHConfigListFromBase64(Base64ECHConfigList)
+			if err != nil {
+				return errors.New("Failed to unmarshal ECHConfigList: ", err)
+			}
+			ECHConfig, _ = ECHConfigList.MarshalBinary()
+		} else { // query config from dns
+			parts := strings.Split(c.EchConfigList, "+")
+			if len(parts) == 2 {
+				// parse ECH DOH server in format of "example.com+https://1.1.1.1/dns-query"
+				nameToQuery = parts[0]
+				DOHServer = parts[1]
+			} else if len(parts) == 1 {
+				// normal format
+				DOHServer = parts[0]
+			} else {
+				return errors.New("Invalid ECH DNS server format: ", c.EchConfigList)
+			}
 			if nameToQuery == "" {
 				return errors.New("Using DOH for ECH needs serverName or use dohServer format example.com+https://1.1.1.1/dns-query")
 			}
@@ -53,6 +58,7 @@ func ApplyECH(c *Config, config *tls.Config) error {
 		config.EncryptedClientHelloConfigList = ECHConfig
 	}
 
+	// for server
 	if len(c.EchKeySets) != 0 {
 		var keys []tls.EncryptedClientHelloKey
 		KeySets, err := goech.UnmarshalECHKeySetList(c.EchKeySets)
@@ -70,8 +76,8 @@ func ApplyECH(c *Config, config *tls.Config) error {
 				PrivateKey: ECHPrivateKey})
 		}
 		config.EncryptedClientHelloKeys = keys
-		fmt.Println(config.EncryptedClientHelloKeys)
 	}
+	
 	return nil
 }