Skip to content

Write SSH keys in default encoding #146

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

Draft
ricedavida wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Write SSH keys in default encoding #146

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7da5909
Enable ssh key's to be written with user provided property
ricedavida Jul 23, 2021
a88025d
adjusting to use default charset
ricedavida Oct 21, 2021
e4d3227
added toString() to fix incorrect object type
Oct 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/main/java/org/jenkinsci/plugins/credentialsbinding/impl/SSHUserPrivateKeyBinding.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import hudson.Util;
import hudson.model.Run;
import hudson.model.TaskListener;
import hudson.model.Computer;
import hudson.util.Secret;
import org.jenkinsci.Symbol;
import org.jenkinsci.plugins.credentialsbinding.BindingDescriptor;
Expand Down Expand Up @@ -100,8 +101,11 @@ public String getPassphraseVariable() {
contents.append(key);
contents.append('\n');
}
keyFile.write(contents.toString(), "UTF-8");
keyFile.chmod(0400);

Computer computer = keyFile.toComputer();
keyFile.write(contents.toString(), computer.getDefaultCharset());
Copy link
Member

@jglick jglick Oct 21, 2021

Choose a reason for hiding this comment

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

Suggested change
Computer computer = keyFile.toComputer();
keyFile.write(contents.toString(), computer.getDefaultCharset());
keyFile.write(contents.toString(), null);

as per https://javadoc.jenkins.io/hudson/FilePath.html#write-java.lang.String-java.lang.String-


keyFile.chmod(0400);
Copy link
Member

@jglick jglick Oct 21, 2021

Choose a reason for hiding this comment

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

Suggested change
keyFile.write(contents.toString(), computer.getDefaultCharset());
keyFile.chmod(0400);
keyFile.write(contents.toString(), computer.getDefaultCharset());
keyFile.chmod(0400);

(tabs → spaces for consistency)


Map<String, String> secretValues = new LinkedHashMap<>();
Map<String, String> publicValues = new LinkedHashMap<>();
Expand Down