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

Ensure error messages don't leak private key (backport #11523) #11569

Closed

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 23, 2024

Motivation

Since #8766, invalid base64 is rendered in errors, but we don't actually want to show this in the case of an invalid private keys.

Context

#8766

Priorities and Process

Add 👍 to pull requests you find important.

The Nix maintainer team uses a GitHub project board to schedule and track reviews.


This is an automatic backport of pull request #11523 done by [Mergify](https://mergify.com).

Ericson2314 and others added 2 commits September 23, 2024 21:14
… is detected"

We have a safer way of doing this.

This reverts commit dc3ccf0.

(cherry picked from commit d0c351b)
Since #8766, invalid base64 is rendered in errors, but we don't actually
want to show this in the case of an invalid private keys.

Co-Authored-By: Eelco Dolstra <[email protected]>
(cherry picked from commit 2b6b03d)

# Conflicts:
#	src/libutil/signature/local-keys.cc
Copy link
Author

mergify bot commented Sep 23, 2024

Cherry-pick of 2b6b03d has failed:

On branch mergify/bp/2.24-maintenance/pr-11523
Your branch is ahead of 'origin/2.24-maintenance' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 2b6b03d8d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/libfetchers/git-utils.cc
	modified:   src/libstore/machines.cc
	modified:   src/libstore/ssh.cc
	modified:   src/libstore/ssh.hh
	modified:   src/libutil/hash.cc
	modified:   src/libutil/signature/local-keys.hh
	modified:   src/libutil/util.cc
	modified:   src/libutil/util.hh
	modified:   tests/unit/libexpr/nix_api_expr.cc

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/libutil/signature/local-keys.cc

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot requested a review from Ericson2314 as a code owner September 23, 2024 21:14
@mergify mergify bot added the conflicts label Sep 23, 2024
@mergify mergify bot requested a review from edolstra as a code owner September 23, 2024 21:14
@mergify mergify bot added the merge-queue label Sep 23, 2024
@github-actions github-actions bot added the fetching Networking with the outside (non-Nix) world, input locking label Sep 23, 2024
@Ericson2314
Copy link
Member

Ericson2314 commented Sep 23, 2024

Needs backport of #11390. Made those, now waiting.

@Mic92
Copy link
Member

Mic92 commented Sep 24, 2024

Backport without conflicts in #11523

@Mic92 Mic92 closed this Sep 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts fetching Networking with the outside (non-Nix) world, input locking merge-queue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants