Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-22 16:06:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor: safe sql access

Browse Source
This commit is contained in:
dignifiedquire
2019-06-08 16:42:29 +02:00
parent 205493f89d
commit ab41679855
34 changed files with 6550 additions and 8249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
src/oauth2.rs
View File

@@ -1,5 +1,4 @@
use std::collections::HashMap;
use std::ffi::CString;
use percent_encoding::{utf8_percent_encode, DEFAULT_ENCODE_SET};
use serde::Deserialize;
@@ -51,10 +50,11 @@ pub fn dc_get_oauth2_url(
redirect_uri: impl AsRef<str>,
) -> Option<String> {
if let Some(oauth2) = Oauth2::from_address(addr) {
set_config(
dc_sqlite3_set_config(
context,
&context.sql.clone().read().unwrap(),
"oauth2_pending_redirect_uri",
redirect_uri.as_ref(),
Some(redirect_uri.as_ref()),
);
let oauth2_url = replace_in_uri(&oauth2.get_code, "$CLIENT_ID", &oauth2.client_id);
let oauth2_url = replace_in_uri(&oauth2_url, "$REDIRECT_URI", redirect_uri.as_ref());
@@ -79,16 +79,31 @@ pub fn dc_get_oauth2_access_token(
// read generated token
if 0 == flags & 0x1 && !is_expired(context) {
let access_token = get_config(context, "oauth2_access_token");
let access_token = dc_sqlite3_get_config(
context,
&context.sql.clone().read().unwrap(),
"oauth2_access_token",
None,
);
if access_token.is_some() {
// success
return access_token;
}
}
let refresh_token = get_config(context, "oauth2_refresh_token");
let refresh_token_for =
get_config(context, "oauth2_refresh_token_for").unwrap_or_else(|| "unset".into());
let refresh_token = dc_sqlite3_get_config(
context,
&context.sql.clone().read().unwrap(),
"oauth2_refresh_token",
None,
);
let refresh_token_for = dc_sqlite3_get_config(
context,
&context.sql.clone().read().unwrap(),
"oauth2_refresh_token_for",
None,
)
.unwrap_or_else(|| "unset".into());
let (redirect_uri, token_url, update_redirect_uri_on_success) =
if refresh_token.is_none() || refresh_token_for != code.as_ref() {
@@ -97,8 +112,13 @@ pub fn dc_get_oauth2_access_token(
0, "Generate OAuth2 refresh_token and access_token...",
);
(
get_config(context, "oauth2_pending_redirect_uri")
.unwrap_or_else(|| "unset".into()),
dc_sqlite3_get_config(
context,
&context.sql.clone().read().unwrap(),
"oauth2_pending_redirect_uri",
None,
)
.unwrap_or_else(|| "unset".into()),
oauth2.init_token,
true,
)
@@ -108,7 +128,13 @@ pub fn dc_get_oauth2_access_token(
0, "Regenerate OAuth2 access_token by refresh_token...",
);
(
get_config(context, "oauth2_redirect_uri").unwrap_or_else(|| "unset".into()),
dc_sqlite3_get_config(
context,
&context.sql.clone().read().unwrap(),
"oauth2_redirect_uri",
None,
)
.unwrap_or_else(|| "unset".into()),
oauth2.refresh_token,
false,
)
@@ -151,23 +177,48 @@ pub fn dc_get_oauth2_access_token(
println!("response: {:?}", &parsed);
let response = parsed.unwrap();
if let Some(ref token) = response.refresh_token {
set_config(context, "oauth2_refresh_token", token);
set_config(context, "oauth2_refresh_token_for", code.as_ref());
dc_sqlite3_set_config(
context,
&context.sql.clone().read().unwrap(),
"oauth2_refresh_token",
Some(token),
);
dc_sqlite3_set_config(
context,
&context.sql.clone().read().unwrap(),
"oauth2_refresh_token_for",
Some(code.as_ref()),
);
}
// after that, save the access token.
// if it's unset, we may get it in the next round as we have the refresh_token now.
if let Some(ref token) = response.access_token {
set_config(context, "oauth2_access_token", token);
dc_sqlite3_set_config(
context,
&context.sql.clone().read().unwrap(),
"oauth2_access_token",
Some(token),
);
let expires_in = response
.expires_in
// refresh a bet before
.map(|t| time() + t as i64 - 5)
.unwrap_or_else(|| 0);
set_config_int64(context, "oauth2_timestamp_expires", expires_in);
dc_sqlite3_set_config_int64(
context,
&context.sql.clone().read().unwrap(),
"oauth2_timestamp_expires",
expires_in,
);
if update_redirect_uri_on_success {
set_config(context, "oauth2_redirect_uri", redirect_uri.as_ref());
dc_sqlite3_set_config(
context,
&context.sql.clone().read().unwrap(),
"oauth2_redirect_uri",
Some(redirect_uri.as_ref()),
);
}
} else {
warn!(context, 0, "Failed to find OAuth2 access token");
@@ -279,35 +330,9 @@ impl Oauth2 {
}
}
fn get_config(context: &Context, key: &str) -> Option<String> {
let key_c = CString::new(key).unwrap();
let res =
unsafe { dc_sqlite3_get_config(context, &context.sql, key_c.as_ptr(), std::ptr::null()) };
if res.is_null() {
return None;
}
Some(to_string(res))
}
fn set_config(context: &Context, key: &str, value: &str) {
let key_c = CString::new(key).unwrap();
let value_c = CString::new(value).unwrap();
unsafe { dc_sqlite3_set_config(context, &context.sql, key_c.as_ptr(), value_c.as_ptr()) };
}
fn set_config_int64(context: &Context, key: &str, value: i64) {
let key_c = CString::new(key).unwrap();
unsafe { dc_sqlite3_set_config_int64(context, &context.sql, key_c.as_ptr(), value) };
}
fn is_expired(context: &Context) -> bool {
let expire_timestamp = dc_sqlite3_get_config_int64(
context,
&context.sql,
b"oauth2_timestamp_expires\x00" as *const u8 as *const libc::c_char,
0i32 as int64_t,
);
let expire_timestamp =
dc_sqlite3_get_config_int64(context, &context.sql, "oauth2_timestamp_expires", Some(0));
if expire_timestamp <= 0 {
return false;