---

yihanzhen · web-flow · commit 2ddaaa5815df · 2018-02-01T13:42:42.000-08:00
yaml --- r: 8971 b: refs/heads/lesv-patch-1 c: 0ca34ad h: refs/heads/master i: 8969: 2e9d678 8967: 215bfbc
diff --git a/[refs] b/[refs]
@@ -66,7 +66,7 @@ refs/tags/v0.22.0: 18b298fe4bfe8ec2f20b0e0bf7ffdcce5cc3c5fe
 refs/heads/vam-google-patch-1: d0c8fee3a4074d0bf7360ce8c4f7f7223d0ee7b9
 refs/heads/vam-google-patch-CODEOWNERS: 2ac1616e25229e51d08a984708ef1918f91a35ee
 refs/heads/danoscarmike-patch-1: 7342a9916bce4ed00002c7202e2a16c5d46afaea
-refs/heads/lesv-patch-1: 536af840f93622a8743d7c129104e72909aeab0a
+refs/heads/lesv-patch-1: 0ca34ad5460eb92fa426dd0ae6db5a34d8c92e7a
 refs/heads/ml-update-branch: 079dd6610017f5c51b9d1938c12d6d55b61513cf
 refs/heads/vkedia-patch-2: 7d8241388a9769a5c069334761b06c7012c878e7
 refs/heads/vkedia-patch-3: 4d128043acaa7db9160faf439d2ca6104e8a88cb
diff --git a/branches/lesv-patch-1/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java b/branches/lesv-patch-1/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java
@@ -452,8 +452,7 @@ private static String getAppEngineProjectIdFromMetadataServer() throws IOExcepti
             .setReadTimeout(500)
             .setHeaders(new HttpHeaders().set("Metadata-Flavor", "Google"));
     HttpResponse response = request.execute();
-    String projectId = response.parseAsString();
-    return projectId != null && isValidProjectId(projectId)? projectId : null;
+    return response.parseAsString();
   }
 
   protected static String getServiceAccountProjectId() {
@@ -477,29 +476,6 @@ static String getServiceAccountProjectId(String credentialsPath) {
     return project;
   }
 
-  /* 
-   * Returns true if the projectId is valid. This method checks whether the projectId
-   * contains only lowercase letters, digits and hyphens, starts with a lowercase letter
-   * and does not end with a hyphen, but does not check the length of projectId. This
-   * method is primarily used to protect against DNS hijacking.
-   */
-  static boolean isValidProjectId(String projectId) {   
-    for (char c : projectId.toCharArray()) {
-      if (!isLowerCase(c) && !isDigit(c) && c != '-') {
-        return false;
-      }
-    }
-    return projectId.length() > 0 && isLowerCase(projectId.charAt(0))
-      && !projectId.endsWith("-");
-  }
-
-  private static boolean isLowerCase(char c) {
-    return c >= 'a' && c <= 'z';
-  }
-
-  private static boolean isDigit(char c) {
-    return c >= '0' && c <= '9';
-  }
 
   /**
    * Returns a Service object for the current service. For instance, when using Google Cloud
diff --git a/branches/lesv-patch-1/google-cloud-core/src/test/java/com/google/cloud/ServiceOptionsTest.java b/branches/lesv-patch-1/google-cloud-core/src/test/java/com/google/cloud/ServiceOptionsTest.java
@@ -23,7 +23,6 @@
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import static com.google.common.truth.Truth.assertThat;
 
 import com.google.api.core.ApiClock;
 import com.google.api.core.CurrentMillisClock;
@@ -314,13 +313,4 @@ public void testGetServiceAccountProjectId_nonExistentFile() throws Exception {
 
     assertNull(ServiceOptions.getServiceAccountProjectId(credentialsFile.getPath()));
   }
-
-  @Test
-  public void testValidateProjectId() throws Exception {
-    assertThat(ServiceOptions.isValidProjectId("abc-123")).isTrue();
-    assertThat(ServiceOptions.isValidProjectId("abc-123-ab")).isTrue();
-    assertThat(ServiceOptions.isValidProjectId("abc=123")).isFalse();
-    assertThat(ServiceOptions.isValidProjectId("abc123-")).isFalse();
-    assertThat(ServiceOptions.isValidProjectId("1abc-23")).isFalse();
-  }
 }
