@sitblueprint/website-construct 0.1.3 → 0.1.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -6,8 +6,17 @@ A reusable [AWS CDK](https://docs.aws.amazon.com/cdk/) construct to deploy a web
6
6
 
7
7
  - CDN caching via CloudFont
8
8
  - Deployment via S3
9
+ - Hardened S3 bucket defaults with bucket-owner-only ACLs and automatic SSE
9
10
  - Direct access to the underlying S3 bucket and CloudFront distribution for advanced customization
10
11
 
12
+ ### Bucket security hardening
13
+
14
+ The construct keeps the S3 bucket accessible for static website hosting while enforcing safer defaults:
15
+
16
+ - Bucket ACLs are blocked and ownership is enforced so only the account owner controls access.
17
+ - Objects are encrypted at rest with S3 managed keys.
18
+ - CloudFront OAI access is granted explicitly via a bucket policy instead of broad public access.
19
+
11
20
  ## Installation
12
21
 
13
22
  ```bash
package/docs/CHANGELOG.md CHANGED
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
7
7
 
8
8
  ---
9
9
 
10
+ ## [v0.1.4] - 2025-09-30
11
+
12
+ ### Security
13
+
14
+ - Hardened the website bucket policy by blocking ACLs, enforcing bucket-owner full control, and retaining S3 managed encryption.
15
+
10
16
  ## [v0.1.3] - 2025-09-30
11
17
 
12
18
  ### Added
package/lib/index.js CHANGED
@@ -40,7 +40,10 @@ class Website extends constructs_1.Construct {
40
40
  this.bucket = new s3.Bucket(this, props.bucketName, {
41
41
  websiteIndexDocument: props.indexFile,
42
42
  websiteErrorDocument: props.errorFile,
43
+ publicReadAccess: true,
43
44
  removalPolicy: cdk.RemovalPolicy.DESTROY,
45
+ blockPublicAccess: s3.BlockPublicAccess.BLOCK_ACLS_ONLY,
46
+ accessControl: s3.BucketAccessControl.BUCKET_OWNER_FULL_CONTROL,
44
47
  encryption: s3.BucketEncryption.S3_MANAGED,
45
48
  });
46
49
  const oai = new cloudfont.OriginAccessIdentity(this, `${props.bucketName}-OAI`);
@@ -108,4 +111,4 @@ class Website extends constructs_1.Construct {
108
111
  }
109
112
  }
110
113
  exports.Website = Website;
111
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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","sourcesContent":["import { Construct } from \"constructs\";\nimport * as s3 from \"aws-cdk-lib/aws-s3\";\nimport * as cloudfont from \"aws-cdk-lib/aws-cloudfront\";\nimport * as origins from \"aws-cdk-lib/aws-cloudfront-origins\";\nimport * as certificatemanager from \"aws-cdk-lib/aws-certificatemanager\";\nimport * as cdk from \"aws-cdk-lib\";\nimport * as iam from \"aws-cdk-lib/aws-iam\";\nimport * as route53 from \"aws-cdk-lib/aws-route53\";\n\nexport interface DomainConfig {\n  /** The root domain name (e.g., example.com).\n   * There must be an associated hosted zone in Route 53 for this domain.\n   */\n  domainName: string;\n  /** The subdomain name */\n  subdomainName: string;\n  /** The ARN of the SSL certificate to use for the domain. */\n  certificateArn: string;\n}\n\nexport interface WebsiteProps {\n  /** The name of the S3 bucket that will host the website content. */\n  bucketName: string;\n\n  /** The path to the index document that will be served as the default page. */\n  indexFile: string;\n\n  /** The path to the error document that will be served when an error occurs. */\n  errorFile: string;\n\n  /** Optional configuration for custom domain setup. */\n  domainConfig?: DomainConfig;\n\n  /** Optional path to a custom 404 page. If not specified, the error file will be used. */\n  notFoundResponsePagePath?: string;\n}\n\nexport class Website extends Construct {\n  public readonly bucket: s3.Bucket;\n  public readonly distribution: cloudfont.Distribution;\n\n  constructor(scope: Construct, id: string, props: WebsiteProps) {\n    super(scope, id);\n    this.bucket = new s3.Bucket(this, props.bucketName, {\n      websiteIndexDocument: props.indexFile,\n      websiteErrorDocument: props.errorFile,\n      removalPolicy: cdk.RemovalPolicy.DESTROY,\n      encryption: s3.BucketEncryption.S3_MANAGED,\n    });\n    const oai = new cloudfont.OriginAccessIdentity(\n      this,\n      `${props.bucketName}-OAI`,\n    );\n    this.bucket.addToResourcePolicy(\n      new iam.PolicyStatement({\n        actions: [\"s3:GetObject\"],\n        resources: [this.bucket.arnForObjects(\"*\")],\n        principals: [\n          new iam.CanonicalUserPrincipal(\n            oai.cloudFrontOriginAccessIdentityS3CanonicalUserId,\n          ),\n        ],\n      }),\n    );\n\n    this.distribution = new cloudfont.Distribution(\n      this,\n      `${props.bucketName}-distribution`,\n      {\n        defaultBehavior: {\n          origin: new origins.S3StaticWebsiteOrigin(this.bucket),\n          viewerProtocolPolicy:\n            cloudfont.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,\n        },\n        errorResponses: [\n          {\n            httpStatus: 404,\n            responseHttpStatus: 404,\n            responsePagePath: props.notFoundResponsePagePath || `/404.html`,\n            ttl: cdk.Duration.minutes(30),\n          },\n        ],\n        priceClass: cloudfont.PriceClass.PRICE_CLASS_100,\n        ...(props.domainConfig\n          ? {\n              domainNames: [this._getFullDomainName(props.domainConfig)],\n              certificate: this._getCertificate(\n                props.domainConfig.certificateArn,\n              ),\n            }\n          : {}),\n      },\n    );\n\n    if (props.domainConfig) {\n      const hostedZone = route53.HostedZone.fromLookup(this, \"HostedZone\", {\n        domainName: props.domainConfig.domainName,\n      });\n      const domainARecord = new route53.ARecord(this, \"DomainARecord\", {\n        zone: hostedZone,\n        recordName: this._getFullDomainName(props.domainConfig),\n        target: cdk.aws_route53.RecordTarget.fromAlias(\n          new cdk.aws_route53_targets.CloudFrontTarget(this.distribution),\n        ),\n      });\n      domainARecord.node.addDependency(this.distribution);\n    }\n\n    new cdk.CfnOutput(this, \"cloudfront-website-url\", {\n      value: this.distribution.distributionDomainName,\n      description: \"CloudFront Distribution Domain Name\",\n    });\n\n    new cdk.CfnOutput(this, \"s3-website-url\", {\n      value: this.bucket.bucketWebsiteUrl,\n      description: \"S3 Bucket Website URL\",\n    });\n\n    if (props.domainConfig) {\n      new cdk.CfnOutput(this, \"website-url\", {\n        value: this.distribution.domainName,\n        description: \"Website URL\",\n      });\n    }\n  }\n\n  private _getFullDomainName(domainConfig: DomainConfig): string {\n    return domainConfig.subdomainName\n      ? `${domainConfig.subdomainName}.${domainConfig.domainName}`\n      : domainConfig.domainName;\n  }\n\n  private _getCertificate(arn: string): certificatemanager.ICertificate {\n    return certificatemanager.Certificate.fromCertificateArn(\n      this,\n      `website-cert`,\n      arn,\n    );\n  }\n}\n"]}
114
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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","sourcesContent":["import { Construct } from \"constructs\";\nimport * as s3 from \"aws-cdk-lib/aws-s3\";\nimport * as cloudfont from \"aws-cdk-lib/aws-cloudfront\";\nimport * as origins from \"aws-cdk-lib/aws-cloudfront-origins\";\nimport * as certificatemanager from \"aws-cdk-lib/aws-certificatemanager\";\nimport * as cdk from \"aws-cdk-lib\";\nimport * as iam from \"aws-cdk-lib/aws-iam\";\nimport * as route53 from \"aws-cdk-lib/aws-route53\";\n\nexport interface DomainConfig {\n  /** The root domain name (e.g., example.com).\n   * There must be an associated hosted zone in Route 53 for this domain.\n   */\n  domainName: string;\n  /** The subdomain name */\n  subdomainName: string;\n  /** The ARN of the SSL certificate to use for the domain. */\n  certificateArn: string;\n}\n\nexport interface WebsiteProps {\n  /** The name of the S3 bucket that will host the website content. */\n  bucketName: string;\n\n  /** The path to the index document that will be served as the default page. */\n  indexFile: string;\n\n  /** The path to the error document that will be served when an error occurs. */\n  errorFile: string;\n\n  /** Optional configuration for custom domain setup. */\n  domainConfig?: DomainConfig;\n\n  /** Optional path to a custom 404 page. If not specified, the error file will be used. */\n  notFoundResponsePagePath?: string;\n}\n\nexport class Website extends Construct {\n  public readonly bucket: s3.Bucket;\n  public readonly distribution: cloudfont.Distribution;\n\n  constructor(scope: Construct, id: string, props: WebsiteProps) {\n    super(scope, id);\n    this.bucket = new s3.Bucket(this, props.bucketName, {\n      websiteIndexDocument: props.indexFile,\n      websiteErrorDocument: props.errorFile,\n      publicReadAccess: true,\n      removalPolicy: cdk.RemovalPolicy.DESTROY,\n      blockPublicAccess: s3.BlockPublicAccess.BLOCK_ACLS_ONLY,\n      accessControl: s3.BucketAccessControl.BUCKET_OWNER_FULL_CONTROL,\n      encryption: s3.BucketEncryption.S3_MANAGED,\n    });\n    const oai = new cloudfont.OriginAccessIdentity(\n      this,\n      `${props.bucketName}-OAI`\n    );\n    this.bucket.addToResourcePolicy(\n      new iam.PolicyStatement({\n        actions: [\"s3:GetObject\"],\n        resources: [this.bucket.arnForObjects(\"*\")],\n        principals: [\n          new iam.CanonicalUserPrincipal(\n            oai.cloudFrontOriginAccessIdentityS3CanonicalUserId\n          ),\n        ],\n      })\n    );\n\n    this.distribution = new cloudfont.Distribution(\n      this,\n      `${props.bucketName}-distribution`,\n      {\n        defaultBehavior: {\n          origin: new origins.S3StaticWebsiteOrigin(this.bucket),\n          viewerProtocolPolicy:\n            cloudfont.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,\n        },\n        errorResponses: [\n          {\n            httpStatus: 404,\n            responseHttpStatus: 404,\n            responsePagePath: props.notFoundResponsePagePath || `/404.html`,\n            ttl: cdk.Duration.minutes(30),\n          },\n        ],\n        priceClass: cloudfont.PriceClass.PRICE_CLASS_100,\n        ...(props.domainConfig\n          ? {\n              domainNames: [this._getFullDomainName(props.domainConfig)],\n              certificate: this._getCertificate(\n                props.domainConfig.certificateArn\n              ),\n            }\n          : {}),\n      }\n    );\n\n    if (props.domainConfig) {\n      const hostedZone = route53.HostedZone.fromLookup(this, \"HostedZone\", {\n        domainName: props.domainConfig.domainName,\n      });\n      const domainARecord = new route53.ARecord(this, \"DomainARecord\", {\n        zone: hostedZone,\n        recordName: this._getFullDomainName(props.domainConfig),\n        target: cdk.aws_route53.RecordTarget.fromAlias(\n          new cdk.aws_route53_targets.CloudFrontTarget(this.distribution)\n        ),\n      });\n      domainARecord.node.addDependency(this.distribution);\n    }\n\n    new cdk.CfnOutput(this, \"cloudfront-website-url\", {\n      value: this.distribution.distributionDomainName,\n      description: \"CloudFront Distribution Domain Name\",\n    });\n\n    new cdk.CfnOutput(this, \"s3-website-url\", {\n      value: this.bucket.bucketWebsiteUrl,\n      description: \"S3 Bucket Website URL\",\n    });\n\n    if (props.domainConfig) {\n      new cdk.CfnOutput(this, \"website-url\", {\n        value: this.distribution.domainName,\n        description: \"Website URL\",\n      });\n    }\n  }\n\n  private _getFullDomainName(domainConfig: DomainConfig): string {\n    return domainConfig.subdomainName\n      ? `${domainConfig.subdomainName}.${domainConfig.domainName}`\n      : domainConfig.domainName;\n  }\n\n  private _getCertificate(arn: string): certificatemanager.ICertificate {\n    return certificatemanager.Certificate.fromCertificateArn(\n      this,\n      `website-cert`,\n      arn\n    );\n  }\n}\n"]}
package/lib/index.ts CHANGED
@@ -44,12 +44,15 @@ export class Website extends Construct {
44
44
  this.bucket = new s3.Bucket(this, props.bucketName, {
45
45
  websiteIndexDocument: props.indexFile,
46
46
  websiteErrorDocument: props.errorFile,
47
+ publicReadAccess: true,
47
48
  removalPolicy: cdk.RemovalPolicy.DESTROY,
49
+ blockPublicAccess: s3.BlockPublicAccess.BLOCK_ACLS_ONLY,
50
+ accessControl: s3.BucketAccessControl.BUCKET_OWNER_FULL_CONTROL,
48
51
  encryption: s3.BucketEncryption.S3_MANAGED,
49
52
  });
50
53
  const oai = new cloudfont.OriginAccessIdentity(
51
54
  this,
52
- `${props.bucketName}-OAI`,
55
+ `${props.bucketName}-OAI`
53
56
  );
54
57
  this.bucket.addToResourcePolicy(
55
58
  new iam.PolicyStatement({
@@ -57,10 +60,10 @@ export class Website extends Construct {
57
60
  resources: [this.bucket.arnForObjects("*")],
58
61
  principals: [
59
62
  new iam.CanonicalUserPrincipal(
60
- oai.cloudFrontOriginAccessIdentityS3CanonicalUserId,
63
+ oai.cloudFrontOriginAccessIdentityS3CanonicalUserId
61
64
  ),
62
65
  ],
63
- }),
66
+ })
64
67
  );
65
68
 
66
69
  this.distribution = new cloudfont.Distribution(
@@ -85,11 +88,11 @@ export class Website extends Construct {
85
88
  ? {
86
89
  domainNames: [this._getFullDomainName(props.domainConfig)],
87
90
  certificate: this._getCertificate(
88
- props.domainConfig.certificateArn,
91
+ props.domainConfig.certificateArn
89
92
  ),
90
93
  }
91
94
  : {}),
92
- },
95
+ }
93
96
  );
94
97
 
95
98
  if (props.domainConfig) {
@@ -100,7 +103,7 @@ export class Website extends Construct {
100
103
  zone: hostedZone,
101
104
  recordName: this._getFullDomainName(props.domainConfig),
102
105
  target: cdk.aws_route53.RecordTarget.fromAlias(
103
- new cdk.aws_route53_targets.CloudFrontTarget(this.distribution),
106
+ new cdk.aws_route53_targets.CloudFrontTarget(this.distribution)
104
107
  ),
105
108
  });
106
109
  domainARecord.node.addDependency(this.distribution);
@@ -134,7 +137,7 @@ export class Website extends Construct {
134
137
  return certificatemanager.Certificate.fromCertificateArn(
135
138
  this,
136
139
  `website-cert`,
137
- arn,
140
+ arn
138
141
  );
139
142
  }
140
143
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sitblueprint/website-construct",
3
- "version": "0.1.3",
3
+ "version": "0.1.4",
4
4
  "description": "A reusable AWS CDK construct for deploying static websites with optional custom domain support.",
5
5
  "author": "Miguel Merlin <mmerlin@stevens.edu>",
6
6
  "license": "MIT",