Merge remote-tracking branch 'origin/alejandro.gonzalez/APPSEC-69139-resteasy-bound-multipart' into alejandro.gonzalez/APPSEC-69139-resteasy-bound-multipart

Author: jandro996

components/json/src/main/java/datadog/json/JsonWriter.java

@@ -19,6 +19,7 @@ public final class JsonWriter implements Flushable, AutoCloseable {
   private final JsonStructure structure;
 
   private boolean requireComma;
+  private int bytesWritten;
 
   /** Creates a writer with structure check. */
   public JsonWriter() {
@@ -245,6 +246,11 @@ public void flush() {
     }
   }
 
+  /** Approximate number of bytes written so far. */
+  public int sizeInBytes() {
+    return this.bytesWritten;
+  }
+
   @Override
   public void close() {
     try {
@@ -268,13 +274,15 @@ private void endsValue() {
   private void write(char ch) {
     try {
       this.writer.write(ch);
+      this.bytesWritten++;
     } catch (IOException ignored) {
     }
   }
 
   private void writeStringLiteral(String str) {
     try {
       this.writer.write('"');
+      int count = 1;
 
       for (int i = 0; i < str.length(); ++i) {
         char c = str.charAt(i);
@@ -286,33 +294,40 @@ private void writeStringLiteral(String str) {
           this.writer.write(HEX_DIGITS[(c >>> 8) & 0xF]);
           this.writer.write(HEX_DIGITS[(c >>> 4) & 0xF]);
           this.writer.write(HEX_DIGITS[c & 0xF]);
+          count += 6;
         } else {
           switch (c) {
             case '"': // Quotation mark
             case '\\': // Reverse solidus
             case '/': // Solidus
               this.writer.write('\\');
               this.writer.write(c);
+              count += 2;
               break;
             case '\b': // Backspace
               this.writer.write('\\');
               this.writer.write('b');
+              count += 2;
               break;
             case '\f': // Form feed
               this.writer.write('\\');
               this.writer.write('f');
+              count += 2;
               break;
             case '\n': // Line feed
               this.writer.write('\\');
               this.writer.write('n');
+              count += 2;
               break;
             case '\r': // Carriage return
               this.writer.write('\\');
               this.writer.write('r');
+              count += 2;
               break;
             case '\t': // Horizontal tab
               this.writer.write('\\');
               this.writer.write('t');
+              count += 2;
               break;
             default:
               if (c < 0x20) {
@@ -322,22 +337,28 @@ private void writeStringLiteral(String str) {
                 this.writer.write('0');
                 this.writer.write(HEX_DIGITS[(c >>> 4) & 0xF]);
                 this.writer.write(HEX_DIGITS[c & 0xF]);
+                count += 6;
               } else {
                 this.writer.write(c);
+                count += 1;
               }
               break;
           }
         }
       }
 
       this.writer.write('"');
+      count += 1;
+
+      this.bytesWritten += count;
     } catch (IOException ignored) {
     }
   }
 
   private void writeStringRaw(String str) {
     try {
       this.writer.write(str);
+      this.bytesWritten += str.length(); // exact if ASCII, estimate otherwise
     } catch (IOException ignored) {
     }
   }

components/json/src/test/java/datadog/json/JsonWriterTest.java

@@ -165,6 +165,54 @@ void testCompleteObject() {
     }
   }
 
+  @Test
+  void testSizeInBytes() {
+    try (JsonWriter writer = new JsonWriter()) {
+      assertEquals(0, writer.sizeInBytes(), "Check empty writer size");
+
+      writer.beginArray();
+      assertSizeInBytes(writer, "Check size after plain ASCII string");
+      writer.value("bar");
+
+      assertSizeInBytes(writer, "Check size after escaped characters");
+      writer.value("\"\\/");
+
+      assertSizeInBytes(writer, "Check size after named escapes");
+      writer.value("\b\f\n\r\t");
+
+      assertSizeInBytes(writer, "Check size after control character escape");
+      writer.value("\u0001");
+
+      assertSizeInBytes(writer, "Check size after non-ASCII character escape");
+      writer.value("café");
+
+      assertSizeInBytes(writer, "Check size after int value");
+      writer.value(3);
+
+      assertSizeInBytes(writer, "Check size after long value");
+      writer.value(3456789123L);
+
+      assertSizeInBytes(writer, "Check size after float value");
+      writer.value(3.142f);
+
+      assertSizeInBytes(writer, "Check size after double value");
+      writer.value(PI);
+
+      assertSizeInBytes(writer, "Check size after boolean value");
+      writer.value(true);
+
+      assertSizeInBytes(writer, "Check size after null value");
+      writer.nullValue();
+
+      writer.endArray();
+      assertSizeInBytes(writer, "Check final size matches written bytes");
+    }
+  }
+
+  private static void assertSizeInBytes(JsonWriter writer, String message) {
+    assertEquals(writer.toByteArray().length, writer.sizeInBytes(), message);
+  }
+
   @Test
   void testCompleteArray() {
     try (JsonWriter writer = new JsonWriter()) {

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BuildkiteInfo.java

@@ -23,7 +23,8 @@ class BuildkiteInfo implements CIProviderInfo {
   public static final String BUILDKITE = "BUILDKITE";
   public static final String BUILDKITE_PROVIDER_NAME = "buildkite";
   public static final String BUILDKITE_PIPELINE_ID = "BUILDKITE_BUILD_ID";
-  public static final String BUILDKITE_PIPELINE_NAME = "BUILDKITE_PIPELINE_SLUG";
+  public static final String BUILDKITE_PIPELINE_SLUG = "BUILDKITE_PIPELINE_SLUG";
+  public static final String BUILDKITE_PIPELINE_DISPLAY_NAME = "BUILDKITE_PIPELINE_NAME";
   public static final String BUILDKITE_PIPELINE_NUMBER = "BUILDKITE_BUILD_NUMBER";
   public static final String BUILDKITE_BUILD_URL = "BUILDKITE_BUILD_URL";
   public static final String BUILDKITE_JOB_ID = "BUILDKITE_JOB_ID";
@@ -67,7 +68,8 @@ public CIInfo buildCIInfo() {
     return CIInfo.builder(environment)
         .ciProviderName(BUILDKITE_PROVIDER_NAME)
         .ciPipelineId(environment.get(BUILDKITE_PIPELINE_ID))
-        .ciPipelineName(environment.get(BUILDKITE_PIPELINE_NAME))
+        .ciPipelineName(environment.get(BUILDKITE_PIPELINE_SLUG))
+        .ciPipelineDisplayName(environment.get(BUILDKITE_PIPELINE_DISPLAY_NAME))
         .ciPipelineNumber(environment.get(BUILDKITE_PIPELINE_NUMBER))
         .ciPipelineUrl(ciPipelineUrl)
         .ciJobId(environment.get(BUILDKITE_JOB_ID))

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CIInfo.java

@@ -22,6 +22,7 @@ public static final class Builder {
     private String ciProviderName;
     private String ciPipelineId;
     private String ciPipelineName;
+    private String ciPipelineDisplayName;
     private String ciStageName;
     private String ciJobId;
     private String ciJobName;
@@ -53,6 +54,11 @@ public Builder ciPipelineName(String ciPipelineName) {
       return this;
     }
 
+    public Builder ciPipelineDisplayName(String ciPipelineDisplayName) {
+      this.ciPipelineDisplayName = ciPipelineDisplayName;
+      return this;
+    }
+
     public Builder ciStageName(String ciStageName) {
       this.ciStageName = ciStageName;
       return this;
@@ -123,6 +129,7 @@ public CIInfo build() {
           ciProviderName,
           ciPipelineId,
           ciPipelineName,
+          ciPipelineDisplayName,
           ciStageName,
           ciJobId,
           ciJobName,
@@ -140,6 +147,7 @@ public CIInfo build() {
   private final String ciProviderName;
   private final String ciPipelineId;
   private final String ciPipelineName;
+  private final String ciPipelineDisplayName;
   private final String ciStageName;
   private final String ciJobId;
   private final String ciJobName;
@@ -153,13 +161,14 @@ public CIInfo build() {
   private final Map<String, String> additionalTags;
 
   public CIInfo() {
-    this(null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+    this(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
   }
 
   public CIInfo(
       String ciProviderName,
       String ciPipelineId,
       String ciPipelineName,
+      String ciPipelineDisplayName,
       String ciStageName,
       String ciJobId,
       String ciJobName,
@@ -174,6 +183,7 @@ public CIInfo(
     this.ciProviderName = ciProviderName;
     this.ciPipelineId = ciPipelineId;
     this.ciPipelineName = ciPipelineName;
+    this.ciPipelineDisplayName = ciPipelineDisplayName;
     this.ciStageName = ciStageName;
     this.ciJobId = ciJobId;
     this.ciJobName = ciJobName;
@@ -199,6 +209,10 @@ public String getCiPipelineName() {
     return ciPipelineName;
   }
 
+  public String getCiPipelineDisplayName() {
+    return ciPipelineDisplayName;
+  }
+
   public String getCiStageName() {
     return ciStageName;
   }
@@ -267,6 +281,7 @@ public boolean equals(Object o) {
     return Objects.equals(ciProviderName, ciInfo.ciProviderName)
         && Objects.equals(ciPipelineId, ciInfo.ciPipelineId)
         && Objects.equals(ciPipelineName, ciInfo.ciPipelineName)
+        && Objects.equals(ciPipelineDisplayName, ciInfo.ciPipelineDisplayName)
         && Objects.equals(ciStageName, ciInfo.ciStageName)
         && Objects.equals(ciJobId, ciInfo.ciJobId)
         && Objects.equals(ciJobName, ciInfo.ciJobName)
@@ -286,6 +301,7 @@ public int hashCode() {
     hash = 31 * hash + (ciProviderName == null ? 0 : ciProviderName.hashCode());
     hash = 31 * hash + (ciPipelineId == null ? 0 : ciPipelineId.hashCode());
     hash = 31 * hash + (ciPipelineName == null ? 0 : ciPipelineName.hashCode());
+    hash = 31 * hash + (ciPipelineDisplayName == null ? 0 : ciPipelineDisplayName.hashCode());
     hash = 31 * hash + (ciStageName == null ? 0 : ciStageName.hashCode());
     hash = 31 * hash + (ciJobId == null ? 0 : ciJobId.hashCode());
     hash = 31 * hash + (ciJobName == null ? 0 : ciJobName.hashCode());
@@ -312,6 +328,9 @@ public String toString() {
         + ", ciPipelineName='"
         + ciPipelineName
         + '\''
+        + ", ciPipelineDisplayName='"
+        + ciPipelineDisplayName
+        + '\''
         + ", ciStageName='"
         + ciStageName
         + '\''

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CITagsProvider.java

@@ -29,6 +29,7 @@ public Map<String, String> getCiTags(CIInfo ciInfo, PullRequestInfo pullRequestI
         .withCiProviderName(ciInfo.getCiProviderName())
         .withCiPipelineId(ciInfo.getCiPipelineId())
         .withCiPipelineName(ciInfo.getCiPipelineName())
+        .withCiPipelineDisplayName(ciInfo.getCiPipelineDisplayName())
         .withCiStageName(ciInfo.getCiStageName())
         .withCiJobName(ciInfo.getCiJobName())
         .withCiJobId(ciInfo.getCiJobId())
@@ -82,6 +83,10 @@ public CITagsBuilder withCiPipelineName(final String ciPipelineName) {
       return putTagValue(Tags.CI_PIPELINE_NAME, ciPipelineName);
     }
 
+    public CITagsBuilder withCiPipelineDisplayName(final String ciPipelineDisplayName) {
+      return putTagValue(Tags.CI_PIPELINE_DISPLAY_NAME, ciPipelineDisplayName);
+    }
+
     public CITagsBuilder withCiPipelineNumber(final String ciPipelineNumber) {
       return putTagValue(Tags.CI_PIPELINE_NUMBER, ciPipelineNumber);
     }

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/codeowners/CodeownersImpl.java

@@ -4,11 +4,9 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.Reader;
-import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Deque;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -20,9 +18,9 @@
 
 public class CodeownersImpl implements Codeowners {
 
-  private final Collection<Section> sections;
+  private final List<Section> sections;
 
-  private CodeownersImpl(Collection<Section> sections) {
+  private CodeownersImpl(List<Section> sections) {
     this.sections = sections;
   }
 
@@ -32,17 +30,25 @@ private CodeownersImpl(Collection<Section> sections) {
    */
   @Override
   public @Nullable Collection<String> getOwners(@Nonnull String path) {
-    char[] pathCharacters = path.toCharArray();
+    if (sections.size() == 1) {
+      Section section = sections.get(0);
+      if (section.isExcluded(path)) {
+        return new ArrayList<>();
+      }
+      Entry entry = section.findMatchingEntry(path);
+      return entry != null ? new ArrayList<>(entry.getOwners()) : null;
+    }
+
     Set<String> owners = null;
     for (Section section : sections) {
-      if (section.isExcluded(pathCharacters)) {
+      if (section.isExcluded(path)) {
         if (owners == null) {
           owners = new LinkedHashSet<>();
         }
         continue;
       }
 
-      Entry entry = section.findMatchingEntry(pathCharacters);
+      Entry entry = section.findMatchingEntry(path);
       if (entry != null) {
         if (owners == null) {
           owners = new LinkedHashSet<>();
@@ -90,36 +96,4 @@ public static Codeowners parse(Reader r) throws IOException {
     sections.addAll(namedSections.values());
     return new CodeownersImpl(sections);
   }
-
-  private static final class Section {
-
-    private final Deque<Entry> entries = new ArrayDeque<>();
-    private final Collection<Entry> exclusions = new ArrayList<>();
-
-    private void add(Entry entry) {
-      if (entry.isExclusion()) {
-        exclusions.add(entry);
-      } else {
-        entries.offerFirst(entry);
-      }
-    }
-
-    private boolean isExcluded(char[] path) {
-      for (Entry exclusion : exclusions) {
-        if (exclusion.getMatcher().consume(path, 0) >= 0) {
-          return true;
-        }
-      }
-      return false;
-    }
-
-    private @Nullable Entry findMatchingEntry(char[] path) {
-      for (Entry entry : entries) {
-        if (entry.getMatcher().consume(path, 0) >= 0) {
-          return entry;
-        }
-      }
-      return null;
-    }
-  }
 }