Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stop feature dist-server from pulling in openssl #1738

Closed
wants to merge 2 commits into from

Conversation

NobodyXu
Copy link
Contributor

@NobodyXu NobodyXu commented Apr 19, 2023

  • Replace direct openssl usage in sccache-dist/token_check.rs with pkcs1
  • Enable rouille/rustls instead of rouille/ssl to use rustls instead of openssl in tiny_http (dep of rouille).
  • Remove openssl that get pulled in debug build

Signed-off-by: Jiahao XU Jiahao_XU@outlook.com

@NobodyXu
Copy link
Contributor Author

Build failure will be fixed once #1737 is merged

@codecov-commenter
Copy link

codecov-commenter commented Apr 19, 2023

Codecov Report

Patch coverage has no change and project coverage change: +0.24 🎉

Comparison is base (4a8b5f5) 28.87% compared to head (b82c18c) 29.11%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1738      +/-   ##
==========================================
+ Coverage   28.87%   29.11%   +0.24%     
==========================================
  Files          49       49              
  Lines       17202    17446     +244     
  Branches     8268     8455     +187     
==========================================
+ Hits         4967     5080     +113     
- Misses       7221     7301      +80     
- Partials     5014     5065      +51     

see 22 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@NobodyXu
Copy link
Contributor Author

The CI failure is caused by spki (pulled in pkcs1).

Its msrv is 1.65 while currently sccache has a msrv of 1.64, thus requires a bump of msrv.
Given that they are quite close, I think a msrv bump is fine.

 - Replace direct `openssl` usage in sccache-dist/token_check.rs with
   `pkcs1`
 - Enable `rouille/rustls` instead of `rouille/ssl` to use rustls
   instead of openssl in tiny_http (dep of rouille).

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu NobodyXu force-pushed the rm-openssl-for-dist-server branch from cfd4e2d to b9b3595 Compare April 20, 2023 00:06
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu NobodyXu marked this pull request as draft April 20, 2023 00:45
@NobodyXu
Copy link
Contributor Author

Blocked on tomaka/rouille#272

@drahnr
Copy link
Collaborator

drahnr commented Apr 20, 2023

I'd say porting to warp (see #1620 ) should avoid the issue and move to a more modern framework

@NobodyXu
Copy link
Contributor Author

I'd say porting to warp (see #1620 ) should avoid the issue and move to a more modern framework

Thanks for the advice!
I would look into that, if I figured it out I would submit a PR.

@NobodyXu
Copy link
Contributor Author

I will close this PR for now.

@NobodyXu NobodyXu closed this Apr 21, 2023
NobodyXu added a commit to NobodyXu/sccache that referenced this pull request Apr 21, 2023
This is split from mozilla#1738 , to remove dependency on `openssl` in
`src/bin/sccache-dist/token_check.rs`.

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu NobodyXu deleted the rm-openssl-for-dist-server branch April 21, 2023 05:21
@NobodyXu NobodyXu mentioned this pull request Apr 21, 2023
NobodyXu added a commit to NobodyXu/sccache that referenced this pull request Apr 21, 2023
This is split from mozilla#1738 , to remove dependency on `openssl` in
`src/bin/sccache-dist/token_check.rs`.

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
NobodyXu added a commit to NobodyXu/sccache that referenced this pull request Apr 21, 2023
This is split from mozilla#1738 , to remove dependency on `openssl` in
`src/bin/sccache-dist/token_check.rs`.

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
NobodyXu added a commit to NobodyXu/sccache that referenced this pull request Apr 21, 2023
This is split from mozilla#1738 , to remove dependency on `openssl` in
`src/bin/sccache-dist/token_check.rs`.

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
NobodyXu added a commit to NobodyXu/sccache that referenced this pull request Apr 21, 2023
This is split from mozilla#1738 , to remove dependency on `openssl` in
`src/bin/sccache-dist/token_check.rs`.

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
NobodyXu added a commit to NobodyXu/sccache that referenced this pull request Apr 22, 2023
This is split from mozilla#1738 , to remove dependency on `openssl` in
`src/bin/sccache-dist/token_check.rs`.

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants