浏览代码

Fix: log session_id for tactics requests

Rod Hynes 7 年之前
父节点
当前提交
eb7c0e22f4
共有 1 个文件被更改,包括 7 次插入2 次删除
  1. 7 2
      psiphon/server/api.go

+ 7 - 2
psiphon/server/api.go

@@ -173,7 +173,10 @@ func dispatchAPIRequestHandler(
 }
 }
 
 
 var handshakeRequestParams = append(
 var handshakeRequestParams = append(
-	append([]requestParamSpec(nil), tacticsParams...),
+	append(
+		// Note: legacy clients may not send "session_id" in handshake
+		[]requestParamSpec{{"session_id", isHexDigits, requestParamOptional}},
+		tacticsParams...),
 	baseRequestParams...)
 	baseRequestParams...)
 
 
 // handshakeAPIRequestHandler implements the "handshake" API request.
 // handshakeAPIRequestHandler implements the "handshake" API request.
@@ -479,7 +482,9 @@ var tacticsParams = []requestParamSpec{
 }
 }
 
 
 var tacticsRequestParams = append(
 var tacticsRequestParams = append(
-	append([]requestParamSpec(nil), tacticsParams...),
+	append(
+		[]requestParamSpec{{"session_id", isHexDigits, 0}},
+		tacticsParams...),
 	baseRequestParams...)
 	baseRequestParams...)
 
 
 func getTacticsAPIParameterValidator(config *Config) common.APIParameterValidator {
 func getTacticsAPIParameterValidator(config *Config) common.APIParameterValidator {