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

Fix: don't log params with requestParamNotLogged flag

Rod Hynes 9 лет назад
Родитель
Сommit
d47afe2d3f
1 измененных файлов с 6 добавлено и 0 удалено
  1. 6 0
      psiphon/server/api.go

+ 6 - 0
psiphon/server/api.go

@@ -394,6 +394,11 @@ func getRequestLogFields(
 	logFields["client_isp"] = strings.Replace(geoIPData.ISP, " ", "_", -1)
 	logFields["client_isp"] = strings.Replace(geoIPData.ISP, " ", "_", -1)
 
 
 	for _, expectedParam := range expectedParams {
 	for _, expectedParam := range expectedParams {
+
+		if expectedParam.flags&requestParamNotLogged != 0 {
+			continue
+		}
+
 		value := params[expectedParam.name]
 		value := params[expectedParam.name]
 		if value == nil {
 		if value == nil {
 			// Skip optional params
 			// Skip optional params
@@ -405,6 +410,7 @@ func getRequestLogFields(
 			// validateRequestParams, so failure is unexpected.
 			// validateRequestParams, so failure is unexpected.
 			continue
 			continue
 		}
 		}
+
 		// Special cases:
 		// Special cases:
 		// - Number fields are encoded as integer types.
 		// - Number fields are encoded as integer types.
 		// - For ELK performance we record these domain-or-IP
 		// - For ELK performance we record these domain-or-IP