mirrors/ntex
1
0
Fork 0
mirror of https://github.com/ntex-rs/ntex.git synced 2025-04-05 13:57:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix unsupported web ws handling

Browse source
This commit is contained in:
Nikolay Kim 2022-01-31 23:03:28 +06:00
parent c56bd776d2
commit 1c635a6b55
8 changed files with 44 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ntex-bytes/src/string.rs
View file

@ -208,7 +208,10 @@ impl From<&str> for ByteString {
impl<'a> From<borrow::Cow<'a, str>> for ByteString { impl<'a> From<borrow::Cow<'a, str>> for ByteString {
#[inline] #[inline]
fn from(value: borrow::Cow<'a, str>) -> Self { fn from(value: borrow::Cow<'a, str>) -> Self {
Self::from(value.to_owned()) match value {
borrow::Cow::Owned(s) => Self::from(s),
borrow::Cow::Borrowed(s) => Self::from(s),
}
} }
} }
@ -340,7 +343,7 @@ mod test {
#[test] #[test]
fn test_basics() { fn test_basics() {
let s = ByteString::from_static("test"); let mut s = ByteString::from_static("test");
s.trimdown(); s.trimdown();
assert_eq!(s, "test"); assert_eq!(s, "test");
assert_eq!(s, *"test"); assert_eq!(s, *"test");

4
ntex/CHANGES.md
View file

@ -1,5 +1,9 @@
# Changes # Changes
## [0.5.15] - 2022-02-xx
* web: Fix unsupported web ws handling
## [0.5.14] - 2022-01-30 ## [0.5.14] - 2022-01-30
* Update ntex-io to 0.1.7 * Update ntex-io to 0.1.7

2
ntex/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "ntex" name = "ntex"
version = "0.5.14" version = "0.5.15"
authors = ["ntex contributors <team@ntex.rs>"] authors = ["ntex contributors <team@ntex.rs>"]
description = "Framework for composable network services" description = "Framework for composable network services"
readme = "README.md" readme = "README.md"

1
ntex/src/http/h1/dispatcher.rs
View file

@ -177,6 +177,7 @@ where
let item = if let Some(item) = msg.head().take_io() { let item = if let Some(item) = msg.head().take_io() {
item item
} else { } else {
log::trace!("Handler service consumed io, exit");
return Poll::Ready(Ok(())); return Poll::Ready(Ok(()));
}; };

2
ntex/src/web/response.rs
View file

@ -126,7 +126,7 @@ impl WebResponse {
impl From<WebResponse> for Response<Body> { impl From<WebResponse> for Response<Body> {
fn from(mut res: WebResponse) -> Response<Body> { fn from(mut res: WebResponse) -> Response<Body> {
let head = res.response.head_mut(); let head = res.response.head_mut();
if head.upgrade() { if res.request.head().upgrade() {
head.set_io(res.request.head()); head.set_io(res.request.head());
} }
res.response res.response

8
ntex/src/ws/client.rs
View file

@ -768,6 +768,14 @@ impl<F: Filter> WsConnection<F> {
} }
} }
impl<F> fmt::Debug for WsConnection<F> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.debug_struct("WsConnection")
.field("response", &self.res)
.finish()
}
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;

3
ntex/tests/connect.rs
View file

@ -71,7 +71,7 @@ mod danger {
#[ntex::test] #[ntex::test]
async fn test_openssl_string() { async fn test_openssl_string() {
use ntex::server::openssl; use ntex::server::openssl;
use ntex_tls::{openssl::PeerCert, types::HttpProtocol}; use ntex_tls::{openssl::PeerCert, openssl::PeerCertChain, types::HttpProtocol};
use tls_openssl::{ use tls_openssl::{
ssl::{SslConnector, SslMethod, SslVerifyMode}, ssl::{SslConnector, SslMethod, SslVerifyMode},
x509::X509, x509::X509,
@ -109,6 +109,7 @@ async fn test_openssl_string() {
io.query::<PeerCert>().as_ref().unwrap().0.to_der().unwrap(), io.query::<PeerCert>().as_ref().unwrap().0.to_der().unwrap(),
cert.to_der().unwrap() cert.to_der().unwrap()
); );
assert_eq!(io.query::<PeerCertChain>().as_ref().unwrap().0.len(), 1);
let item = io.recv(&BytesCodec).await.unwrap().unwrap(); let item = io.recv(&BytesCodec).await.unwrap().unwrap();
assert_eq!(item, Bytes::from_static(b"test")); assert_eq!(item, Bytes::from_static(b"test"));
} }

23
ntex/tests/web_ws.rs
View file

@ -3,7 +3,8 @@ use std::io;
use ntex::http::StatusCode; use ntex::http::StatusCode;
use ntex::service::{fn_factory_with_config, fn_service}; use ntex::service::{fn_factory_with_config, fn_service};
use ntex::util::{ByteString, Bytes}; use ntex::util::{ByteString, Bytes};
use ntex::web::{self, test, ws, App, HttpRequest}; use ntex::web::{self, test, ws, App, HttpRequest, HttpResponse};
use ntex::ws::error::WsClientError;
async fn service(msg: ws::Frame) -> Result<Option<ws::Message>, io::Error> { async fn service(msg: ws::Frame) -> Result<Option<ws::Message>, io::Error> {
let msg = match msg { let msg = match msg {
@ -65,6 +66,26 @@ async fn web_ws() {
assert_eq!(item, ws::Frame::Close(Some(ws::CloseCode::Away.into()))); assert_eq!(item, ws::Frame::Close(Some(ws::CloseCode::Away.into())));
} }
#[ntex::test]
async fn web_no_ws() {
let srv = test::server(|| {
App::new()
.service(web::resource("/").route(web::to(|| async { HttpResponse::Ok() })))
.service(web::resource("/ws_error").route(web::to(|| async {
Err::<HttpResponse, _>(io::Error::new(io::ErrorKind::Other, "test"))
})))
});
assert!(matches!(
srv.ws().await.err().unwrap(),
WsClientError::InvalidResponseStatus(StatusCode::OK)
));
assert!(matches!(
srv.ws_at("/ws_error").await.err().unwrap(),
WsClientError::InvalidResponseStatus(StatusCode::INTERNAL_SERVER_ERROR)
));
}
#[ntex::test] #[ntex::test]
async fn web_ws_client() { async fn web_ws_client() {
let srv = test::server(|| { let srv = test::server(|| {