Skip to content

Add validation for project-id returned by metadata server #2868

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
yihanzhen merged 9 commits into from
Feb 13, 2018
Merged

Add validation for project-id returned by metadata server #2868

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2f8a445
Revert "Validate project-id returned from metadata server (#2822)"
yihanzhen Feb 1, 2018
c0feaf8
Merge branch 'master' of https://github.com/GoogleCloudPlatform/googl…
yihanzhen Feb 5, 2018
c43e45f
Validate the project id returned by metadata server by checking
yihanzhen Feb 6, 2018
2f11b0c
Remove unused import
yihanzhen Feb 6, 2018
b4d41a4
remove whitespaces
yihanzhen Feb 6, 2018
b31c155
remove unused imports
yihanzhen Feb 6, 2018
116245d
change to mock
yihanzhen Feb 6, 2018
c358a00
Add null check in ServiceOptions
yihanzhen Feb 7, 2018
6bb951b
Fix code review issues
yihanzhen Feb 7, 2018
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
3 changes: 2 additions & 1 deletion google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,8 @@ private static String getAppEngineProjectIdFromMetadataServer() throws IOExcepti

@InternalApi("Visible for testing")
static boolean headerContainsMetadataFlavor(HttpResponse response) {
return "Google".equals(response.getHeaders().getFirstHeaderStringValue("Metadata-Flavor"));
String metadataFlavorValue = response.getHeaders().getFirstHeaderStringValue("Metadata-Flavor");
return "Google".equals(metadataFlavorValue);
}

protected static String getServiceAccountProjectId() {
Expand Down
23 changes: 14 additions & 9 deletions google-cloud-core/src/test/java/com/google/cloud/ServiceOptionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,12 @@
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.Charset;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import java.util.regex.Pattern;

import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Multimap;
import com.google.common.io.Files;
import org.junit.Rule;
import org.junit.Test;
Expand Down Expand Up @@ -328,25 +329,29 @@ public void testGetServiceAccountProjectId_nonExistentFile() throws Exception {
}

@Test

This comment was marked as spam.

Sign in to view

public void testResponseHeaderContainsMetaDataFlavor() throws Exception {
Map<String, String> headers = new HashMap<String, String>();
HttpResponse httpResponse = createHttpResponseWithHeader(headers);
assertThat(ServiceOptions.headerContainsMetadataFlavor(httpResponse)).isFalse();

public void testResponseHeaderContainsMetaDataFlavor() throws Exception {
Multimap<String, String> headers = ArrayListMultimap.create();
headers.put("Metadata-Flavor", "Google");
httpResponse = createHttpResponseWithHeader(headers);
HttpResponse httpResponse = createHttpResponseWithHeader(headers);
assertThat(ServiceOptions.headerContainsMetadataFlavor(httpResponse)).isTrue();

This comment was marked as spam.

Sign in to view

}

@Test
public void testResponseHeaderDoesNotContainMetaDataFlavor() throws Exception {

This comment was marked as spam.

Sign in to view

Multimap<String, String> headers = ArrayListMultimap.create();
HttpResponse httpResponse = createHttpResponseWithHeader(headers);
assertThat(ServiceOptions.headerContainsMetadataFlavor(httpResponse)).isFalse();
}

private HttpResponse createHttpResponseWithHeader(final Map<String, String> headers) throws Exception {
private HttpResponse createHttpResponseWithHeader(final Multimap<String, String> headers) throws Exception {
HttpTransport mockHttpTransport = new MockHttpTransport() {
@Override
public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
return new MockLowLevelHttpRequest() {
@Override
public LowLevelHttpResponse execute() throws IOException {
MockLowLevelHttpResponse response = new MockLowLevelHttpResponse();
for (Map.Entry<String, String> entry : headers.entrySet()) {
for (Map.Entry<String, String> entry : headers.entries()) {

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

response.addHeader(entry.getKey(), entry.getValue());
}
return response;
Expand Down