Merge branch 'master' of github.com:/v2fly/v2ray-core

v2ray · Jun 1, 2020 · c84e795 · c84e795
2 parents 82ae56e + a1e4c9b
commit c84e795
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 109 deletions.
diff --git a/app/dispatcher/default.go b/app/dispatcher/default.go
@@ -288,9 +288,10 @@ func (d *DefaultDispatcher) routedDispatch(ctx context.Context, link *transport.
 		return
 	}
 
-	accessMessage := log.AccessMessageFromContext(ctx)
-	if accessMessage != nil {
-		accessMessage.Detour = "[" + handler.Tag() + "]"
+	if accessMessage := log.AccessMessageFromContext(ctx); accessMessage != nil {
+		if tag := handler.Tag(); tag != "" {
+			accessMessage.Detour = tag
+		}
 		log.Record(accessMessage)
 	}
 

diff --git a/azure-pipelines.template.yml b/azure-pipelines.template.yml
@@ -9,7 +9,7 @@ jobs:
   - checkout: self
   - task: GoTool@0
     inputs:
-      version: '1.14'
+      version: '1.13'
   - script: |
       go test -p 1 -v -timeout 30m ./...
     workingDirectory: '$(Build.SourcesDirectory)'

diff --git a/common/buf/io.go b/common/buf/io.go
@@ -65,12 +65,7 @@ func NewReader(reader io.Reader) Reader {
 			if err != nil {
 				newError("failed to get sysconn").Base(err).WriteToLog()
 			} else {
-				/* Check if ReadVReader Can be used on this reader first
-				   Fix https://github.com/v2ray/v2ray-core/issues/1666
-				*/
-				if ok, _ := checkReadVConstraint(rawConn); ok {
-					return NewReadVReader(reader, rawConn)
-				}
+				return NewReadVReader(reader, rawConn)
 			}
 		}
 	}

diff --git a/common/buf/readv_constraint_other.go b/common/buf/readv_constraint_other.go
diff --git a/common/buf/readv_constraint_windows.go b/common/buf/readv_constraint_windows.go
diff --git a/common/log/access.go b/common/log/access.go
@@ -25,7 +25,8 @@ type AccessMessage struct {
 	To     interface{}
 	Status AccessStatus
 	Reason interface{}
-	Detour interface{}
+	Email  string
+	Detour string
 }
 
 func (m *AccessMessage) String() string {
@@ -36,8 +37,11 @@ func (m *AccessMessage) String() string {
 	builder.WriteByte(' ')
 	builder.WriteString(serial.ToString(m.To))
 	builder.WriteByte(' ')
-	builder.WriteString(serial.ToString(m.Detour))
-	builder.WriteByte(' ')
+	if len(m.Detour) > 0 {
+		builder.WriteByte('[')
+		builder.WriteString(m.Detour)
+		builder.WriteString("] ")
+	}
 	builder.WriteString(serial.ToString(m.Reason))
 
 	if len(m.Email) > 0 {

diff --git a/infra/conf/command/command.go b/infra/conf/command/command.go
@@ -3,7 +3,6 @@ package command
 //go:generate errorgen
 
 import (
-	"bufio"
 	"os"
 
 	"github.com/golang/protobuf/proto"
@@ -28,7 +27,7 @@ func (c *ConfigCommand) Description() control.Description {
 }
 
 func (c *ConfigCommand) Execute(args []string) error {
-	pbConfig, err := serial.LoadJSONConfig(bufio.NewReader(os.Stdin))
+	pbConfig, err := serial.LoadJSONConfig(os.Stdin)
 	if err != nil {
 		return newError("failed to parse json config").Base(err)
 	}

diff --git a/release/install-release.sh b/release/install-release.sh
@@ -447,7 +447,7 @@ main(){
         RETVAL="$?"
         if [[ $RETVAL == 0 ]] && [[ "$FORCE" != "1" ]]; then
             colorEcho ${BLUE} "Latest version ${CUR_VER} is already installed."
-            if [[ "${ERROR_IF_UPTODATE}" == "1" ]]; then
+            if [ -n "${ERROR_IF_UPTODATE}" ]; then
               return 10
             fi
             return

diff --git a/release/user-package.sh b/release/user-package.sh
@@ -86,14 +86,6 @@ packtgzAbPath() {
 	echo ">>> Generated: $ABPATH"
 }
 
-packtgzAbPath() {
-	local ABPATH="$1"
-	echo ">>> Generating tgz package at $ABPATH"
-	pushd $TMP
-	tar cvfz $ABPATH .
-	echo ">>> Generated: $ABPATH"
-}
-
 
 pkg=zip
 nosource=0
@@ -169,7 +161,7 @@ if [[ $pkg == "zip" ]]; then
 elif [[ $pkg == "tgz" ]]; then
   packtgz
 else
-	packtgzAbPath $pkg
+	packtgzAbPath "$pkg"
 fi
 
 

diff --git a/transport/internet/tls/config.go b/transport/internet/tls/config.go
@@ -187,24 +187,8 @@ func (c *Config) GetTLSConfig(opts ...Option) *tls.Config {
 	}
 
 	if !c.AllowInsecureCiphers && len(config.CipherSuites) == 0 {
-		config.CipherSuites = []uint16{
-			tls.TLS_AES_128_GCM_SHA256,
-			tls.TLS_AES_256_GCM_SHA384,
-			tls.TLS_CHACHA20_POLY1305_SHA256,
-
-			tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,
-			tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,
-			tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
-			tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
-			tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
-			tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
-			tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,
-			tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
-			tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,
-			tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
-			tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
-			tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
-		}
+		// crypto/tls will use the proper ciphers
+		config.CipherSuites = nil
 	}
 
 	config.InsecureSkipVerify = c.AllowInsecure

diff --git a/transport/internet/tls/tls13_workaround.go b/transport/internet/tls/tls13_workaround.go