diff --git a/app/dispatcher/default.go b/app/dispatcher/default.go index 18d47302..7c22e05a 100644 --- 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/release/install-release.sh b/release/install-release.sh index 85284a10..f84f5cf7 100755 --- 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 index 8c6b3945..d0bef1c4 100755 --- 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 index 1d41ed4a..2cd25721 100644 --- 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