actix/examples
1
0
Fork 0
mirror of https://github.com/actix/examples synced 2024-11-23 14:31:07 +01:00
Code Issues Releases Wiki Activity

use rustls v0.21

Browse Source
This commit is contained in:
Rob Ede 2023-08-29 18:28:12 +01:00
parent 9ac242138a
commit cfea68d5c7
No known key found for this signature in database
GPG Key ID: 97C636207D3EF933
12 changed files with 66 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
Cargo.lock generated
View File

@ -13,12 +13,11 @@ dependencies = [
]
[[package]]
name = "acme-micro"
version = "0.12.0"
name = "acme-lib"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a18fb402a32ddc56ef7015df8d575c326ea911887ba9b7661ce18786282e89a3"
checksum = "292ac9d513052341a7f5bdae61f31c4dc93c1dce2598508f52709df08cecc8b0"
dependencies = [
"anyhow",
"base64 0.13.1",
"lazy_static",
"log",
@ -131,9 +130,9 @@ dependencies = [
[[package]]
name = "actix-http"
version = "3.3.1"
version = "3.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2079246596c18b4a33e274ae10c0e50613f4d32a4198e09c7b93771013fed74"
checksum = "a92ef85799cba03f76e4f7c10f533e66d87c9a7e7055f3391f09000ad8351bc9"
dependencies = [
"actix-codec",
"actix-rt",
@ -142,7 +141,7 @@ dependencies = [
"actix-utils",
"ahash 0.8.3",
"base64 0.21.2",
"bitflags 1.3.2",
"bitflags 2.3.3",
"brotli",
"bytes 1.4.0",
"bytestring",
@ -390,23 +389,24 @@ dependencies = [
[[package]]
name = "actix-tls"
version = "3.0.3"
version = "3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9fde0cf292f7cdc7f070803cb9a0d45c018441321a78b1042ffbbb81ec333297"
checksum = "a70bd48b6604191a700372f60bdc997db560eff5e4d41a7f00664390b5228b38"
dependencies = [
"actix-codec",
"actix-rt",
"actix-service",
"actix-utils",
"futures-core",
"http",
"log",
"impl-more",
"openssl",
"pin-project-lite 0.2.10",
"tokio 1.29.1",
"tokio-openssl",
"tokio-rustls",
"tokio-rustls 0.24.1",
"tokio-util 0.7.8",
"webpki-roots 0.22.6",
"tracing",
"webpki-roots 0.25.2",
]
[[package]]
@ -421,9 +421,9 @@ dependencies = [
[[package]]
name = "actix-web"
version = "4.3.1"
version = "4.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd3cb42f9566ab176e1ef0b8b3a896529062b4efc6be0123046095914c4c1c96"
checksum = "0e4a5b5e29603ca8c94a77c65cf874718ceb60292c5a5c3e5f4ace041af462b9"
dependencies = [
"actix-codec",
"actix-http",
@ -435,7 +435,7 @@ dependencies = [
"actix-tls",
"actix-utils",
"actix-web-codegen",
"ahash 0.7.6",
"ahash 0.8.3",
"bytes 1.4.0",
"bytestring",
"cfg-if 1.0.0",
@ -444,7 +444,6 @@ dependencies = [
"encoding_rs",
"futures-core",
"futures-util",
"http",
"itoa 1.0.9",
"language-tags",
"log",
@ -456,7 +455,7 @@ dependencies = [
"serde_json",
"serde_urlencoded",
"smallvec 1.11.0",
"socket2 0.4.9",
"socket2 0.5.3",
"time 0.3.23",
"url",
]
@ -1114,9 +1113,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "awc"
version = "3.1.1"
version = "3.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87ef547a81796eb2dfe9b345aba34c2e08391a0502493711395b36dd64052b69"
checksum = "7fa3c705a9c7917ac0f41c0757a0a747b43bbc29b0b364b081bd7c5fc67fb223"
dependencies = [
"actix-codec",
"actix-http",
@ -1124,7 +1123,6 @@ dependencies = [
"actix-service",
"actix-tls",
"actix-utils",
"ahash 0.7.6",
"base64 0.21.2",
"bytes 1.4.0",
"cfg-if 1.0.0",
@ -1141,7 +1139,7 @@ dependencies = [
"percent-encoding",
"pin-project-lite 0.2.10",
"rand 0.8.5",
"rustls 0.20.8",
"rustls 0.21.5",
"serde",
"serde_json",
"serde_urlencoded",
@ -1157,8 +1155,8 @@ dependencies = [
"env_logger",
"log",
"mime",
"rustls 0.20.8",
"webpki-roots 0.24.0",
"rustls 0.21.5",
"webpki-roots 0.25.2",
]
[[package]]
@ -3819,7 +3817,7 @@ dependencies = [
"rustls 0.20.8",
"rustls-native-certs",
"tokio 1.29.1",
"tokio-rustls",
"tokio-rustls 0.23.4",
]
[[package]]
@ -4617,7 +4615,7 @@ dependencies = [
"env_logger",
"futures-util",
"log",
"rustls 0.20.8",
"rustls 0.21.5",
"rustls-pemfile",
]
@ -4774,7 +4772,7 @@ dependencies = [
"take_mut",
"thiserror",
"tokio 1.29.1",
"tokio-rustls",
"tokio-rustls 0.23.4",
"tokio-util 0.7.8",
"trust-dns-proto",
"trust-dns-resolver",
@ -5117,7 +5115,7 @@ dependencies = [
name = "openssl-auto-le"
version = "1.0.0"
dependencies = [
"acme-micro",
"acme-lib",
"actix-files",
"actix-web",
"anyhow",
@ -6310,6 +6308,7 @@ version = "0.21.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "79ea77c539259495ce8ca47f53e66ae0330a8819f67e23ac96ca02f50e7b7d36"
dependencies = [
"log",
"ring",
"rustls-webpki",
"sct 0.7.0",
@ -6323,7 +6322,7 @@ dependencies = [
"actix-web",
"env_logger",
"log",
"rustls 0.20.8",
"rustls 0.21.5",
"rustls-pemfile",
]
@ -6335,7 +6334,7 @@ dependencies = [
"actix-web",
"env_logger",
"log",
"rustls 0.20.8",
"rustls 0.21.5",
"rustls-pemfile",
]
@ -7193,7 +7192,7 @@ checksum = "804d3f245f894e61b1e6263c84b23ca675d96753b5abfd5cc8597d86806e8024"
dependencies = [
"once_cell",
"tokio 1.29.1",
"tokio-rustls",
"tokio-rustls 0.23.4",
]
[[package]]
@ -7957,6 +7956,16 @@ dependencies = [
"webpki 0.22.0",
]
[[package]]
name = "tokio-rustls"
version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
dependencies = [
"rustls 0.21.5",
"tokio 1.29.1",
]
[[package]]
name = "tokio-stream"
version = "0.1.14"
@ -8833,6 +8842,12 @@ dependencies = [
"rustls-webpki",
]
[[package]]
name = "webpki-roots"
version = "0.25.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc"
[[package]]
name = "websocket"
version = "1.0.0"

9
Cargo.toml
View File

@ -73,20 +73,20 @@ actix-broker = "0.4"
actix-codec = "0.5"
actix-cors = "0.6"
actix-files = "0.6"
actix-http = "3"
actix-http = "3.4"
actix-identity = "0.5"
actix-multipart = "0.6"
actix-multipart-derive = "0.6"
actix-protobuf = "0.9"
actix-session = "0.7"
actix-test = "0.1"
actix-tls = "3"
actix-tls = "3.1"
actix-utils = "3"
actix-web = "4.3"
actix-web = "4.4"
actix-web-actors = "4.1"
actix-web-lab = "0.19"
actix-ws = "0.2.5"
awc = "3"
awc = "3.2"
chrono = { version = "0.4.20", default-features = false, features = ["clock", "serde"] }
derive_more = "0.99.7"
@ -96,6 +96,7 @@ futures-util = { version = "0.3.17", default-features = false, features = ["std"
log = "0.4"
openssl = { version = "0.10.55", features = ["v110"] }
rand = "0.8"
rustls = "0.21"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
tokio = { version = "1.24.2", features = ["sync", "io-util"] }

2
cors/backend/Cargo.toml
View File

@ -4,7 +4,7 @@ version = "1.0.0"
edition = "2021"
[dependencies]
actix-web = { workspace = true, features = ["rustls"] }
actix-web.workspace = true
actix-cors.workspace = true
env_logger.workspace = true

6
https-tls/awc-https/Cargo.toml
View File

@ -5,10 +5,10 @@ edition = "2021"
[dependencies]
actix-web.workspace = true
awc = { version = "3", features = ["rustls"] }
awc = { workspace = true, features = ["rustls-0_21"] }
env_logger.workspace = true
log.workspace = true
mime = "0.3"
rustls = "0.20"
webpki-roots = "0.24"
rustls.workspace = true
webpki-roots = "0.25"

2
https-tls/openssl-auto-le/Cargo.toml
View File

@ -7,7 +7,7 @@ edition = "2021"
actix-web = { workspace = true, features = ["openssl"] }
actix-files.workspace = true
acme-micro = "0.12"
acme-lib = "0.8"
anyhow = "1"
env_logger.workspace = true
log.workspace = true

2
https-tls/openssl-auto-le/src/main.rs
View File

@ -1,6 +1,6 @@
use std::{fs, time::Duration};
use acme_micro::{create_p384_key, Certificate, Directory, DirectoryUrl};
use acme_lib::{create_p384_key, Certificate, Directory, DirectoryUrl};
use actix_files::Files;
use actix_web::{rt, web, App, HttpRequest, HttpServer, Responder};
use anyhow::anyhow;

4
https-tls/rustls-client-cert/Cargo.toml
View File

@ -5,8 +5,8 @@ edition = "2021"
[dependencies]
actix-tls.workspace = true
actix-web = { workspace = true, features = ["rustls"] }
actix-web = { workspace = true, features = ["rustls-0_21"] }
env_logger.workspace = true
log.workspace = true
rustls = "0.20"
rustls.workspace = true
rustls-pemfile = "1"

2
https-tls/rustls-client-cert/src/main.rs
View File

@ -108,7 +108,7 @@ async fn main() -> std::io::Result<()> {
HttpServer::new(|| App::new().default_service(web::to(route_whoami)))
.on_connect(get_client_cert)
.bind(("localhost", 8080))?
.bind_rustls(("localhost", 8443), config)?
.bind_rustls_021(("localhost", 8443), config)?
.workers(1)
.run()
.await

4
https-tls/rustls/Cargo.toml
View File

@ -8,10 +8,10 @@ name = "rustls-server"
path = "src/main.rs"
[dependencies]
actix-web = { workspace = true, features = ["rustls"] }
actix-web = { workspace = true, features = ["rustls-0_21"] }
actix-files.workspace = true
env_logger.workspace = true
log.workspace = true
rustls = "0.20.2"
rustls.workspace = true
rustls-pemfile = "1"

2
https-tls/rustls/src/main.rs
View File

@ -36,7 +36,7 @@ async fn main() -> std::io::Result<()> {
.service(web::redirect("/", "/index.html"))
.service(Files::new("/static", "static"))
})
.bind_rustls("127.0.0.1:8443", config)?
.bind_rustls_021("127.0.0.1:8443", config)?
.run()
.await
}

4
middleware/middleware-http-to-https/Cargo.toml
View File

@ -4,9 +4,9 @@ version = "1.0.0"
edition = "2021"
[dependencies]
actix-web = { workspace = true, features = ["rustls"] }
actix-web = { workspace = true, features = ["rustls-0_21"] }
env_logger.workspace = true
futures-util.workspace = true
log.workspace = true
rustls = "0.20"
rustls.workspace = true
rustls-pemfile = "1"

2
middleware/middleware-http-to-https/src/main.rs
View File

@ -62,7 +62,7 @@ async fn main() -> std::io::Result<()> {
.service(index)
})
.bind(("127.0.0.1", 80))? // HTTP port
.bind_rustls(("127.0.0.1", 443), config)? // HTTPS port
.bind_rustls_021(("127.0.0.1", 443), config)? // HTTPS port
.run()
.await
}