CloudFrontUtilities clobbers port number if present when signing URLs

[sagebind]

Describe the bug

When signing a resource URL with CloudFrontUtilities::getSignedUrlWithCannedPolicy, if the given URL contains a port number in the authority, the signature will be generated based on the original string with the port, but the port will be stripped from the actual string that is returned. The signature will be invalid.

Expected Behavior

CloudFrontUtilities::getSignedUrlWithCannedPolicy should not modify the URL authority that it is given.

Current Behavior

Current behavior is that CloudFrontUtilities::getSignedUrlWithCannedPolicy always strips the port number from the authority given, after it has already generated a signature.

Reproduction Steps

CloudFrontUtilities cloudFrontUtilities = CloudFrontUtilities.create();

String urlToSign = "https://abc.cloudfront.net:443/foo/bar.html";
String signedUrl = cloudFrontUtilities.getSignedUrlWithCannedPolicy(signer -> signer
    .resourceUrl(uri.toString())
    .keyPairId(keyName)
    .privateKey(privateKey)
    .expirationDate(normalizedExpires))
    .url();

// signedUrl will be "https://abc.cloudfront.net/foo/bar.html", but the signature was
// signed for "https://abc.cloudfront.net:443/foo/bar.html".
assert signedUrl.startsWith(urlToSign);

Possible Solution

When reconstructing the signed URL, use the original URL's authority string unmodified, or add conditional logic to append the port to the reconstructed URL if given.

Possible implementation (untested):

             URI uri = URI.create(resourceUrl);
             String protocol = uri.getScheme();
             String domain = uri.getHost();
+            String authority = uri.getAuthority();
             String encodedPath = uri.getRawPath()
                                  + (uri.getQuery() != null ? "?" + uri.getRawQuery() + "&" : "?")
                                  + "Expires=" + request.expirationDate().getEpochSecond()
                                  + "&Signature=" + urlSafeSignature
                                  + "&Key-Pair-Id=" + request.keyPairId();
             return DefaultSignedUrl.builder().protocol(protocol).domain(domain).encodedPath(encodedPath)
-                                   .url(protocol + "://" + domain + encodedPath).build();
+                                   .url(protocol + "://" + authority + encodedPath).build();

Additional Information/Context

We sign "dummy URLs" in our unit and local application tests. These dummy URLs sometimes point to local servers and not real CloudFront hosts. This behavior broke such code when we upgraded from the AWS SDK for Java v1, since these local servers don't run on port 80 or 443.

In general, modifying the URL authority seems unexpected and unnecessary anyway.

AWS Java SDK version used

2.24.13

JDK version used

1.8.0_332

Operating System and version

macOS 13.6.5

[debora-ito]

@sagebind thank you for the reaching out, marking as a bug.

[davidh44]

This has been fixed with #5222, closing issue

[github-actions]

This issue is now closed. Comments on closed issues are hard for our team to see.
If you need more assistance, please open a new issue that references this one.