Skip to content

[JENKINS-46321] Avoid 'JSONException: null object' when no key 'auths' exist in .docker/config.json #59

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[JENKINS-46321] Avoid 'JSONException: null object' when no key 'auths' exist in .docker/config.json #59

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions src/main/java/org/jenkinsci/plugins/docker/commons/credentials/DockerRegistryToken.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,12 @@ public KeyMaterialFactory newKeyMaterialFactory(final URL endpoint, @Nonnull Vir
* Makes the credentials available locally and returns {@link KeyMaterialFactory} that gives you the parameters
* needed to access it.
*
* This is done by inserting the token into {@code ~/.dockercfg}
* This is done by inserting the token into {@code ~/.dockercfg} or {@code ~/.docker/config.json}
*/
public KeyMaterialFactory newKeyMaterialFactory(final @Nonnull URL endpoint, @Nonnull VirtualChannel target, @CheckForNull Launcher launcher, final @Nonnull TaskListener listener) throws InterruptedException, IOException {
target.call(new MasterToSlaveCallable<Void, IOException>() {
/**
* Insert the token into {@code ~/.dockercfg}
* Insert the token into {@code ~/.dockercfg} or {@code ~/.docker/config.json}
*/
@Override
public Void call() throws IOException {
Expand All @@ -96,6 +96,11 @@ public Void call() throws IOException {
if (config.exists()) {
json = JSONObject.fromObject(FileUtils.readFileToString(config, "UTF-8"));
auths = json.getJSONObject("auths");
if (auths.isNullObject()) {
auths = new JSONObject();
json.put("auths", auths);
FileUtils.writeStringToFile(config, json.toString(2), "UTF-8");
Copy link
Member

@oleg-nenashev oleg-nenashev Sep 26, 2017

Choose a reason for hiding this comment

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

I would add some logic on the FINE/CONFIG level here. It is just a data migration logic IIUC

}
} else {
config = new File(System.getProperty("user.home"), ".dockercfg");
if (config.exists()) {
Expand Down