Skip to content

Commit 630e453

Browse files
yihanzhenyihanzhen
authored
---
yaml --- r: 8511 b: refs/heads/master c: 4c00485 h: refs/heads/master i: 8509: fbf134d 8507: 5802314 8503: 85a0d28 8495: d132328 8479: 3ccbaaa 8447: bd370ef
1 parent d4bef47 commit 630e453

4 files changed

Lines changed: 65 additions & 1 deletion

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: a20561e5d621758f6100bd9cbea07c2640bb5717
2+
refs/heads/master: 4c004858f1999665e368d9e6a25a24287ef3d741
33
refs/heads/travis: 47e4fee4fd5af9b2a8ce46f23c72ec95f9b195b2
44
refs/heads/gh-pages: 3e16a39145437096333db5811e5c0292719c1823
55
refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444

‎trunk/google-cloud-storage/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,11 @@
5454
<artifactId>junit</artifactId>
5555
<scope>test</scope>
5656
</dependency>
57+
<dependency>
58+
<groupId>com.google.truth</groupId>
59+
<artifactId>truth</artifactId>
60+
<scope>test</scope>
61+
</dependency>
5762
<dependency>
5863
<groupId>org.easymock</groupId>
5964
<artifactId>easymock</artifactId>

‎trunk/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageOptions.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package com.google.cloud.storage;
1818

19+
import com.google.cloud.NoCredentials;
1920
import com.google.cloud.http.HttpTransportOptions;
2021
import com.google.cloud.ServiceDefaults;
2122
import com.google.cloud.ServiceOptions;
@@ -128,6 +129,13 @@ public static StorageOptions getDefaultInstance() {
128129
return newBuilder().build();
129130
}
130131

132+
/**
133+
* Returns a unauthenticated {@code StorageOptions} instance.
134+
*/
135+
public static StorageOptions getUnauthenticatedInstance() {
136+
return newBuilder().setCredentials(NoCredentials.getInstance()).build();
137+
}
138+
131139
@SuppressWarnings("unchecked")
132140
@Override
133141
public Builder toBuilder() {

‎trunk/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import static org.junit.Assert.assertNull;
2525
import static org.junit.Assert.assertTrue;
2626
import static org.junit.Assert.fail;
27+
import static com.google.common.truth.Truth.assertThat;
2728

2829
import com.google.api.gax.paging.Page;
2930
import com.google.cloud.Identity;
@@ -50,6 +51,7 @@
5051
import com.google.cloud.storage.StorageClass;
5152
import com.google.cloud.storage.StorageException;
5253
import com.google.cloud.storage.StorageRoles;
54+
import com.google.cloud.storage.StorageOptions;
5355
import com.google.cloud.storage.testing.RemoteStorageHelper;
5456
import com.google.common.collect.ImmutableList;
5557
import com.google.common.collect.ImmutableMap;
@@ -1319,6 +1321,55 @@ public void testGetBlobs() {
13191321
assertTrue(remoteBlobs.get(1).delete());
13201322
}
13211323

1324+
@Test
1325+
public void testDownloadPublicBlobWithoutAuthentication() {
1326+
// create an unauthorized user
1327+
Storage unauthorizedStorage = StorageOptions.getUnauthenticatedInstance().getService();
1328+
1329+
// try to download blobs from a public bucket
1330+
String landsatBucket = "gcp-public-data-landsat";
1331+
String landsatPrefix = "LC08/PRE/044/034/LC80440342016259LGN00/";
1332+
String landsatBlob = landsatPrefix + "LC80440342016259LGN00_MTL.txt";
1333+
byte[] bytes = unauthorizedStorage.readAllBytes(landsatBucket, landsatBlob);
1334+
assertThat(bytes.length).isEqualTo(7903);
1335+
int numBlobs = 0;
1336+
Iterator<Blob> blobIterator = unauthorizedStorage
1337+
.list(landsatBucket, Storage.BlobListOption.prefix(landsatPrefix))
1338+
.iterateAll().iterator();
1339+
while (blobIterator.hasNext()) {
1340+
numBlobs++;
1341+
blobIterator.next();
1342+
}
1343+
assertThat(numBlobs).isEqualTo(13);
1344+
1345+
// try to download blobs from a bucket that requires authentication
1346+
// authenticated client will succeed
1347+
// unauthenticated client will receive an exception
1348+
String sourceBlobName = "source-blob-name";
1349+
BlobInfo sourceBlob = BlobInfo.newBuilder(BUCKET, sourceBlobName).build();
1350+
assertThat(storage.create(sourceBlob)).isNotNull();
1351+
assertThat(storage.readAllBytes(BUCKET, sourceBlobName)).isNotNull();
1352+
try {
1353+
unauthorizedStorage.readAllBytes(BUCKET, sourceBlobName);
1354+
fail("Expected StorageException");
1355+
} catch (StorageException ex) {
1356+
// expected
1357+
}
1358+
assertThat(storage.get(sourceBlob.getBlobId()).delete()).isTrue();
1359+
1360+
// try to upload blobs to a bucket that requires authentication
1361+
// authenticated client will succeed
1362+
// unauthenticated client will receive an exception
1363+
assertThat(storage.create(sourceBlob)).isNotNull();
1364+
try {
1365+
unauthorizedStorage.create(sourceBlob);
1366+
fail("Expected StorageException");
1367+
} catch (StorageException ex) {
1368+
// expected
1369+
}
1370+
assertThat(storage.get(sourceBlob.getBlobId()).delete()).isTrue();
1371+
}
1372+
13221373
@Test
13231374
public void testGetBlobsFail() {
13241375
String sourceBlobName1 = "test-get-blobs-fail-1";

0 commit comments

Comments
 (0)