@anthusai/papyrus 2.0.0-next.5 → 2.0.0-next.50
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/amplify/data/resource.js +23 -3
- package/amplify/data/resource.ts +25 -3
- package/amplify/data/schema.js +2028 -1979
- package/amplify/data/schema.ts +72 -14
- package/amplify/functions/assignment-action/data-access.js +90 -0
- package/amplify/functions/assignment-action/data-access.ts +89 -0
- package/amplify/functions/assignment-action/handler.ts +1 -1
- package/amplify/functions/content-actions/handler.py +53 -2
- package/amplify/functions/content-actions/requirements.txt +1 -0
- package/amplify/functions/content-actions/resource.js +1 -1
- package/amplify/functions/content-actions/resource.ts +1 -1
- package/amplify/functions/editorial-checks/handler.py +14 -0
- package/amplify/functions/editorial-checks/requirements.txt +1 -0
- package/amplify/{plugins/editorial-checks/function → functions/editorial-checks}/resource.js +7 -7
- package/amplify/{plugins/editorial-checks/function → functions/editorial-checks}/resource.ts +7 -7
- package/amplify/functions/editorial-checks/schema.js +121 -0
- package/amplify/{plugins → functions}/editorial-checks/schema.ts +33 -6
- package/amplify/functions/editorial-checks/wire.js +53 -0
- package/amplify/functions/editorial-checks/wire.ts +61 -0
- package/amplify/functions/monitoring-view/handler.py +11 -0
- package/amplify/functions/monitoring-view/resource.js +24 -0
- package/amplify/functions/monitoring-view/resource.ts +34 -0
- package/amplify/functions/monitoring-view/schema.js +16 -0
- package/amplify/functions/monitoring-view/schema.ts +18 -0
- package/amplify/functions/monitoring-view/wire.js +37 -0
- package/amplify/functions/monitoring-view/wire.ts +47 -0
- package/amplify/functions/public-forms/core.js +247 -0
- package/amplify/functions/public-forms/core.ts +310 -0
- package/amplify/functions/public-forms/handler.ts +41 -0
- package/amplify/functions/public-forms/origins.js +35 -0
- package/amplify/functions/public-forms/origins.ts +43 -0
- package/amplify/functions/public-forms/resource.js +9 -0
- package/amplify/functions/public-forms/resource.ts +10 -0
- package/amplify/functions/public-forms/wire.js +25 -0
- package/amplify/functions/public-forms/wire.ts +32 -0
- package/amplify/functions/shared/editorial-context.ts +63 -4
- package/amplify/functions/shared/python-bundle.js +20 -14
- package/amplify/functions/shared/python-bundle.ts +25 -18
- package/amplify/plugins/newsletter/config.js +195 -0
- package/amplify/plugins/newsletter/config.ts +240 -0
- package/amplify/plugins/newsletter/function/handler.py +6 -0
- package/amplify/plugins/newsletter/function/requirements.txt +5 -0
- package/amplify/plugins/newsletter/ops/handler.py +12 -0
- package/amplify/plugins/newsletter/ops/resource.js +27 -0
- package/amplify/plugins/newsletter/ops/resource.ts +37 -0
- package/amplify/plugins/newsletter/papyrus.plugin.js +260 -0
- package/amplify/plugins/newsletter/papyrus.plugin.ts +308 -0
- package/amplify/plugins/newsletter/schema.js +56 -0
- package/amplify/plugins/newsletter/schema.ts +61 -0
- package/amplify/plugins/newsletter/secure-string-parameter.js +107 -0
- package/amplify/plugins/newsletter/secure-string-parameter.ts +120 -0
- package/amplify/plugins/newsletter/sending.js +140 -0
- package/amplify/plugins/newsletter/sending.ts +186 -0
- package/amplify/plugins/reader-steering/config.js +162 -0
- package/amplify/plugins/reader-steering/config.ts +248 -0
- package/amplify/plugins/reader-steering/function/ai_moderation.py +230 -0
- package/amplify/plugins/reader-steering/function/handler.py +1363 -0
- package/amplify/plugins/reader-steering/function/moderation-prompt.md +27 -0
- package/amplify/plugins/reader-steering/function/moderation.py +316 -0
- package/amplify/plugins/reader-steering/function/resource.js +27 -0
- package/amplify/plugins/reader-steering/function/resource.ts +35 -0
- package/amplify/plugins/reader-steering/papyrus.plugin.js +175 -0
- package/amplify/plugins/reader-steering/papyrus.plugin.ts +201 -0
- package/amplify/plugins/reader-steering/schema.js +140 -0
- package/amplify/plugins/reader-steering/schema.ts +142 -0
- package/amplify/plugins/registry.js +4 -2
- package/amplify/plugins/registry.ts +4 -2
- package/amplify/plugins/types.ts +5 -0
- package/amplify/plugins/wire.js +1 -0
- package/amplify/plugins/wire.ts +1 -0
- package/amplify/publication/redirect-and-index.js +105 -0
- package/amplify/publication/redirect-rules.js +73 -0
- package/amplify/publication/redirect-rules.ts +93 -0
- package/amplify/publication/s3-projection.js +7 -1
- package/amplify/publication/s3-projection.ts +9 -1
- package/amplify/site-backend-config.ts +17 -0
- package/amplify/site-backend.js +36 -1
- package/amplify/site-backend.ts +44 -1
- package/app/api/newsletter/confirm/route.ts +13 -0
- package/app/api/newsletter/preferences/route.ts +13 -0
- package/app/api/newsletter/subscribe/route.ts +9 -0
- package/app/api/newsletter/unsubscribe/route.ts +13 -0
- package/app/api/newsroom/curation/context/route.ts +9 -0
- package/app/api/newsroom/curation/priming/route.ts +9 -0
- package/app/api/newsroom/curation/publication/route.ts +9 -0
- package/app/api/reader/comment/delete/route.ts +9 -0
- package/app/api/reader/comment/edit/route.ts +9 -0
- package/app/api/reader/comment/route.ts +9 -0
- package/app/api/reader/handle/route.ts +9 -0
- package/app/api/reader/me/route.ts +9 -0
- package/app/api/reader/rating/route.ts +9 -0
- package/app/api/reader/report/route.ts +9 -0
- package/app/api/reader/retired/route.ts +9 -0
- package/app/api/reader/submit/route.ts +9 -0
- package/app/api/reader/vote/route.ts +9 -0
- package/bin/papyrus-infra.mjs +20 -1
- package/components/editorial-checks-admin-panel.tsx +36 -11
- package/components/moderation-panel.tsx +248 -0
- package/components/monitoring-overview-view.tsx +241 -0
- package/components/monitoring-panel.tsx +40 -0
- package/components/newsletter-panel.tsx +474 -0
- package/components/newsletter-sections.tsx +163 -0
- package/components/newsroom-article-editor.tsx +2 -4
- package/components/newsroom-board-view.tsx +4 -1
- package/components/newsroom-curation-bootstrap.tsx +45 -0
- package/components/newsroom-organizer.css +31 -0
- package/components/newsroom-references-view.tsx +14 -14
- package/components/publication-cyclotron-panel.tsx +15 -10
- package/components/reference-add-entry.tsx +75 -0
- package/components/reference-curation-controls.tsx +31 -22
- package/components/reference-cyclotron-priming.tsx +58 -19
- package/components/reference-cyclotron-suggestion.tsx +1 -1
- package/components/reference-priming.tsx +14 -10
- package/components/reference-section-suggestion.tsx +1 -1
- package/components/topic-steering-workspace.tsx +64 -20
- package/components/use-editorial-checks.ts +12 -10
- package/infra/amplify-app-shell.js +90 -16
- package/infra/amplify-app-shell.ts +102 -18
- package/infra/index.js +1 -0
- package/infra/secure-string-parameter-handler.js +41 -0
- package/infra/secure-string-parameter-handler.ts +41 -0
- package/infra/secure-string-parameter.js +79 -0
- package/infra/secure-string-parameter.ts +91 -0
- package/infra/site-config.js +85 -6
- package/infra/site-config.ts +123 -6
- package/lib/category-repository.ts +11 -9
- package/lib/curation-routes.ts +345 -0
- package/lib/editorial-checks-backend.ts +1 -1
- package/lib/editorial-checks-client.ts +19 -1
- package/lib/editorial-checks-demo.ts +2 -2
- package/lib/editorial-checks-settings.ts +3 -0
- package/lib/editorial-checks.ts +8 -11
- package/lib/editorial-preview.ts +5 -5
- package/lib/monitoring-client.ts +29 -0
- package/lib/monitoring-overview-fixture.ts +51 -0
- package/lib/monitoring-overview.ts +145 -0
- package/lib/newsletter-api.ts +391 -0
- package/lib/newsletter-client.ts +46 -0
- package/lib/newsletter-fixture.ts +184 -0
- package/lib/newsletter-model.ts +202 -0
- package/lib/newsletter-pages.ts +264 -0
- package/lib/newsroom-board.ts +27 -2
- package/lib/prospectus-session.ts +15 -14
- package/lib/prospectus-sign-in-routes.ts +54 -13
- package/lib/prospectus-site-identity.ts +24 -1
- package/lib/reader-api.ts +145 -0
- package/lib/reader-moderation.ts +220 -0
- package/lib/reader-retirement-route.ts +89 -0
- package/lib/reader-subject.md +29 -0
- package/lib/reader-subject.ts +53 -0
- package/lib/relevance-status.ts +2 -2
- package/lib/site-brand-tenant.ts +11 -6
- package/lib/site-brand.ts +6 -3
- package/lib/site-origin.ts +67 -0
- package/middleware.ts +14 -3
- package/package.json +42 -4
- package/routes.manifest.json +191 -1
- package/amplify/plugins/editorial-checks/function/handler.py +0 -11
- package/amplify/plugins/editorial-checks/function/requirements.txt +0 -1
- package/amplify/plugins/editorial-checks/papyrus.plugin.js +0 -50
- package/amplify/plugins/editorial-checks/papyrus.plugin.ts +0 -63
- package/amplify/plugins/editorial-checks/schema.js +0 -94
|
@@ -2,10 +2,10 @@ import { Construct } from "constructs";
|
|
|
2
2
|
import { ArnFormat, CfnOutput, Duration, Fn, Stack, StackProps } from "aws-cdk-lib";
|
|
3
3
|
import * as iam from "aws-cdk-lib/aws-iam";
|
|
4
4
|
import * as amplify from "aws-cdk-lib/aws-amplify";
|
|
5
|
-
import
|
|
5
|
+
import { SecureStringParameter } from "./secure-string-parameter";
|
|
6
6
|
import { GITHUB_OIDC_PROVIDER_HOST } from "./github-oidc-provider";
|
|
7
7
|
import { cmsProductionBuildSpec, cmsStagingBuildSpec, readerBuildSpec } from "./build-specs";
|
|
8
|
-
import { AmplifyAppShellSiteConfig, PROSPECTUS_PAPYRUS_SITE_ROUTES, ReaderCustomHeaderRule, hasCmsApp, isStagingEnabled, resolveRedirectSubDomainPrefix, resolveCmsHostName, resolveProspectusAccountsEndpoint, resolveRevalidateSecretParameterName, resolveStackName, resolveStagingDomainName, resolveStoragePreviewPrefix } from "./site-config";
|
|
8
|
+
import { AmplifyAppShellSiteConfig, PROSPECTUS_PAPYRUS_SITE_ROUTES, ReaderCustomHeaderRule, hasCmsApp, isStagingEnabled, resolveRedirectSubDomainPrefix, resolveCmsHostName, resolveSiteOrigin, githubOidcSubjects, resolveGithubRepository, resolveProspectusAccountsEndpoint, resolveProspectusSessionSealingParameterName, resolveReaderPollSecretParameterName, resolveRevalidateSecretParameterName, resolveStackName, resolveStagingDomainName, resolveStoragePreviewPrefix } from "./site-config";
|
|
9
9
|
|
|
10
10
|
function environmentVariables(variables: Record<string, string>): amplify.CfnBranch.EnvironmentVariableProperty[] {
|
|
11
11
|
return Object.entries(variables).map(([name, value]) => ({ name, value }));
|
|
@@ -72,6 +72,9 @@ export class AmplifyAppShellStack extends Stack {
|
|
|
72
72
|
if (!hasCmsApp(config)) {
|
|
73
73
|
if (!config.reader) throw new Error(`site ${config.siteId} has neither a cms section nor a reader`);
|
|
74
74
|
this.readerAppId = this.addReaderApp(config, config.reader);
|
|
75
|
+
if (config.autoDeploy) {
|
|
76
|
+
this.addGithubDeployRole(config, [{ appId: this.readerAppId, branch: config.reader.branchName ?? "main" }]);
|
|
77
|
+
}
|
|
75
78
|
return;
|
|
76
79
|
}
|
|
77
80
|
|
|
@@ -97,37 +100,55 @@ export class AmplifyAppShellStack extends Stack {
|
|
|
97
100
|
|
|
98
101
|
const revalidateSecretParameterName = config.frontend === "pretext" ? resolveRevalidateSecretParameterName(config) : undefined;
|
|
99
102
|
if (revalidateSecretParameterName) {
|
|
103
|
+
const revalidateSecret = new SecureStringParameter(this, "RevalidateSecretParameter", {
|
|
104
|
+
parameterName: revalidateSecretParameterName,
|
|
105
|
+
description: `Shared secret that authorizes publishes to call the /api/revalidate route of ${cmsAppName}`,
|
|
106
|
+
});
|
|
100
107
|
computeRole.addToPolicy(
|
|
101
108
|
new iam.PolicyStatement({
|
|
102
109
|
sid: "ReadRevalidateSecret",
|
|
103
110
|
actions: ["ssm:GetParameter"],
|
|
104
|
-
resources: [
|
|
105
|
-
this.formatArn({ service: "ssm", resource: "parameter", resourceName: revalidateSecretParameterName.slice(1), arnFormat: ArnFormat.SLASH_RESOURCE_NAME }),
|
|
106
|
-
],
|
|
111
|
+
resources: [revalidateSecret.parameterArn],
|
|
107
112
|
}),
|
|
108
113
|
);
|
|
109
114
|
}
|
|
110
115
|
|
|
111
116
|
const prospectusAccountsApiStageArn = config.cms.prospectusAccountsApiStageArn;
|
|
112
|
-
const
|
|
113
|
-
? new
|
|
117
|
+
const prospectusSessionSealing = prospectusAccountsApiStageArn
|
|
118
|
+
? new SecureStringParameter(this, "ProspectusSessionSealingParameter", {
|
|
119
|
+
parameterName: resolveProspectusSessionSealingParameterName(config),
|
|
114
120
|
description: `Seals the Prospectus sign-in cookies of ${cmsAppName}; replacing it signs everyone out`,
|
|
115
|
-
generateSecretString: { passwordLength: 64, excludePunctuation: true },
|
|
116
121
|
})
|
|
117
122
|
: undefined;
|
|
118
|
-
const prospectusEnvironment = prospectusAccountsApiStageArn &&
|
|
123
|
+
const prospectusEnvironment: Record<string, string> = prospectusAccountsApiStageArn && prospectusSessionSealing
|
|
119
124
|
? {
|
|
120
125
|
PAPYRUS_PROSPECTUS_ACCOUNTS_ENDPOINT: resolveProspectusAccountsEndpoint(prospectusAccountsApiStageArn),
|
|
121
|
-
|
|
126
|
+
PAPYRUS_PROSPECTUS_SESSION_SECRET_PARAMETER: prospectusSessionSealing.parameterName,
|
|
122
127
|
PAPYRUS_PROSPECTUS_SITE_PRODUCT: `papyrus-${config.siteId}`,
|
|
123
128
|
}
|
|
124
129
|
: {};
|
|
125
|
-
if (
|
|
130
|
+
if (prospectusSessionSealing) {
|
|
126
131
|
computeRole.addToPolicy(
|
|
127
132
|
new iam.PolicyStatement({
|
|
128
133
|
sid: "ReadProspectusSessionSealingSecret",
|
|
129
|
-
actions: ["
|
|
130
|
-
resources: [
|
|
134
|
+
actions: ["ssm:GetParameter"],
|
|
135
|
+
resources: [prospectusSessionSealing.parameterArn],
|
|
136
|
+
}),
|
|
137
|
+
);
|
|
138
|
+
}
|
|
139
|
+
if (prospectusAccountsApiStageArn && config.cms.readerRetirementPoll) {
|
|
140
|
+
// Prospectus admits one caller per site, this compute role, so the scheduled snapshot run reaches the retired-subject
|
|
141
|
+
// route through the CMS route /api/reader/retired, which it authenticates with this secret.
|
|
142
|
+
const readerPollSecret = new SecureStringParameter(this, "ReaderPollSecretParameter", {
|
|
143
|
+
parameterName: resolveReaderPollSecretParameterName(config),
|
|
144
|
+
description: `Authorizes the scheduled reader snapshot run to call the retired-subject route of ${cmsAppName}`,
|
|
145
|
+
});
|
|
146
|
+
prospectusEnvironment.PAPYRUS_READER_POLL_SECRET_PARAMETER = readerPollSecret.parameterName;
|
|
147
|
+
computeRole.addToPolicy(
|
|
148
|
+
new iam.PolicyStatement({
|
|
149
|
+
sid: "ReadReaderPollSecret",
|
|
150
|
+
actions: ["ssm:GetParameter"],
|
|
151
|
+
resources: [readerPollSecret.parameterArn],
|
|
131
152
|
}),
|
|
132
153
|
);
|
|
133
154
|
}
|
|
@@ -172,9 +193,15 @@ export class AmplifyAppShellStack extends Stack {
|
|
|
172
193
|
const stagingOrigin = stagingDomainName
|
|
173
194
|
? `https://${stagingDomainName}/`
|
|
174
195
|
: Fn.join("", ["https://staging.", cmsApp.attrDefaultDomain, "/"]);
|
|
196
|
+
// The compute adapter's request URL is https://localhost:3000, so the site names its own public origin.
|
|
197
|
+
// A site served by its own edge (cms.siteOrigin) has no Amplify domain, so the edge host is its origin.
|
|
198
|
+
const siteOrigin = resolveSiteOrigin(config);
|
|
199
|
+
const productionSiteOrigin = cmsHostName ? `https://${cmsHostName}` : siteOrigin ?? Fn.join("", ["https://main.", cmsApp.attrDefaultDomain]);
|
|
200
|
+
const stagingSiteOrigin = stagingDomainName ? `https://${stagingDomainName}` : Fn.join("", ["https://staging.", cmsApp.attrDefaultDomain]);
|
|
175
201
|
const sharedRootDomain = config.cms.domainPrefix !== undefined;
|
|
176
202
|
const defaultOriginsToAllow = [
|
|
177
203
|
...(config.cms.domainName ? [] : [productionOrigin]),
|
|
204
|
+
...(siteOrigin ? [`${siteOrigin}/`] : []),
|
|
178
205
|
...(stagingEnabled && !stagingDomainName ? [stagingOrigin] : []),
|
|
179
206
|
];
|
|
180
207
|
const oauthRedirectUrls = defaultOriginsToAllow.length === 0
|
|
@@ -185,7 +212,8 @@ export class AmplifyAppShellStack extends Stack {
|
|
|
185
212
|
appId: cmsApp.attrAppId,
|
|
186
213
|
branchName: "main",
|
|
187
214
|
stage: "PRODUCTION",
|
|
188
|
-
|
|
215
|
+
// Auto-build off when GitHub Actions starts the job on merge (autoDeploy): nothing may double-build.
|
|
216
|
+
enableAutoBuild: !config.autoDeploy,
|
|
189
217
|
enablePerformanceMode: false,
|
|
190
218
|
environmentVariables: environmentVariables({
|
|
191
219
|
...config.cms.environment,
|
|
@@ -194,6 +222,7 @@ export class AmplifyAppShellStack extends Stack {
|
|
|
194
222
|
PAPYRUS_OAUTH_REDIRECT_URLS: oauthRedirectUrls,
|
|
195
223
|
PAPYRUS_SITE_BRAND: config.brand,
|
|
196
224
|
SITE_ENV: "production",
|
|
225
|
+
PAPYRUS_SITE_ORIGIN: productionSiteOrigin,
|
|
197
226
|
PAPYRUS_CONTENT_SOURCE: "published",
|
|
198
227
|
...(revalidateSecretParameterName ? { PAPYRUS_REVALIDATE_SECRET_PARAMETER: revalidateSecretParameterName } : {}),
|
|
199
228
|
...prospectusEnvironment,
|
|
@@ -216,6 +245,7 @@ export class AmplifyAppShellStack extends Stack {
|
|
|
216
245
|
PAPYRUS_OAUTH_REDIRECT_URLS: oauthRedirectUrls,
|
|
217
246
|
PAPYRUS_SITE_BRAND: config.brand,
|
|
218
247
|
SITE_ENV: "staging",
|
|
248
|
+
PAPYRUS_SITE_ORIGIN: stagingSiteOrigin,
|
|
219
249
|
...stagingMode,
|
|
220
250
|
...prospectusEnvironment,
|
|
221
251
|
NEXT_PUBLIC_PAPYRUS_STAGING_URL: stagingDomainName
|
|
@@ -274,6 +304,13 @@ export class AmplifyAppShellStack extends Stack {
|
|
|
274
304
|
const amplifyAppIds = [cmsApp.attrAppId, ...(this.readerAppId ? [this.readerAppId] : [])];
|
|
275
305
|
this.addAuthoringRole(config, cmsApp.attrAppId, amplifyAppIds);
|
|
276
306
|
|
|
307
|
+
if (config.autoDeploy) {
|
|
308
|
+
this.addGithubDeployRole(config, [
|
|
309
|
+
{ appId: cmsApp.attrAppId, branch: "main" },
|
|
310
|
+
...(this.readerAppId && config.reader ? [{ appId: this.readerAppId, branch: config.reader.branchName ?? "main" }] : []),
|
|
311
|
+
]);
|
|
312
|
+
}
|
|
313
|
+
|
|
277
314
|
if (config.github) {
|
|
278
315
|
this.addGithubCiRole(config, config.github, cmsApp.attrAppId, amplifyAppIds);
|
|
279
316
|
}
|
|
@@ -326,6 +363,55 @@ export class AmplifyAppShellStack extends Stack {
|
|
|
326
363
|
});
|
|
327
364
|
}
|
|
328
365
|
|
|
366
|
+
/**
|
|
367
|
+
* The merge-to-main deploy role: assumable only by a GitHub Actions run on `main` of the site's own
|
|
368
|
+
* repository (OIDC, no keys), and able to do exactly one thing: start and read Amplify jobs on the
|
|
369
|
+
* production branch of the site's apps.
|
|
370
|
+
*/
|
|
371
|
+
private addGithubDeployRole(config: AmplifyAppShellSiteConfig, targets: { appId: string; branch: string }[]): void {
|
|
372
|
+
const { owner, repo } = resolveGithubRepository(config);
|
|
373
|
+
const provider = iam.OpenIdConnectProvider.fromOpenIdConnectProviderArn(
|
|
374
|
+
this,
|
|
375
|
+
"GithubDeployOidcProvider",
|
|
376
|
+
this.formatArn({
|
|
377
|
+
service: "iam",
|
|
378
|
+
region: "",
|
|
379
|
+
resource: "oidc-provider",
|
|
380
|
+
resourceName: GITHUB_OIDC_PROVIDER_HOST,
|
|
381
|
+
arnFormat: ArnFormat.SLASH_RESOURCE_NAME,
|
|
382
|
+
}),
|
|
383
|
+
);
|
|
384
|
+
const deployRole = new iam.Role(this, "GithubDeployRole", {
|
|
385
|
+
roleName: `${config.siteId}-github-deploy`,
|
|
386
|
+
description: `Merge-to-main deploy for ${owner}/${repo}: GitHub OIDC on refs/heads/main only; amplify:StartJob and GetJob on the production branch of the site's apps only`,
|
|
387
|
+
maxSessionDuration: Duration.hours(1),
|
|
388
|
+
assumedBy: new iam.OpenIdConnectPrincipal(provider, {
|
|
389
|
+
StringEquals: {
|
|
390
|
+
[`${GITHUB_OIDC_PROVIDER_HOST}:aud`]: "sts.amazonaws.com",
|
|
391
|
+
[`${GITHUB_OIDC_PROVIDER_HOST}:sub`]: githubOidcSubjects(config, "main"),
|
|
392
|
+
},
|
|
393
|
+
}),
|
|
394
|
+
});
|
|
395
|
+
deployRole.addToPolicy(
|
|
396
|
+
new iam.PolicyStatement({
|
|
397
|
+
sid: "StartAndReadProductionJobs",
|
|
398
|
+
actions: ["amplify:StartJob", "amplify:GetJob"],
|
|
399
|
+
resources: targets.map((target) =>
|
|
400
|
+
this.formatArn({
|
|
401
|
+
service: "amplify",
|
|
402
|
+
resource: "apps",
|
|
403
|
+
resourceName: `${target.appId}/branches/${target.branch}/jobs/*`,
|
|
404
|
+
arnFormat: ArnFormat.SLASH_RESOURCE_NAME,
|
|
405
|
+
}),
|
|
406
|
+
),
|
|
407
|
+
}),
|
|
408
|
+
);
|
|
409
|
+
new CfnOutput(this, "GithubDeployRoleArn", {
|
|
410
|
+
value: deployRole.roleArn,
|
|
411
|
+
description: `Role for the merge-to-main deploy workflow in ${owner}/${repo}`,
|
|
412
|
+
});
|
|
413
|
+
}
|
|
414
|
+
|
|
329
415
|
private addGithubCiRole(
|
|
330
416
|
config: AmplifyAppShellSiteConfig,
|
|
331
417
|
github: NonNullable<AmplifyAppShellSiteConfig["github"]>,
|
|
@@ -351,9 +437,7 @@ export class AmplifyAppShellStack extends Stack {
|
|
|
351
437
|
assumedBy: new iam.OpenIdConnectPrincipal(provider, {
|
|
352
438
|
StringEquals: { [`${GITHUB_OIDC_PROVIDER_HOST}:aud`]: "sts.amazonaws.com" },
|
|
353
439
|
StringLike: {
|
|
354
|
-
[`${GITHUB_OIDC_PROVIDER_HOST}:sub`]: github.branches.
|
|
355
|
-
(branch) => `repo:${github.owner}/${github.repo}:ref:refs/heads/${branch}`,
|
|
356
|
-
),
|
|
440
|
+
[`${GITHUB_OIDC_PROVIDER_HOST}:sub`]: github.branches.flatMap((branch) => githubOidcSubjects(config, branch)),
|
|
357
441
|
},
|
|
358
442
|
}),
|
|
359
443
|
});
|
|
@@ -420,7 +504,7 @@ export class AmplifyAppShellStack extends Stack {
|
|
|
420
504
|
appId: readerApp.attrAppId,
|
|
421
505
|
branchName: readerBranchName,
|
|
422
506
|
stage: "PRODUCTION",
|
|
423
|
-
enableAutoBuild:
|
|
507
|
+
enableAutoBuild: !config.autoDeploy,
|
|
424
508
|
environmentVariables: environmentVariables({
|
|
425
509
|
...(reader.environment ?? {}),
|
|
426
510
|
PAPYRUS_SITE_BRAND: config.brand,
|
package/infra/index.js
CHANGED
|
@@ -10,6 +10,7 @@ try {
|
|
|
10
10
|
);
|
|
11
11
|
}
|
|
12
12
|
export const { AmplifyAppShellStack } = await import("./amplify-app-shell.js");
|
|
13
|
+
export const { SecureStringParameter } = await import("./secure-string-parameter.js");
|
|
13
14
|
export const { GithubOidcProviderStack } = await import("./github-oidc-provider.js");
|
|
14
15
|
export { parseSiteConfig } from "./site-config.js";
|
|
15
16
|
export { cmsProductionBuildSpec, cmsStagingBuildSpec, readerBuildSpec, buildSpecFor } from "./build-specs.js";
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Source of the Lambda behind SecureStringParameter, as a string so the staged
|
|
3
|
+
* package (which ships only .ts under infra/) can inline it and tests can run it
|
|
4
|
+
* against a fake SSM client. CommonJS, under the 4096-character inline limit.
|
|
5
|
+
*
|
|
6
|
+
* It creates the parameter when it is missing and does nothing else: it never
|
|
7
|
+
* overwrites an existing value, never reads one back, never logs the value, and
|
|
8
|
+
* returns no data (only the parameter name as the physical id).
|
|
9
|
+
*/
|
|
10
|
+
export const SECURE_STRING_PARAMETER_HANDLER_SOURCE = `
|
|
11
|
+
const { randomInt } = require("node:crypto");
|
|
12
|
+
const ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
|
|
13
|
+
function generate(length) {
|
|
14
|
+
let value = "";
|
|
15
|
+
for (let index = 0; index < length; index += 1) value += ALPHABET[randomInt(ALPHABET.length)];
|
|
16
|
+
return value;
|
|
17
|
+
}
|
|
18
|
+
exports.createHandler = (ssm, PutParameterCommand) => async (event) => {
|
|
19
|
+
const name = event.ResourceProperties.ParameterName;
|
|
20
|
+
if (event.RequestType === "Delete") return { PhysicalResourceId: event.PhysicalResourceId };
|
|
21
|
+
try {
|
|
22
|
+
await ssm.send(new PutParameterCommand({
|
|
23
|
+
Name: name,
|
|
24
|
+
Description: event.ResourceProperties.Description,
|
|
25
|
+
Type: "SecureString",
|
|
26
|
+
Tier: "Standard",
|
|
27
|
+
Overwrite: false,
|
|
28
|
+
Value: generate(Number(event.ResourceProperties.Length)),
|
|
29
|
+
}));
|
|
30
|
+
} catch (error) {
|
|
31
|
+
if (!error || error.name !== "ParameterAlreadyExists") {
|
|
32
|
+
throw new Error("PutParameter failed for " + name + " (" + (error && error.name ? error.name : "error") + ")");
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
return { PhysicalResourceId: name };
|
|
36
|
+
};
|
|
37
|
+
exports.handler = async (event) => {
|
|
38
|
+
const { SSMClient, PutParameterCommand } = require("@aws-sdk/client-ssm");
|
|
39
|
+
return exports.createHandler(new SSMClient({}), PutParameterCommand)(event);
|
|
40
|
+
};
|
|
41
|
+
`;
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Source of the Lambda behind SecureStringParameter, as a string so the staged
|
|
3
|
+
* package (which ships only .ts under infra/) can inline it and tests can run it
|
|
4
|
+
* against a fake SSM client. CommonJS, under the 4096-character inline limit.
|
|
5
|
+
*
|
|
6
|
+
* It creates the parameter when it is missing and does nothing else: it never
|
|
7
|
+
* overwrites an existing value, never reads one back, never logs the value, and
|
|
8
|
+
* returns no data (only the parameter name as the physical id).
|
|
9
|
+
*/
|
|
10
|
+
export const SECURE_STRING_PARAMETER_HANDLER_SOURCE = `
|
|
11
|
+
const { randomInt } = require("node:crypto");
|
|
12
|
+
const ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
|
|
13
|
+
function generate(length) {
|
|
14
|
+
let value = "";
|
|
15
|
+
for (let index = 0; index < length; index += 1) value += ALPHABET[randomInt(ALPHABET.length)];
|
|
16
|
+
return value;
|
|
17
|
+
}
|
|
18
|
+
exports.createHandler = (ssm, PutParameterCommand) => async (event) => {
|
|
19
|
+
const name = event.ResourceProperties.ParameterName;
|
|
20
|
+
if (event.RequestType === "Delete") return { PhysicalResourceId: event.PhysicalResourceId };
|
|
21
|
+
try {
|
|
22
|
+
await ssm.send(new PutParameterCommand({
|
|
23
|
+
Name: name,
|
|
24
|
+
Description: event.ResourceProperties.Description,
|
|
25
|
+
Type: "SecureString",
|
|
26
|
+
Tier: "Standard",
|
|
27
|
+
Overwrite: false,
|
|
28
|
+
Value: generate(Number(event.ResourceProperties.Length)),
|
|
29
|
+
}));
|
|
30
|
+
} catch (error) {
|
|
31
|
+
if (!error || error.name !== "ParameterAlreadyExists") {
|
|
32
|
+
throw new Error("PutParameter failed for " + name + " (" + (error && error.name ? error.name : "error") + ")");
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
return { PhysicalResourceId: name };
|
|
36
|
+
};
|
|
37
|
+
exports.handler = async (event) => {
|
|
38
|
+
const { SSMClient, PutParameterCommand } = require("@aws-sdk/client-ssm");
|
|
39
|
+
return exports.createHandler(new SSMClient({}), PutParameterCommand)(event);
|
|
40
|
+
};
|
|
41
|
+
`;
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
import { Construct } from "constructs";
|
|
2
|
+
import { ArnFormat, CustomResource, Duration, RemovalPolicy, Stack } from "aws-cdk-lib";
|
|
3
|
+
import * as iam from "aws-cdk-lib/aws-iam";
|
|
4
|
+
import * as lambda from "aws-cdk-lib/aws-lambda";
|
|
5
|
+
import * as customResources from "aws-cdk-lib/custom-resources";
|
|
6
|
+
import { SECURE_STRING_PARAMETER_HANDLER_SOURCE } from "./secure-string-parameter-handler.js";
|
|
7
|
+
/** One Lambda and role per stack, shared by every SecureStringParameter in it. */
|
|
8
|
+
class SecureStringParameterProvider extends Construct {
|
|
9
|
+
static ID = "SecureStringParameterProvider";
|
|
10
|
+
role;
|
|
11
|
+
provider;
|
|
12
|
+
static of(stack) {
|
|
13
|
+
return stack.node.tryFindChild(SecureStringParameterProvider.ID)
|
|
14
|
+
?? new SecureStringParameterProvider(stack);
|
|
15
|
+
}
|
|
16
|
+
constructor(stack) {
|
|
17
|
+
super(stack, SecureStringParameterProvider.ID);
|
|
18
|
+
this.role = new iam.Role(this, "Role", {
|
|
19
|
+
assumedBy: new iam.ServicePrincipal("lambda.amazonaws.com"),
|
|
20
|
+
description: "Creates generated SecureString parameters: PutParameter per named parameter, never overwriting",
|
|
21
|
+
managedPolicies: [iam.ManagedPolicy.fromAwsManagedPolicyName("service-role/AWSLambdaBasicExecutionRole")],
|
|
22
|
+
});
|
|
23
|
+
const onEvent = new lambda.Function(this, "OnEvent", {
|
|
24
|
+
runtime: lambda.Runtime.NODEJS_22_X,
|
|
25
|
+
handler: "index.handler",
|
|
26
|
+
code: lambda.Code.fromInline(SECURE_STRING_PARAMETER_HANDLER_SOURCE),
|
|
27
|
+
role: this.role,
|
|
28
|
+
timeout: Duration.seconds(30),
|
|
29
|
+
description: "Creates a generated SecureString parameter once; never returns or logs the value",
|
|
30
|
+
});
|
|
31
|
+
this.provider = new customResources.Provider(this, "Provider", { onEventHandler: onEvent });
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
/**
|
|
35
|
+
* A generated secret in SSM Parameter Store as a standard SecureString (free,
|
|
36
|
+
* AWS-managed `aws/ssm` key), instead of a Secrets Manager secret ($0.40/month).
|
|
37
|
+
*
|
|
38
|
+
* CloudFormation cannot create a SecureString, so a custom resource Lambda puts
|
|
39
|
+
* it. The Lambda generates a random value at create time and never returns or
|
|
40
|
+
* logs it, so the value is in no template, output or stack event. It is
|
|
41
|
+
* create-only: an update never regenerates it and never overwrites a parameter
|
|
42
|
+
* that already exists (a hand-made one is adopted as it is), and delete retains
|
|
43
|
+
* it, so a stack teardown cannot sign anyone out. Rotate it with
|
|
44
|
+
* `aws ssm put-parameter --overwrite`. Readers get `ssm:GetParameter` on
|
|
45
|
+
* `parameterArn` only; decrypting with the AWS-managed key needs no KMS grant.
|
|
46
|
+
*/
|
|
47
|
+
export class SecureStringParameter extends Construct {
|
|
48
|
+
parameterName;
|
|
49
|
+
parameterArn;
|
|
50
|
+
constructor(scope, id, props) {
|
|
51
|
+
super(scope, id);
|
|
52
|
+
if (!props.parameterName.startsWith("/"))
|
|
53
|
+
throw new Error(`SSM parameter name must be absolute: ${props.parameterName}`);
|
|
54
|
+
const length = props.length ?? 64;
|
|
55
|
+
if (!Number.isInteger(length) || length < 32)
|
|
56
|
+
throw new Error("A generated secret must be at least 32 characters.");
|
|
57
|
+
const stack = Stack.of(this);
|
|
58
|
+
this.parameterName = props.parameterName;
|
|
59
|
+
this.parameterArn = stack.formatArn({
|
|
60
|
+
service: "ssm",
|
|
61
|
+
resource: "parameter",
|
|
62
|
+
resourceName: props.parameterName.slice(1),
|
|
63
|
+
arnFormat: ArnFormat.SLASH_RESOURCE_NAME,
|
|
64
|
+
});
|
|
65
|
+
const shared = SecureStringParameterProvider.of(stack);
|
|
66
|
+
shared.role.addToPolicy(new iam.PolicyStatement({
|
|
67
|
+
sid: `Put${id.replace(/[^A-Za-z0-9]/g, "")}`,
|
|
68
|
+
actions: ["ssm:PutParameter"],
|
|
69
|
+
resources: [this.parameterArn],
|
|
70
|
+
}));
|
|
71
|
+
const resource = new CustomResource(this, "Resource", {
|
|
72
|
+
serviceToken: shared.provider.serviceToken,
|
|
73
|
+
resourceType: "Custom::SecureStringParameter",
|
|
74
|
+
properties: { ParameterName: props.parameterName, Description: props.description, Length: String(length) },
|
|
75
|
+
removalPolicy: RemovalPolicy.RETAIN,
|
|
76
|
+
});
|
|
77
|
+
resource.node.addDependency(shared.role);
|
|
78
|
+
}
|
|
79
|
+
}
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
import { Construct } from "constructs";
|
|
2
|
+
import { ArnFormat, CustomResource, Duration, RemovalPolicy, Stack } from "aws-cdk-lib";
|
|
3
|
+
import * as iam from "aws-cdk-lib/aws-iam";
|
|
4
|
+
import * as lambda from "aws-cdk-lib/aws-lambda";
|
|
5
|
+
import * as customResources from "aws-cdk-lib/custom-resources";
|
|
6
|
+
import { SECURE_STRING_PARAMETER_HANDLER_SOURCE } from "./secure-string-parameter-handler";
|
|
7
|
+
|
|
8
|
+
export interface SecureStringParameterProps {
|
|
9
|
+
/** Absolute parameter name, e.g. `/papyrus/<siteId>/prospectus-session-sealing`. */
|
|
10
|
+
parameterName: string;
|
|
11
|
+
description: string;
|
|
12
|
+
/** Length of the generated value. Default 64. */
|
|
13
|
+
length?: number;
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
/** One Lambda and role per stack, shared by every SecureStringParameter in it. */
|
|
17
|
+
class SecureStringParameterProvider extends Construct {
|
|
18
|
+
static readonly ID = "SecureStringParameterProvider";
|
|
19
|
+
public readonly role: iam.Role;
|
|
20
|
+
public readonly provider: customResources.Provider;
|
|
21
|
+
|
|
22
|
+
static of(stack: Stack): SecureStringParameterProvider {
|
|
23
|
+
return (stack.node.tryFindChild(SecureStringParameterProvider.ID) as SecureStringParameterProvider | undefined)
|
|
24
|
+
?? new SecureStringParameterProvider(stack);
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
private constructor(stack: Stack) {
|
|
28
|
+
super(stack, SecureStringParameterProvider.ID);
|
|
29
|
+
this.role = new iam.Role(this, "Role", {
|
|
30
|
+
assumedBy: new iam.ServicePrincipal("lambda.amazonaws.com"),
|
|
31
|
+
description: "Creates generated SecureString parameters: PutParameter per named parameter, never overwriting",
|
|
32
|
+
managedPolicies: [iam.ManagedPolicy.fromAwsManagedPolicyName("service-role/AWSLambdaBasicExecutionRole")],
|
|
33
|
+
});
|
|
34
|
+
const onEvent = new lambda.Function(this, "OnEvent", {
|
|
35
|
+
runtime: lambda.Runtime.NODEJS_22_X,
|
|
36
|
+
handler: "index.handler",
|
|
37
|
+
code: lambda.Code.fromInline(SECURE_STRING_PARAMETER_HANDLER_SOURCE),
|
|
38
|
+
role: this.role,
|
|
39
|
+
timeout: Duration.seconds(30),
|
|
40
|
+
description: "Creates a generated SecureString parameter once; never returns or logs the value",
|
|
41
|
+
});
|
|
42
|
+
this.provider = new customResources.Provider(this, "Provider", { onEventHandler: onEvent });
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
/**
|
|
47
|
+
* A generated secret in SSM Parameter Store as a standard SecureString (free,
|
|
48
|
+
* AWS-managed `aws/ssm` key), instead of a Secrets Manager secret ($0.40/month).
|
|
49
|
+
*
|
|
50
|
+
* CloudFormation cannot create a SecureString, so a custom resource Lambda puts
|
|
51
|
+
* it. The Lambda generates a random value at create time and never returns or
|
|
52
|
+
* logs it, so the value is in no template, output or stack event. It is
|
|
53
|
+
* create-only: an update never regenerates it and never overwrites a parameter
|
|
54
|
+
* that already exists (a hand-made one is adopted as it is), and delete retains
|
|
55
|
+
* it, so a stack teardown cannot sign anyone out. Rotate it with
|
|
56
|
+
* `aws ssm put-parameter --overwrite`. Readers get `ssm:GetParameter` on
|
|
57
|
+
* `parameterArn` only; decrypting with the AWS-managed key needs no KMS grant.
|
|
58
|
+
*/
|
|
59
|
+
export class SecureStringParameter extends Construct {
|
|
60
|
+
public readonly parameterName: string;
|
|
61
|
+
public readonly parameterArn: string;
|
|
62
|
+
|
|
63
|
+
constructor(scope: Construct, id: string, props: SecureStringParameterProps) {
|
|
64
|
+
super(scope, id);
|
|
65
|
+
if (!props.parameterName.startsWith("/")) throw new Error(`SSM parameter name must be absolute: ${props.parameterName}`);
|
|
66
|
+
const length = props.length ?? 64;
|
|
67
|
+
if (!Number.isInteger(length) || length < 32) throw new Error("A generated secret must be at least 32 characters.");
|
|
68
|
+
const stack = Stack.of(this);
|
|
69
|
+
this.parameterName = props.parameterName;
|
|
70
|
+
this.parameterArn = stack.formatArn({
|
|
71
|
+
service: "ssm",
|
|
72
|
+
resource: "parameter",
|
|
73
|
+
resourceName: props.parameterName.slice(1),
|
|
74
|
+
arnFormat: ArnFormat.SLASH_RESOURCE_NAME,
|
|
75
|
+
});
|
|
76
|
+
|
|
77
|
+
const shared = SecureStringParameterProvider.of(stack);
|
|
78
|
+
shared.role.addToPolicy(new iam.PolicyStatement({
|
|
79
|
+
sid: `Put${id.replace(/[^A-Za-z0-9]/g, "")}`,
|
|
80
|
+
actions: ["ssm:PutParameter"],
|
|
81
|
+
resources: [this.parameterArn],
|
|
82
|
+
}));
|
|
83
|
+
const resource = new CustomResource(this, "Resource", {
|
|
84
|
+
serviceToken: shared.provider.serviceToken,
|
|
85
|
+
resourceType: "Custom::SecureStringParameter",
|
|
86
|
+
properties: { ParameterName: props.parameterName, Description: props.description, Length: String(length) },
|
|
87
|
+
removalPolicy: RemovalPolicy.RETAIN,
|
|
88
|
+
});
|
|
89
|
+
resource.node.addDependency(shared.role);
|
|
90
|
+
}
|
|
91
|
+
}
|