Skip to content

fix: possible NPE when HttpStorageOptions deserialized #2153

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

Merged
BenWhitehead merged 1 commit into from
Aug 3, 2023
Merged

fix: possible NPE when HttpStorageOptions deserialized #2153

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions google-cloud-storage/src/main/java/com/google/cloud/storage/HttpStorageOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public class HttpStorageOptions extends StorageOptions {
private static final String DEFAULT_HOST = "https://storage.googleapis.com";

private final HttpRetryAlgorithmManager retryAlgorithmManager;
private final transient RetryDependenciesAdapter retryDepsAdapter;
private final RetryDependenciesAdapter retryDepsAdapter;

private HttpStorageOptions(Builder builder, StorageDefaults serviceDefaults) {
super(builder, serviceDefaults);
Expand Down Expand Up @@ -334,7 +334,7 @@ public ServiceRpc create(StorageOptions options) {
* We don't yet want to make HttpStorageOptions itself implement {@link RetryingDependencies} but
* we do need use it in a couple places, for those we create this adapter.
*/
private final class RetryDependenciesAdapter implements RetryingDependencies {
private final class RetryDependenciesAdapter implements RetryingDependencies, Serializable {

private RetryDependenciesAdapter() {}

Expand Down
25 changes: 25 additions & 0 deletions google-cloud-storage/src/test/java/com/google/cloud/storage/SerializationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,11 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.Base64;
import java.util.Collections;
Expand Down Expand Up @@ -213,6 +215,29 @@ protected Serializable[] serializableObjects() {
}
}

@Test
public void avoidNpeHttpStorageOptions_retryDeps() throws IOException, ClassNotFoundException {
HttpStorageOptions optionsHttp1 =
StorageOptions.http()
.setProjectId("http1")
.setCredentials(NoCredentials.getInstance())
.build();

assertThat(optionsHttp1.asRetryDependencies()).isNotNull();

ByteArrayOutputStream baos = new ByteArrayOutputStream();
try (ObjectOutputStream oos = new ObjectOutputStream(baos)) {
oos.writeObject(optionsHttp1);
}

byte[] byteArray = baos.toByteArray();
try (ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(byteArray))) {
Object o = ois.readObject();
HttpStorageOptions hso = (HttpStorageOptions) o;
assertThat(hso.asRetryDependencies()).isNotNull();
}
}

@Override
@SuppressWarnings("resource")
protected Restorable<?>[] restorableObjects() {
Expand Down