[JENKINS-73305] Create .ssh directory with owner only permissions #1150
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When the JGit implementation needs to create a `.ssh` directory, create it with permissions only allowing access to the directory owner. That is the common pattern used by the OpenSSH project and by POSIX systems to reduce access to the sensitive information stored in the directory. Testing done Ran the CredentialsTest in a debugger with a configured 'auth-data` directory and confirmed that the modified lines are executed on my RHEL 8 development computer. Confirmed that the resulting directory permissions were read, write, and execute for only the owner, with no other permissions.
MarkEWaite
force-pushed
the
create-ssh-dir-with-better-perms
branch
from
d518e26 to
a09e86f
Compare
jtnord
reviewed
Jun 16, 2024
| .getKnownHostsFile() | ||
| .getParentFile() | ||
| .toPath()); | ||
| if (isWindows()) { |
There was a problem hiding this comment.
Here be dragons.
Don't assume that POSIX file systems == non windows systems.
You can be on Linux and have a non POSIX FS (and the inverse).
And there was (and iirc) still is a bug where when you ask for the filesystem for a path you get the default even if it should be different!
This the only reliable way to do this is to actually try, catch the exception and do a fallback unless that big is fixed.
| Set<PosixFilePermission> ownerOnly = PosixFilePermissions.fromString("rwx------"); | ||
| FileAttribute<Set<PosixFilePermission>> fileAttribute = | ||
| PosixFilePermissions.asFileAttribute(ownerOnly); | ||
| Files.createDirectories( |
There was a problem hiding this comment.
I think you want createDirectory here (and possibly a different call to create any missing parents of this directory)?
(At least you don't want all directories up to the parent to be created with these perms do you?)
MarkEWaite
force-pushed
the
create-ssh-dir-with-better-perms
branch
from
5069b72 to
a09e86f
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
JENKINS-73305 Create .ssh directory with owner only permissions
When the JGit implementation needs to create a
.sshdirectory, create it with permissions only allowing access to the directory owner. That is the common pattern used by the OpenSSH project and by POSIX systems to reduce access to the sensitive information stored in the directory.Testing done
Ran the CredentialsTest in a debugger with a configured 'auth-data` directory and confirmed that the modified lines are executed on my RHEL 8 development computer. Confirmed that the resulting directory permissions were read, write, and execute for only the owner, with no other permissions.
The coverage report on the ci.jenkins.io job also shows that the newly added statements are executed by automated tests.
Checklist
Types of changes
What types of changes does your code introduce?