Removed obsolete Edge99 impersonate support (#114)

0x676e67 · Aug 12, 2024 · d40c754 · d40c754
1 parent 87219ca
commit d40c754
Show file tree

Hide file tree

Showing 49 changed files with 6 additions and 67 deletions.
diff --git a/src/tls/profile/chrome/mod.rs → src/tls/impersonate/chrome/mod.rs b/src/tls/profile/chrome/mod.rs → src/tls/impersonate/chrome/mod.rs
diff --git a/src/tls/profile/chrome/v100.rs → src/tls/impersonate/chrome/v100.rs b/src/tls/profile/chrome/v100.rs → src/tls/impersonate/chrome/v100.rs
diff --git a/src/tls/profile/chrome/v101.rs → src/tls/impersonate/chrome/v101.rs b/src/tls/profile/chrome/v101.rs → src/tls/impersonate/chrome/v101.rs
diff --git a/src/tls/profile/chrome/v104.rs → src/tls/impersonate/chrome/v104.rs b/src/tls/profile/chrome/v104.rs → src/tls/impersonate/chrome/v104.rs
diff --git a/src/tls/profile/chrome/v105.rs → src/tls/impersonate/chrome/v105.rs b/src/tls/profile/chrome/v105.rs → src/tls/impersonate/chrome/v105.rs
diff --git a/src/tls/profile/chrome/v106.rs → src/tls/impersonate/chrome/v106.rs b/src/tls/profile/chrome/v106.rs → src/tls/impersonate/chrome/v106.rs
diff --git a/src/tls/profile/chrome/v107.rs → src/tls/impersonate/chrome/v107.rs b/src/tls/profile/chrome/v107.rs → src/tls/impersonate/chrome/v107.rs
diff --git a/src/tls/profile/chrome/v108.rs → src/tls/impersonate/chrome/v108.rs b/src/tls/profile/chrome/v108.rs → src/tls/impersonate/chrome/v108.rs
diff --git a/src/tls/profile/chrome/v109.rs → src/tls/impersonate/chrome/v109.rs b/src/tls/profile/chrome/v109.rs → src/tls/impersonate/chrome/v109.rs
diff --git a/src/tls/profile/chrome/v114.rs → src/tls/impersonate/chrome/v114.rs b/src/tls/profile/chrome/v114.rs → src/tls/impersonate/chrome/v114.rs
diff --git a/src/tls/profile/chrome/v116.rs → src/tls/impersonate/chrome/v116.rs b/src/tls/profile/chrome/v116.rs → src/tls/impersonate/chrome/v116.rs
diff --git a/src/tls/profile/chrome/v117.rs → src/tls/impersonate/chrome/v117.rs b/src/tls/profile/chrome/v117.rs → src/tls/impersonate/chrome/v117.rs
diff --git a/src/tls/profile/chrome/v118.rs → src/tls/impersonate/chrome/v118.rs b/src/tls/profile/chrome/v118.rs → src/tls/impersonate/chrome/v118.rs
diff --git a/src/tls/profile/chrome/v119.rs → src/tls/impersonate/chrome/v119.rs b/src/tls/profile/chrome/v119.rs → src/tls/impersonate/chrome/v119.rs
diff --git a/src/tls/profile/chrome/v120.rs → src/tls/impersonate/chrome/v120.rs b/src/tls/profile/chrome/v120.rs → src/tls/impersonate/chrome/v120.rs
diff --git a/src/tls/profile/chrome/v123.rs → src/tls/impersonate/chrome/v123.rs b/src/tls/profile/chrome/v123.rs → src/tls/impersonate/chrome/v123.rs
diff --git a/src/tls/profile/chrome/v124.rs → src/tls/impersonate/chrome/v124.rs b/src/tls/profile/chrome/v124.rs → src/tls/impersonate/chrome/v124.rs
diff --git a/src/tls/profile/chrome/v126.rs → src/tls/impersonate/chrome/v126.rs b/src/tls/profile/chrome/v126.rs → src/tls/impersonate/chrome/v126.rs
diff --git a/src/tls/profile/chrome/v127.rs → src/tls/impersonate/chrome/v127.rs b/src/tls/profile/chrome/v127.rs → src/tls/impersonate/chrome/v127.rs
diff --git a/src/tls/profile/edge/edge101.rs → src/tls/impersonate/edge/edge101.rs b/src/tls/profile/edge/edge101.rs → src/tls/impersonate/edge/edge101.rs
diff --git a/src/tls/profile/edge/edge122.rs → src/tls/impersonate/edge/edge122.rs b/src/tls/profile/edge/edge122.rs → src/tls/impersonate/edge/edge122.rs
diff --git a/src/tls/profile/edge/edge127.rs → src/tls/impersonate/edge/edge127.rs b/src/tls/profile/edge/edge127.rs → src/tls/impersonate/edge/edge127.rs
diff --git a/src/tls/profile/edge/mod.rs → src/tls/impersonate/edge/mod.rs b/src/tls/profile/edge/mod.rs → src/tls/impersonate/edge/mod.rs
@@ -1,7 +1,6 @@
 pub mod edge101;
 pub mod edge122;
 pub mod edge127;
-pub mod edge99;
 
 const CIPHER_LIST: [&str; 15] = [
     "TLS_AES_128_GCM_SHA256",

diff --git a/src/tls/profile/mod.rs → src/tls/impersonate/mod.rs b/src/tls/profile/mod.rs → src/tls/impersonate/mod.rs
@@ -70,7 +70,6 @@ pub fn tls_settings(ver: Impersonate, headers: &mut HeaderMap) -> TlsResult<SslB
         OkHttp5 => okhttp::okhttp5::get_settings,
 
         // Edge
-        Edge99 => edge::edge99::get_settings,
         Edge101 => edge::edge101::get_settings,
         Edge122 => edge::edge122::get_settings,
         Edge127 => edge::edge127::get_settings
@@ -122,9 +121,8 @@ pub enum Impersonate {
     OkHttp4_9,
     OkHttp4_10,
     OkHttp5,
-    
+
     // Edge
-    Edge99,
     Edge101,
     Edge122,
     Edge127,
@@ -180,7 +178,6 @@ impl FromStr for Impersonate {
             "okhttp_5" => Ok(OkHttp5),
 
             // Edge
-            "edge_99" => Ok(Edge99),
             "edge_101" => Ok(Edge101),
             "edge_122" => Ok(Edge122),
             "edge_127" => Ok(Edge127),
@@ -223,7 +220,7 @@ impl Impersonate {
             }
 
             // Edge
-            Edge99 | Edge101 | Edge122 | Edge127 => TypedImpersonate::Edge,
+            Edge101 | Edge122 | Edge127 => TypedImpersonate::Edge,
         }
     }
 }

diff --git a/src/tls/profile/okhttp/mod.rs → src/tls/impersonate/okhttp/mod.rs b/src/tls/profile/okhttp/mod.rs → src/tls/impersonate/okhttp/mod.rs
diff --git a/src/tls/profile/okhttp/okhttp3_11.rs → src/tls/impersonate/okhttp/okhttp3_11.rs b/src/tls/profile/okhttp/okhttp3_11.rs → src/tls/impersonate/okhttp/okhttp3_11.rs
diff --git a/src/tls/profile/okhttp/okhttp3_13.rs → src/tls/impersonate/okhttp/okhttp3_13.rs b/src/tls/profile/okhttp/okhttp3_13.rs → src/tls/impersonate/okhttp/okhttp3_13.rs
diff --git a/src/tls/profile/okhttp/okhttp3_14.rs → src/tls/impersonate/okhttp/okhttp3_14.rs b/src/tls/profile/okhttp/okhttp3_14.rs → src/tls/impersonate/okhttp/okhttp3_14.rs
diff --git a/src/tls/profile/okhttp/okhttp3_9.rs → src/tls/impersonate/okhttp/okhttp3_9.rs b/src/tls/profile/okhttp/okhttp3_9.rs → src/tls/impersonate/okhttp/okhttp3_9.rs
diff --git a/src/tls/profile/okhttp/okhttp4_10.rs → src/tls/impersonate/okhttp/okhttp4_10.rs b/src/tls/profile/okhttp/okhttp4_10.rs → src/tls/impersonate/okhttp/okhttp4_10.rs
diff --git a/src/tls/profile/okhttp/okhttp4_9.rs → src/tls/impersonate/okhttp/okhttp4_9.rs b/src/tls/profile/okhttp/okhttp4_9.rs → src/tls/impersonate/okhttp/okhttp4_9.rs
diff --git a/src/tls/profile/okhttp/okhttp5.rs → src/tls/impersonate/okhttp/okhttp5.rs b/src/tls/profile/okhttp/okhttp5.rs → src/tls/impersonate/okhttp/okhttp5.rs
diff --git a/src/tls/profile/safari/mod.rs → src/tls/impersonate/safari/mod.rs b/src/tls/profile/safari/mod.rs → src/tls/impersonate/safari/mod.rs
diff --git a/src/tls/profile/safari/safari15_3.rs → src/tls/impersonate/safari/safari15_3.rs b/src/tls/profile/safari/safari15_3.rs → src/tls/impersonate/safari/safari15_3.rs
diff --git a/src/tls/profile/safari/safari15_5.rs → src/tls/impersonate/safari/safari15_5.rs b/src/tls/profile/safari/safari15_5.rs → src/tls/impersonate/safari/safari15_5.rs
diff --git a/src/tls/profile/safari/safari15_6_1.rs → src/tls/impersonate/safari/safari15_6_1.rs b/src/tls/profile/safari/safari15_6_1.rs → src/tls/impersonate/safari/safari15_6_1.rs
diff --git a/src/tls/profile/safari/safari16.rs → src/tls/impersonate/safari/safari16.rs b/src/tls/profile/safari/safari16.rs → src/tls/impersonate/safari/safari16.rs
diff --git a/src/tls/profile/safari/safari16_5.rs → src/tls/impersonate/safari/safari16_5.rs b/src/tls/profile/safari/safari16_5.rs → src/tls/impersonate/safari/safari16_5.rs
diff --git a/src/tls/profile/safari/safari17_0.rs → src/tls/impersonate/safari/safari17_0.rs b/src/tls/profile/safari/safari17_0.rs → src/tls/impersonate/safari/safari17_0.rs
diff --git a/src/tls/profile/safari/safari17_2_1.rs → src/tls/impersonate/safari/safari17_2_1.rs b/src/tls/profile/safari/safari17_2_1.rs → src/tls/impersonate/safari/safari17_2_1.rs
diff --git a/src/tls/profile/safari/safari17_4_1.rs → src/tls/impersonate/safari/safari17_4_1.rs b/src/tls/profile/safari/safari17_4_1.rs → src/tls/impersonate/safari/safari17_4_1.rs
diff --git a/src/tls/profile/safari/safari17_5.rs → src/tls/impersonate/safari/safari17_5.rs b/src/tls/profile/safari/safari17_5.rs → src/tls/impersonate/safari/safari17_5.rs
diff --git a/src/tls/profile/safari/safari_ios_16_5.rs → ...tls/impersonate/safari/safari_ios_16_5.rs b/src/tls/profile/safari/safari_ios_16_5.rs → ...tls/impersonate/safari/safari_ios_16_5.rs
diff --git a/src/tls/profile/safari/safari_ios_17_2.rs → ...tls/impersonate/safari/safari_ios_17_2.rs b/src/tls/profile/safari/safari_ios_17_2.rs → ...tls/impersonate/safari/safari_ios_17_2.rs
diff --git a/src/tls/profile/safari/safari_ios_17_4_1.rs → ...s/impersonate/safari/safari_ios_17_4_1.rs b/src/tls/profile/safari/safari_ios_17_4_1.rs → ...s/impersonate/safari/safari_ios_17_4_1.rs
diff --git a/src/tls/mod.rs b/src/tls/mod.rs
@@ -9,7 +9,7 @@
 mod cert_compression;
 pub mod connector;
 pub mod extension;
-mod profile;
+mod impersonate;
 mod settings;
 
 use crate::connect::HttpConnector;
@@ -20,8 +20,8 @@ use boring::{
     ssl::{ConnectConfiguration, SslConnectorBuilder},
 };
 use connector::{HttpsConnector, HttpsLayer, HttpsLayerSettings};
-pub(crate) use profile::tls_settings;
-pub use profile::{Impersonate, TypedImpersonate};
+pub(crate) use impersonate::tls_settings;
+pub use impersonate::{Impersonate, TypedImpersonate};
 pub use settings::{
     Http2Settings, ImpersonateSettings, SslBuilderSettings, SslContextSettings, SslSettings,
 };

diff --git a/src/tls/profile/edge/edge99.rs b/src/tls/profile/edge/edge99.rs
diff --git a/src/tls/settings.rs b/src/tls/settings.rs
@@ -1,5 +1,5 @@
 use super::{
-    profile::{Impersonate, TypedImpersonate},
+    impersonate::{Impersonate, TypedImpersonate},
     Version,
 };
 use crate::async_impl::client::HttpVersionPref;

diff --git a/tests/badssl.rs b/tests/badssl.rs
@@ -21,7 +21,6 @@ async fn test_badssl_modern() {
 #[tokio::test]
 async fn test_badssl_self_signed() {
     let text = rquest::Client::builder()
-        .impersonate(rquest::tls::OkHttp4_9)
         .danger_accept_invalid_certs(true)
         .no_proxy()
         .build()