Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: enforce w3c trace context value validation (#777)
* fix: enforce w3c trace context value validation validate length and characters of the w3c trace context value. see https://www.w3.org/TR/trace-context/#traceparent-header-field-values refactor unit testing to bring invalid w3c trace context tests to separate file Fixes #774 * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * chore: fix bug in formatting validation change length of the span field from 12 to 16 according to the standard * chore: refactor w3c format regex Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
- Loading branch information
1 parent
746a011
commit 0150655
Showing
4 changed files
with
78 additions
and
60 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 57 additions & 0 deletions
57
google-cloud-logging/src/test/java/com/google/cloud/logging/InvalidContextTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
/* | ||
* Copyright 2021 Google LLC | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* https://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package com.google.cloud.logging; | ||
|
||
import java.util.Arrays; | ||
import java.util.Collection; | ||
import org.junit.Test; | ||
import org.junit.runner.RunWith; | ||
import org.junit.runners.Parameterized; | ||
import org.junit.runners.Parameterized.Parameters; | ||
|
||
@RunWith(Parameterized.class) | ||
public class InvalidContextTest { | ||
@Parameters | ||
public static Collection<String> data() { | ||
final String[] INVALID_W3C_TRACE_CONTEXTS = { | ||
"", | ||
"abc/efg", | ||
"01-something", | ||
"00-123456789012345678901234567890", | ||
"00-12345678901234567890123456789012", | ||
"00-12345678901234567890123456789012345", | ||
"00-12345678901234567890123456789012-123456789012345", | ||
"00-12345678901234567890123456789012-1234567890123456", | ||
"00-12345678901234567890123456789012-12345678901234567", | ||
"00-12345678901234567890123456789012-1234567890123456-1", | ||
"00-12345678901234567890123456789012-1234567890123456-123" | ||
}; | ||
return Arrays.asList(INVALID_W3C_TRACE_CONTEXTS); | ||
} | ||
|
||
private final String traceContext; | ||
|
||
public InvalidContextTest(String traceContext) { | ||
this.traceContext = traceContext; | ||
} | ||
|
||
@Test(expected = IllegalArgumentException.class) | ||
public void testAssertionInvalidContext() { | ||
Context.Builder builder = Context.newBuilder(); | ||
builder.loadW3CTraceParentContext(traceContext); | ||
} | ||
} |