Skip to content

chore(middleware-bucket-endpoint): include fips/dualstack checks in s3 hostname pattern #3004

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

Merged
merged 1 commit into from
Nov 11, 2021
Merged

chore(middleware-bucket-endpoint): include fips/dualstack checks in s3 hostname pattern #3004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 2 additions & 7 deletions packages/middleware-bucket-endpoint/src/bucketHostname.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,11 @@ export interface BucketHostname {

export const bucketHostname = (options: BucketHostnameParams | ArnHostnameParams): BucketHostname => {
validateCustomEndpoint(options);

// TODO: Remove checks for ".dualstack" from entire middleware.
const { dualstackEndpoint, baseHostname } = options;
const updatedBaseHostname = dualstackEndpoint ? baseHostname.replace(".dualstack", "") : baseHostname;

return isBucketNameOptions(options)
? // Construct endpoint when bucketName is a string referring to a bucket name
getEndpointFromBucketName({ ...options, baseHostname: updatedBaseHostname })
getEndpointFromBucketName(options)
: // Construct endpoint when bucketName is an ARN referring to an S3 resource like Access Point
getEndpointFromArn({ ...options, baseHostname: updatedBaseHostname });
getEndpointFromArn(options);
};

const getEndpointFromBucketName = ({
Expand Down
4 changes: 2 additions & 2 deletions packages/middleware-bucket-endpoint/src/bucketHostnameUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const DOMAIN_PATTERN = /^[a-z0-9][a-z0-9\.\-]{1,61}[a-z0-9]$/;
const IP_ADDRESS_PATTERN = /(\d+\.){3}\d+/;
const DOTS_PATTERN = /\.\./;
export const DOT_PATTERN = /\./;
export const S3_HOSTNAME_PATTERN = /^(.+\.)?s3[.-]([a-z0-9-]+)\./;
export const S3_HOSTNAME_PATTERN = /^(.+\.)?s3(-fips)?(\.dualstack)?[.-]([a-z0-9-]+)\./;
const S3_US_EAST_1_ALTNAME_PATTERN = /^s3(-external-1)?\.amazonaws\.com$/;
const AWS_PARTITION_SUFFIX = "amazonaws.com";

Expand Down Expand Up @@ -49,7 +49,7 @@ export const isDnsCompatibleBucketName = (bucketName: string): boolean =>

const getRegionalSuffix = (hostname: string): [string, string] => {
const parts = hostname.match(S3_HOSTNAME_PATTERN)!;
return [parts[2], hostname.replace(new RegExp(`^${parts[0]}`), "")];
return [parts[4], hostname.replace(new RegExp(`^${parts[0]}`), "")];
};

export const getSuffix = (hostname: string): [string, string] =>
Expand Down