migration_tool: Switch from OpenSSL to Rustls

This commit is contained in:
Valentin Tolmer
2022-07-15 15:20:25 +02:00
committed by nitnelave
parent 5e4ed9ee17
commit 4ba0db4e9e
3 changed files with 249 additions and 112 deletions
+13 -4
View File
@@ -6,8 +6,6 @@ authors = ["Valentin Tolmer <valentin@tolmer.fr>"]
[dependencies]
anyhow = "*"
graphql_client = "0.10"
ldap3 = "*"
rand = "0.8"
requestty = "*"
serde = "1"
@@ -16,8 +14,19 @@ smallvec = "*"
[dependencies.lldap_auth]
path = "../auth"
features = [ "opaque_client" ]
features = ["opaque_client"]
[dependencies.graphql_client]
features = ["graphql_query_derive", "reqwest-rustls"]
default-features = false
version = "0.11"
[dependencies.reqwest]
version = "*"
features = [ "json", "blocking" ]
default-features = false
features = ["json", "blocking", "rustls-tls"]
[dependencies.ldap3]
version = "*"
default-features = false
features = ["sync", "tls-rustls"]
+7 -8
View File
@@ -30,7 +30,7 @@ impl GraphQLClient {
where
QueryType: GraphQLQuery + 'static,
{
let unwrap_graphql_response = |graphql_client::Response { data, errors }| {
let unwrap_graphql_response = |graphql_client::Response { data, errors, .. }| {
data.ok_or_else(|| {
anyhow!(
"Errors: [{}]",
@@ -69,13 +69,12 @@ pub struct User {
impl User {
// https://github.com/graphql-rust/graphql-client/issues/386
#[allow(non_snake_case)]
pub fn new(
id: String,
email: String,
displayName: Option<String>,
firstName: Option<String>,
lastName: Option<String>,
display_name: Option<String>,
first_name: Option<String>,
last_name: Option<String>,
password: Option<String>,
dn: String,
) -> User {
@@ -83,9 +82,9 @@ impl User {
user_input: create_user::CreateUserInput {
id,
email,
displayName,
firstName,
lastName,
display_name,
first_name,
last_name,
},
password,
dn,