Просмотр исходного кода

Fix: don't select obfuscated QUIC when fronted

- Also allow fronting_provider_id to be logged in
  other cases.
Rod Hynes 6 лет назад
Родитель
Сommit
58e77eccf7
2 измененных файлов с 2 добавлено и 2 удалено
  1. 1 1
      psiphon/dialParameters.go
  2. 1 1
      psiphon/server/api.go

+ 1 - 1
psiphon/dialParameters.go

@@ -924,7 +924,7 @@ func selectQUICVersion(
 			continue
 		}
 
-		if !isFronted &&
+		if isFronted &&
 			protocol.QUICVersionIsObfuscated(quicVersion) {
 			continue
 		}

+ 1 - 1
psiphon/server/api.go

@@ -716,7 +716,7 @@ var baseRequestParams = []requestParamSpec{
 	{"ssh_client_version", isAnyString, requestParamOptional},
 	{"upstream_proxy_type", isUpstreamProxyType, requestParamOptional},
 	{"upstream_proxy_custom_header_names", isAnyString, requestParamOptional | requestParamArray},
-	{"fronting_provider_id", isAnyString, requestParamOptional | requestParamLogOnlyForFrontedMeek},
+	{"fronting_provider_id", isAnyString, requestParamOptional},
 	{"meek_dial_address", isDialAddress, requestParamOptional | requestParamLogOnlyForFrontedMeek},
 	{"meek_resolved_ip_address", isIPAddress, requestParamOptional | requestParamLogOnlyForFrontedMeek},
 	{"meek_sni_server_name", isDomain, requestParamOptional},