Преглед изворни кода

Fix: always log all fronting fields for remote_server_list

The meek_* fields in remote_server_list are only set with fronting values,
never direct dial addresses, and so the
requestParamLogOnlyForFrontedMeekOrConjure/etc. flags, which are intended to
avoid logging direct tunnel server addresses, do not apply, and result in the
unintended omission of flagged fields due to the lack of a relay_protocol
field.
Rod Hynes пре 2 година
родитељ
комит
45d07ead88
1 измењених фајлова са 3 додато и 3 уклоњено
  1. 3 3
      psiphon/server/api.go

+ 3 - 3
psiphon/server/api.go

@@ -534,10 +534,10 @@ var remoteServerListStatParams = append(
 		{"duration", isIntString, requestParamOptional | requestParamLogStringAsInt},
 		{"authenticated", isBooleanFlag, requestParamOptional | requestParamLogFlagAsBool},
 		{"fronting_provider_id", isAnyString, requestParamOptional},
-		{"meek_dial_address", isDialAddress, requestParamOptional | requestParamLogOnlyForFrontedMeekOrConjure},
-		{"meek_resolved_ip_address", isIPAddress, requestParamOptional | requestParamLogOnlyForFrontedMeekOrConjure},
+		{"meek_dial_address", isDialAddress, requestParamOptional},
+		{"meek_resolved_ip_address", isIPAddress, requestParamOptional},
 		{"meek_sni_server_name", isDomain, requestParamOptional},
-		{"meek_host_header", isHostHeader, requestParamOptional | requestParamNotLoggedForUnfrontedMeekNonTransformedHeader},
+		{"meek_host_header", isHostHeader, requestParamOptional},
 		{"meek_transformed_host_name", isBooleanFlag, requestParamOptional | requestParamLogFlagAsBool},
 		{"user_agent", isAnyString, requestParamOptional},
 		{"tls_profile", isAnyString, requestParamOptional},