chore(tls): Refactor tls alpn protocol check (#1681)

tottoto · web-flow · commit 7551d5d6392f · 2024-05-21T05:29:47.000Z
diff --git a/tonic/src/transport/service/tls.rs b/tonic/src/transport/service/tls.rs
@@ -85,10 +85,8 @@ impl TlsConnector {
         // explicitly set `assume_http2` to true, we'll allow it to be missing.
         let (_, session) = io.get_ref();
         let alpn_protocol = session.alpn_protocol();
-        if alpn_protocol != Some(ALPN_H2) {
-            if alpn_protocol.is_some() || !self.assume_http2 {
-                return Err(TlsError::H2NotNegotiated.into());
-            }
+        if !(alpn_protocol == Some(ALPN_H2) || self.assume_http2) {
+            return Err(TlsError::H2NotNegotiated.into());
         }
         Ok(BoxedIo::new(io))
     }

Original file line number	Diff line number	Diff line change
`@@ -85,10 +85,8 @@ impl TlsConnector {`
`85`	`85`	// explicitly set `assume_http2` to true, we'll allow it to be missing.
`86`	`86`	`let (_, session) = io.get_ref();`
`87`	`87`	`let alpn_protocol = session.alpn_protocol();`
`88`		`- if alpn_protocol != Some(ALPN_H2) {`
`89`		`- if alpn_protocol.is_some() \|\| !self.assume_http2 {`
`90`		`- return Err(TlsError::H2NotNegotiated.into());`
`91`		`- }`
	`88`	`+ if !(alpn_protocol == Some(ALPN_H2) \|\| self.assume_http2) {`
	`89`	`+ return Err(TlsError::H2NotNegotiated.into());`
`92`	`90`	`}`
`93`	`91`	`Ok(BoxedIo::new(io))`
`94`	`92`	`}`