From 49c2128265311ff42c1351c3b2ebc5a625432053 Mon Sep 17 00:00:00 2001
From: arimu1 <19286898+arimu1@users.noreply.github.com>
Date: Sun, 13 Sep 2026 06:26:07 +0700
Subject: [PATCH] fix: guard null pull status in swarm detection

Pull error responses can omit status; checkForDockerSwarmResponse no longer calls matches on null so auth/pull failures surface as DockerClientException.

Fixes #2465
---
 .../api/command/PullImageResultCallback.java  |  3 +-
 .../core/command/PullImageResultCallback.java |  3 +-
 .../command/PullImageResultCallbackTest.java  | 57 +++++++++++++++++++
 3 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 docker-java/src/test/java/com/github/dockerjava/api/command/PullImageResultCallbackTest.java

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageResultCallback.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageResultCallback.java
index 5980ce3dff..1b8fa6d29b 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageResultCallback.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageResultCallback.java
@@ -45,7 +45,8 @@ public void onNext(PullResponseItem item) {
     }
 
     private void checkForDockerSwarmResponse(PullResponseItem item) {
-        if (item.getStatus().matches("Pulling\\s.+\\.{3}$")) {
+        String status = item.getStatus();
+        if (status != null && status.matches("Pulling\\s.+\\.{3}$")) {
             isSwarm = true;
             LOGGER.debug("Communicating with Docker Swarm.");
         }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
index 67b6b5e488..af94f5260f 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
@@ -48,7 +48,8 @@ public void onNext(PullResponseItem item) {
     }
 
     private void checkForDockerSwarmResponse(PullResponseItem item) {
-        if (item.getStatus().matches("Pulling\\s.+\\.{3}$")) {
+        String status = item.getStatus();
+        if (status != null && status.matches("Pulling\\s.+\\.{3}$")) {
             isSwarm = true;
             LOGGER.debug("Communicating with Docker Swarm.");
         }
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/command/PullImageResultCallbackTest.java b/docker-java/src/test/java/com/github/dockerjava/api/command/PullImageResultCallbackTest.java
new file mode 100644
index 0000000000..02af446fe5
--- /dev/null
+++ b/docker-java/src/test/java/com/github/dockerjava/api/command/PullImageResultCallbackTest.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2026
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.exception.DockerClientException;
+import com.github.dockerjava.api.model.PullResponseItem;
+import com.github.dockerjava.api.model.PullResponseJSONSamples;
+import org.junit.Test;
+
+import java.io.IOException;
+
+import static com.github.dockerjava.test.serdes.JSONTestHelper.testRoundTrip;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+
+public class PullImageResultCallbackTest {
+
+    @Test
+    public void onNextWithErrorAndNullStatusDoesNotThrowNullPointerException() throws IOException {
+        PullResponseItem item = testRoundTrip(PullResponseJSONSamples.pullImageResponse_error, PullResponseItem.class);
+        assertNull(item.getStatus());
+
+        PullImageResultCallback callback = new PullImageResultCallback();
+        callback.onNext(item);
+    }
+
+    @Test
+    public void awaitCompletionSurfacesPullErrorWhenStatusIsNull() throws Exception {
+        PullResponseItem item = testRoundTrip(PullResponseJSONSamples.pullImageResponse_error, PullResponseItem.class);
+
+        PullImageResultCallback callback = new PullImageResultCallback();
+        callback.onNext(item);
+        callback.onComplete();
+
+        try {
+            callback.awaitCompletion();
+            fail("Expected DockerClientException");
+        } catch (DockerClientException e) {
+            assertThat(e.getMessage(), containsString("cccxxx/xxxccc:latest not found"));
+        }
+    }
+}