refactor!: use rustls instead of native-tls #4901

kwaa · 2024-07-15T13:28:53Z

Part of #4900

Cargo.toml

… into remove_openssl_dess

dessalines · 2024-07-16T15:40:41Z

Even after this its still getting:

openssl v0.10.64
└── native-tls v0.2.12
    ├── hyper-tls v0.5.0
    │   └── reqwest v0.11.27
    │       ├── activitypub_federation v0.5.8
    │       │   ├── lemmy_api v0.19.5 (/home/xxx/git/lemmy/crates/api)
    │       │   │   └── lemmy_server v0.19.5 (/home/xxx/git/lemmy)
    │       │   ├── lemmy_api_common v0.19.5 (/home/xxx/git/lemmy/crates/api_common)
    │       │   │   ├── lemmy_api v0.19.5 (/home/xxx/git/lemmy/crates/api) (*)
    │       │   │   ├── lemmy_api_crud v0.19.5 (/home/xxx/git/lemmy/crates/api_crud)
    │       │   │   │   └── lemmy_server v0.19.5 (/home/xxx/git/lemmy)
    │       │   │   ├── lemmy_apub v0.19.5 (/home/xxx/git/lemmy/crates/apub)
    │       │   │   │   ├── lemmy_federate v0.19.5 (/home/xxx/git/lemmy/crates/federate)
    │       │   │   │   │   └── lemmy_server v0.19.5 (/home/xxx/git/lemmy)
    │       │   │   │   └── lemmy_server v0.19.5 (/home/xxx/git/lemmy)
    │       │   │   ├── lemmy_federate v0.19.5 (/home/xxx/git/lemmy/crates/federate) (*)
    │       │   │   ├── lemmy_routes v0.19.5 (/home/xxx/git/lemmy/crates/routes)
    │       │   │   │   └── lemmy_server v0.19.5 (/home/xxx/git/lemmy)
    │       │   │   └── lemmy_server v0.19.5 (/home/xxx/git/lemmy)
    │       │   ├── lemmy_api_crud v0.19.5 (/home/xxx/git/lemmy/crates/api_crud) (*)
    │       │   ├── lemmy_apub v0.19.5 (/home/xxx/git/lemmy/crates/apub) (*)
    │       │   ├── lemmy_db_schema v0.19.5 (/home/xxx/git/lemmy/crates/db_schema)
    │       │   │   ├── lemmy_api v0.19.5 (/home/xxx/git/lemmy/crates/api) (*)
    │       │   │   ├── lemmy_api_common v0.19.5 (/home/xxx/git/lemmy/crates/api_common) (*)
    │       │   │   ├── lemmy_api_crud v0.19.5 (/home/xxx/git/lemmy/crates/api_crud) (*)
    │       │   │   ├── lemmy_apub v0.19.5 (/home/xxx/git/lemmy/crates/apub) (*)
    │       │   │   ├── lemmy_db_views v0.19.5 (/home/xxx/git/lemmy/crates/db_views)
    │       │   │   │   ├── lemmy_api v0.19.5 (/home/xxx/git/lemmy/crates/api) (*)
    │       │   │   │   ├── lemmy_api_common v0.19.5 (/home/xxx/git/lemmy/crates/api_common) (*)
    │       │   │   │   ├── lemmy_api_crud v0.19.5 (/home/xxx/git/lemmy/crates/api_crud) (*)
    │       │   │   │   ├── lemmy_apub v0.19.5 (/home/xxx/git/lemmy/crates/apub) (*)
    │       │   │   │   └── lemmy_routes v0.19.5 (/home/xxx/git/lemmy/crates/routes) (*)
    │       │   │   ├── lemmy_db_views_actor v0.19.5 (/home/xxx/git/lemmy/crates/db_views_actor)
    │       │   │   │   ├── lemmy_api v0.19.5 (/home/xxx/git/lemmy/crates/api) (*)
    │       │   │   │   ├── lemmy_api_common v0.19.5 (/home/xxx/git/lemmy/crates/api_common) (*)
    │       │   │   │   ├── lemmy_api_crud v0.19.5 (/home/xxx/git/lemmy/crates/api_crud) (*)
    │       │   │   │   ├── lemmy_apub v0.19.5 (/home/xxx/git/lemmy/crates/apub) (*)
    │       │   │   │   ├── lemmy_federate v0.19.5 (/home/xxx/git/lemmy/crates/federate) (*)
    │       │   │   │   └── lemmy_routes v0.19.5 (/home/xxx/git/lemmy/crates/routes) (*)
    │       │   │   ├── lemmy_db_views_moderator v0.19.5 (/home/xxx/git/lemmy/crates/db_views_moderator)
    │       │   │   │   ├── lemmy_api v0.19.5 (/home/xxx/git/lemmy/crates/api) (*)
    │       │   │   │   └── lemmy_api_common v0.19.5 (/home/xxx/git/lemmy/crates/api_common) (*)
    │       │   │   ├── lemmy_federate v0.19.5 (/home/xxx/git/lemmy/crates/federate) (*)
    │       │   │   ├── lemmy_routes v0.19.5 (/home/xxx/git/lemmy/crates/routes) (*)
    │       │   │   └── lemmy_server v0.19.5 (/home/xxx/git/lemmy)
    │       │   ├── lemmy_federate v0.19.5 (/home/xxx/git/lemmy/crates/federate) (*)
    │       │   ├── lemmy_routes v0.19.5 (/home/xxx/git/lemmy/crates/routes) (*)
    │       │   └── lemmy_server v0.19.5 (/home/xxx/git/lemmy)
    │       ├── http-signature-normalization-reqwest v0.10.0
    │       │   └── activitypub_federation v0.5.8 (*)
    │       ├── lemmy_api_common v0.19.5 (/home/xxx/git/lemmy/crates/api_common) (*)
    │       ├── lemmy_apub v0.19.5 (/home/xxx/git/lemmy/crates/apub) (*)
    │       ├── lemmy_federate v0.19.5 (/home/xxx/git/lemmy/crates/federate) (*)
    │       ├── lemmy_routes v0.19.5 (/home/xxx/git/lemmy/crates/routes) (*)
    │       ├── lemmy_server v0.19.5 (/home/xxx/git/lemmy)
    │       ├── reqwest-middleware v0.2.5
    │       │   ├── activitypub_federation v0.5.8 (*)
    │       │   ├── http-signature-normalization-reqwest v0.10.0 (*)
    │       │   ├── lemmy_api_common v0.19.5 (/home/xxx/git/lemmy/crates/api_common) (*)
    │       │   ├── lemmy_routes v0.19.5 (/home/xxx/git/lemmy/crates/routes) (*)
    │       │   ├── lemmy_server v0.19.5 (/home/xxx/git/lemmy)
    │       │   ├── lemmy_utils v0.19.5 (/home/xxx/git/lemmy/crates/utils)
    │       │   │   ├── lemmy_api v0.19.5 (/home/xxx/git/lemmy/crates/api) (*)
    │       │   │   ├── lemmy_api_common v0.19.5 (/home/xxx/git/lemmy/crates/api_common) (*)
    │       │   │   ├── lemmy_api_crud v0.19.5 (/home/xxx/git/lemmy/crates/api_crud) (*)
    │       │   │   ├── lemmy_apub v0.19.5 (/home/xxx/git/lemmy/crates/apub) (*)
    │       │   │   ├── lemmy_db_schema v0.19.5 (/home/xxx/git/lemmy/crates/db_schema) (*)
    │       │   │   ├── lemmy_db_views v0.19.5 (/home/xxx/git/lemmy/crates/db_views) (*)
    │       │   │   ├── lemmy_federate v0.19.5 (/home/xxx/git/lemmy/crates/federate) (*)
    │       │   │   ├── lemmy_routes v0.19.5 (/home/xxx/git/lemmy/crates/routes) (*)
    │       │   │   └── lemmy_server v0.19.5 (/home/xxx/git/lemmy)
    │       │   └── reqwest-tracing v0.4.8
    │       │       └── lemmy_server v0.19.5 (/home/xxx/git/lemmy)
    │       ├── reqwest-tracing v0.4.8 (*)
    │       └── webmention v0.5.0
    │           └── lemmy_api_crud v0.19.5 (/home/xxx/git/lemmy/crates/api_crud) (*)
    ├── reqwest v0.11.27 (*)
    └── tokio-native-tls v0.3.1
        ├── hyper-tls v0.5.0 (*)
        └── reqwest v0.11.27 (*)

kwaa · 2024-07-16T16:20:26Z

~~@dessalines I think it's because rustls-tls feature was missed here.~~

lemmy/Cargo.toml

Line 124 in ba044c7

reqwest = { version = "0.11.27", features = ["json", "blocking", "gzip"] }

Cargo.toml

kwaa · 2024-07-16T16:33:17Z

There may be other libraries using reqwest that do not enable the rustls-tls feature.

https://github.com/kwaa/lemmy/blob/854fee98e9f7481e0abebbc7405b271f8e7a4080/Cargo.lock#L4661

kwaa · 2024-07-17T05:01:55Z

This may be due to the webmention library, which does not disable the default feature.

https://github.com/timmarinin/webmention/blob/main/Cargo.toml#L17

dessalines · 2024-07-17T13:28:17Z

I'll do a PR there, but according to cargo tree above, there's a lot more that require it for some reason, including our own deps even (which I don't understand why).

kwaa · 2024-07-17T14:44:56Z

I'll do a PR there, but according to cargo tree above, there's a lot more that require it for some reason, including our own deps even (which I don't understand why).

This should just be because they use the same version and openssl will be installed as long as one of them doesn't disable the default features.

dessalines · 2024-07-17T17:29:00Z

@Nutomic I tried to look up how workspace dependencies work, and tried to add default-features = false to all our reqwest workspace deps, but it had no effect.

Apparently workspace dep features are additive only, so none of them should require the full features of reqwest, so I don't know why all our lemmy crates are requiring openssl.

Nutomic · 2024-07-18T09:49:08Z

Run cargo tree -i openssl --edges features to see which feature is enabled by which dependency. And so far the webmention dependency is unchanged, you can use a git dependency from your branch to test if its enough.

dessalines · 2024-07-18T12:20:25Z

That did it, thx! Okay this is ready to merge now (as long as tests pass).

I guess the messy cargo trees just had to do with circulare dependencies.

Nutomic · 2024-07-18T13:41:37Z

We shouldnt merge any git dependencies as that will break cargo publish which is part of ci.

dessalines · 2024-07-18T15:35:31Z

Oops.. I'll just do a PR to change that one dependency back, and once @timmarinin merges my webmention PR, this will be handled.

- Context: #4901

kwaa added 4 commits July 15, 2024 21:24

refactor(utils): remove apub

c28137a

refactor(utils): remove apub

8de3e87

refactor(utils): remove openssl

9b9be5d

refactor(utils): remove openssl

462cb9b

kwaa mentioned this pull request Jul 15, 2024

refactor: use rsa instead of openssl #4900

Open

5 tasks

kwaa marked this pull request as ready for review July 15, 2024 13:58

kwaa requested review from Nutomic, dessalines, phiresky, dullbananas and SleeplessOne1917 as code owners July 15, 2024 13:58

kwaa changed the title ~~refactor(utils): remove unused apub utils~~ refactor(utils): remove unused apub util Jul 15, 2024

dullbananas approved these changes Jul 15, 2024

View reviewed changes

Use rustls instead of native-tls.

11e9d7a

dessalines reviewed Jul 15, 2024

View reviewed changes

Cargo.toml Show resolved Hide resolved

kwaa mentioned this pull request Jul 15, 2024

chore(deps/reqwest): enable rustls-tls feature LemmyNet/activitypub-federation-rust#118

Merged

kwaa changed the title ~~refactor(utils): remove unused apub util~~ refactor!: use rustls instead of openssl Jul 15, 2024

kwaa changed the title ~~refactor!: use rustls instead of openssl~~ refactor!: use rustls instead of native-tls Jul 15, 2024

kwaa and others added 5 commits July 16, 2024 19:41

refactor(utils): remove apub

45137dc

refactor(utils): remove apub

a7801a5

refactor(utils): remove openssl

bcd976c

refactor(utils): remove openssl

8fa9307

Use rustls instead of native-tls.

b9eee1e

kwaa force-pushed the refactor/remove-openssl branch from 11e9d7a to b9eee1e Compare July 16, 2024 11:41

Nutomic approved these changes Jul 16, 2024

View reviewed changes

dessalines added 2 commits July 16, 2024 11:32

Merge branch 'refactor/remove-openssl' of https://github.com/kwaa/lemmy…

bfda04c

… into remove_openssl_dess

Upping activitypub_federation dep

854fee9

dessalines reviewed Jul 16, 2024

View reviewed changes

Cargo.toml Show resolved Hide resolved

Merge branch 'main' into refactor/remove-openssl

49b8faa

dessalines mentioned this pull request Jul 17, 2024

Making reqwest use rustls rather than native-tls. timmarinin/webmention#6

Merged

Using git dep of webmention.

a01ab2e

dessalines approved these changes Jul 18, 2024

View reviewed changes

dessalines enabled auto-merge (squash) July 18, 2024 12:35

dessalines merged commit 847c01f into LemmyNet:main Jul 18, 2024
1 check passed

kwaa deleted the refactor/remove-openssl branch July 18, 2024 12:48

dessalines added a commit that referenced this pull request Jul 18, 2024

Reverting webmention git dep to not break publish.

81de2c2

- Context: #4901

dessalines mentioned this pull request Jul 18, 2024

Reverting webmention git dep to not break publish. #4904

Merged

Nutomic pushed a commit that referenced this pull request Jul 19, 2024

Reverting webmention git dep to not break publish. (#4904)

073ff44

- Context: #4901

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor!: use rustls instead of native-tls #4901

refactor!: use rustls instead of native-tls #4901

kwaa commented Jul 15, 2024

dessalines commented Jul 16, 2024

kwaa commented Jul 16, 2024 •

edited

Loading

kwaa commented Jul 16, 2024

kwaa commented Jul 17, 2024

dessalines commented Jul 17, 2024

kwaa commented Jul 17, 2024

dessalines commented Jul 17, 2024 •

edited

Loading

Nutomic commented Jul 18, 2024

dessalines commented Jul 18, 2024

Nutomic commented Jul 18, 2024

dessalines commented Jul 18, 2024 •

edited

Loading

refactor!: use rustls instead of native-tls #4901

refactor!: use rustls instead of native-tls #4901

Conversation

kwaa commented Jul 15, 2024

dessalines commented Jul 16, 2024

kwaa commented Jul 16, 2024 • edited Loading

kwaa commented Jul 16, 2024

kwaa commented Jul 17, 2024

dessalines commented Jul 17, 2024

kwaa commented Jul 17, 2024

dessalines commented Jul 17, 2024 • edited Loading

Nutomic commented Jul 18, 2024

dessalines commented Jul 18, 2024

Nutomic commented Jul 18, 2024

dessalines commented Jul 18, 2024 • edited Loading

kwaa commented Jul 16, 2024 •

edited

Loading

dessalines commented Jul 17, 2024 •

edited

Loading

dessalines commented Jul 18, 2024 •

edited

Loading