mirror of
https://github.com/Sea-Haven-Industries/seahaven-door-unlock-api.git
synced 2026-09-30 07:03:12 +00:00
chore(security): resolve open dependabot and code scanning alerts (#59)
Some checks failed
Deploy / deploy (push) Has been cancelled
Some checks failed
Deploy / deploy (push) Has been cancelled
* ci: add least-privilege permissions blocks to workflow callers Resolves code scanning alerts #3 and #4 (actions/missing-workflow-permissions). Both callable workflows only need contents: read; the dependency-review callable already declares it internally, this caps the caller token to match. Signed-off-by: Adam Moussa <adam@seahavenind.com> * build(deps): bump aws-cdk-lib to 2.262.0 to patch brace-expansion aws-cdk-lib 2.261.0 bundles brace-expansion 5.0.6, which is vulnerable to CVE-2026-13149 (GHSA-3jxr-9vmj-r5cp), an exponential-time DoS in expand(). This was the only path pulling the vulnerable package into the tree. 2.262.0 vendors the patched 5.0.7, resolving Dependabot alert 7. Because brace-expansion arrives bundled inside the aws-cdk-lib tarball rather than resolved by npm, the aws-cdk-lib bump is the only way to move it. Signed-off-by: Adam Moussa <adam@seahavenind.com> * refactor(cdk): drop unreferenced ssm value parameters fromStringParameterName injects an AWS::SSM::Parameter::Value CloudFormation parameter to carry the parameter's value, but DoorId and PhoneIps are only used for grantRead, which builds the ARN from the name string — so DoorIdParameter and PhoneIpsParameter sat unreferenced in the template (flagged W2001 by the CloudFormation validator newly bundled in aws-cdk-lib 2.262.0). Switching to fromStringParameterAttributes with forceDynamicReference resolves the value lazily via an SSM dynamic reference, emitting nothing when unused. Verified the synthesized template is identical apart from the removed Parameters entries and the CDKMetadata analytics hash — no IAM or resource changes. Also re-points the four line-keyed semgrep detect-child-process suppressions (adjudicated FPs, INFRA-105) to the shifted line numbers; the findings themselves are unchanged. Signed-off-by: Adam Moussa <adam@seahavenind.com> --------- Signed-off-by: Adam Moussa <adam@seahavenind.com>
This commit is contained in:
Adam Moussa
GitHub
parent
c662688ae3
commit
211a00a013
6 changed files with 60 additions and 34 deletions
3
.github/workflows/ci.yaml
vendored
3
.github/workflows/ci.yaml
vendored
|
|
@ -3,6 +3,9 @@ on:
|
||||||
pull_request:
|
pull_request:
|
||||||
branches: [main]
|
branches: [main]
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
ci:
|
ci:
|
||||||
uses: Sea-Haven-Industries/.github/.github/workflows/ci-typescript-cdk.yaml@fd60e4c9041784f666ac0fdefb9bec3c7fbf5143 # main
|
uses: Sea-Haven-Industries/.github/.github/workflows/ci-typescript-cdk.yaml@fd60e4c9041784f666ac0fdefb9bec3c7fbf5143 # main
|
||||||
|
|
|
||||||
4
.github/workflows/dependency-review.yml
vendored
4
.github/workflows/dependency-review.yml
vendored
|
|
@ -1,6 +1,10 @@
|
||||||
name: Dependency Review
|
name: Dependency Review
|
||||||
on:
|
on:
|
||||||
pull_request:
|
pull_request:
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
review:
|
review:
|
||||||
uses: Sea-Haven-Industries/.github/.github/workflows/callable-dependency-review.yaml@fd60e4c9041784f666ac0fdefb9bec3c7fbf5143 # main
|
uses: Sea-Haven-Industries/.github/.github/workflows/callable-dependency-review.yaml@fd60e4c9041784f666ac0fdefb9bec3c7fbf5143 # main
|
||||||
|
|
|
||||||
|
|
@ -1,20 +1,20 @@
|
||||||
{
|
{
|
||||||
"suppressions": [
|
"suppressions": [
|
||||||
{
|
{
|
||||||
"id": "semgrep-detect-child-process-55",
|
"id": "semgrep-detect-child-process-61",
|
||||||
"justification": "False positive. CDK local-bundling tryBundle(outputDir) in lib/door-unlock-stack.ts. execSync runs esbuild at cdk-synth time; outputDir is supplied by the CDK framework (staging temp dir) and the other path segments are repo-relative constants. No untrusted input, build-time only on a trusted host, never runs at request time. Verified proof-or-kill 2026-07-13. INFRA-105."
|
"justification": "False positive. CDK local-bundling tryBundle(outputDir) in lib/door-unlock-stack.ts. execSync runs esbuild at cdk-synth time; outputDir is supplied by the CDK framework (staging temp dir) and the other path segments are repo-relative constants. No untrusted input, build-time only on a trusted host, never runs at request time. Verified proof-or-kill 2026-07-13. INFRA-105. Re-pointed from line 55 on 2026-07-23: fromStringParameterName cleanup shifted lines in lib/door-unlock-stack.ts; finding unchanged."
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "semgrep-detect-child-process-84",
|
"id": "semgrep-detect-child-process-90",
|
||||||
"justification": "False positive. Same as semgrep-detect-child-process-55: CDK local-bundling esbuild execSync with framework-supplied synth-time outputDir. Build-time only. INFRA-105."
|
"justification": "False positive. Same as semgrep-detect-child-process-55: CDK local-bundling esbuild execSync with framework-supplied synth-time outputDir. Build-time only. INFRA-105. Re-pointed from line 84 on 2026-07-23: fromStringParameterName cleanup shifted lines in lib/door-unlock-stack.ts; finding unchanged."
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "semgrep-detect-child-process-122",
|
"id": "semgrep-detect-child-process-128",
|
||||||
"justification": "False positive. Same as semgrep-detect-child-process-55: CDK local-bundling esbuild execSync with framework-supplied synth-time outputDir. Build-time only. INFRA-105."
|
"justification": "False positive. Same as semgrep-detect-child-process-55: CDK local-bundling esbuild execSync with framework-supplied synth-time outputDir. Build-time only. INFRA-105. Re-pointed from line 122 on 2026-07-23: fromStringParameterName cleanup shifted lines in lib/door-unlock-stack.ts; finding unchanged."
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "semgrep-detect-child-process-202",
|
"id": "semgrep-detect-child-process-210",
|
||||||
"justification": "False positive. Same as semgrep-detect-child-process-55: CDK local-bundling esbuild execSync with framework-supplied synth-time outputDir. Build-time only. INFRA-105."
|
"justification": "False positive. Same as semgrep-detect-child-process-55: CDK local-bundling esbuild execSync with framework-supplied synth-time outputDir. Build-time only. INFRA-105. Re-pointed from line 202 on 2026-07-23: fromStringParameterName cleanup shifted lines in lib/door-unlock-stack.ts; finding unchanged."
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "checkov-CKV_AWS_111-234",
|
"id": "checkov-CKV_AWS_111-234",
|
||||||
|
|
@ -22,7 +22,7 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "gitleaks-generic-api-key-5193",
|
"id": "gitleaks-generic-api-key-5193",
|
||||||
"justification": "False positive. A provisioning-template token placeholder (the literal __DOOR_UNLOCK_TOKEN__) in Yealink T54W templates — not a secret. The real token was rotated in SSM (INFRA-105, param v3 2026-07-06) and the historical live token was removed by the git-filter-repo history scrub; only the placeholder remains."
|
"justification": "False positive. A provisioning-template token placeholder (the literal __DOOR_UNLOCK_TOKEN__) in Yealink T54W templates \u2014 not a secret. The real token was rotated in SSM (INFRA-105, param v3 2026-07-06) and the historical live token was removed by the git-filter-repo history scrub; only the placeholder remains."
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "gitleaks-generic-api-key-900",
|
"id": "gitleaks-generic-api-key-900",
|
||||||
|
|
@ -30,7 +30,7 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "gitleaks-generic-api-key-3097",
|
"id": "gitleaks-generic-api-key-3097",
|
||||||
"justification": "False positive. A __DOOR_UNLOCK_TOKEN__ placeholder in a Yealink provisioning template (unlock linekey) — not a secret. Live token rotated in SSM 2026-07-06; history scrubbed via git-filter-repo (INFRA-105)."
|
"justification": "False positive. A __DOOR_UNLOCK_TOKEN__ placeholder in a Yealink provisioning template (unlock linekey) \u2014 not a secret. Live token rotated in SSM 2026-07-06; history scrubbed via git-filter-repo (INFRA-105)."
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -34,10 +34,16 @@ export class DoorUnlockStack extends cdk.Stack {
|
||||||
{ parameterName: "/seahaven/door-unlock/auth-token" }
|
{ parameterName: "/seahaven/door-unlock/auth-token" }
|
||||||
);
|
);
|
||||||
|
|
||||||
const doorIdParam = ssm.StringParameter.fromStringParameterName(
|
// forceDynamicReference: the stack only needs the parameter for grantRead
|
||||||
|
// (ARN, built from the name); without it, fromStringParameterName injects
|
||||||
|
// an unreferenced AWS::SSM::Parameter::Value CloudFormation parameter.
|
||||||
|
const doorIdParam = ssm.StringParameter.fromStringParameterAttributes(
|
||||||
this,
|
this,
|
||||||
"DoorId",
|
"DoorId",
|
||||||
"/seahaven/door-unlock/door-id"
|
{
|
||||||
|
parameterName: "/seahaven/door-unlock/door-id",
|
||||||
|
forceDynamicReference: true,
|
||||||
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
const unlockHandler = new lambda.Function(this, "UnlockHandler", {
|
const unlockHandler = new lambda.Function(this, "UnlockHandler", {
|
||||||
|
|
@ -179,8 +185,10 @@ export class DoorUnlockStack extends cdk.Stack {
|
||||||
ec2.Peer.ipv4("10.10.0.0/16"), ec2.Port.tcp(443), "HTTPS to phone LAN via VPN"
|
ec2.Peer.ipv4("10.10.0.0/16"), ec2.Port.tcp(443), "HTTPS to phone LAN via VPN"
|
||||||
);
|
);
|
||||||
|
|
||||||
const phoneIpsParam = ssm.StringParameter.fromStringParameterName(
|
// forceDynamicReference for the same reason as DoorId above.
|
||||||
this, "PhoneIps", "/seahaven/door-unlock/phone-ips"
|
const phoneIpsParam = ssm.StringParameter.fromStringParameterAttributes(
|
||||||
|
this, "PhoneIps",
|
||||||
|
{ parameterName: "/seahaven/door-unlock/phone-ips", forceDynamicReference: true }
|
||||||
);
|
);
|
||||||
|
|
||||||
const phonePasswordSecret = secretsmanager.Secret.fromSecretNameV2(
|
const phonePasswordSecret = secretsmanager.Secret.fromSecretNameV2(
|
||||||
|
|
|
||||||
49
package-lock.json
generated
49
package-lock.json
generated
|
|
@ -8,7 +8,7 @@
|
||||||
"name": "seahaven-door-unlock",
|
"name": "seahaven-door-unlock",
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"aws-cdk-lib": "2.261.0",
|
"aws-cdk-lib": "2.262.0",
|
||||||
"constructs": "^10.7.1"
|
"constructs": "^10.7.1"
|
||||||
},
|
},
|
||||||
"bin": {
|
"bin": {
|
||||||
|
|
@ -38,9 +38,9 @@
|
||||||
"license": "Apache-2.0"
|
"license": "Apache-2.0"
|
||||||
},
|
},
|
||||||
"node_modules/@aws-cdk/cloud-assembly-schema": {
|
"node_modules/@aws-cdk/cloud-assembly-schema": {
|
||||||
"version": "54.2.0",
|
"version": "54.14.0",
|
||||||
"resolved": "https://registry.npmjs.org/@aws-cdk/cloud-assembly-schema/-/cloud-assembly-schema-54.2.0.tgz",
|
"resolved": "https://registry.npmjs.org/@aws-cdk/cloud-assembly-schema/-/cloud-assembly-schema-54.14.0.tgz",
|
||||||
"integrity": "sha512-u3lFXmiXSBozxGBmKTCVD/2mTDsaXzLZH3KYiIQKcB+zPldXOeE5TnooBgKV9ih2jVTo8ML0HpkhfAq2eiv0eQ==",
|
"integrity": "sha512-JCZCzgp3SuXQVljaKqXnttHzcezEHt9Ag/YipK0XwUFD+Iz2T4jY7gUc3pA25Uq6pzY2n9DvO/nEU++dPXW4Rw==",
|
||||||
"bundleDependencies": [
|
"bundleDependencies": [
|
||||||
"jsonschema",
|
"jsonschema",
|
||||||
"semver"
|
"semver"
|
||||||
|
|
@ -48,7 +48,7 @@
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"jsonschema": "^1.5.0",
|
"jsonschema": "^1.5.0",
|
||||||
"semver": "^7.8.1"
|
"semver": "^7.8.5"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">= 18.0.0"
|
"node": ">= 18.0.0"
|
||||||
|
|
@ -63,7 +63,7 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@aws-cdk/cloud-assembly-schema/node_modules/semver": {
|
"node_modules/@aws-cdk/cloud-assembly-schema/node_modules/semver": {
|
||||||
"version": "7.8.1",
|
"version": "7.8.5",
|
||||||
"inBundle": true,
|
"inBundle": true,
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"bin": {
|
"bin": {
|
||||||
|
|
@ -1264,10 +1264,11 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/aws-cdk-lib": {
|
"node_modules/aws-cdk-lib": {
|
||||||
"version": "2.261.0",
|
"version": "2.262.0",
|
||||||
"resolved": "https://registry.npmjs.org/aws-cdk-lib/-/aws-cdk-lib-2.261.0.tgz",
|
"resolved": "https://registry.npmjs.org/aws-cdk-lib/-/aws-cdk-lib-2.262.0.tgz",
|
||||||
"integrity": "sha512-e52e3Abjg0HkuRWlWwtSv5+ZiMW1rhCDdL9ff7lzWXInU8xdfLJpuoimfa0IJwjiNGyphppgg52Azx9M80OA0g==",
|
"integrity": "sha512-6zRVoWRd8kQs9ZZ9xhERSm36W8uWS2vW3/g9Zx0xlhvRRiUwTc80bzfJkohKGdT/5AOW+wy6fSDvohavG94pcA==",
|
||||||
"bundleDependencies": [
|
"bundleDependencies": [
|
||||||
|
"@aws/cloudformation-validate",
|
||||||
"@balena/dockerignore",
|
"@balena/dockerignore",
|
||||||
"@aws-cdk/cloud-assembly-api",
|
"@aws-cdk/cloud-assembly-api",
|
||||||
"case",
|
"case",
|
||||||
|
|
@ -1284,17 +1285,18 @@
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@aws-cdk/asset-awscli-v1": "2.2.282",
|
"@aws-cdk/asset-awscli-v1": "2.2.282",
|
||||||
"@aws-cdk/asset-node-proxy-agent-v6": "^2.1.2",
|
"@aws-cdk/asset-node-proxy-agent-v6": "^2.1.2",
|
||||||
"@aws-cdk/cloud-assembly-api": "^2.2.5",
|
"@aws-cdk/cloud-assembly-api": "^2.2.6",
|
||||||
"@aws-cdk/cloud-assembly-schema": "^54.0.0",
|
"@aws-cdk/cloud-assembly-schema": "^54.11.0",
|
||||||
|
"@aws/cloudformation-validate": "1.5.0-beta",
|
||||||
"@balena/dockerignore": "^1.0.2",
|
"@balena/dockerignore": "^1.0.2",
|
||||||
"case": "1.6.3",
|
"case": "1.6.3",
|
||||||
"fs-extra": "^11.3.5",
|
"fs-extra": "^11.3.6",
|
||||||
"ignore": "^5.3.2",
|
"ignore": "^5.3.2",
|
||||||
"jsonschema": "^1.5.0",
|
"jsonschema": "^1.5.0",
|
||||||
"mime-types": "^2.1.35",
|
"mime-types": "^2.1.35",
|
||||||
"minimatch": "^10.2.5",
|
"minimatch": "^10.2.5",
|
||||||
"punycode": "^2.3.1",
|
"punycode": "^2.3.1",
|
||||||
"semver": "^7.8.1",
|
"semver": "^7.8.5",
|
||||||
"yaml": "1.10.3"
|
"yaml": "1.10.3"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
|
|
@ -1305,18 +1307,27 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/aws-cdk-lib/node_modules/@aws-cdk/cloud-assembly-api": {
|
"node_modules/aws-cdk-lib/node_modules/@aws-cdk/cloud-assembly-api": {
|
||||||
"version": "2.2.5",
|
"version": "2.2.6",
|
||||||
"inBundle": true,
|
"inBundle": true,
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"jsonschema": "^1.5.0",
|
"jsonschema": "^1.5.0",
|
||||||
"semver": "^7.8.0"
|
"semver": "^7.8.4"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">= 18.0.0"
|
"node": ">= 18.0.0"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"@aws-cdk/cloud-assembly-schema": ">=53.28.0"
|
"@aws-cdk/cloud-assembly-schema": ">=54.5.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/aws-cdk-lib/node_modules/@aws/cloudformation-validate": {
|
||||||
|
"version": "1.5.0-beta",
|
||||||
|
"inBundle": true,
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"engines": {
|
||||||
|
"node": "^22.15.0",
|
||||||
|
"npm": ">=10.5.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/aws-cdk-lib/node_modules/@balena/dockerignore": {
|
"node_modules/aws-cdk-lib/node_modules/@balena/dockerignore": {
|
||||||
|
|
@ -1333,7 +1344,7 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/aws-cdk-lib/node_modules/brace-expansion": {
|
"node_modules/aws-cdk-lib/node_modules/brace-expansion": {
|
||||||
"version": "5.0.6",
|
"version": "5.0.7",
|
||||||
"inBundle": true,
|
"inBundle": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|
@ -1352,7 +1363,7 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/aws-cdk-lib/node_modules/fs-extra": {
|
"node_modules/aws-cdk-lib/node_modules/fs-extra": {
|
||||||
"version": "11.3.5",
|
"version": "11.3.6",
|
||||||
"inBundle": true,
|
"inBundle": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|
@ -1438,7 +1449,7 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/aws-cdk-lib/node_modules/semver": {
|
"node_modules/aws-cdk-lib/node_modules/semver": {
|
||||||
"version": "7.8.1",
|
"version": "7.8.5",
|
||||||
"inBundle": true,
|
"inBundle": true,
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"bin": {
|
"bin": {
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@
|
||||||
"typescript": "~7.0.2"
|
"typescript": "~7.0.2"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"aws-cdk-lib": "2.261.0",
|
"aws-cdk-lib": "2.262.0",
|
||||||
"constructs": "^10.7.1"
|
"constructs": "^10.7.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue