fix: remaining upgrade issues

actix · Aug 29, 2023 · 72d0d1e · 72d0d1e
1 parent 09dad8f
commit 72d0d1e
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 16 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/https-tls/awc-https/src/main.rs b/https-tls/awc-https/src/main.rs
@@ -49,7 +49,7 @@ async fn main() -> std::io::Result<()> {
             // Wikipedia requires a User-Agent header to make requests
             .add_default_header((header::USER_AGENT, "awc-example/1.0"))
             // a "connector" wraps the stream into an encrypted connection
-            .connector(Connector::new().rustls(Arc::clone(&client_tls_config)))
+            .connector(Connector::new().rustls_021(Arc::clone(&client_tls_config)))
             .finish();
 
         App::new()
@@ -66,7 +66,7 @@ async fn main() -> std::io::Result<()> {
 /// Create simple rustls client config from root certificates.
 fn rustls_config() -> ClientConfig {
     let mut root_store = RootCertStore::empty();
-    root_store.add_server_trust_anchors(webpki_roots::TLS_SERVER_ROOTS.0.iter().map(|ta| {
+    root_store.add_trust_anchors(webpki_roots::TLS_SERVER_ROOTS.iter().map(|ta| {
         OwnedTrustAnchor::from_subject_spki_name_constraints(
             ta.subject,
             ta.spki,

diff --git a/https-tls/openssl-auto-le/Cargo.toml b/https-tls/openssl-auto-le/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 actix-web = { workspace = true, features = ["openssl"] }
 actix-files.workspace = true
 
-acme-lib = "0.8"
+acme-micro = "0.12"
 anyhow = "1"
 env_logger.workspace = true
 log.workspace = true

diff --git a/https-tls/openssl-auto-le/src/main.rs b/https-tls/openssl-auto-le/src/main.rs
@@ -1,6 +1,6 @@
 use std::{fs, time::Duration};
 
-use acme_lib::{create_p384_key, Certificate, Directory, DirectoryUrl};
+use acme_micro::{create_p384_key, Certificate, Directory, DirectoryUrl};
 use actix_files::Files;
 use actix_web::{rt, web, App, HttpRequest, HttpServer, Responder};
 use anyhow::anyhow;

diff --git a/https-tls/rustls-client-cert/Cargo.toml b/https-tls/rustls-client-cert/Cargo.toml
@@ -4,7 +4,7 @@ version = "1.0.0"
 edition = "2021"
 
 [dependencies]
-actix-tls.workspace = true
+actix-tls = { workspace = true, features = ["rustls-0_21"] }
 actix-web = { workspace = true, features = ["rustls-0_21"] }
 env_logger.workspace = true
 log.workspace = true

diff --git a/https-tls/rustls-client-cert/src/main.rs b/https-tls/rustls-client-cert/src/main.rs
@@ -1,9 +1,9 @@
 //! This example shows how to use `actix_web::HttpServer::on_connect` to access client certificates
 //! pass them to a handler through connection-local data.
 
-use std::{any::Any, fs::File, io::BufReader, net::SocketAddr};
+use std::{any::Any, sync::Arc, fs::File, io::BufReader, net::SocketAddr};
 
-use actix_tls::accept::rustls::{reexports::ServerConfig, TlsStream};
+use actix_tls::accept::rustls_0_21::{reexports::ServerConfig, TlsStream};
 use actix_web::{
     dev::Extensions, rt::net::TcpStream, web, App, HttpRequest, HttpResponse, HttpServer, Responder,
 };
@@ -85,7 +85,7 @@ async fn main() -> std::io::Result<()> {
     let client_auth = AllowAnyAnonymousOrAuthenticatedClient::new(cert_store);
     let config = ServerConfig::builder()
         .with_safe_defaults()
-        .with_client_cert_verifier(client_auth);
+        .with_client_cert_verifier(Arc::new(client_auth));
 
     // import server cert and key
     let cert_file = &mut BufReader::new(File::open(SERVER_CERT)?);

diff --git a/websockets/chat-actorless/src/server.rs b/websockets/chat-actorless/src/server.rs
@@ -130,7 +130,7 @@ impl ChatServer {
         // auto join session to main room
         self.rooms
             .entry("main".to_owned())
-            .or_insert_with(HashSet::new)
+            .or_default()
             .insert(id);
 
         let count = self.visitor_count.fetch_add(1, Ordering::SeqCst);
@@ -187,7 +187,7 @@ impl ChatServer {
 
         self.rooms
             .entry(room.clone())
-            .or_insert_with(HashSet::new)
+            .or_default()
             .insert(conn_id);
 
         self.send_system_message(&room, conn_id, "Someone connected")

diff --git a/websockets/chat/src/server.rs b/websockets/chat/src/server.rs
@@ -131,7 +131,7 @@ impl Handler<Connect> for ChatServer {
         // auto join session to main room
         self.rooms
             .entry("main".to_owned())
-            .or_insert_with(HashSet::new)
+            .or_default()
             .insert(id);
 
         let count = self.visitor_count.fetch_add(1, Ordering::SeqCst);
@@ -213,7 +213,7 @@ impl Handler<Join> for ChatServer {
 
         self.rooms
             .entry(name.clone())
-            .or_insert_with(HashSet::new)
+            .or_default()
             .insert(id);
 
         self.send_message(&name, "Someone connected", id);