mirror of
https://github.com/fafhrd91/actix-web
synced 2025-03-20 06:25:16 +01:00
build(deps): update rand requirement from 0.8 to 0.9 (#3564)
* build(deps): update rand requirement from 0.8 to 0.9 Updates the requirements on [rand](https://github.com/rust-random/rand) to permit the latest version. - [Release notes](https://github.com/rust-random/rand/releases) - [Changelog](https://github.com/rust-random/rand/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-random/rand/compare/0.8.0...0.9.0) --- updated-dependencies: - dependency-name: rand dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> * chore: fix rand upgrade * chore: address clippy lint --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Rob Ede <robjtede@icloud.com>
This commit is contained in:
parent
59961a58a8
commit
66e2afe306
@ -132,7 +132,7 @@ h2 = { version = "0.3.26", optional = true }
|
|||||||
# websockets
|
# websockets
|
||||||
local-channel = { version = "0.1", optional = true }
|
local-channel = { version = "0.1", optional = true }
|
||||||
base64 = { version = "0.22", optional = true }
|
base64 = { version = "0.22", optional = true }
|
||||||
rand = { version = "0.8", optional = true }
|
rand = { version = "0.9", optional = true }
|
||||||
sha1 = { version = "0.10", optional = true }
|
sha1 = { version = "0.10", optional = true }
|
||||||
|
|
||||||
# openssl/rustls
|
# openssl/rustls
|
||||||
|
@ -16,6 +16,7 @@ use actix_utils::future::{err, ok, ready};
|
|||||||
use bytes::Bytes;
|
use bytes::Bytes;
|
||||||
use derive_more::derive::{Display, Error};
|
use derive_more::derive::{Display, Error};
|
||||||
use futures_util::{stream::once, FutureExt as _, StreamExt as _};
|
use futures_util::{stream::once, FutureExt as _, StreamExt as _};
|
||||||
|
use rand::Rng as _;
|
||||||
use regex::Regex;
|
use regex::Regex;
|
||||||
|
|
||||||
#[actix_rt::test]
|
#[actix_rt::test]
|
||||||
@ -164,7 +165,10 @@ async fn chunked_payload() {
|
|||||||
|
|
||||||
for chunk_size in chunk_sizes.iter() {
|
for chunk_size in chunk_sizes.iter() {
|
||||||
let mut bytes = Vec::new();
|
let mut bytes = Vec::new();
|
||||||
let random_bytes: Vec<u8> = (0..*chunk_size).map(|_| rand::random::<u8>()).collect();
|
let random_bytes = rand::rng()
|
||||||
|
.sample_iter(rand::distr::StandardUniform)
|
||||||
|
.take(*chunk_size)
|
||||||
|
.collect::<Vec<_>>();
|
||||||
|
|
||||||
bytes.extend(format!("{:X}\r\n", chunk_size).as_bytes());
|
bytes.extend(format!("{:X}\r\n", chunk_size).as_bytes());
|
||||||
bytes.extend(&random_bytes[..]);
|
bytes.extend(&random_bytes[..]);
|
||||||
|
@ -50,7 +50,7 @@ local-waker = "0.1"
|
|||||||
log = "0.4"
|
log = "0.4"
|
||||||
memchr = "2.5"
|
memchr = "2.5"
|
||||||
mime = "0.3"
|
mime = "0.3"
|
||||||
rand = "0.8"
|
rand = "0.9"
|
||||||
serde = "1"
|
serde = "1"
|
||||||
serde_json = "1"
|
serde_json = "1"
|
||||||
serde_plain = "1"
|
serde_plain = "1"
|
||||||
|
@ -5,10 +5,7 @@ use actix_web::{
|
|||||||
web::{BufMut as _, Bytes, BytesMut},
|
web::{BufMut as _, Bytes, BytesMut},
|
||||||
};
|
};
|
||||||
use mime::Mime;
|
use mime::Mime;
|
||||||
use rand::{
|
use rand::distr::{Alphanumeric, SampleString as _};
|
||||||
distributions::{Alphanumeric, DistString as _},
|
|
||||||
thread_rng,
|
|
||||||
};
|
|
||||||
|
|
||||||
const CRLF: &[u8] = b"\r\n";
|
const CRLF: &[u8] = b"\r\n";
|
||||||
const CRLF_CRLF: &[u8] = b"\r\n\r\n";
|
const CRLF_CRLF: &[u8] = b"\r\n\r\n";
|
||||||
@ -64,7 +61,7 @@ pub fn create_form_data_payload_and_headers(
|
|||||||
content_type: Option<Mime>,
|
content_type: Option<Mime>,
|
||||||
file: Bytes,
|
file: Bytes,
|
||||||
) -> (Bytes, HeaderMap) {
|
) -> (Bytes, HeaderMap) {
|
||||||
let boundary = Alphanumeric.sample_string(&mut thread_rng(), 32);
|
let boundary = Alphanumeric.sample_string(&mut rand::rng(), 32);
|
||||||
|
|
||||||
create_form_data_payload_and_headers_with_boundary(
|
create_form_data_payload_and_headers_with_boundary(
|
||||||
&boundary,
|
&boundary,
|
||||||
|
@ -180,7 +180,7 @@ criterion = { version = "0.5", features = ["html_reports"] }
|
|||||||
env_logger = "0.11"
|
env_logger = "0.11"
|
||||||
flate2 = "1.0.13"
|
flate2 = "1.0.13"
|
||||||
futures-util = { version = "0.3.17", default-features = false, features = ["std"] }
|
futures-util = { version = "0.3.17", default-features = false, features = ["std"] }
|
||||||
rand = "0.8"
|
rand = "0.9"
|
||||||
rcgen = "0.13"
|
rcgen = "0.13"
|
||||||
rustls-pemfile = "2"
|
rustls-pemfile = "2"
|
||||||
serde = { version = "1", features = ["derive"] }
|
serde = { version = "1", features = ["derive"] }
|
||||||
|
@ -25,7 +25,7 @@ use openssl::{
|
|||||||
ssl::{SslAcceptor, SslMethod},
|
ssl::{SslAcceptor, SslMethod},
|
||||||
x509::X509,
|
x509::X509,
|
||||||
};
|
};
|
||||||
use rand::{distributions::Alphanumeric, Rng as _};
|
use rand::distr::{Alphanumeric, SampleString as _};
|
||||||
|
|
||||||
mod utils;
|
mod utils;
|
||||||
|
|
||||||
@ -188,11 +188,7 @@ async fn body_gzip_large() {
|
|||||||
|
|
||||||
#[actix_rt::test]
|
#[actix_rt::test]
|
||||||
async fn test_body_gzip_large_random() {
|
async fn test_body_gzip_large_random() {
|
||||||
let data = rand::thread_rng()
|
let data = Alphanumeric.sample_string(&mut rand::rng(), 70_000);
|
||||||
.sample_iter(&Alphanumeric)
|
|
||||||
.take(70_000)
|
|
||||||
.map(char::from)
|
|
||||||
.collect::<String>();
|
|
||||||
let srv_data = data.clone();
|
let srv_data = data.clone();
|
||||||
|
|
||||||
let srv = actix_test::start_with(actix_test::config().h1(), move || {
|
let srv = actix_test::start_with(actix_test::config().h1(), move || {
|
||||||
@ -432,11 +428,7 @@ async fn test_zstd_encoding() {
|
|||||||
|
|
||||||
#[actix_rt::test]
|
#[actix_rt::test]
|
||||||
async fn test_zstd_encoding_large() {
|
async fn test_zstd_encoding_large() {
|
||||||
let data = rand::thread_rng()
|
let data = Alphanumeric.sample_string(&mut rand::rng(), 320_000);
|
||||||
.sample_iter(&Alphanumeric)
|
|
||||||
.take(320_000)
|
|
||||||
.map(char::from)
|
|
||||||
.collect::<String>();
|
|
||||||
|
|
||||||
let srv = actix_test::start_with(actix_test::config().h1(), || {
|
let srv = actix_test::start_with(actix_test::config().h1(), || {
|
||||||
App::new().service(
|
App::new().service(
|
||||||
@ -529,11 +521,7 @@ async fn test_gzip_encoding_large() {
|
|||||||
|
|
||||||
#[actix_rt::test]
|
#[actix_rt::test]
|
||||||
async fn test_reading_gzip_encoding_large_random() {
|
async fn test_reading_gzip_encoding_large_random() {
|
||||||
let data = rand::thread_rng()
|
let data = Alphanumeric.sample_string(&mut rand::rng(), 60_000);
|
||||||
.sample_iter(&Alphanumeric)
|
|
||||||
.take(60_000)
|
|
||||||
.map(char::from)
|
|
||||||
.collect::<String>();
|
|
||||||
|
|
||||||
let srv = actix_test::start_with(actix_test::config().h1(), || {
|
let srv = actix_test::start_with(actix_test::config().h1(), || {
|
||||||
App::new().service(web::resource("/").route(web::to(move |body: Bytes| async {
|
App::new().service(web::resource("/").route(web::to(move |body: Bytes| async {
|
||||||
@ -599,11 +587,7 @@ async fn test_reading_deflate_encoding_large() {
|
|||||||
|
|
||||||
#[actix_rt::test]
|
#[actix_rt::test]
|
||||||
async fn test_reading_deflate_encoding_large_random() {
|
async fn test_reading_deflate_encoding_large_random() {
|
||||||
let data = rand::thread_rng()
|
let data = Alphanumeric.sample_string(&mut rand::rng(), 160_000);
|
||||||
.sample_iter(&Alphanumeric)
|
|
||||||
.take(160_000)
|
|
||||||
.map(char::from)
|
|
||||||
.collect::<String>();
|
|
||||||
|
|
||||||
let srv = actix_test::start_with(actix_test::config().h1(), || {
|
let srv = actix_test::start_with(actix_test::config().h1(), || {
|
||||||
App::new().service(web::resource("/").route(web::to(move |body: Bytes| async {
|
App::new().service(web::resource("/").route(web::to(move |body: Bytes| async {
|
||||||
@ -648,11 +632,7 @@ async fn test_brotli_encoding() {
|
|||||||
|
|
||||||
#[actix_rt::test]
|
#[actix_rt::test]
|
||||||
async fn test_brotli_encoding_large() {
|
async fn test_brotli_encoding_large() {
|
||||||
let data = rand::thread_rng()
|
let data = Alphanumeric.sample_string(&mut rand::rng(), 320_000);
|
||||||
.sample_iter(&Alphanumeric)
|
|
||||||
.take(320_000)
|
|
||||||
.map(char::from)
|
|
||||||
.collect::<String>();
|
|
||||||
|
|
||||||
let srv = actix_test::start_with(actix_test::config().h1(), || {
|
let srv = actix_test::start_with(actix_test::config().h1(), || {
|
||||||
App::new().service(
|
App::new().service(
|
||||||
@ -737,11 +717,7 @@ mod plus_rustls {
|
|||||||
|
|
||||||
#[actix_rt::test]
|
#[actix_rt::test]
|
||||||
async fn test_reading_deflate_encoding_large_random_rustls() {
|
async fn test_reading_deflate_encoding_large_random_rustls() {
|
||||||
let data = rand::thread_rng()
|
let data = Alphanumeric.sample_string(&mut rand::rng(), 160_000);
|
||||||
.sample_iter(&Alphanumeric)
|
|
||||||
.take(160_000)
|
|
||||||
.map(char::from)
|
|
||||||
.collect::<String>();
|
|
||||||
|
|
||||||
let srv = actix_test::start_with(actix_test::config().rustls_0_23(tls_config()), || {
|
let srv = actix_test::start_with(actix_test::config().rustls_0_23(tls_config()), || {
|
||||||
App::new().service(web::resource("/").route(web::to(|bytes: Bytes| async {
|
App::new().service(web::resource("/").route(web::to(|bytes: Bytes| async {
|
||||||
|
@ -116,7 +116,7 @@ log =" 0.4"
|
|||||||
mime = "0.3"
|
mime = "0.3"
|
||||||
percent-encoding = "2.1"
|
percent-encoding = "2.1"
|
||||||
pin-project-lite = "0.2"
|
pin-project-lite = "0.2"
|
||||||
rand = "0.8"
|
rand = "0.9"
|
||||||
serde = "1.0"
|
serde = "1.0"
|
||||||
serde_json = "1.0"
|
serde_json = "1.0"
|
||||||
serde_urlencoded = "0.7"
|
serde_urlencoded = "0.7"
|
||||||
|
@ -326,7 +326,7 @@ impl WebsocketsRequest {
|
|||||||
|
|
||||||
// Generate a random key for the `Sec-WebSocket-Key` header which is a base64-encoded
|
// Generate a random key for the `Sec-WebSocket-Key` header which is a base64-encoded
|
||||||
// (see RFC 4648 §4) value that, when decoded, is 16 bytes in length (RFC 6455 §1.3).
|
// (see RFC 4648 §4) value that, when decoded, is 16 bytes in length (RFC 6455 §1.3).
|
||||||
let sec_key: [u8; 16] = rand::random();
|
let sec_key = rand::random::<[u8; 16]>();
|
||||||
let key = BASE64_STANDARD.encode(sec_key);
|
let key = BASE64_STANDARD.encode(sec_key);
|
||||||
|
|
||||||
self.head.headers.insert(
|
self.head.headers.insert(
|
||||||
|
@ -20,7 +20,7 @@ use base64::prelude::*;
|
|||||||
use bytes::Bytes;
|
use bytes::Bytes;
|
||||||
use cookie::Cookie;
|
use cookie::Cookie;
|
||||||
use futures_util::stream;
|
use futures_util::stream;
|
||||||
use rand::Rng;
|
use rand::distr::{Alphanumeric, SampleString as _};
|
||||||
|
|
||||||
mod utils;
|
mod utils;
|
||||||
|
|
||||||
@ -516,11 +516,7 @@ async fn client_gzip_encoding_large() {
|
|||||||
#[cfg(feature = "compress-gzip")]
|
#[cfg(feature = "compress-gzip")]
|
||||||
#[actix_rt::test]
|
#[actix_rt::test]
|
||||||
async fn client_gzip_encoding_large_random() {
|
async fn client_gzip_encoding_large_random() {
|
||||||
let data = rand::thread_rng()
|
let data = Alphanumeric.sample_string(&mut rand::rng(), 100_000);
|
||||||
.sample_iter(&rand::distributions::Alphanumeric)
|
|
||||||
.take(100_000)
|
|
||||||
.map(char::from)
|
|
||||||
.collect::<String>();
|
|
||||||
|
|
||||||
let srv = actix_test::start(|| {
|
let srv = actix_test::start(|| {
|
||||||
App::new().service(web::resource("/").route(web::to(|data: Bytes| async {
|
App::new().service(web::resource("/").route(web::to(|data: Bytes| async {
|
||||||
@ -562,11 +558,7 @@ async fn client_brotli_encoding() {
|
|||||||
#[cfg(feature = "compress-brotli")]
|
#[cfg(feature = "compress-brotli")]
|
||||||
#[actix_rt::test]
|
#[actix_rt::test]
|
||||||
async fn client_brotli_encoding_large_random() {
|
async fn client_brotli_encoding_large_random() {
|
||||||
let data = rand::thread_rng()
|
let data = Alphanumeric.sample_string(&mut rand::rng(), 70_000);
|
||||||
.sample_iter(&rand::distributions::Alphanumeric)
|
|
||||||
.take(70_000)
|
|
||||||
.map(char::from)
|
|
||||||
.collect::<String>();
|
|
||||||
|
|
||||||
let srv = actix_test::start(|| {
|
let srv = actix_test::start(|| {
|
||||||
App::new().service(web::resource("/").route(web::to(|data: Bytes| async {
|
App::new().service(web::resource("/").route(web::to(|data: Bytes| async {
|
||||||
@ -607,11 +599,7 @@ async fn client_deflate_encoding() {
|
|||||||
|
|
||||||
#[actix_rt::test]
|
#[actix_rt::test]
|
||||||
async fn client_deflate_encoding_large_random() {
|
async fn client_deflate_encoding_large_random() {
|
||||||
let data = rand::thread_rng()
|
let data = Alphanumeric.sample_string(&mut rand::rng(), 70_000);
|
||||||
.sample_iter(rand::distributions::Alphanumeric)
|
|
||||||
.map(char::from)
|
|
||||||
.take(70_000)
|
|
||||||
.collect::<String>();
|
|
||||||
|
|
||||||
let srv = actix_test::start(|| {
|
let srv = actix_test::start(|| {
|
||||||
App::new().default_service(web::to(|body: Bytes| async {
|
App::new().default_service(web::to(|body: Bytes| async {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user