summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluwenpeng <[email protected]>2021-12-20 16:35:34 +0800
committerluwenpeng <[email protected]>2021-12-20 16:35:47 +0800
commitd201968652ab059013578a272278acbabe036b69 (patch)
treef8483e575dfab1e95ca9a167e5aaa4d0af97f81b
parent84ce78c1ce9036c80e5b2447993fce786c8d670e (diff)
bugfix: TSG-8634 命中Proxy Deny策略时,触发Zero eof被误判Pinninngv4.5.30-20211220
(触发Zero eof后当做protocol errors处理)
-rw-r--r--platform/src/ssl_stream.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/platform/src/ssl_stream.cpp b/platform/src/ssl_stream.cpp
index 5e1edcc..a6baa70 100644
--- a/platform/src/ssl_stream.cpp
+++ b/platform/src/ssl_stream.cpp
@@ -1258,10 +1258,8 @@ void ssl_stream_process_zero_eof(struct ssl_stream * s_stream, struct ssl_mgr* m
if(s_upstream->verify_result.is_hostmatched && s_upstream->is_server_cert_verify_passed )
{
const char *sni = s_upstream->client_hello ? (s_upstream->client_hello->sni ? s_upstream->client_hello->sni : "null"): "null";
- TFE_LOG_DEBUG(mgr->logger, "sni:%s cert verify passed and hit zero eof, set pinning:2, next use app_not_pinning to correct", sni);
-
- s_upstream->svc_status.cli_pinning_status=PINNING_ST_MAYBE_PINNING;
- // ssl_stream_set_cmsg_integer(s_stream, TFE_CMSG_SSL_PINNING_STATE, PINNING_ST_MAYBE_PINNING);
+ TFE_LOG_DEBUG(mgr->logger, "sni:%s cert verify passed and hit zero eof, set protocol errors", sni);
+ s_upstream->svc_status.has_protocol_errors=1;
ssl_service_cache_write(mgr->svc_cache, s_stream->peer->up_parts.client_hello, s_stream->tcp_stream, &(s_stream->peer->up_parts.svc_status));
}
s_stream->error=SSL_STREAM_R_CLIENT_CLOSED;