Validate project-id returned from metadata server by yihanzhen · Pull Request #2822 · googleapis/google-cloud-java

yihanzhen · 2018-01-30T22:03:14Z

Validate project-id returned from metadata server to handle cases in which a descriptive failure html page is returned instead of the project-id itself from server when projects are not running in google cloud machines.

which a descriptive failure html page is returned instead of the projectid itself from server when projects are not running in google cloud machines.

google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java

+   * Returns true if the projectId is valid.
+   * projectId must be between 6 and 30 characters
+   * projectId can have lowercase letters, digits or hyphens
+   * and must start with a lowercase letter


google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java

+   * and must start with a lowercase letter
+   */
+  private boolean isValidProjectId(String projectId) {
+    Pattern p = Pattern.compile("^[a-z][a-z0-9-]*$");


google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java

+   * projectId can have lowercase letters, digits or hyphens
+   * and must start with a lowercase letter
+   */
+  private boolean isValidProjectId(String projectId) {


googlebot · 2018-01-31T18:09:00Z

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this State. It's up to you to confirm consent of the commit author(s) and merge this pull request when appropriate.

which a descriptive failure html page is returned instead of the projectid itself from server when projects are not running in google cloud machines.

yihanzhen · 2018-01-31T21:15:53Z

PTAL

google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java

  private static final RetrySettings NO_RETRY_SETTINGS = getDefaultRetrySettingsBuilder()
      .setMaxAttempts(1).build();

+  private static final Pattern projectIdPattern = Pattern.compile("^[a-z][a-z0-9-]*[a-z0-9]+$");


google-cloud-core/src/test/java/com/google/cloud/ServiceOptionsTest.java

+    assertThat(ServiceOptions.isValidProjectId(validProjectId)).isTrue();
+    assertThat(ServiceOptions.isValidProjectId(invalidProjectId1)).isFalse();
+    assertThat(ServiceOptions.isValidProjectId(invalidProjectId2)).isFalse();
+    assertThat(ServiceOptions.isValidProjectId(invalidProjectId3)).isFalse();


yihanzhen · 2018-02-01T00:03:15Z

PTAL

wsh

As it is, this change introduces a bug (it will reject project IDs with colons in them). Please consider reverting the merge.

google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java

+      && !projectId.endsWith("-");
+  }
+
+  private static boolean isLowerCase(char c) {


google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java

+    return c >= 'a' && c <= 'z';
+  }
+
+  private static boolean isDigit(char c) {


google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java

+        return false;
+      }
+    }
+    return projectId.length() > 0 && isLowerCase(projectId.charAt(0))


google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java

+   * method is primarily used to protect against DNS hijacking.
+   */
+  static boolean isValidProjectId(String projectId) {   
+    for (char c : projectId.toCharArray()) {


…#2822)" This reverts commit 536af84.

…2833) This reverts commit 536af84.

…ng to v1.46.0 (#2822)

yihanzhen added 2 commits January 30, 2018 11:55

Validate project-id returned from metadata server to handle cases in

fe11aaf

which a descriptive failure html page is returned instead of the projectid itself from server when projects are not running in google cloud machines.

update comments

8348feb

yihanzhen requested a review from garrettjonesgoogle as a code owner January 30, 2018 22:03

googlebot added the cla: yes This human has signed the Contributor License Agreement. label Jan 30, 2018

yihanzhen requested a review from pongad January 30, 2018 22:03

pongad reviewed Jan 30, 2018

View reviewed changes

googlebot added cla: no This human has *not* signed the Contributor License Agreement. and removed cla: yes This human has signed the Contributor License Agreement. labels Jan 31, 2018

yihanzhen added 2 commits January 31, 2018 10:44

Validate project-id returned from metadata server to handle cases in

2c86cb2

which a descriptive failure html page is returned instead of the projectid itself from server when projects are not running in google cloud machines.

update comments

7ab63f1

yihanzhen force-pushed the check_projectid_from_metadataserver branch from a934449 to 7ab63f1 Compare January 31, 2018 18:49

fix code review problems

52d0d98

pongad reviewed Jan 31, 2018

View reviewed changes

yihanzhen added 2 commits January 31, 2018 14:42

Fix code review problems

c88ff33

fix code review problems

04ec228

fix useless parentheses

bf39d93

pongad approved these changes Feb 1, 2018

View reviewed changes

yihanzhen merged commit 536af84 into googleapis:master Feb 1, 2018

yihanzhen mentioned this pull request Feb 1, 2018

Datastore - Datastore object creation fails with version 1.5.1 #2440

Closed

wsh reviewed Feb 1, 2018

View reviewed changes

yihanzhen added a commit to yihanzhen/google-cloud-java that referenced this pull request Feb 1, 2018

Revert "Validate project-id returned from metadata server (googleapis…

2f8a445

…#2822)" This reverts commit 536af84.

yihanzhen added a commit that referenced this pull request Feb 1, 2018

Revert "Validate project-id returned from metadata server (#2822)" (#…

0ca34ad

…2833) This reverts commit 536af84.

chingor13 pushed a commit that referenced this pull request Feb 20, 2026

deps: update dependency io.opentelemetry:opentelemetry-exporter-loggi…

4b59e8f

…ng to v1.46.0 (#2822)

Conversation

yihanzhen commented Jan 30, 2018

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

googlebot commented Jan 31, 2018

Uh oh!

yihanzhen commented Jan 31, 2018

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

yihanzhen commented Feb 1, 2018

Uh oh!

wsh left a comment

Choose a reason for hiding this comment

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants