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.

Sign up for GitHub

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

Jump to bottom

Don't attempt to read a token from stdin if a cmdline token is provided #12440

Merged
merged 1 commit into from Aug 3, 2023
Merged

Don't attempt to read a token from stdin if a cmdline token is provided #12440

merged 1 commit into from Aug 3, 2023

Conversation

arlosi
Copy link
Contributor

@arlosi arlosi commented Aug 2, 2023

Fixes #12438

@rustbot
Copy link
Collaborator

rustbot commented Aug 2, 2023

r? @ehuss

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added A-interacts-with-crates.io Area: interaction with registries Command-login S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 2, 2023
weihanglo
weihanglo approved these changes Aug 3, 2023
View reviewed changes
Copy link
Member

@weihanglo weihanglo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

I am not sure how to write a test for this. If you come up with a way to have a proper test please submit another PR :)

I'll merge this now.

@weihanglo
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Aug 3, 2023

📌 Commit 8f07d84 has been approved by weihanglo

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 3, 2023
@bors
Copy link
Collaborator

bors commented Aug 3, 2023

⌛ Testing commit 8f07d84 with merge 336b443...

@bors
Copy link
Collaborator

bors commented Aug 3, 2023

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing 336b443 to master...

@bors bors merged commit 336b443 into rust-lang:master Aug 3, 2023
19 checks passed
@weihanglo weihanglo mentioned this pull request Aug 3, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 3, 2023
@bors
Auto merge of rust-lang#114420 - weihanglo:update-cargo, r=weihanglo
defed62 
Update cargo (CVE-2023-38497 fix included)

2 commits in 020651c52257052d28f6fd83fbecf5cfa1ed516c..d78bbf4bde3c6b95caca7512f537c6f9721426ff
2023-08-02 16:00:37 +0000 to 2023-08-03 12:58:25 +0000
- Fix CVE-2023-38497 for master (rust-lang/cargo#12443)
- Don't attempt to read a token from stdin if a cmdline token is provided (rust-lang/cargo#12440)

r? `@ghost`
@ehuss ehuss added this to the 1.73.0 milestone Aug 22, 2023
@ehuss ehuss mentioned this pull request Sep 7, 2023
Closed
16 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@weihanglo weihanglo weihanglo approved these changes

Assignees

@ehuss ehuss

Labels
A-interacts-with-crates.io Area: interaction with registries Command-login S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.73.0
Development

Successfully merging this pull request may close these issues.

Providing a token to cargo login via command line causes a hang on CI
5 participants
@arlosi @rustbot @weihanglo @bors @ehuss