Swap libsignal-protocol dependency with libsignal-client #83

rubdos · 2021-04-20T15:21:27Z

Fixes #72

rubdos · 2021-04-20T20:51:36Z

It's a bit of a rewrite, so I'm pushing broken commits as I pass over code. In the end I'll squash the part x things to something with a real commit message :-)

rubdos · 2021-04-26T21:10:47Z

Important detail. libsignal-client is AGPLv3. We have to move to AGPLv3 from this point.

Be-ing · 2021-04-27T01:05:43Z

No, relicensing to AGPL is not needed and can't be done without explicit agreement of everyone who has contributed to this repo:

The ordinary GNU General Public License and the GNU Affero General Public License are two different copyleft licenses, so they are naturally incompatible. We have set up a special kind of explicit compatibility between them: you can include source code under the GNU GPL version 3 together with other source code under the GNU Affero GPL in a single combined program. This is permitted because both of those licenses explicitly say so, and the effect is that the GNU AGPL applies to the combined program. However, you can't simply relicense code from the GNU GPL (with or without “or later”) to the GNU Affero GPL, or vice versa; neither of these licenses gives permission for that. Note also that the GNU Affero GPL version 3 is not a “later version” of the ordinary GNU GPL version 2, because the GNU Affero GPL and the GNU GPL are two different series of licenses.

https://www.gnu.org/licenses/license-compatibility.html

Considering only 10 people have contributed code to this repository so far, I think relicensing to AGPL is feasible. I think it would be advisable to avoid confusion. Also, if we want to copy any of this code to send upstream to libsignal-client, they might want it to be AGPL.

rubdos · 2021-04-27T07:29:56Z

So either we relicense the whole thing, or we go the complicated route as I took with Whisperfish: old source is GPLv3 and new source is AGPLv3. If we don't get the permission of them all, that's what we should do.

I'll make an announcement on issue #72.

Either way, the whole of libsignal-service-rs will fall under AGPLv3, since it's a combination of (A)GPLv3 and AGPLv3 sources.

And wrt. sending to libsignal-client: that's a whole other story, because they require a CLA. AFAICT, for moving code, only my code and @gferon's code is being moved on the short term.

rubdos

Looks like we're not far off! :-)

rubdos · 2021-04-27T16:28:36Z

libsignal-service/Cargo.toml

@@ -7,8 +7,8 @@ license = "GPLv3"
 readme = "../README.md"

 [dependencies]
-libsignal-protocol = { git = "https://github.com/Michael-F-Bryan/libsignal-protocol-rs" }
-zkgroup = { git = "https://github.com/signalapp/zkgroup" }
+libsignal-protocol = { git = "https://github.com/whisperfish/libsignal-client", branch = "make-error-sync" }


Should we wait on signalapp/libsignal#279?

Yes we will wait.

libsignal-service/src/account_manager.rs

libsignal-service/src/cipher.rs

libsignal-service/src/lib.rs

libsignal-service/src/push_service.rs

rubdos · 2021-04-27T16:52:57Z

libsignal-service/src/sender.rs

-                        if let Some(ref uuid) = recipient.uuid {
-                            self.cipher.store_context.delete_session(
-                                &libsignal_protocol::Address::new(
-                                    uuid.to_string(),
-                                    *extra_device_id,
-                                ),
-                            )?;
+                        if let Some(_uuid) = recipient.uuid {
+                            unimplemented!("deleting session: unimplemented following the switch to the Rust version of libsignal-protocol");
                        }
-                        if let Some(e164) = recipient.e164() {
-                            self.cipher.store_context.delete_session(
-                                &libsignal_protocol::Address::new(
-                                    &e164,
-                                    *extra_device_id,
-                                ),
-                            )?;
+                        if let Some(_e164) = recipient.e164() {
+                            unimplemented!("deleting session: unimplemented following the switch to the Rust version of libsignal-protocol");


Tracking issue for this? This definitely affects Whisperfish.

Weird, I swear I reverted that. I added SessionStoreExt so that's possible again.

libsignal-service/src/sender.rs

libsignal-service/src/account_manager.rs

libsignal-service/src/cipher.rs

libsignal-service/src/lib.rs

libsignal-service/src/account_manager.rs

gferon · 2021-04-27T20:00:21Z

libsignal-service/src/sender.rs

-                        if let Some(ref uuid) = recipient.uuid {
-                            self.cipher.store_context.delete_session(
-                                &libsignal_protocol::Address::new(
-                                    uuid.to_string(),
-                                    *extra_device_id,
-                                ),
-                            )?;
+                        if let Some(_uuid) = recipient.uuid {
+                            unimplemented!("deleting session: unimplemented following the switch to the Rust version of libsignal-protocol");
                        }
-                        if let Some(e164) = recipient.e164() {
-                            self.cipher.store_context.delete_session(
-                                &libsignal_protocol::Address::new(
-                                    &e164,
-                                    *extra_device_id,
-                                ),
-                            )?;
+                        if let Some(_e164) = recipient.e164() {
+                            unimplemented!("deleting session: unimplemented following the switch to the Rust version of libsignal-protocol");


Weird, I swear I reverted that. I added SessionStoreExt so that's possible again.

Leptopoda · 2021-04-28T06:25:55Z

So either we relicense the whole thing, or we go the complicated route as I took with Whisperfish: old source is GPLv3 and new source is AGPLv3. If we don't get the permission of them all, that's what we should do.

I'll make an announcement on issue #72.

Either way, the whole of libsignal-service-rs will fall under AGPLv3, since it's a combination of (A)GPLv3 and AGPLv3 sources.

And wrt. sending to libsignal-client: that's a whole other story, because they require a CLA. AFAICT, for moving code, only my code and @gferon's code is being moved on the short term.

Just FYI that's exactly the reason why they have the CLA. They want to own the code so they can release it under a different license or sell it as closed source (like they did to Facebook or so)

rubdos · 2021-04-28T07:32:27Z

Just FYI that's exactly the reason why they have the CLA. They want to own the code so they can release it under a different license or sell it as closed source (like they did to Facebook or so)

Yes, and that's exactly the reason that I'm against CLA's too. In my opinion, the person that wrote the code should have the right to choose whether a change of license is okay with them, like in this case :-)

But let's stick to topic, we're very close having libsignal-client replacing libsignal-protocol-rs! 🎉

gferon · 2021-04-28T09:01:52Z

Maybe you mean libsignal-protocol by libsignal-protocol? 😂 Both the pure C-bindings crate and the newer one have the same name.

rubdos · 2021-04-28T09:03:01Z

potato tomato!

Merge upstream/master into libsignal-client branch

…lient

gferon · 2021-04-29T11:38:53Z

@rubdos I think this is ready for a second (and hopefully final?) look!

libsignal-service/Cargo.toml

rubdos

Mostly clippy, there are still some unresolved discussions, @gferon.

Generally looking good, let's catch everything else in prod ;p

rubdos · 2021-04-30T07:58:30Z

libsignal-service/src/account_manager.rs

@@ -78,9 +75,12 @@ impl<Service: PushService> AccountManager<Service> {
    /// Equivalent to Java's RefreshPreKeysJob
    ///
    /// Returns the next pre-key offset and next signed pre-key offset as a tuple.
-    pub async fn update_pre_key_bundle(
+    pub async fn update_pre_key_bundle<R: rand::Rng + rand::CryptoRng>(


Suggested change

pub async fn update_pre_key_bundle<R: rand::Rng + rand::CryptoRng>(

#[allow(clippy::too_many_arguments)] // See issue https://github.com/Michael-F-Bryan/libsignal-service-rs/issues/92

pub async fn update_pre_key_bundle<R: rand::Rng + rand::CryptoRng>(

rubdos · 2021-04-30T07:58:47Z

libsignal-service/src/account_manager.rs

-            signed_pre_key: signed_pre_key.into(),
-            identity_key: identity_key_pair.public(),
+            signed_pre_key: signed_prekey_record.try_into()?,
+            identity_key: identity_key_pair.public_key().clone(),


Suggested change

identity_key: identity_key_pair.public_key().clone(),

identity_key: identity_key_pair.public_key(),

libsignal-service/src/cipher.rs

libsignal-service/src/push_service.rs

libsignal-service/src/sealed_session_cipher.rs

libsignal-service/src/sender.rs

rubdos · 2021-04-30T08:09:14Z

libsignal-service/src/sender.rs

        if !self
-            .cipher
-            .store_context
-            .contains_session(&recipient_address)?
+            .session_store
+            .load_session(&recipient_address, None)
+            .await?
+            .is_some()


Suggestion feature on GH doesn't let me, but this should be self.[..].is_none() instead, apparently

libsignal-service/src/sender.rs

rubdos added 2 commits April 20, 2021 20:27

Swap libsignal-protocol dependency with libsignal-client

76758f0

part 1

c4110d2

rubdos force-pushed the libsignal-client branch from 73a9ce5 to c4110d2 Compare April 20, 2021 18:32

rubdos added 2 commits April 20, 2021 21:38

rand 0.7 because of compatibility

f4615cc

part 2

9e61ecf

gferon added 2 commits April 26, 2021 14:50

Merge remote-tracking branch 'upstream/master' into libsignal-client

adc795d

Progress towards using the new libsignal-protocol in Rust

04788d8

rubdos mentioned this pull request Apr 27, 2021

Consider/switch to libsignal-client #72

Closed

gferon added 3 commits April 27, 2021 10:29

Fix HKDF usage

5a3531e

Use dynamic dispatch and fix tests

839baaa

Adjust usage of verify_signature

3419aa9

Be-ing mentioned this pull request Apr 27, 2021

[ Feature ] Rust Library signalapp/libsignal#277

Closed

gferon added 3 commits April 27, 2021 18:13

Remove FIXME

66b8969

Last changes before shipping\!

926d062

Last changes before shipping!

53dddee

gferon force-pushed the libsignal-client branch from 926d062 to 53dddee Compare April 27, 2021 16:19

gferon mentioned this pull request Apr 27, 2021

Use the Rust version of libsignal-protocol whisperfish/presage#15

Merged

Merge remote-tracking branch 'upstream/master' into libsignal-client

c867547

rubdos marked this pull request as ready for review April 27, 2021 16:25

rubdos commented Apr 27, 2021

View reviewed changes

Use upstream libsignal-client

f1ae701

gferon reviewed Apr 27, 2021

View reviewed changes

Address review comments

1829246

rubdos mentioned this pull request Apr 28, 2021

Use libsignal-service-rs ? ZenGo-X/mpc-over-signal#5

Open

boxdot and others added 4 commits April 29, 2021 11:07

Merge remote-tracking branch 'upstream/master' into libsignal-client

6e00342

Merge pull request #1 from boxdot/libsignal-client

0ab27c5

Merge upstream/master into libsignal-client branch

Merge remote-tracking branch 'fork/libsignal-client' into libsignal-c…

4436018

…lient

Use static dispatch

1365782

Be-ing reviewed Apr 29, 2021

View reviewed changes

libsignal-service/Cargo.toml Show resolved Hide resolved

rubdos commented Apr 30, 2021

View reviewed changes

gferon and others added 5 commits April 30, 2021 11:45

Derive clone on ciphers and sender/receiver

f6c4df7

Fix clippy warnings

797dead

Add get_sub_device_sessions method to ServiceAddress

a3be3d5

Change license to AGPLv3

4a5cfa2

Reflect license and copyright changes in README

ead122e

rubdos merged commit 5556ac2 into master Apr 30, 2021

rubdos mentioned this pull request May 1, 2021

Put aarch64 simd feature behind nightly feature flag signalapp/libsignal#284

Closed

gferon mentioned this pull request May 5, 2021

"Rate limit exceeded" when sending a single message whisperfish/presage#27

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Swap libsignal-protocol dependency with libsignal-client #83

Swap libsignal-protocol dependency with libsignal-client #83

rubdos commented Apr 20, 2021 •

edited

Loading

rubdos commented Apr 20, 2021

rubdos commented Apr 26, 2021

Be-ing commented Apr 27, 2021 •

edited

Loading

rubdos commented Apr 27, 2021 •

edited

Loading

rubdos left a comment

rubdos Apr 27, 2021

rubdos Apr 27, 2021

rubdos Apr 27, 2021

gferon Apr 27, 2021

gferon Apr 27, 2021

Leptopoda commented Apr 28, 2021

rubdos commented Apr 28, 2021

gferon commented Apr 28, 2021

rubdos commented Apr 28, 2021

gferon commented Apr 29, 2021

rubdos left a comment •

edited

Loading

rubdos Apr 30, 2021

rubdos Apr 30, 2021

rubdos Apr 30, 2021

	pub async fn update_pre_key_bundle<R: rand::Rng + rand::CryptoRng>(
	#[allow(clippy::too_many_arguments)] // See issue https://github.com/Michael-F-Bryan/libsignal-service-rs/issues/92
	pub async fn update_pre_key_bundle<R: rand::Rng + rand::CryptoRng>(

	identity_key: identity_key_pair.public_key().clone(),
	identity_key: identity_key_pair.public_key(),

Swap libsignal-protocol dependency with libsignal-client #83

Swap libsignal-protocol dependency with libsignal-client #83

Conversation

rubdos commented Apr 20, 2021 • edited Loading

rubdos commented Apr 20, 2021

rubdos commented Apr 26, 2021

Be-ing commented Apr 27, 2021 • edited Loading

rubdos commented Apr 27, 2021 • edited Loading

rubdos left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Leptopoda commented Apr 28, 2021

rubdos commented Apr 28, 2021

gferon commented Apr 28, 2021

rubdos commented Apr 28, 2021

gferon commented Apr 29, 2021

rubdos left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rubdos commented Apr 20, 2021 •

edited

Loading

Be-ing commented Apr 27, 2021 •

edited

Loading

rubdos commented Apr 27, 2021 •

edited

Loading

rubdos left a comment •

edited

Loading