Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-08 09:26:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

also convert lookup_field function to use a &str param isntead of char*

Browse Source
This commit is contained in:
holger krekel
2019-07-10 11:43:16 +02:00
parent e3fb0a23c6
commit 6d17de05b2
1 changed files with 17 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/dc_securejoin.rs
View File

@@ -401,10 +401,7 @@ pub unsafe fn dc_handle_securejoin_handshake(
let mut ret: libc::c_int = 0i32; let mut ret: libc::c_int = 0i32;
let mut contact: *mut dc_contact_t = 0 as *mut dc_contact_t; let mut contact: *mut dc_contact_t = 0 as *mut dc_contact_t;
if !(contact_id <= 9i32 as libc::c_uint) { if !(contact_id <= 9i32 as libc::c_uint) {
step = lookup_field( step = lookup_field(mimeparser, "Secure-Join");
mimeparser,
b"Secure-Join\x00" as *const u8 as *const libc::c_char,
);
if !step.is_null() { if !step.is_null() {
dc_log_info( dc_log_info(
context, context,
@@ -438,31 +435,26 @@ pub unsafe fn dc_handle_securejoin_handshake(
// send_message() will fail with the error "End-to-end-encryption unavailable unexpectedly.", so, there is no additional check needed here. // send_message() will fail with the error "End-to-end-encryption unavailable unexpectedly.", so, there is no additional check needed here.
// verify that the `Secure-Join-Invitenumber:`-header matches invitenumber written to the QR code // verify that the `Secure-Join-Invitenumber:`-header matches invitenumber written to the QR code
let invitenumber: *const libc::c_char; let invitenumber: *const libc::c_char;
invitenumber = lookup_field( invitenumber = lookup_field(mimeparser, "Secure-Join-Invitenumber");
mimeparser,
b"Secure-Join-Invitenumber\x00" as *const u8 as *const libc::c_char,
);
if invitenumber.is_null() { if invitenumber.is_null() {
dc_log_warning( warn!(
context, context,
0i32, 0,
b"Secure-join denied (invitenumber missing).\x00" as *const u8 "Secure-join denied (invitenumber missing).",
as *const libc::c_char,
); );
current_block = 4378276786830486580; current_block = 4378276786830486580;
} else if dc_token_exists(context, DC_TOKEN_INVITENUMBER, invitenumber) == 0i32 { } else if dc_token_exists(context, DC_TOKEN_INVITENUMBER, invitenumber) == 0i32 {
dc_log_warning( warn!(
context, context,
0i32, 0,
b"Secure-join denied (bad invitenumber).\x00" as *const u8 "Secure-join denied (bad invitenumber).",
as *const libc::c_char,
); );
current_block = 4378276786830486580; current_block = 4378276786830486580;
} else { } else {
dc_log_info( info!(
context, context,
0i32, 0,
b"Secure-join requested.\x00" as *const u8 as *const libc::c_char, "Secure-join requested.",
); );
context.call_cb( context.call_cb(
Event::SECUREJOIN_INVITER_PROGRESS, Event::SECUREJOIN_INVITER_PROGRESS,
@@ -589,10 +581,7 @@ pub unsafe fn dc_handle_securejoin_handshake(
============================================================ */ ============================================================ */
// verify that Secure-Join-Fingerprint:-header matches the fingerprint of Bob // verify that Secure-Join-Fingerprint:-header matches the fingerprint of Bob
let fingerprint: *const libc::c_char; let fingerprint: *const libc::c_char;
fingerprint = lookup_field( fingerprint = lookup_field(mimeparser, "Secure-Join-Fingerprint");
mimeparser,
b"Secure-Join-Fingerprint\x00" as *const u8 as *const libc::c_char,
);
if fingerprint.is_null() { if fingerprint.is_null() {
could_not_establish_secure_connection( could_not_establish_secure_connection(
context, context,
@@ -623,10 +612,7 @@ pub unsafe fn dc_handle_securejoin_handshake(
); );
// verify that the `Secure-Join-Auth:`-header matches the secret written to the QR code // verify that the `Secure-Join-Auth:`-header matches the secret written to the QR code
let auth_0: *const libc::c_char; let auth_0: *const libc::c_char;
auth_0 = lookup_field( auth_0 = lookup_field(mimeparser, "Secure-Join-Auth");
mimeparser,
b"Secure-Join-Auth\x00" as *const u8 as *const libc::c_char,
);
if auth_0.is_null() { if auth_0.is_null() {
could_not_establish_secure_connection( could_not_establish_secure_connection(
context, context,
@@ -668,10 +654,7 @@ pub unsafe fn dc_handle_securejoin_handshake(
600i32 as uintptr_t, 600i32 as uintptr_t,
); );
if 0 != join_vg { if 0 != join_vg {
grpid = dc_strdup(lookup_field( grpid = dc_strdup(lookup_field(mimeparser, "Secure-Join-Group"));
mimeparser,
b"Secure-Join-Group\x00" as *const u8 as *const libc::c_char,
));
let group_chat_id: uint32_t = dc_get_chat_id_by_grpid( let group_chat_id: uint32_t = dc_get_chat_id_by_grpid(
context, context,
grpid, grpid,
@@ -805,11 +788,7 @@ pub unsafe fn dc_handle_securejoin_handshake(
if 0 != join_vg { if 0 != join_vg {
if 0 == dc_addr_equals_self( if 0 == dc_addr_equals_self(
context, context,
lookup_field( lookup_field(mimeparser, "Chat-Group-Member-Added"),
mimeparser,
b"Chat-Group-Member-Added\x00" as *const u8
as *const libc::c_char,
),
) { ) {
dc_log_info(context, 0i32, dc_log_info(context, 0i32,
b"Message belongs to a different handshake (scaled up contact anyway to allow creation of group).\x00" b"Message belongs to a different handshake (scaled up contact anyway to allow creation of group).\x00"
@@ -927,12 +906,9 @@ unsafe fn secure_connection_established(context: &Context, contact_chat_id: uint
dc_contact_unref(contact); dc_contact_unref(contact);
} }
unsafe fn lookup_field( unsafe fn lookup_field(mimeparser: &dc_mimeparser_t, key: &str) -> *const libc::c_char {
mimeparser: &dc_mimeparser_t,
key: *const libc::c_char,
) -> *const libc::c_char {
let mut value: *const libc::c_char = 0 as *const libc::c_char; let mut value: *const libc::c_char = 0 as *const libc::c_char;
let field: *mut mailimf_field = dc_mimeparser_lookup_field(mimeparser, as_str(key)); let field: *mut mailimf_field = dc_mimeparser_lookup_field(mimeparser, key);
if field.is_null() if field.is_null()
|| (*field).fld_type != MAILIMF_FIELD_OPTIONAL_FIELD as libc::c_int || (*field).fld_type != MAILIMF_FIELD_OPTIONAL_FIELD as libc::c_int
|| (*field).fld_data.fld_optional_field.is_null() || (*field).fld_data.fld_optional_field.is_null()