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

Merge tag 'v1.142.11'

Browse Source
This commit is contained in:
link2xt
2024-08-30 22:38:15 +00:00
parent 93e181b2da fcf3dbbad4
commit 9d47be0d8a
15 changed files with 43 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@@ -1,5 +1,11 @@
# Changelog
## [1.142.11] - 2024-08-30
### Fixes
- Set backward verification when observing vc-contact-confirm or `vg-member-added` ([#5930](https://github.com/deltachat/deltachat-core-rust/pull/5930)).
## [1.142.10] - 2024-08-26
### Fixes
@@ -4792,3 +4798,4 @@ https://github.com/deltachat/deltachat-core-rust/pulls?q=is%3Apr+is%3Aclosed
[1.142.8]: https://github.com/deltachat/deltachat-core-rust/compare/v1.142.7...v1.142.8
[1.142.9]: https://github.com/deltachat/deltachat-core-rust/compare/v1.142.8...v1.142.9
[1.142.10]: https://github.com/deltachat/deltachat-core-rust/compare/v1.142.9..v1.142.10
[1.142.11]: https://github.com/deltachat/deltachat-core-rust/compare/v1.142.10..v1.142.11

10
Cargo.lock generated
View File

@@ -1249,7 +1249,7 @@ dependencies = [
[[package]]
name = "deltachat"
version = "1.142.10"
version = "1.142.11"
dependencies = [
"ansi_term",
"anyhow",
@@ -1343,7 +1343,7 @@ dependencies = [
[[package]]
name = "deltachat-jsonrpc"
version = "1.142.10"
version = "1.142.11"
dependencies = [
"anyhow",
"async-channel 2.3.1",
@@ -1368,7 +1368,7 @@ dependencies = [
[[package]]
name = "deltachat-repl"
version = "1.142.10"
version = "1.142.11"
dependencies = [
"ansi_term",
"anyhow",
@@ -1383,7 +1383,7 @@ dependencies = [
[[package]]
name = "deltachat-rpc-server"
version = "1.142.10"
version = "1.142.11"
dependencies = [
"anyhow",
"deltachat",
@@ -1412,7 +1412,7 @@ dependencies = [
[[package]]
name = "deltachat_ffi"
version = "1.142.10"
version = "1.142.11"
dependencies = [
"anyhow",
"deltachat",

2
Cargo.toml
View File

@@ -1,6 +1,6 @@
[package]
name = "deltachat"
version = "1.142.10"
version = "1.142.11"
edition = "2021"
license = "MPL-2.0"
rust-version = "1.77"

2
deltachat-ffi/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package]
name = "deltachat_ffi"
version = "1.142.10"
version = "1.142.11"
description = "Deltachat FFI"
edition = "2018"
readme = "README.md"

2
deltachat-jsonrpc/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package]
name = "deltachat-jsonrpc"
version = "1.142.10"
version = "1.142.11"
description = "DeltaChat JSON-RPC API"
edition = "2021"
default-run = "deltachat-jsonrpc-server"

2
deltachat-jsonrpc/typescript/package.json
View File

@@ -58,5 +58,5 @@
},
"type": "module",
"types": "dist/deltachat.d.ts",
"version": "1.142.10"
"version": "1.142.11"
}

2
deltachat-repl/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package]
name = "deltachat-repl"
version = "1.142.10"
version = "1.142.11"
license = "MPL-2.0"
edition = "2021"
repository = "https://github.com/deltachat/deltachat-core-rust"

2
deltachat-rpc-client/pyproject.toml
View File

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
[project]
name = "deltachat-rpc-client"
version = "1.142.10"
version = "1.142.11"
description = "Python client for Delta Chat core JSON-RPC interface"
classifiers = [
"Development Status :: 5 - Production/Stable",

17
deltachat-rpc-client/tests/test_securejoin.py
View File

@@ -61,9 +61,16 @@ def test_qr_setup_contact_svg(acfactory) -> None:
@pytest.mark.parametrize("protect", [True, False])
def test_qr_securejoin(acfactory, protect):
def test_qr_securejoin(acfactory, protect, tmp_path):
alice, bob = acfactory.get_online_accounts(2)
# Setup second device for Alice
# to test observing securejoin protocol.
alice.export_backup(tmp_path)
files = list(tmp_path.glob("*.tar"))
alice2 = acfactory.get_unconfigured_account()
alice2.import_backup(files[0])
logging.info("Alice creates a verified group")
alice_chat = alice.create_group("Verified group", protect=protect)
assert alice_chat.get_basic_snapshot().is_protected == protect
@@ -97,6 +104,14 @@ def test_qr_securejoin(acfactory, protect):
bob_contact_alice_snapshot = bob_contact_alice.get_snapshot()
assert bob_contact_alice_snapshot.is_verified
# Start second Alice device.
# Alice observes securejoin protocol and verifies Bob on second device.
alice2.start_io()
alice2.wait_for_securejoin_inviter_success()
alice2_contact_bob = alice2.get_contact_by_addr(bob.get_config("addr"))
alice2_contact_bob_snapshot = alice2_contact_bob.get_snapshot()
assert alice2_contact_bob_snapshot.is_verified
def test_qr_securejoin_contact_request(acfactory) -> None:
"""Alice invites Bob to a group when Bob's chat with Alice is in a contact request mode."""

2
deltachat-rpc-server/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package]
name = "deltachat-rpc-server"
version = "1.142.10"
version = "1.142.11"
description = "DeltaChat JSON-RPC server"
edition = "2021"
readme = "README.md"

2
deltachat-rpc-server/npm-package/package.json
View File

@@ -15,5 +15,5 @@
},
"type": "module",
"types": "index.d.ts",
"version": "1.142.10"
"version": "1.142.11"
}

2
package.json
View File

@@ -55,5 +55,5 @@
"test:mocha": "mocha node/test/test.mjs --growl --reporter=spec --bail --exit"
},
"types": "node/dist/index.d.ts",
"version": "1.142.10"
"version": "1.142.11"
}

2
python/pyproject.toml
View File

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
[project]
name = "deltachat"
version = "1.142.10"
version = "1.142.11"
description = "Python bindings for the Delta Chat Core library using CFFI against the Rust-implemented libdeltachat"
readme = "README.rst"
requires-python = ">=3.7"

2
release-date.in
View File

@@ -1 +1 @@
2024-08-26
2024-08-30

4
src/securejoin.rs
View File

@@ -637,6 +637,10 @@ pub(crate) async fn observe_securejoin_on_other_device(
return Ok(HandshakeMessage::Ignore);
};
peerstate.set_verified(key.clone(), fingerprint, addr)?;
if matches!(step, "vg-member-added" | "vc-contact-confirm") {
peerstate.backward_verified_key_id =
Some(context.get_config_i64(Config::KeyId).await?).filter(|&id| id > 0);
}
peerstate.prefer_encrypt = EncryptPreference::Mutual;
peerstate.save_to_db(&context.sql).await?;