Skip to content

Wrap Json writer in a try block. #6751

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

Open
Fred1155 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Wrap Json writer in a try block. #6751

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8070ec
make sonarqube happy
Fred1155 Feb 24, 2026
89fce69
Merge branch 'master' into bole_sonartype_issue
Fred1155 Feb 24, 2026
105940e
Merge branch 'master' into bole_sonartype_issue
Fred1155 Mar 3, 2026
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
102 changes: 52 additions & 50 deletions ...src/main/java/software/amazon/awssdk/services/cloudfront/internal/utils/SigningUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,25 +62,26 @@ public static String buildCannedPolicy(String resourceUrl, Instant expirationDat
Validate.notNull(expirationDate, "expirationDate must not be null");
validateInput(resourceUrl, "resourceUrl");

JsonWriter writer = JsonWriter.create();
writer.writeStartObject()
.writeFieldName("Statement")
.writeStartArray()
.writeStartObject()
.writeFieldName("Resource")
.writeValue(resourceUrl)
.writeFieldName("Condition")
.writeStartObject()
.writeFieldName("DateLessThan")
.writeStartObject()
.writeFieldName("AWS:EpochTime")
.writeValue(expirationDate.getEpochSecond())
.writeEndObject()
.writeEndObject()
.writeEndObject()
.writeEndArray()
.writeEndObject();
return new String(writer.getBytes(), UTF_8);
try (JsonWriter writer = JsonWriter.create()) {
writer.writeStartObject()
.writeFieldName("Statement")
.writeStartArray()
.writeStartObject()
.writeFieldName("Resource")
.writeValue(resourceUrl)
.writeFieldName("Condition")
.writeStartObject()
.writeFieldName("DateLessThan")
.writeStartObject()
.writeFieldName("AWS:EpochTime")
.writeValue(expirationDate.getEpochSecond())
.writeEndObject()
.writeEndObject()
.writeEndObject()
.writeEndArray()
.writeEndObject();
return new String(writer.getBytes(), UTF_8);
}
}

/**
Expand All @@ -102,43 +103,44 @@ public static String buildCustomPolicy(String resourceUrl, Instant activeDate, I
validateInput(ipAddress, "ipAddress");
}

JsonWriter writer = JsonWriter.create();
writer.writeStartObject()
.writeFieldName("Statement")
.writeStartArray()
.writeStartObject()
.writeFieldName("Resource")
.writeValue(resourceUrl)
.writeFieldName("Condition")
.writeStartObject()
.writeFieldName("DateLessThan")
.writeStartObject()
.writeFieldName("AWS:EpochTime")
.writeValue(expirationDate.getEpochSecond())
.writeEndObject();

if (ipAddress != null) {
writer.writeFieldName("IpAddress")
try (JsonWriter writer = JsonWriter.create()) {
writer.writeStartObject()
.writeFieldName("Statement")
.writeStartArray()
.writeStartObject()
.writeFieldName("AWS:SourceIp")
.writeValue(ipAddress)
.writeEndObject();
}

if (activeDate != null) {
writer.writeFieldName("DateGreaterThan")
.writeFieldName("Resource")
.writeValue(resourceUrl)
.writeFieldName("Condition")
.writeStartObject()
.writeFieldName("DateLessThan")
.writeStartObject()
.writeFieldName("AWS:EpochTime")
.writeValue(activeDate.getEpochSecond())
.writeValue(expirationDate.getEpochSecond())
.writeEndObject();
}

writer.writeEndObject()
.writeEndObject()
.writeEndArray()
.writeEndObject();
if (ipAddress != null) {
writer.writeFieldName("IpAddress")
.writeStartObject()
.writeFieldName("AWS:SourceIp")
.writeValue(ipAddress)
.writeEndObject();
}

return new String(writer.getBytes(), UTF_8);
if (activeDate != null) {
writer.writeFieldName("DateGreaterThan")
.writeStartObject()
.writeFieldName("AWS:EpochTime")
.writeValue(activeDate.getEpochSecond())
.writeEndObject();
}

writer.writeEndObject()
.writeEndObject()
.writeEndArray()
.writeEndObject();

return new String(writer.getBytes(), UTF_8);
}
}

/**
Expand Down