diff options
25 files changed, 2127 insertions, 861 deletions
diff --git a/services/docker/auto-backup/rclone.conf b/services/docker/auto-backup/rclone.conf index bfcbbc3..0cf3b64 100644 --- a/services/docker/auto-backup/rclone.conf +++ b/services/docker/auto-backup/rclone.conf @@ -1,4 +1,4 @@ [remote] type = s3 env_auth = true -no_head = true +no_check_bucket = true diff --git a/services/docker/mail-server/Dockerfile b/services/docker/mail-server/Dockerfile index 47b2c4b..4811067 100644 --- a/services/docker/mail-server/Dockerfile +++ b/services/docker/mail-server/Dockerfile @@ -1,2 +1,11 @@ +FROM denoland/deno AS deno-build +ADD relay /app/ +WORKDIR /app +RUN deno install +RUN deno task compile + FROM dovecot/dovecot:latest-root +COPY --from=deno-build /app/out/crupest-relay /app/ ADD dovecot.conf /etc/dovecot/dovecot.conf +ADD app/* /app/ +CMD ["/app/main.bash"] diff --git a/services/docker/mail-server/app/main.bash b/services/docker/mail-server/app/main.bash new file mode 100755 index 0000000..f57d254 --- /dev/null +++ b/services/docker/mail-server/app/main.bash @@ -0,0 +1,13 @@ +#!/usr/bin/bash + +set -e -o pipefail + +die() { + echo "$@" >&2 + exit 1 +} + +/app/crupest-relay init || die "crupest-relay failed to init." + +/app/crupest-relay real-serve & +/dovecot/sbin/dovecot -F diff --git a/services/docker/mail-server/dovecot.conf b/services/docker/mail-server/dovecot.conf index 16d0430..5d2eaf4 100644 --- a/services/docker/mail-server/dovecot.conf +++ b/services/docker/mail-server/dovecot.conf @@ -3,65 +3,28 @@ dovecot_storage_version = 2.4.0 base_dir = /run/dovecot state_dir = /run/dovecot +log_path = /dev/stdout -protocols = imap submission lmtp lda sieve - -mail_driver=maildir -mailbox_list_layout=index -mailbox_list_utf8=yes -mail_path=~/mail -mail_home=/data/vmail/%{user | domain}/%{user | username} -mail_utf8_extensions = yes +protocols = imap submission lmtp sieve +sendmail_path = /app/out/crupest-relay sendmail +submission_relay_host = 127.0.0.1 +submission_relay_port = 2346 +submission_relay_trusted = yes -mail_uid = vmail -mail_gid = vmail +mail_driver = maildir +mail_home = /data/vmail/%{user | domain}/%{user | username} +mail_path = ~/mail +mail_log_events = delete undelete expunge save copy mailbox_create mailbox_delete mailbox_rename flag_change # Setup default mailboxes for inbox namespace @mailbox_defaults = english namespace inbox { - separator = / - - mailbox Drafts { - auto = subscribe - special_use = \Drafts - } - mailbox Junk { - auto = subscribe - special_use = \Junk - } - mailbox Trash { - auto = subscribe - special_use = \Trash - } - - mailbox Sent { - auto = subscribe - special_use = \Sent - } - mailbox Archive { - auto = subscribe - special_use = \Archive - } -} - -ssl = yes -ssl_server { - cert_file = /etc/dovecot/ssl/tls.crt - key_file = /etc/dovecot/ssl/tls.key -} - -mail_attribute { - dict file { - path = %{home}/dovecot-attributes + special_use = "\\Archive" } } -log_path = /dev/stdout - -imap_hibernate_timeout = 5s - mail_plugins { fts = yes fts_flatcurve = yes @@ -69,8 +32,6 @@ mail_plugins { notify = yes } -mail_log_events = delete undelete expunge save copy mailbox_create mailbox_delete mailbox_rename flag_change - fts_autoindex = yes fts_autoindex_max_recent_msgs = 999 fts_search_add_missing = yes @@ -89,7 +50,6 @@ fts flatcurve { } auth_mechanisms = plain login -auth_username_format = %{user | username} passdb passwd-file { passwd_file_path = /data/userdb @@ -105,6 +65,12 @@ userdb passwd-file { } } +ssl = yes +ssl_server { + cert_file = /etc/dovecot/ssl/tls.crt + key_file = /etc/dovecot/ssl/tls.key +} + protocol imap { mail_plugins { imap_sieve = yes @@ -118,6 +84,12 @@ protocol lmtp { } } +protocol lda { + mail_plugins { + sieve = yes + } +} + service imap-login { process_min_avail = 1 client_limit = 100 @@ -138,32 +110,12 @@ service submission-login { } } -lda_original_recipient_header = X-Original-To - -protocol lda { - mail_plugins { - sieve = yes - } -} - service managesieve-login { process_min_avail = 1 client_limit = 100 } -plugin { - sieve = ~/.dovecot.sieve - sieve_dir = ~/sieve - - # Directory for :global include scripts for the include extension. - #sieve_global_dir = - - sieve_before = /data/sieve/global/before/ - sieve_after = /data/sieve/global/after/ - - sieve_extensions = +notify +imapflags +special-use +vnd.dovecot.pipe +vnd.dovecot.filter - sieve_plugins = sieve_imapsieve sieve_extprograms -} +sieve_plugins = sieve_imapsieve sieve_extprograms event_exporter log { format = json diff --git a/services/docker/mail-server/relay/.gitignore b/services/docker/mail-server/relay/.gitignore index 2eb12ee..6129c3d 100644 --- a/services/docker/mail-server/relay/.gitignore +++ b/services/docker/mail-server/relay/.gitignore @@ -1,2 +1,4 @@ +out .env.local db.sqlite +test-mail.txt diff --git a/services/docker/mail-server/relay/app.ts b/services/docker/mail-server/relay/app.ts index 83d7c4d..3a85996 100644 --- a/services/docker/mail-server/relay/app.ts +++ b/services/docker/mail-server/relay/app.ts @@ -1,42 +1,78 @@ +import { join } from "@std/path"; import { Hono } from "hono"; +import { logger as honoLogger } from "hono/logger"; -import { Logger, setLogger } from "./logger.ts"; -import { Config, getConfig, setConfig } from "./config.ts"; +import logger, { error } from "./logger.ts"; +import config from "./config.ts"; import { DbService } from "./db.ts"; -import { MailDeliverer } from "./mail.ts"; +import { + AliasFileMailHook, + FallbackReceiptsHook, + MailDeliverer, +} from "./mail.ts"; import { DovecotMailDeliverer } from "./dovecot.ts"; +import { CronTask, CronTaskConfig } from "./cron.ts"; +import { DumbSMTPServer as DumbSmtpServer } from "./dumb-smtp-server.ts"; export abstract class AppBase { protected readonly db: DbService; - protected readonly inboundDeliverer: MailDeliverer; + protected readonly crons: CronTask[] = []; protected readonly routes: Hono[] = []; + protected readonly inboundDeliverer: MailDeliverer; + protected readonly hono = new Hono(); protected abstract readonly outboundDeliverer: MailDeliverer; constructor() { - setLogger(new Logger("log")); - setConfig(new Config()); + const dataPath = config.getValue("dataPath"); + Deno.mkdirSync(dataPath, { recursive: true }); + logger.path = join(dataPath, "log"); + logger.log(config); - this.db = new DbService(`${getConfig().getValue("dataPath")}/db.sqlite`); + this.db = new DbService(join(dataPath, "db.sqlite")); this.inboundDeliverer = new DovecotMailDeliverer(); + this.inboundDeliverer.preHooks.push( + new FallbackReceiptsHook(new Set(config.getValueList("inboundFallback"))), + new AliasFileMailHook(join(dataPath, "aliases.csv")), + ); - const hono = new Hono() - .post("/send/raw", async (context) => { - this.outboundDeliverer.deliverRaw(await context.req.text()); - }) - .post("/receive/raw", async (context) => { - this.inboundDeliverer.deliverRaw(await context.req.text()); - }); - this.routes.push(hono); + this.hono.onError((err, c) => { + error(err); + return c.json({ msg: "Server error." }, 500); + }); + + this.hono.use(honoLogger()); + this.hono.post("/send/raw", async (context) => { + const body = await context.req.text(); + if (body.trim().length === 0) { + return context.json({ msg: "Can't send an empty mail" }, 400); + } else { + const mail = await this.outboundDeliverer.deliverRaw(body); + return context.json({ + messageId: mail.messageId, + awsMessageId: mail.awsMessageId, + }); + } + }); + this.hono.post("/receive/raw", async (context) => { + await this.inboundDeliverer.deliverRaw(await context.req.text()); + return context.json({}); + }); } - async run(): Promise<void> { - const hono = new Hono(); - this.routes.forEach((h) => hono.route("/", h)); + createCron(config: CronTaskConfig): CronTask { + const cron = new CronTask(config); + this.crons.push(cron); + return cron; + } - const server = Deno.serve({ - hostname: "0.0.0.0", - }, hono.fetch); - await server.finished; + serve(): { smtp: DumbSmtpServer; http: Deno.HttpServer } { + const smtp = new DumbSmtpServer(this.outboundDeliverer); + smtp.serve(); + const http = Deno.serve({ + hostname: config.HTTP_HOST, + port: config.HTTP_PORT, + }, this.hono.fetch); + return { smtp, http }; } } diff --git a/services/docker/mail-server/relay/aws/app.ts b/services/docker/mail-server/relay/aws/app.ts index 251d151..76e2793 100644 --- a/services/docker/mail-server/relay/aws/app.ts +++ b/services/docker/mail-server/relay/aws/app.ts @@ -1,48 +1,223 @@ +import { parseArgs } from "@std/cli"; +import { decodeBase64 } from "@std/encoding/base64"; import { z } from "zod"; -import { Hono } from "hono"; import { zValidator } from "@hono/zod-validator"; +import { error, log } from "../logger.ts"; import { AppBase } from "../app.ts"; import { AwsContext } from "./context.ts"; import { AwsMailDeliverer } from "./deliver.ts"; import { AwsMailRetriever } from "./retriever.ts"; +import config from "../config.ts"; + +const AWS_SNS_MESSAGE_MODEL = z.object({ + Type: z.enum(["Notification", "SubscriptionConfirmation"]), + TopicArn: z.string(), + Timestamp: z.string(), + Subject: z.string().optional(), + SubscribeURL: z.string().optional(), + Message: z.string(), + MessageId: z.string(), + Signature: z.string(), + SigningCertURL: z.string(), + SignatureVersion: z.string(), +}); + +type AwsSnsMessage = z.TypeOf<typeof AWS_SNS_MESSAGE_MODEL>; + +const AWS_SES_SNS_MESSAGE_MODEL = z.object({ + notificationType: z.literal("Received").or(z.string()), + receipt: z.object({ + recipients: z.array(z.string()), + }), + mail: z.object({ + messageId: z.string(), + }), +}); + +const AWS_SNS_SIGNATURE_FIELDS = { + Notification: [ + "Message", + "MessageId", + "Subject", + "Timestamp", + "TopicArn", + "Type", + ], + SubscriptionConfirmation: [ + "Message", + "MessageId", + "SubscribeURL", + "Timestamp", + "TopicArn", + "Type", + ], +} as const; + +async function verifySnsSignature(message: AwsSnsMessage) { + const signingCertUrl = message.SigningCertURL; + + if (!new URL(signingCertUrl).hostname.endsWith(".amazonaws.com")) { + throw new Error( + `Signature cert url ${signingCertUrl} does not belong to aws!!!`, + ); + } + + const signature = message.Signature; + const data = AWS_SNS_SIGNATURE_FIELDS[message.Type].filter((field) => + field in message + ).flatMap((field) => [field, message[field]]).join("\n"); + const certData = await (await fetch(signingCertUrl)).bytes(); + const key = await crypto.subtle.importKey( + "pkcs8", + certData, + { + name: "RSA-PSS", + hash: message.SignatureVersion === "1" ? "SHA-1" : "SHA-256", + }, + false, + ["verify"], + ); + const isVerified = await crypto.subtle.verify( + { + name: "RSA-PSS", + hash: message.SignatureVersion === "1" ? "SHA-1" : "SHA-256", + }, + key, + decodeBase64(signature), + new TextEncoder().encode(data), + ); + + if (!isVerified) { + throw new Error("Signature does not match!!!"); + } +} export class AwsRelayApp extends AppBase { readonly #aws = new AwsContext(); readonly #retriever; - readonly #liveMailRecyclerAborter = new AbortController(); protected readonly outboundDeliverer = new AwsMailDeliverer(this.#aws); constructor() { super(); this.#retriever = new AwsMailRetriever(this.#aws, this.inboundDeliverer); - const hono = new Hono() - .post( - "/receive/s3", - zValidator( - "json", - z.object({ - key: z.string(), - }), - ), - async (ctx) => { - await this.#retriever.deliverS3Mail( - ctx.req.valid("json").key, - ); - }, - ); - - this.routes.push(hono); + this.hono.post( + "/receive/s3", + zValidator( + "json", + z.object({ + key: z.string(), + }), + ), + async (ctx) => { + await this.#retriever.deliverS3Mail( + ctx.req.valid("json").key, + ); + return ctx.json({ + "msg": "Done!", + }); + }, + ); + this.hono.post( + `/receive/aws-sns/${config.getValue("awsInboundPath")}`, + zValidator("json", AWS_SNS_MESSAGE_MODEL), + async (ctx) => { + const message = ctx.req.valid("json"); + await verifySnsSignature(message); + if (message.Type === "Notification") { + const sesMessage = JSON.parse(message.Message); + const parsedSesMessage = AWS_SES_SNS_MESSAGE_MODEL.parse(sesMessage); + // TODO: Here!!! Specify receipts! + await this.#retriever.deliverS3Mail(parsedSesMessage.mail.messageId); + return ctx.json({ + "msg": "Done!", + }); + } else if (message.Type === "SubscriptionConfirmation") { + } else { + } + }, + ); } - override run(): Promise<void> { - Deno.cron("live-mail-recycler", "0 */6 * * *", { - signal: this.#liveMailRecyclerAborter.signal, - }, () => { - this.#retriever.recycleLiveMails(); + realServe() { + this.createCron({ + name: "live-mail-recycler", + interval: 6 * 3600 * 1000, + callback: () => { + return this.#retriever.recycleLiveMails(); + }, + startNow: true, }); - return super.run(); + return this.serve(); + } + + readonly cli = { + "init": (_: unknown) => { + log("Just init!"); + return Promise.resolve(); + }, + "list-lives": async (_: unknown) => { + const liveMails = await this.#retriever.listLiveMails(); + log(`Total ${liveMails.length}:`); + log(liveMails.join("\n")); + }, + "recycle-lives": async (_: unknown) => { + await this.#retriever.recycleLiveMails(); + }, + "serve": async (_: unknown) => { + await this.serve().http.finished; + }, + "real-serve": async (_: unknown) => { + await this.realServe().http.finished; + }, + } as const; +} + +const nonServerCli = { + "sendmail": async (_: unknown) => { + const decoder = new TextDecoder(); + let text = ""; + for await (const chunk of Deno.stdin.readable) { + text += decoder.decode(chunk); + } + + const res = await fetch( + `http://localhost:${config.HTTP_PORT}/send/raw`, + { + method: "post", + body: text, + }, + ); + const logger = res.ok ? log : error; + logger(res); + logger("Body\n" + await res.text()); + if (!res.ok) Deno.exit(-1); + }, +} as const; + +if (import.meta.main) { + const args = parseArgs(Deno.args); + + if (args._.length === 0) { + throw new Error("You must specify a command."); + } + + const command = args._[0]; + + if (command in nonServerCli) { + log(`Run non-server command ${command}.`); + await nonServerCli[command as keyof typeof nonServerCli](args); + Deno.exit(0); + } + + const app = new AwsRelayApp(); + if (command in app.cli) { + log(`Run command ${command}.`); + await app.cli[command as keyof AwsRelayApp["cli"]](args); + Deno.exit(0); + } else { + throw new Error(command + " is not a valid command."); } } diff --git a/services/docker/mail-server/relay/aws/context.ts b/services/docker/mail-server/relay/aws/context.ts index 34d2d9f..c4f67bc 100644 --- a/services/docker/mail-server/relay/aws/context.ts +++ b/services/docker/mail-server/relay/aws/context.ts @@ -3,27 +3,21 @@ import { DeleteObjectCommand, S3Client, } from "@aws-sdk/client-s3"; +import { FetchHttpHandler } from "@smithy/fetch-http-handler"; -import { getConfig } from "../config.ts"; - -declare module "../mail.ts" { - interface Mail { - awsMessageId?: string; - } -} +import { getConfigValue } from "../config.ts"; export class AwsContext { - readonly region = "ap-southeast-1"; - - accessKeyId = getConfig().getValue("awsAccessKeyId"); - secretAccessKey = getConfig().getValue("awsSecretAccessKey"); - - getCredentials() { - const { accessKeyId, secretAccessKey } = this; - return Promise.resolve({ accessKeyId, secretAccessKey }); + readonly credentials = () => + Promise.resolve({ + accessKeyId: getConfigValue("awsAccessKeyId"), + secretAccessKey: getConfigValue("awsSecretAccessKey"), + }); + readonly requestHandler = new FetchHttpHandler(); + + get region() { + return getConfigValue("awsRegion"); } - - readonly credentials = this.getCredentials.bind(this); } export async function s3MoveObject( @@ -35,7 +29,7 @@ export async function s3MoveObject( const copyCommand = new CopyObjectCommand({ Bucket: bucket, Key: newPath, - CopySource: path, + CopySource: `${bucket}/${path}`, }); await client.send(copyCommand); diff --git a/services/docker/mail-server/relay/aws/deliver.ts b/services/docker/mail-server/relay/aws/deliver.ts index 93e4954..793c85a 100644 --- a/services/docker/mail-server/relay/aws/deliver.ts +++ b/services/docker/mail-server/relay/aws/deliver.ts @@ -1,7 +1,14 @@ import { SendEmailCommand, SESv2Client } from "@aws-sdk/client-sesv2"; import { AwsContext } from "./context.ts"; -import { Mail, MailDeliverer } from "../mail.ts"; +import { + Mail, + MailDeliverContext, + MailDeliverer, + MailDeliverReceiptResult, +} from "./mail.ts"; +import { warn } from "../logger.ts"; +import { log } from "node:console"; export class AwsMailDeliverer extends MailDeliverer { readonly name = "aws"; @@ -9,12 +16,19 @@ export class AwsMailDeliverer extends MailDeliverer { constructor(aws: AwsContext) { super(); - const { region, credentials } = aws; - this.#ses = new SESv2Client({ region, credentials }); + this.#ses = new SESv2Client(aws); } - protected override async doDeliver(mail: Mail): Promise<void> { - let awsMessageId: string | undefined; + protected override async doDeliver( + mail: Mail, + context: MailDeliverContext, + ): Promise<void> { + log("Begin to call aws send-email api..."); + + const result: MailDeliverReceiptResult = { + kind: "done", + message: "Success to call send-email api of aws.", + }; try { const sendCommand = new SendEmailCommand({ @@ -24,18 +38,16 @@ export class AwsMailDeliverer extends MailDeliverer { }); const res = await this.#ses.send(sendCommand); - awsMessageId = res.MessageId; + if (res.MessageId == null) { + warn("Aws send-email returns no message id."); + } + mail.awsMessageId = res.MessageId; } catch (cause) { - mail.throwDeliverError( - this, - "failed to call send-email api of aws.", - cause, - ); - } - - if (awsMessageId == null) { - mail.setDelivered(this, new Error("No message id is returned from aws.")); + result.kind = "fail"; + result.message = "An error was thrown when calling aws send-email." + + cause; + result.cause = cause; } - mail.awsMessageId = awsMessageId; + context.result.set("*", result); } } diff --git a/services/docker/mail-server/relay/aws/mail.ts b/services/docker/mail-server/relay/aws/mail.ts new file mode 100644 index 0000000..a0f2639 --- /dev/null +++ b/services/docker/mail-server/relay/aws/mail.ts @@ -0,0 +1,7 @@ +export * from "../mail.ts"; + +declare module "../mail.ts" { + interface Mail { + awsMessageId?: string; + } +} diff --git a/services/docker/mail-server/relay/aws/retriever.ts b/services/docker/mail-server/relay/aws/retriever.ts index 2ee5643..b81a8f6 100644 --- a/services/docker/mail-server/relay/aws/retriever.ts +++ b/services/docker/mail-server/relay/aws/retriever.ts @@ -6,16 +6,18 @@ import { S3Client, } from "@aws-sdk/client-s3"; -import { AwsContext, s3MoveObject } from "./context.ts"; -import { getLogger } from "../logger.ts"; -import { getConfig } from "../config.ts"; +import { log, warn } from "../logger.ts"; +import { getConfigValue } from "../config.ts"; +import "../util.ts"; import { Mail, MailDeliverer } from "../mail.ts"; -import { generateTimeStringForFileName } from "../util.ts"; +import { AwsContext, s3MoveObject } from "./context.ts"; + +const AWS_SES_S3_SETUP_TAG = "AMAZON_SES_SETUP_NOTIFICATION"; export class AwsMailRetriever { readonly liveMailPrefix = "mail/live/"; readonly archiveMailPrefix = "mail/archive/"; - readonly mailBucket = getConfig().getValue("awsMailBucket"); + readonly mailBucket = getConfigValue("awsMailBucket"); readonly #s3; @@ -23,11 +25,12 @@ export class AwsMailRetriever { aws: AwsContext, public readonly inboundDeliverer: MailDeliverer, ) { - const { region, credentials } = aws; - this.#s3 = new S3Client({ region, credentials }); + this.#s3 = new S3Client(aws); } async listLiveMails(): Promise<string[]> { + log("Begin to retrieve live mails."); + const listCommand = new ListObjectsV2Command({ Bucket: this.mailBucket, Prefix: this.liveMailPrefix, @@ -35,25 +38,28 @@ export class AwsMailRetriever { const res = await this.#s3.send(listCommand); if (res.Contents == null) { - getLogger().warn("Listing live mails in S3 returns null Content."); + warn("Listing live mails in S3 returns null Content."); return []; } const result: string[] = []; for (const object of res.Contents) { - if (object.Key != null) { - // TODO: check prefix consistence here. - result.push(object.Key.slice(this.liveMailPrefix.length)); - } else { - getLogger().warn( - "Listing live mails in S3 returns an object with no Key.", - ); + if (object.Key == null) { + warn("Listing live mails in S3 returns an object with no Key."); + continue; } + + if (object.Key.endsWith(AWS_SES_S3_SETUP_TAG)) continue; + + result.push(object.Key.slice(this.liveMailPrefix.length)); } return result; } async deliverS3Mail(s3Key: string) { + log(`Begin to deliver s3 mail ${s3Key}...`); + + log(`Fetching s3 mail ${s3Key}...`); const mailPath = `${this.liveMailPrefix}${s3Key}`; const command = new GetObjectCommand({ Bucket: this.mailBucket, @@ -62,29 +68,30 @@ export class AwsMailRetriever { const res = await this.#s3.send(command); if (res.Body == null) { - // TODO: Better error. - throw new Error(); + throw new Error("S3 mail returns a null body."); } const rawMail = await res.Body.transformToString(); + log(`Done fetching s3 mail ${s3Key}.`); + + log(`Delivering s3 mail ${s3Key}...`); const mail = new Mail(rawMail); await this.inboundDeliverer.deliver(mail); + log(`Done delivering s3 mail ${s3Key}.`); + const date = mail.date ?? mail.simpleParseDate(); - const dateString = date != null - ? generateTimeStringForFileName(date, true) - : "invalid-date"; - - // TODO: Continue here. - await s3MoveObject( - this.#s3, - this.mailBucket, - mailPath, - `${this.archiveMailPrefix}${dateString}/${s3Key}`, - ); + const dateString = date?.toFileNameString(true) ?? "invalid-date"; + const newPath = `${this.archiveMailPrefix}${dateString}/${s3Key}`; + + log(`Archiving s3 mail ${s3Key} to ${newPath}...`); + await s3MoveObject(this.#s3, this.mailBucket, mailPath, newPath); + log(`Done delivering s3 mail ${s3Key}...`); } async recycleLiveMails() { + log("Begin to recycle live mails..."); const mails = await this.listLiveMails(); + log(`Found ${mails.length} live mails`); for (const s3Key of mails) { await this.deliverS3Mail(s3Key); } diff --git a/services/docker/mail-server/relay/config.ts b/services/docker/mail-server/relay/config.ts index 1e832cf..ec7e7d4 100644 --- a/services/docker/mail-server/relay/config.ts +++ b/services/docker/mail-server/relay/config.ts @@ -1,4 +1,4 @@ -import { createSingleton, transformProperties } from "./util.ts"; +import { transformProperties } from "./util.ts"; export const APP_PREFIX = "crupest"; export const APP_NAME = "mailserver"; @@ -7,33 +7,62 @@ interface ConfigItemDef { env: string; description: string; default?: string; + secret?: boolean; } export const CONFIG_DEFS = { + mailDomain: { + env: "MAIL_DOMAIN", + description: "the part after `@` of an address", + }, dataPath: { env: "DATA_PATH", description: "path to save app persistent data", }, + ldaPath: { + env: "LDA_PATH", + description: "full path of lda executable", + "default": "/dovecot/libexec/dovecot/dovecot-lda", + }, + inboundFallback: { + env: "INBOUND_FALLBACK", + description: "comma separated addresses used as fallback receipts", + "default": "", + }, + awsInboundPath: { + env: "AWS_INBOUND_PATH", + description: "(random set) path for aws sns", + }, + awsInboundKey: { + env: "AWS_INBOUND_KEY", + description: "(random set) http header Authorization for aws sns", + }, + awsRegion: { env: "AWS_REGION", description: "aws region" }, awsAccessKeyId: { env: "AWS_USER", description: "aws access key id" }, awsSecretAccessKey: { env: "AWS_PASSWORD", description: "aws secret access key", + secret: true, }, awsMailBucket: { env: "AWS_MAIL_BUCKET", description: "aws s3 bucket saving raw mails", + secret: true, }, } as const satisfies Record<string, ConfigItemDef>; type ConfigDefs = typeof CONFIG_DEFS; type ConfigKey = keyof ConfigDefs; type ConfigMap = { - [K in ConfigKey]: ConfigDefs[K] & { value: string }; + [K in ConfigKey]: ConfigItemDef & { value: string }; }; +function getFullEnvKey(key: string): string { + return `${APP_PREFIX.toUpperCase()}_${APP_NAME.toUpperCase()}_${key}`; +} + function resolveAppConfigItem(def: ConfigItemDef): string { - const envKey = - `${APP_PREFIX.toUpperCase()}_${APP_NAME.toUpperCase()}_${def.env}`; + const envKey = getFullEnvKey(def.env); const value = Deno.env.get(envKey); if (value != null) return value; if (def.default != null) return def.default; @@ -43,18 +72,39 @@ function resolveAppConfigItem(def: ConfigItemDef): string { } export class Config { - private config = transformProperties( + #config = transformProperties( CONFIG_DEFS, (def) => ({ ...def, value: resolveAppConfigItem(def) }), ) as ConfigMap; + readonly HTTP_HOST = "0.0.0.0"; + readonly HTTP_PORT = 2345; + readonly SMTP_HOST = "127.0.0.1"; + readonly SMTP_PORT = 2346; + get<K extends ConfigKey>(key: K): ConfigMap[K] { - return this.config[key]; + return this.#config[key]; } getValue(key: ConfigKey): string { return this.get(key).value; } + + getValueList(key: ConfigKey, separator: string = ","): string[] { + const value = this.getValue(key); + if (value.length === 0) return []; + return value.split(separator); + } + + [Symbol.for("Deno.customInspect")]() { + return Object.entries(this.#config).map(([key, item]) => + `${key} [env: ${getFullEnvKey(item.env)}]: ${ + item.secret === true ? "***" : item.value + }` + ).join("\n"); + } } -export const [getConfig, setConfig] = createSingleton<Config>("Config"); +const config = new Config(); +export default config; +export const getConfigValue = config.getValue.bind(config); diff --git a/services/docker/mail-server/relay/cron.ts b/services/docker/mail-server/relay/cron.ts new file mode 100644 index 0000000..bf0a0be --- /dev/null +++ b/services/docker/mail-server/relay/cron.ts @@ -0,0 +1,43 @@ +export type CronCallback = (task: CronTask) => Promise<void>; + +export interface CronTaskConfig { + readonly name: string; + readonly interval: number; + readonly callback: CronCallback; + readonly startNow?: boolean; +} + +export class CronTask { + #timerTag: number | null = null; + + constructor(public readonly config: CronTaskConfig) { + if (config.interval <= 0) { + throw new Error("Cron task interval must be positive."); + } + + if (config.startNow === true) { + this.start(); + } + } + + get running(): boolean { + return this.#timerTag != null; + } + + start() { + if (this.#timerTag == null) { + this.#timerTag = setInterval( + this.config.callback, + this.config.interval, + this, + ); + } + } + + stop() { + if (this.#timerTag != null) { + clearInterval(this.#timerTag); + this.#timerTag = null; + } + } +} diff --git a/services/docker/mail-server/relay/db.test.ts b/services/docker/mail-server/relay/db.test.ts index 071c1b4..eef3e1b 100644 --- a/services/docker/mail-server/relay/db.test.ts +++ b/services/docker/mail-server/relay/db.test.ts @@ -14,7 +14,6 @@ describe("DbService", () => { const db = new DbService(":memory:"); await db.migrate(); await db.addMail(mockRow); - expect(await db.listMails()).toEqual([mockRow]); expect(await db.messageIdToAws(mockRow.message_id)).toBe( mockRow.aws_message_id, ); diff --git a/services/docker/mail-server/relay/db.ts b/services/docker/mail-server/relay/db.ts index 73c3abe..ee8bad1 100644 --- a/services/docker/mail-server/relay/db.ts +++ b/services/docker/mail-server/relay/db.ts @@ -6,19 +6,17 @@ import { Kysely, Migration, Migrator, - Selectable, SqliteDatabase, SqliteDialect, SqliteStatement, } from "kysely"; - import * as sqlite from "@db/sqlite"; class SqliteStatementAdapter implements SqliteStatement { constructor(public readonly stmt: sqlite.Statement) {} get reader(): boolean { - return this.stmt.columnNames.length >= 1; + return this.stmt.columnNames().length >= 1; } all(parameters: readonly unknown[]): unknown[] { @@ -57,7 +55,7 @@ class SqliteDatabaseAdapter implements SqliteDatabase { export class DbError extends Error { } -const tableNames = { +const NAMES = { mail: { table: "mail", columns: { @@ -71,46 +69,51 @@ const tableNames = { } as const; interface MailTable { - [tableNames.mail.columns.id]: Generated<number>; - [tableNames.mail.columns.messageId]: string; - [tableNames.mail.columns.awsMessageId]: string | null; - [tableNames.mail.columns.date]: number | null; - [tableNames.mail.columns.raw]: string; + [NAMES.mail.columns.id]: Generated<number>; + [NAMES.mail.columns.messageId]: string; + [NAMES.mail.columns.awsMessageId]: string | null; + [NAMES.mail.columns.date]: string | null; + [NAMES.mail.columns.raw]: string; } interface Database { - [tableNames.mail.table]: MailTable; + [NAMES.mail.table]: MailTable; } const migrations: Record<string, Migration> = { "0001-init": { // deno-lint-ignore no-explicit-any async up(db: Kysely<any>): Promise<void> { - const names = tableNames.mail; - await db.schema - .createTable(names.table) + .createTable(NAMES.mail.table) .addColumn( - names.columns.id, + NAMES.mail.columns.id, "integer", (col) => col.primaryKey().autoIncrement(), ) .addColumn( - names.columns.messageId, + NAMES.mail.columns.messageId, "text", (col) => col.notNull().unique(), ) - .addColumn(names.columns.awsMessageId, "text", (col) => col.unique()) - .addColumn(names.columns.date, "integer") - .addColumn(names.columns.raw, "text", (col) => col.notNull()) + .addColumn( + NAMES.mail.columns.awsMessageId, + "text", + (col) => col.unique(), + ) + .addColumn(NAMES.mail.columns.date, "text") + .addColumn(NAMES.mail.columns.raw, "text", (col) => col.notNull()) .execute(); for ( - const column of [names.columns.messageId, names.columns.awsMessageId] + const column of [ + NAMES.mail.columns.messageId, + NAMES.mail.columns.awsMessageId, + ] ) { await db.schema - .createIndex(`${names.table}_${column}`) - .on(names.table) + .createIndex(`${NAMES.mail.table}_${column}`) + .on(NAMES.mail.table) .column(column) .execute(); } @@ -118,7 +121,7 @@ const migrations: Record<string, Migration> = { // deno-lint-ignore no-explicit-any async down(db: Kysely<any>): Promise<void> { - await db.schema.dropTable(tableNames.mail.table).execute(); + await db.schema.dropTable(NAMES.mail.table).execute(); }, }, }; @@ -149,31 +152,28 @@ export class DbService { await this.#migrator.migrateToLatest(); } - async addMail(mail: Insertable<MailTable>): Promise<void> { - await this.#kysely.insertInto(tableNames.mail.table).values(mail) - .execute(); - } - - async listMails(): Promise<Selectable<MailTable>[]> { - return await this.#kysely.selectFrom(tableNames.mail.table).selectAll() - .execute(); + async addMail(mail: Insertable<MailTable>): Promise<number> { + const inserted = await this.#kysely.insertInto(NAMES.mail.table).values( + mail, + ).executeTakeFirstOrThrow(); + return Number(inserted.insertId!); } async messageIdToAws(messageId: string): Promise<string | null> { - const row = await this.#kysely.selectFrom(tableNames.mail.table).where( - tableNames.mail.columns.messageId, + const row = await this.#kysely.selectFrom(NAMES.mail.table).where( + NAMES.mail.columns.messageId, "=", messageId, - ).select(tableNames.mail.columns.awsMessageId).executeTakeFirst(); + ).select(NAMES.mail.columns.awsMessageId).executeTakeFirst(); return row?.aws_message_id ?? null; } async messageIdFromAws(awsMessageId: string): Promise<string | null> { - const row = await this.#kysely.selectFrom(tableNames.mail.table).where( - tableNames.mail.columns.awsMessageId, + const row = await this.#kysely.selectFrom(NAMES.mail.table).where( + NAMES.mail.columns.awsMessageId, "=", awsMessageId, - ).select(tableNames.mail.columns.messageId).executeTakeFirst(); + ).select(NAMES.mail.columns.messageId).executeTakeFirst(); return row?.message_id ?? null; } } diff --git a/services/docker/mail-server/relay/deno.json b/services/docker/mail-server/relay/deno.json index 3c2c34e..2bf6a0e 100644 --- a/services/docker/mail-server/relay/deno.json +++ b/services/docker/mail-server/relay/deno.json @@ -1,18 +1,25 @@ { - "unstable": [ "temporal", "cron" ], + "unstable": [ "cron" ], "tasks": { - "dev": "deno run --watch main.ts" + "run": "deno run -A aws/app.ts", + "test": "deno test -A", + "compile": "deno compile -o out/crupest-relay -A aws/app.ts" }, "imports": { "@aws-sdk/client-s3": "npm:@aws-sdk/client-s3@^3.797.0", "@aws-sdk/client-sesv2": "npm:@aws-sdk/client-sesv2@^3.782.0", + "@aws-sdk/client-sns": "npm:@aws-sdk/client-sns@^3.821.0", "@db/sqlite": "jsr:@db/sqlite@^0.12.0", "@hono/zod-validator": "npm:@hono/zod-validator@^0.5.0", + "@smithy/fetch-http-handler": "npm:@smithy/fetch-http-handler@^5.0.4", "@std/cli": "jsr:@std/cli@^1.0.17", + "@std/csv": "jsr:@std/csv@^1.0.6", "@std/encoding": "jsr:@std/encoding@^1.0.10", "@std/expect": "jsr:@std/expect@^1.0.16", + "@std/io": "jsr:@std/io@^0.225.2", "@std/path": "jsr:@std/path@^1.0.9", "@std/testing": "jsr:@std/testing@^1.0.12", + "email-addresses": "npm:email-addresses@^5.0.0", "hono": "npm:hono@^4.7.10", "kysely": "npm:kysely@^0.28.2", "zod": "npm:zod@^3.25.20" diff --git a/services/docker/mail-server/relay/deno.lock b/services/docker/mail-server/relay/deno.lock index bbb516b..66ecee7 100644 --- a/services/docker/mail-server/relay/deno.lock +++ b/services/docker/mail-server/relay/deno.lock @@ -7,7 +7,9 @@ "jsr:@std/assert@1": "1.0.13", "jsr:@std/assert@^1.0.13": "1.0.13", "jsr:@std/async@^1.0.13": "1.0.13", + "jsr:@std/bytes@^1.0.5": "1.0.6", "jsr:@std/cli@^1.0.17": "1.0.17", + "jsr:@std/csv@^1.0.6": "1.0.6", "jsr:@std/data-structures@^1.0.8": "1.0.8", "jsr:@std/encoding@1": "1.0.10", "jsr:@std/encoding@^1.0.10": "1.0.10", @@ -17,14 +19,19 @@ "jsr:@std/fs@^1.0.17": "1.0.17", "jsr:@std/internal@^1.0.6": "1.0.7", "jsr:@std/internal@^1.0.7": "1.0.7", + "jsr:@std/io@~0.225.2": "0.225.2", "jsr:@std/path@0.217": "0.217.0", "jsr:@std/path@1": "1.0.9", "jsr:@std/path@^1.0.9": "1.0.9", + "jsr:@std/streams@^1.0.9": "1.0.9", "jsr:@std/testing@^1.0.12": "1.0.12", "npm:@aws-sdk/client-s3@^3.797.0": "3.797.0", "npm:@aws-sdk/client-sesv2@^3.782.0": "3.782.0", + "npm:@aws-sdk/client-sns@^3.821.0": "3.821.0", "npm:@hono/zod-validator@0.5": "0.5.0_hono@4.7.10_zod@3.25.20", + "npm:@smithy/fetch-http-handler@^5.0.4": "5.0.4", "npm:@types/node@*": "22.15.15", + "npm:email-addresses@5": "5.0.0", "npm:hono@^4.7.10": "4.7.10", "npm:kysely@~0.28.2": "0.28.2", "npm:zod@^3.25.20": "3.25.20" @@ -58,9 +65,18 @@ "@std/async@1.0.13": { "integrity": "1d76ca5d324aef249908f7f7fe0d39aaf53198e5420604a59ab5c035adc97c96" }, + "@std/bytes@1.0.6": { + "integrity": "f6ac6adbd8ccd99314045f5703e23af0a68d7f7e58364b47d2c7f408aeb5820a" + }, "@std/cli@1.0.17": { "integrity": "e15b9abe629e17be90cc6216327f03a29eae613365f1353837fa749aad29ce7b" }, + "@std/csv@1.0.6": { + "integrity": "52ef0e62799a0028d278fa04762f17f9bd263fad9a8e7f98c14fbd371d62d9fd", + "dependencies": [ + "jsr:@std/streams" + ] + }, "@std/data-structures@1.0.8": { "integrity": "2fb7219247e044c8fcd51341788547575653c82ae2c759ff209e0263ba7d9b66" }, @@ -86,6 +102,12 @@ "@std/internal@1.0.7": { "integrity": "39eeb5265190a7bc5d5591c9ff019490bd1f2c3907c044a11b0d545796158a0f" }, + "@std/io@0.225.2": { + "integrity": "3c740cd4ee4c082e6cfc86458f47e2ab7cb353dc6234d5e9b1f91a2de5f4d6c7", + "dependencies": [ + "jsr:@std/bytes" + ] + }, "@std/path@0.217.0": { "integrity": "1217cc25534bca9a2f672d7fe7c6f356e4027df400c0e85c0ef3e4343bc67d11", "dependencies": [ @@ -95,6 +117,9 @@ "@std/path@1.0.9": { "integrity": "260a49f11edd3db93dd38350bf9cd1b4d1366afa98e81b86167b4e3dd750129e" }, + "@std/streams@1.0.9": { + "integrity": "a9d26b1988cdd7aa7b1f4b51e1c36c1557f3f252880fa6cc5b9f37078b1a5035" + }, "@std/testing@1.0.12": { "integrity": "fec973a45ccc62c540fb89296199051fee142409138fd6e3eae409366bcd4720", "dependencies": [ @@ -112,7 +137,7 @@ "integrity": "sha512-nLbCWqQNgUiwwtFsen1AdzAtvuLRsQS8rYgMuxCrdKf9kOssamGLuPwyTY9wyYblNr9+1XM8v6zoDTPPSIeANg==", "dependencies": [ "@aws-crypto/util", - "@aws-sdk/types", + "@aws-sdk/types@3.775.0", "tslib" ] }, @@ -120,7 +145,7 @@ "integrity": "sha512-+iWb8qaHLYKrNvGRbiYRHSdKRWhto5XlZUEBwDjYNf+ly5SVYG6zEoYIdxvf5R3zyeP16w4PLBn3rH1xc74Rag==", "dependencies": [ "@aws-crypto/util", - "@aws-sdk/types", + "@aws-sdk/types@3.775.0", "tslib" ] }, @@ -129,7 +154,7 @@ "dependencies": [ "@aws-crypto/supports-web-crypto", "@aws-crypto/util", - "@aws-sdk/types", + "@aws-sdk/types@3.775.0", "@aws-sdk/util-locate-window", "@smithy/util-utf8@2.3.0", "tslib" @@ -141,7 +166,7 @@ "@aws-crypto/sha256-js", "@aws-crypto/supports-web-crypto", "@aws-crypto/util", - "@aws-sdk/types", + "@aws-sdk/types@3.775.0", "@aws-sdk/util-locate-window", "@smithy/util-utf8@2.3.0", "tslib" @@ -151,7 +176,7 @@ "integrity": "sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA==", "dependencies": [ "@aws-crypto/util", - "@aws-sdk/types", + "@aws-sdk/types@3.775.0", "tslib" ] }, @@ -164,7 +189,7 @@ "@aws-crypto/util@5.2.0": { "integrity": "sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==", "dependencies": [ - "@aws-sdk/types", + "@aws-sdk/types@3.775.0", "@smithy/util-utf8@2.3.0", "tslib" ] @@ -180,51 +205,51 @@ "@aws-sdk/middleware-bucket-endpoint", "@aws-sdk/middleware-expect-continue", "@aws-sdk/middleware-flexible-checksums", - "@aws-sdk/middleware-host-header", + "@aws-sdk/middleware-host-header@3.775.0", "@aws-sdk/middleware-location-constraint", - "@aws-sdk/middleware-logger", - "@aws-sdk/middleware-recursion-detection", + "@aws-sdk/middleware-logger@3.775.0", + "@aws-sdk/middleware-recursion-detection@3.775.0", "@aws-sdk/middleware-sdk-s3@3.796.0", "@aws-sdk/middleware-ssec", "@aws-sdk/middleware-user-agent@3.796.0", - "@aws-sdk/region-config-resolver", + "@aws-sdk/region-config-resolver@3.775.0", "@aws-sdk/signature-v4-multi-region@3.796.0", - "@aws-sdk/types", + "@aws-sdk/types@3.775.0", "@aws-sdk/util-endpoints@3.787.0", - "@aws-sdk/util-user-agent-browser", + "@aws-sdk/util-user-agent-browser@3.775.0", "@aws-sdk/util-user-agent-node@3.796.0", "@aws-sdk/xml-builder", - "@smithy/config-resolver", - "@smithy/core", + "@smithy/config-resolver@4.1.0", + "@smithy/core@3.2.0", "@smithy/eventstream-serde-browser", "@smithy/eventstream-serde-config-resolver", "@smithy/eventstream-serde-node", - "@smithy/fetch-http-handler", + "@smithy/fetch-http-handler@5.0.2", "@smithy/hash-blob-browser", - "@smithy/hash-node", + "@smithy/hash-node@4.0.2", "@smithy/hash-stream-node", - "@smithy/invalid-dependency", + "@smithy/invalid-dependency@4.0.2", "@smithy/md5-js", - "@smithy/middleware-content-length", - "@smithy/middleware-endpoint", - "@smithy/middleware-retry", - "@smithy/middleware-serde", - "@smithy/middleware-stack", - "@smithy/node-config-provider", - "@smithy/node-http-handler", - "@smithy/protocol-http", - "@smithy/smithy-client", - "@smithy/types", - "@smithy/url-parser", + "@smithy/middleware-content-length@4.0.2", + "@smithy/middleware-endpoint@4.1.0", + "@smithy/middleware-retry@4.1.0", + "@smithy/middleware-serde@4.0.3", + "@smithy/middleware-stack@4.0.2", + "@smithy/node-config-provider@4.0.2", + "@smithy/node-http-handler@4.0.4", + "@smithy/protocol-http@5.1.0", + "@smithy/smithy-client@4.2.0", + "@smithy/types@4.2.0", + "@smithy/url-parser@4.0.2", "@smithy/util-base64", "@smithy/util-body-length-browser", "@smithy/util-body-length-node", - "@smithy/util-defaults-mode-browser", - "@smithy/util-defaults-mode-node", - "@smithy/util-endpoints", - "@smithy/util-middleware", - "@smithy/util-retry", - "@smithy/util-stream", + "@smithy/util-defaults-mode-browser@4.0.8", + "@smithy/util-defaults-mode-node@4.0.8", + "@smithy/util-endpoints@3.0.2", + "@smithy/util-middleware@4.0.2", + "@smithy/util-retry@4.0.2", + "@smithy/util-stream@4.2.0", "@smithy/util-utf8@4.0.0", "@smithy/util-waiter", "tslib" @@ -237,40 +262,84 @@ "@aws-crypto/sha256-js", "@aws-sdk/core@3.775.0", "@aws-sdk/credential-provider-node@3.782.0", - "@aws-sdk/middleware-host-header", - "@aws-sdk/middleware-logger", - "@aws-sdk/middleware-recursion-detection", + "@aws-sdk/middleware-host-header@3.775.0", + "@aws-sdk/middleware-logger@3.775.0", + "@aws-sdk/middleware-recursion-detection@3.775.0", "@aws-sdk/middleware-user-agent@3.782.0", - "@aws-sdk/region-config-resolver", + "@aws-sdk/region-config-resolver@3.775.0", "@aws-sdk/signature-v4-multi-region@3.775.0", - "@aws-sdk/types", + "@aws-sdk/types@3.775.0", "@aws-sdk/util-endpoints@3.782.0", - "@aws-sdk/util-user-agent-browser", + "@aws-sdk/util-user-agent-browser@3.775.0", "@aws-sdk/util-user-agent-node@3.782.0", - "@smithy/config-resolver", - "@smithy/core", - "@smithy/fetch-http-handler", - "@smithy/hash-node", - "@smithy/invalid-dependency", - "@smithy/middleware-content-length", - "@smithy/middleware-endpoint", - "@smithy/middleware-retry", - "@smithy/middleware-serde", - "@smithy/middleware-stack", - "@smithy/node-config-provider", - "@smithy/node-http-handler", - "@smithy/protocol-http", - "@smithy/smithy-client", - "@smithy/types", - "@smithy/url-parser", + "@smithy/config-resolver@4.1.0", + "@smithy/core@3.2.0", + "@smithy/fetch-http-handler@5.0.2", + "@smithy/hash-node@4.0.2", + "@smithy/invalid-dependency@4.0.2", + "@smithy/middleware-content-length@4.0.2", + "@smithy/middleware-endpoint@4.1.0", + "@smithy/middleware-retry@4.1.0", + "@smithy/middleware-serde@4.0.3", + "@smithy/middleware-stack@4.0.2", + "@smithy/node-config-provider@4.0.2", + "@smithy/node-http-handler@4.0.4", + "@smithy/protocol-http@5.1.0", + "@smithy/smithy-client@4.2.0", + "@smithy/types@4.2.0", + "@smithy/url-parser@4.0.2", + "@smithy/util-base64", + "@smithy/util-body-length-browser", + "@smithy/util-body-length-node", + "@smithy/util-defaults-mode-browser@4.0.8", + "@smithy/util-defaults-mode-node@4.0.8", + "@smithy/util-endpoints@3.0.2", + "@smithy/util-middleware@4.0.2", + "@smithy/util-retry@4.0.2", + "@smithy/util-utf8@4.0.0", + "tslib" + ] + }, + "@aws-sdk/client-sns@3.821.0": { + "integrity": "sha512-I7TLsuAzfD/Cu643i2m5F/c798vNfc3skmDQ96aRei1cM4t1x6JJl/F4IIj6pgDBn4CqfWJ1AaPgmX49opuGuw==", + "dependencies": [ + "@aws-crypto/sha256-browser", + "@aws-crypto/sha256-js", + "@aws-sdk/core@3.821.0", + "@aws-sdk/credential-provider-node@3.821.0", + "@aws-sdk/middleware-host-header@3.821.0", + "@aws-sdk/middleware-logger@3.821.0", + "@aws-sdk/middleware-recursion-detection@3.821.0", + "@aws-sdk/middleware-user-agent@3.821.0", + "@aws-sdk/region-config-resolver@3.821.0", + "@aws-sdk/types@3.821.0", + "@aws-sdk/util-endpoints@3.821.0", + "@aws-sdk/util-user-agent-browser@3.821.0", + "@aws-sdk/util-user-agent-node@3.821.0", + "@smithy/config-resolver@4.1.4", + "@smithy/core@3.5.1", + "@smithy/fetch-http-handler@5.0.4", + "@smithy/hash-node@4.0.4", + "@smithy/invalid-dependency@4.0.4", + "@smithy/middleware-content-length@4.0.4", + "@smithy/middleware-endpoint@4.1.9", + "@smithy/middleware-retry@4.1.10", + "@smithy/middleware-serde@4.0.8", + "@smithy/middleware-stack@4.0.4", + "@smithy/node-config-provider@4.1.3", + "@smithy/node-http-handler@4.0.6", + "@smithy/protocol-http@5.1.2", + "@smithy/smithy-client@4.4.1", + "@smithy/types@4.3.1", + "@smithy/url-parser@4.0.4", "@smithy/util-base64", "@smithy/util-body-length-browser", "@smithy/util-body-length-node", - "@smithy/util-defaults-mode-browser", - "@smithy/util-defaults-mode-node", - "@smithy/util-endpoints", - "@smithy/util-middleware", - "@smithy/util-retry", + "@smithy/util-defaults-mode-browser@4.0.17", + "@smithy/util-defaults-mode-node@4.0.17", + "@smithy/util-endpoints@3.0.6", + "@smithy/util-middleware@4.0.4", + "@smithy/util-retry@4.0.5", "@smithy/util-utf8@4.0.0", "tslib" ] @@ -281,39 +350,39 @@ "@aws-crypto/sha256-browser", "@aws-crypto/sha256-js", "@aws-sdk/core@3.775.0", - "@aws-sdk/middleware-host-header", - "@aws-sdk/middleware-logger", - "@aws-sdk/middleware-recursion-detection", + "@aws-sdk/middleware-host-header@3.775.0", + "@aws-sdk/middleware-logger@3.775.0", + "@aws-sdk/middleware-recursion-detection@3.775.0", "@aws-sdk/middleware-user-agent@3.782.0", - "@aws-sdk/region-config-resolver", - "@aws-sdk/types", + "@aws-sdk/region-config-resolver@3.775.0", + "@aws-sdk/types@3.775.0", "@aws-sdk/util-endpoints@3.782.0", - "@aws-sdk/util-user-agent-browser", + "@aws-sdk/util-user-agent-browser@3.775.0", "@aws-sdk/util-user-agent-node@3.782.0", - "@smithy/config-resolver", - "@smithy/core", - "@smithy/fetch-http-handler", - "@smithy/hash-node", - "@smithy/invalid-dependency", - "@smithy/middleware-content-length", - "@smithy/middleware-endpoint", - "@smithy/middleware-retry", - "@smithy/middleware-serde", - "@smithy/middleware-stack", - "@smithy/node-config-provider", - "@smithy/node-http-handler", - "@smithy/protocol-http", - "@smithy/smithy-client", - "@smithy/types", - "@smithy/url-parser", + "@smithy/config-resolver@4.1.0", + "@smithy/core@3.2.0", + "@smithy/fetch-http-handler@5.0.2", + "@smithy/hash-node@4.0.2", + "@smithy/invalid-dependency@4.0.2", + "@smithy/middleware-content-length@4.0.2", + "@smithy/middleware-endpoint@4.1.0", + "@smithy/middleware-retry@4.1.0", + "@smithy/middleware-serde@4.0.3", + "@smithy/middleware-stack@4.0.2", + "@smithy/node-config-provider@4.0.2", + "@smithy/node-http-handler@4.0.4", + "@smithy/protocol-http@5.1.0", + "@smithy/smithy-client@4.2.0", + "@smithy/types@4.2.0", + "@smithy/url-parser@4.0.2", "@smithy/util-base64", "@smithy/util-body-length-browser", "@smithy/util-body-length-node", - "@smithy/util-defaults-mode-browser", - "@smithy/util-defaults-mode-node", - "@smithy/util-endpoints", - "@smithy/util-middleware", - "@smithy/util-retry", + "@smithy/util-defaults-mode-browser@4.0.8", + "@smithy/util-defaults-mode-node@4.0.8", + "@smithy/util-endpoints@3.0.2", + "@smithy/util-middleware@4.0.2", + "@smithy/util-retry@4.0.2", "@smithy/util-utf8@4.0.0", "tslib" ] @@ -324,39 +393,82 @@ "@aws-crypto/sha256-browser", "@aws-crypto/sha256-js", "@aws-sdk/core@3.796.0", - "@aws-sdk/middleware-host-header", - "@aws-sdk/middleware-logger", - "@aws-sdk/middleware-recursion-detection", + "@aws-sdk/middleware-host-header@3.775.0", + "@aws-sdk/middleware-logger@3.775.0", + "@aws-sdk/middleware-recursion-detection@3.775.0", "@aws-sdk/middleware-user-agent@3.796.0", - "@aws-sdk/region-config-resolver", - "@aws-sdk/types", + "@aws-sdk/region-config-resolver@3.775.0", + "@aws-sdk/types@3.775.0", "@aws-sdk/util-endpoints@3.787.0", - "@aws-sdk/util-user-agent-browser", + "@aws-sdk/util-user-agent-browser@3.775.0", "@aws-sdk/util-user-agent-node@3.796.0", - "@smithy/config-resolver", - "@smithy/core", - "@smithy/fetch-http-handler", - "@smithy/hash-node", - "@smithy/invalid-dependency", - "@smithy/middleware-content-length", - "@smithy/middleware-endpoint", - "@smithy/middleware-retry", - "@smithy/middleware-serde", - "@smithy/middleware-stack", - "@smithy/node-config-provider", - "@smithy/node-http-handler", - "@smithy/protocol-http", - "@smithy/smithy-client", - "@smithy/types", - "@smithy/url-parser", + "@smithy/config-resolver@4.1.0", + "@smithy/core@3.2.0", + "@smithy/fetch-http-handler@5.0.2", + "@smithy/hash-node@4.0.2", + "@smithy/invalid-dependency@4.0.2", + "@smithy/middleware-content-length@4.0.2", + "@smithy/middleware-endpoint@4.1.0", + "@smithy/middleware-retry@4.1.0", + "@smithy/middleware-serde@4.0.3", + "@smithy/middleware-stack@4.0.2", + "@smithy/node-config-provider@4.0.2", + "@smithy/node-http-handler@4.0.4", + "@smithy/protocol-http@5.1.0", + "@smithy/smithy-client@4.2.0", + "@smithy/types@4.2.0", + "@smithy/url-parser@4.0.2", + "@smithy/util-base64", + "@smithy/util-body-length-browser", + "@smithy/util-body-length-node", + "@smithy/util-defaults-mode-browser@4.0.8", + "@smithy/util-defaults-mode-node@4.0.8", + "@smithy/util-endpoints@3.0.2", + "@smithy/util-middleware@4.0.2", + "@smithy/util-retry@4.0.2", + "@smithy/util-utf8@4.0.0", + "tslib" + ] + }, + "@aws-sdk/client-sso@3.821.0": { + "integrity": "sha512-aDEBZUKUd/+Tvudi0d9KQlqt2OW2P27LATZX0jkNC8yVk4145bAPS04EYoqdKLuyUn/U33DibEOgKUpxZB12jQ==", + "dependencies": [ + "@aws-crypto/sha256-browser", + "@aws-crypto/sha256-js", + "@aws-sdk/core@3.821.0", + "@aws-sdk/middleware-host-header@3.821.0", + "@aws-sdk/middleware-logger@3.821.0", + "@aws-sdk/middleware-recursion-detection@3.821.0", + "@aws-sdk/middleware-user-agent@3.821.0", + "@aws-sdk/region-config-resolver@3.821.0", + "@aws-sdk/types@3.821.0", + "@aws-sdk/util-endpoints@3.821.0", + "@aws-sdk/util-user-agent-browser@3.821.0", + "@aws-sdk/util-user-agent-node@3.821.0", + "@smithy/config-resolver@4.1.4", + "@smithy/core@3.5.1", + "@smithy/fetch-http-handler@5.0.4", + "@smithy/hash-node@4.0.4", + "@smithy/invalid-dependency@4.0.4", + "@smithy/middleware-content-length@4.0.4", + "@smithy/middleware-endpoint@4.1.9", + "@smithy/middleware-retry@4.1.10", + "@smithy/middleware-serde@4.0.8", + "@smithy/middleware-stack@4.0.4", + "@smithy/node-config-provider@4.1.3", + "@smithy/node-http-handler@4.0.6", + "@smithy/protocol-http@5.1.2", + "@smithy/smithy-client@4.4.1", + "@smithy/types@4.3.1", + "@smithy/url-parser@4.0.4", "@smithy/util-base64", "@smithy/util-body-length-browser", "@smithy/util-body-length-node", - "@smithy/util-defaults-mode-browser", - "@smithy/util-defaults-mode-node", - "@smithy/util-endpoints", - "@smithy/util-middleware", - "@smithy/util-retry", + "@smithy/util-defaults-mode-browser@4.0.17", + "@smithy/util-defaults-mode-node@4.0.17", + "@smithy/util-endpoints@3.0.6", + "@smithy/util-middleware@4.0.4", + "@smithy/util-retry@4.0.5", "@smithy/util-utf8@4.0.0", "tslib" ] @@ -364,15 +476,15 @@ "@aws-sdk/core@3.775.0": { "integrity": "sha512-8vpW4WihVfz0DX+7WnnLGm3GuQER++b0IwQG35JlQMlgqnc44M//KbJPsIHA0aJUJVwJAEShgfr5dUbY8WUzaA==", "dependencies": [ - "@aws-sdk/types", - "@smithy/core", - "@smithy/node-config-provider", - "@smithy/property-provider", - "@smithy/protocol-http", + "@aws-sdk/types@3.775.0", + "@smithy/core@3.2.0", + "@smithy/node-config-provider@4.0.2", + "@smithy/property-provider@4.0.2", + "@smithy/protocol-http@5.1.0", "@smithy/signature-v4@5.0.2", - "@smithy/smithy-client", - "@smithy/types", - "@smithy/util-middleware", + "@smithy/smithy-client@4.2.0", + "@smithy/types@4.2.0", + "@smithy/util-middleware@4.0.2", "fast-xml-parser", "tslib" ] @@ -380,15 +492,31 @@ "@aws-sdk/core@3.796.0": { "integrity": "sha512-tH8Sp7lCxISVoLnkyv4AouuXs2CDlMhTuesWa0lq2NX1f+DXsMwSBtN37ttZdpFMw3F8mWdsJt27X9h2Oq868A==", "dependencies": [ - "@aws-sdk/types", - "@smithy/core", - "@smithy/node-config-provider", - "@smithy/property-provider", - "@smithy/protocol-http", + "@aws-sdk/types@3.775.0", + "@smithy/core@3.2.0", + "@smithy/node-config-provider@4.0.2", + "@smithy/property-provider@4.0.2", + "@smithy/protocol-http@5.1.0", "@smithy/signature-v4@5.1.0", - "@smithy/smithy-client", - "@smithy/types", - "@smithy/util-middleware", + "@smithy/smithy-client@4.2.0", + "@smithy/types@4.2.0", + "@smithy/util-middleware@4.0.2", + "fast-xml-parser", + "tslib" + ] + }, + "@aws-sdk/core@3.821.0": { + "integrity": "sha512-8eB3wKbmfciQFmxFq7hAjy7mXdUs7vBOR5SwT0ZtQBg0Txc18Lc9tMViqqdO6/KU7OukA6ib2IAVSjIJJEN7FQ==", + "dependencies": [ + "@aws-sdk/types@3.821.0", + "@smithy/core@3.5.1", + "@smithy/node-config-provider@4.1.3", + "@smithy/property-provider@4.0.4", + "@smithy/protocol-http@5.1.2", + "@smithy/signature-v4@5.1.2", + "@smithy/smithy-client@4.4.1", + "@smithy/types@4.3.1", + "@smithy/util-middleware@4.0.4", "fast-xml-parser", "tslib" ] @@ -397,9 +525,9 @@ "integrity": "sha512-6ESVxwCbGm7WZ17kY1fjmxQud43vzJFoLd4bmlR+idQSWdqlzGDYdcfzpjDKTcivdtNrVYmFvcH1JBUwCRAZhw==", "dependencies": [ "@aws-sdk/core@3.775.0", - "@aws-sdk/types", - "@smithy/property-provider", - "@smithy/types", + "@aws-sdk/types@3.775.0", + "@smithy/property-provider@4.0.2", + "@smithy/types@4.2.0", "tslib" ] }, @@ -407,9 +535,19 @@ "integrity": "sha512-kQzGKm4IOYYO6vUrai2JocNwhJm4Aml2BsAV+tBhFhhkutE7khf9PUucoVjB78b0J48nF+kdSacqzY+gB81/Uw==", "dependencies": [ "@aws-sdk/core@3.796.0", - "@aws-sdk/types", - "@smithy/property-provider", - "@smithy/types", + "@aws-sdk/types@3.775.0", + "@smithy/property-provider@4.0.2", + "@smithy/types@4.2.0", + "tslib" + ] + }, + "@aws-sdk/credential-provider-env@3.821.0": { + "integrity": "sha512-C+s/A72pd7CXwEsJj9+Uq9T726iIfIF18hGRY8o82xcIEfOyakiPnlisku8zZOaAu+jm0CihbbYN4NyYNQ+HZQ==", + "dependencies": [ + "@aws-sdk/core@3.821.0", + "@aws-sdk/types@3.821.0", + "@smithy/property-provider@4.0.4", + "@smithy/types@4.3.1", "tslib" ] }, @@ -417,14 +555,14 @@ "integrity": "sha512-PjDQeDH/J1S0yWV32wCj2k5liRo0ssXMseCBEkCsD3SqsU8o5cU82b0hMX4sAib/RkglCSZqGO0xMiN0/7ndww==", "dependencies": [ "@aws-sdk/core@3.775.0", - "@aws-sdk/types", - "@smithy/fetch-http-handler", - "@smithy/node-http-handler", - "@smithy/property-provider", - "@smithy/protocol-http", - "@smithy/smithy-client", - "@smithy/types", - "@smithy/util-stream", + "@aws-sdk/types@3.775.0", + "@smithy/fetch-http-handler@5.0.2", + "@smithy/node-http-handler@4.0.4", + "@smithy/property-provider@4.0.2", + "@smithy/protocol-http@5.1.0", + "@smithy/smithy-client@4.2.0", + "@smithy/types@4.2.0", + "@smithy/util-stream@4.2.0", "tslib" ] }, @@ -432,14 +570,29 @@ "integrity": "sha512-wWOT6VAHIKOuHdKFGm1iyKvx7f6+Kc/YTzFWJPuT+l+CPlXR6ylP1UMIDsHHLKpMzsrh3CH77QDsjkhQrnKkfg==", "dependencies": [ "@aws-sdk/core@3.796.0", - "@aws-sdk/types", - "@smithy/fetch-http-handler", - "@smithy/node-http-handler", - "@smithy/property-provider", - "@smithy/protocol-http", - "@smithy/smithy-client", - "@smithy/types", - "@smithy/util-stream", + "@aws-sdk/types@3.775.0", + "@smithy/fetch-http-handler@5.0.2", + "@smithy/node-http-handler@4.0.4", + "@smithy/property-provider@4.0.2", + "@smithy/protocol-http@5.1.0", + "@smithy/smithy-client@4.2.0", + "@smithy/types@4.2.0", + "@smithy/util-stream@4.2.0", + "tslib" + ] + }, + "@aws-sdk/credential-provider-http@3.821.0": { + "integrity": "sha512-gIRzTLnAsRfRSNarCag7G7rhcHagz4x5nNTWRihQs5cwTOghEExDy7Tj5m4TEkv3dcTAsNn+l4tnR4nZXo6R+Q==", + "dependencies": [ + "@aws-sdk/core@3.821.0", + "@aws-sdk/types@3.821.0", + "@smithy/fetch-http-handler@5.0.4", + "@smithy/node-http-handler@4.0.6", + "@smithy/property-provider@4.0.4", + "@smithy/protocol-http@5.1.2", + "@smithy/smithy-client@4.4.1", + "@smithy/types@4.3.1", + "@smithy/util-stream@4.2.2", "tslib" ] }, @@ -453,11 +606,11 @@ "@aws-sdk/credential-provider-sso@3.782.0", "@aws-sdk/credential-provider-web-identity@3.782.0", "@aws-sdk/nested-clients@3.782.0", - "@aws-sdk/types", - "@smithy/credential-provider-imds", - "@smithy/property-provider", - "@smithy/shared-ini-file-loader", - "@smithy/types", + "@aws-sdk/types@3.775.0", + "@smithy/credential-provider-imds@4.0.2", + "@smithy/property-provider@4.0.2", + "@smithy/shared-ini-file-loader@4.0.2", + "@smithy/types@4.2.0", "tslib" ] }, @@ -471,11 +624,29 @@ "@aws-sdk/credential-provider-sso@3.797.0", "@aws-sdk/credential-provider-web-identity@3.797.0", "@aws-sdk/nested-clients@3.797.0", - "@aws-sdk/types", - "@smithy/credential-provider-imds", - "@smithy/property-provider", - "@smithy/shared-ini-file-loader", - "@smithy/types", + "@aws-sdk/types@3.775.0", + "@smithy/credential-provider-imds@4.0.2", + "@smithy/property-provider@4.0.2", + "@smithy/shared-ini-file-loader@4.0.2", + "@smithy/types@4.2.0", + "tslib" + ] + }, + "@aws-sdk/credential-provider-ini@3.821.0": { + "integrity": "sha512-VRTrmsca8kBHtY1tTek1ce+XkK/H0fzodBKcilM/qXjTyumMHPAzVAxKZfSvGC+28/pXyQzhOEyxZfw7giCiWA==", + "dependencies": [ + "@aws-sdk/core@3.821.0", + "@aws-sdk/credential-provider-env@3.821.0", + "@aws-sdk/credential-provider-http@3.821.0", + "@aws-sdk/credential-provider-process@3.821.0", + "@aws-sdk/credential-provider-sso@3.821.0", + "@aws-sdk/credential-provider-web-identity@3.821.0", + "@aws-sdk/nested-clients@3.821.0", + "@aws-sdk/types@3.821.0", + "@smithy/credential-provider-imds@4.0.6", + "@smithy/property-provider@4.0.4", + "@smithy/shared-ini-file-loader@4.0.4", + "@smithy/types@4.3.1", "tslib" ] }, @@ -488,11 +659,11 @@ "@aws-sdk/credential-provider-process@3.775.0", "@aws-sdk/credential-provider-sso@3.782.0", "@aws-sdk/credential-provider-web-identity@3.782.0", - "@aws-sdk/types", - "@smithy/credential-provider-imds", - "@smithy/property-provider", - "@smithy/shared-ini-file-loader", - "@smithy/types", + "@aws-sdk/types@3.775.0", + "@smithy/credential-provider-imds@4.0.2", + "@smithy/property-provider@4.0.2", + "@smithy/shared-ini-file-loader@4.0.2", + "@smithy/types@4.2.0", "tslib" ] }, @@ -505,11 +676,28 @@ "@aws-sdk/credential-provider-process@3.796.0", "@aws-sdk/credential-provider-sso@3.797.0", "@aws-sdk/credential-provider-web-identity@3.797.0", - "@aws-sdk/types", - "@smithy/credential-provider-imds", - "@smithy/property-provider", - "@smithy/shared-ini-file-loader", - "@smithy/types", + "@aws-sdk/types@3.775.0", + "@smithy/credential-provider-imds@4.0.2", + "@smithy/property-provider@4.0.2", + "@smithy/shared-ini-file-loader@4.0.2", + "@smithy/types@4.2.0", + "tslib" + ] + }, + "@aws-sdk/credential-provider-node@3.821.0": { + "integrity": "sha512-oBgbcgOXWMgknAfhIdTeHSSVIv+k2LXN9oTbxu1r++o4WWBWrEQ8mHU0Zo9dfr7Uaoqi3pezYZznsBkXnMLEOg==", + "dependencies": [ + "@aws-sdk/credential-provider-env@3.821.0", + "@aws-sdk/credential-provider-http@3.821.0", + "@aws-sdk/credential-provider-ini@3.821.0", + "@aws-sdk/credential-provider-process@3.821.0", + "@aws-sdk/credential-provider-sso@3.821.0", + "@aws-sdk/credential-provider-web-identity@3.821.0", + "@aws-sdk/types@3.821.0", + "@smithy/credential-provider-imds@4.0.6", + "@smithy/property-provider@4.0.4", + "@smithy/shared-ini-file-loader@4.0.4", + "@smithy/types@4.3.1", "tslib" ] }, @@ -517,10 +705,10 @@ "integrity": "sha512-A6k68H9rQp+2+7P7SGO90Csw6nrUEm0Qfjpn9Etc4EboZhhCLs9b66umUsTsSBHus4FDIe5JQxfCUyt1wgNogg==", "dependencies": [ "@aws-sdk/core@3.775.0", - "@aws-sdk/types", - "@smithy/property-provider", - "@smithy/shared-ini-file-loader", - "@smithy/types", + "@aws-sdk/types@3.775.0", + "@smithy/property-provider@4.0.2", + "@smithy/shared-ini-file-loader@4.0.2", + "@smithy/types@4.2.0", "tslib" ] }, @@ -528,10 +716,21 @@ "integrity": "sha512-r4e8/4AdKn/qQbRVocW7oXkpoiuXdTv0qty8AASNLnbQnT1vjD1bvmP6kp4fbHPWgwY8I9h0Dqjp49uy9Bqyuw==", "dependencies": [ "@aws-sdk/core@3.796.0", - "@aws-sdk/types", - "@smithy/property-provider", - "@smithy/shared-ini-file-loader", - "@smithy/types", + "@aws-sdk/types@3.775.0", + "@smithy/property-provider@4.0.2", + "@smithy/shared-ini-file-loader@4.0.2", + "@smithy/types@4.2.0", + "tslib" + ] + }, + "@aws-sdk/credential-provider-process@3.821.0": { + "integrity": "sha512-e18ucfqKB3ICNj5RP/FEdvUfhVK6E9MALOsl8pKP13mwegug46p/1BsZWACD5n+Zf9ViiiHxIO7td03zQixfwA==", + "dependencies": [ + "@aws-sdk/core@3.821.0", + "@aws-sdk/types@3.821.0", + "@smithy/property-provider@4.0.4", + "@smithy/shared-ini-file-loader@4.0.4", + "@smithy/types@4.3.1", "tslib" ] }, @@ -541,10 +740,10 @@ "@aws-sdk/client-sso@3.782.0", "@aws-sdk/core@3.775.0", "@aws-sdk/token-providers@3.782.0", - "@aws-sdk/types", - "@smithy/property-provider", - "@smithy/shared-ini-file-loader", - "@smithy/types", + "@aws-sdk/types@3.775.0", + "@smithy/property-provider@4.0.2", + "@smithy/shared-ini-file-loader@4.0.2", + "@smithy/types@4.2.0", "tslib" ] }, @@ -554,10 +753,23 @@ "@aws-sdk/client-sso@3.797.0", "@aws-sdk/core@3.796.0", "@aws-sdk/token-providers@3.797.0", - "@aws-sdk/types", - "@smithy/property-provider", - "@smithy/shared-ini-file-loader", - "@smithy/types", + "@aws-sdk/types@3.775.0", + "@smithy/property-provider@4.0.2", + "@smithy/shared-ini-file-loader@4.0.2", + "@smithy/types@4.2.0", + "tslib" + ] + }, + "@aws-sdk/credential-provider-sso@3.821.0": { + "integrity": "sha512-Dt+pheBLom4O/egO4L75/72k9C1qtUOLl0F0h6lmqZe4Mvhz+wDtjoO/MdGC/P1q0kcIX/bBKr0NQ3cIvAH8pA==", + "dependencies": [ + "@aws-sdk/client-sso@3.821.0", + "@aws-sdk/core@3.821.0", + "@aws-sdk/token-providers@3.821.0", + "@aws-sdk/types@3.821.0", + "@smithy/property-provider@4.0.4", + "@smithy/shared-ini-file-loader@4.0.4", + "@smithy/types@4.3.1", "tslib" ] }, @@ -566,9 +778,9 @@ "dependencies": [ "@aws-sdk/core@3.775.0", "@aws-sdk/nested-clients@3.782.0", - "@aws-sdk/types", - "@smithy/property-provider", - "@smithy/types", + "@aws-sdk/types@3.775.0", + "@smithy/property-provider@4.0.2", + "@smithy/types@4.2.0", "tslib" ] }, @@ -577,20 +789,31 @@ "dependencies": [ "@aws-sdk/core@3.796.0", "@aws-sdk/nested-clients@3.797.0", - "@aws-sdk/types", - "@smithy/property-provider", - "@smithy/types", + "@aws-sdk/types@3.775.0", + "@smithy/property-provider@4.0.2", + "@smithy/types@4.2.0", + "tslib" + ] + }, + "@aws-sdk/credential-provider-web-identity@3.821.0": { + "integrity": "sha512-FF5wnRJkxSQaCVVvWNv53K1MhTMgH8d+O+MHTbkv51gVIgVATrtfFQMKBLcEAxzXrgAliIO3LiNv+1TqqBZ+BA==", + "dependencies": [ + "@aws-sdk/core@3.821.0", + "@aws-sdk/nested-clients@3.821.0", + "@aws-sdk/types@3.821.0", + "@smithy/property-provider@4.0.4", + "@smithy/types@4.3.1", "tslib" ] }, "@aws-sdk/middleware-bucket-endpoint@3.775.0": { "integrity": "sha512-qogMIpVChDYr4xiUNC19/RDSw/sKoHkAhouS6Skxiy6s27HBhow1L3Z1qVYXuBmOZGSWPU0xiyZCvOyWrv9s+Q==", "dependencies": [ - "@aws-sdk/types", + "@aws-sdk/types@3.775.0", "@aws-sdk/util-arn-parser", - "@smithy/node-config-provider", - "@smithy/protocol-http", - "@smithy/types", + "@smithy/node-config-provider@4.0.2", + "@smithy/protocol-http@5.1.0", + "@smithy/types@4.2.0", "@smithy/util-config-provider", "tslib" ] @@ -598,9 +821,9 @@ "@aws-sdk/middleware-expect-continue@3.775.0": { "integrity": "sha512-Apd3owkIeUW5dnk3au9np2IdW2N0zc9NjTjHiH+Mx3zqwSrc+m+ANgJVgk9mnQjMzU/vb7VuxJ0eqdEbp5gYsg==", "dependencies": [ - "@aws-sdk/types", - "@smithy/protocol-http", - "@smithy/types", + "@aws-sdk/types@3.775.0", + "@smithy/protocol-http@5.1.0", + "@smithy/types@4.2.0", "tslib" ] }, @@ -611,13 +834,13 @@ "@aws-crypto/crc32c", "@aws-crypto/util", "@aws-sdk/core@3.796.0", - "@aws-sdk/types", + "@aws-sdk/types@3.775.0", "@smithy/is-array-buffer@4.0.0", - "@smithy/node-config-provider", - "@smithy/protocol-http", - "@smithy/types", - "@smithy/util-middleware", - "@smithy/util-stream", + "@smithy/node-config-provider@4.0.2", + "@smithy/protocol-http@5.1.0", + "@smithy/types@4.2.0", + "@smithy/util-middleware@4.0.2", + "@smithy/util-stream@4.2.0", "@smithy/util-utf8@4.0.0", "tslib" ] @@ -625,34 +848,60 @@ "@aws-sdk/middleware-host-header@3.775.0": { "integrity": "sha512-tkSegM0Z6WMXpLB8oPys/d+umYIocvO298mGvcMCncpRl77L9XkvSLJIFzaHes+o7djAgIduYw8wKIMStFss2w==", "dependencies": [ - "@aws-sdk/types", - "@smithy/protocol-http", - "@smithy/types", + "@aws-sdk/types@3.775.0", + "@smithy/protocol-http@5.1.0", + "@smithy/types@4.2.0", + "tslib" + ] + }, + "@aws-sdk/middleware-host-header@3.821.0": { + "integrity": "sha512-xSMR+sopSeWGx5/4pAGhhfMvGBHioVBbqGvDs6pG64xfNwM5vq5s5v6D04e2i+uSTj4qGa71dLUs5I0UzAK3sw==", + "dependencies": [ + "@aws-sdk/types@3.821.0", + "@smithy/protocol-http@5.1.2", + "@smithy/types@4.3.1", "tslib" ] }, "@aws-sdk/middleware-location-constraint@3.775.0": { "integrity": "sha512-8TMXEHZXZTFTckQLyBT5aEI8fX11HZcwZseRifvBKKpj0RZDk4F0EEYGxeNSPpUQ7n+PRWyfAEnnZNRdAj/1NQ==", "dependencies": [ - "@aws-sdk/types", - "@smithy/types", + "@aws-sdk/types@3.775.0", + "@smithy/types@4.2.0", "tslib" ] }, "@aws-sdk/middleware-logger@3.775.0": { "integrity": "sha512-FaxO1xom4MAoUJsldmR92nT1G6uZxTdNYOFYtdHfd6N2wcNaTuxgjIvqzg5y7QIH9kn58XX/dzf1iTjgqUStZw==", "dependencies": [ - "@aws-sdk/types", - "@smithy/types", + "@aws-sdk/types@3.775.0", + "@smithy/types@4.2.0", + "tslib" + ] + }, + "@aws-sdk/middleware-logger@3.821.0": { + "integrity": "sha512-0cvI0ipf2tGx7fXYEEN5fBeZDz2RnHyb9xftSgUsEq7NBxjV0yTZfLJw6Za5rjE6snC80dRN8+bTNR1tuG89zA==", + "dependencies": [ + "@aws-sdk/types@3.821.0", + "@smithy/types@4.3.1", "tslib" ] }, "@aws-sdk/middleware-recursion-detection@3.775.0": { "integrity": "sha512-GLCzC8D0A0YDG5u3F5U03Vb9j5tcOEFhr8oc6PDk0k0vm5VwtZOE6LvK7hcCSoAB4HXyOUM0sQuXrbaAh9OwXA==", "dependencies": [ - "@aws-sdk/types", - "@smithy/protocol-http", - "@smithy/types", + "@aws-sdk/types@3.775.0", + "@smithy/protocol-http@5.1.0", + "@smithy/types@4.2.0", + "tslib" + ] + }, + "@aws-sdk/middleware-recursion-detection@3.821.0": { + "integrity": "sha512-efmaifbhBoqKG3bAoEfDdcM8hn1psF+4qa7ykWuYmfmah59JBeqHLfz5W9m9JoTwoKPkFcVLWZxnyZzAnVBOIg==", + "dependencies": [ + "@aws-sdk/types@3.821.0", + "@smithy/protocol-http@5.1.2", + "@smithy/types@4.3.1", "tslib" ] }, @@ -660,17 +909,17 @@ "integrity": "sha512-zsvcu7cWB28JJ60gVvjxPCI7ZU7jWGcpNACPiZGyVtjYXwcxyhXbYEVDSWKsSA6ERpz9XrpLYod8INQWfW3ECg==", "dependencies": [ "@aws-sdk/core@3.775.0", - "@aws-sdk/types", + "@aws-sdk/types@3.775.0", "@aws-sdk/util-arn-parser", - "@smithy/core", - "@smithy/node-config-provider", - "@smithy/protocol-http", + "@smithy/core@3.2.0", + "@smithy/node-config-provider@4.0.2", + "@smithy/protocol-http@5.1.0", "@smithy/signature-v4@5.0.2", - "@smithy/smithy-client", - "@smithy/types", + "@smithy/smithy-client@4.2.0", + "@smithy/types@4.2.0", "@smithy/util-config-provider", - "@smithy/util-middleware", - "@smithy/util-stream", + "@smithy/util-middleware@4.0.2", + "@smithy/util-stream@4.2.0", "@smithy/util-utf8@4.0.0", "tslib" ] @@ -679,17 +928,17 @@ "integrity": "sha512-5o78oE79sGOtYkL7Up02h2nmr9UhGQZJgxE29EBdTw4dZ1EaA46L+C8oA+fBCmAB5xPQsjQqvhRrsr4Lcp+jZQ==", "dependencies": [ "@aws-sdk/core@3.796.0", - "@aws-sdk/types", + "@aws-sdk/types@3.775.0", "@aws-sdk/util-arn-parser", - "@smithy/core", - "@smithy/node-config-provider", - "@smithy/protocol-http", + "@smithy/core@3.2.0", + "@smithy/node-config-provider@4.0.2", + "@smithy/protocol-http@5.1.0", "@smithy/signature-v4@5.1.0", - "@smithy/smithy-client", - "@smithy/types", + "@smithy/smithy-client@4.2.0", + "@smithy/types@4.2.0", "@smithy/util-config-provider", - "@smithy/util-middleware", - "@smithy/util-stream", + "@smithy/util-middleware@4.0.2", + "@smithy/util-stream@4.2.0", "@smithy/util-utf8@4.0.0", "tslib" ] @@ -697,8 +946,8 @@ "@aws-sdk/middleware-ssec@3.775.0": { "integrity": "sha512-Iw1RHD8vfAWWPzBBIKaojO4GAvQkHOYIpKdAfis/EUSUmSa79QsnXnRqsdcE0mCB0Ylj23yi+ah4/0wh9FsekA==", "dependencies": [ - "@aws-sdk/types", - "@smithy/types", + "@aws-sdk/types@3.775.0", + "@smithy/types@4.2.0", "tslib" ] }, @@ -706,11 +955,11 @@ "integrity": "sha512-i32H2R6IItX+bQ2p4+v2gGO2jA80jQoJO2m1xjU9rYWQW3+ErWy4I5YIuQHTBfb6hSdAHbaRfqPDgbv9J2rjEg==", "dependencies": [ "@aws-sdk/core@3.775.0", - "@aws-sdk/types", + "@aws-sdk/types@3.775.0", "@aws-sdk/util-endpoints@3.782.0", - "@smithy/core", - "@smithy/protocol-http", - "@smithy/types", + "@smithy/core@3.2.0", + "@smithy/protocol-http@5.1.0", + "@smithy/types@4.2.0", "tslib" ] }, @@ -718,11 +967,23 @@ "integrity": "sha512-IeNg+3jNWT37J45opi5Jx89hGF0lOnZjiNwlMp3rKq7PlOqy8kWq5J1Gxk0W3tIkPpuf68CtBs/QFrRXWOjsZw==", "dependencies": [ "@aws-sdk/core@3.796.0", - "@aws-sdk/types", + "@aws-sdk/types@3.775.0", "@aws-sdk/util-endpoints@3.787.0", - "@smithy/core", - "@smithy/protocol-http", - "@smithy/types", + "@smithy/core@3.2.0", + "@smithy/protocol-http@5.1.0", + "@smithy/types@4.2.0", + "tslib" + ] + }, + "@aws-sdk/middleware-user-agent@3.821.0": { + "integrity": "sha512-rw8q3TxygMg3VrofN04QyWVCCyGwz3bVthYmBZZseENPWG3Krz1OCKcyqjkTcAxMQlEywOske+GIiOasGKnJ3w==", + "dependencies": [ + "@aws-sdk/core@3.821.0", + "@aws-sdk/types@3.821.0", + "@aws-sdk/util-endpoints@3.821.0", + "@smithy/core@3.5.1", + "@smithy/protocol-http@5.1.2", + "@smithy/types@4.3.1", "tslib" ] }, @@ -732,39 +993,39 @@ "@aws-crypto/sha256-browser", "@aws-crypto/sha256-js", "@aws-sdk/core@3.775.0", - "@aws-sdk/middleware-host-header", - "@aws-sdk/middleware-logger", - "@aws-sdk/middleware-recursion-detection", + "@aws-sdk/middleware-host-header@3.775.0", + "@aws-sdk/middleware-logger@3.775.0", + "@aws-sdk/middleware-recursion-detection@3.775.0", "@aws-sdk/middleware-user-agent@3.782.0", - "@aws-sdk/region-config-resolver", - "@aws-sdk/types", + "@aws-sdk/region-config-resolver@3.775.0", + "@aws-sdk/types@3.775.0", "@aws-sdk/util-endpoints@3.782.0", - "@aws-sdk/util-user-agent-browser", + "@aws-sdk/util-user-agent-browser@3.775.0", "@aws-sdk/util-user-agent-node@3.782.0", - "@smithy/config-resolver", - "@smithy/core", - "@smithy/fetch-http-handler", - "@smithy/hash-node", - "@smithy/invalid-dependency", - "@smithy/middleware-content-length", - "@smithy/middleware-endpoint", - "@smithy/middleware-retry", - "@smithy/middleware-serde", - "@smithy/middleware-stack", - "@smithy/node-config-provider", - "@smithy/node-http-handler", - "@smithy/protocol-http", - "@smithy/smithy-client", - "@smithy/types", - "@smithy/url-parser", + "@smithy/config-resolver@4.1.0", + "@smithy/core@3.2.0", + "@smithy/fetch-http-handler@5.0.2", + "@smithy/hash-node@4.0.2", + "@smithy/invalid-dependency@4.0.2", + "@smithy/middleware-content-length@4.0.2", + "@smithy/middleware-endpoint@4.1.0", + "@smithy/middleware-retry@4.1.0", + "@smithy/middleware-serde@4.0.3", + "@smithy/middleware-stack@4.0.2", + "@smithy/node-config-provider@4.0.2", + "@smithy/node-http-handler@4.0.4", + "@smithy/protocol-http@5.1.0", + "@smithy/smithy-client@4.2.0", + "@smithy/types@4.2.0", + "@smithy/url-parser@4.0.2", "@smithy/util-base64", "@smithy/util-body-length-browser", "@smithy/util-body-length-node", - "@smithy/util-defaults-mode-browser", - "@smithy/util-defaults-mode-node", - "@smithy/util-endpoints", - "@smithy/util-middleware", - "@smithy/util-retry", + "@smithy/util-defaults-mode-browser@4.0.8", + "@smithy/util-defaults-mode-node@4.0.8", + "@smithy/util-endpoints@3.0.2", + "@smithy/util-middleware@4.0.2", + "@smithy/util-retry@4.0.2", "@smithy/util-utf8@4.0.0", "tslib" ] @@ -775,39 +1036,82 @@ "@aws-crypto/sha256-browser", "@aws-crypto/sha256-js", "@aws-sdk/core@3.796.0", - "@aws-sdk/middleware-host-header", - "@aws-sdk/middleware-logger", - "@aws-sdk/middleware-recursion-detection", + "@aws-sdk/middleware-host-header@3.775.0", + "@aws-sdk/middleware-logger@3.775.0", + "@aws-sdk/middleware-recursion-detection@3.775.0", "@aws-sdk/middleware-user-agent@3.796.0", - "@aws-sdk/region-config-resolver", - "@aws-sdk/types", + "@aws-sdk/region-config-resolver@3.775.0", + "@aws-sdk/types@3.775.0", "@aws-sdk/util-endpoints@3.787.0", - "@aws-sdk/util-user-agent-browser", + "@aws-sdk/util-user-agent-browser@3.775.0", "@aws-sdk/util-user-agent-node@3.796.0", - "@smithy/config-resolver", - "@smithy/core", - "@smithy/fetch-http-handler", - "@smithy/hash-node", - "@smithy/invalid-dependency", - "@smithy/middleware-content-length", - "@smithy/middleware-endpoint", - "@smithy/middleware-retry", - "@smithy/middleware-serde", - "@smithy/middleware-stack", - "@smithy/node-config-provider", - "@smithy/node-http-handler", - "@smithy/protocol-http", - "@smithy/smithy-client", - "@smithy/types", - "@smithy/url-parser", + "@smithy/config-resolver@4.1.0", + "@smithy/core@3.2.0", + "@smithy/fetch-http-handler@5.0.2", + "@smithy/hash-node@4.0.2", + "@smithy/invalid-dependency@4.0.2", + "@smithy/middleware-content-length@4.0.2", + "@smithy/middleware-endpoint@4.1.0", + "@smithy/middleware-retry@4.1.0", + "@smithy/middleware-serde@4.0.3", + "@smithy/middleware-stack@4.0.2", + "@smithy/node-config-provider@4.0.2", + "@smithy/node-http-handler@4.0.4", + "@smithy/protocol-http@5.1.0", + "@smithy/smithy-client@4.2.0", + "@smithy/types@4.2.0", + "@smithy/url-parser@4.0.2", + "@smithy/util-base64", + "@smithy/util-body-length-browser", + "@smithy/util-body-length-node", + "@smithy/util-defaults-mode-browser@4.0.8", + "@smithy/util-defaults-mode-node@4.0.8", + "@smithy/util-endpoints@3.0.2", + "@smithy/util-middleware@4.0.2", + "@smithy/util-retry@4.0.2", + "@smithy/util-utf8@4.0.0", + "tslib" + ] + }, + "@aws-sdk/nested-clients@3.821.0": { + "integrity": "sha512-2IuHcUsWw44ftSEDYU4dvktTEqgyDvkOcfpoGC/UmT4Qo6TVCP3U5tWEGpNK9nN+7nLvekruxxG/jaMt5/oWVw==", + "dependencies": [ + "@aws-crypto/sha256-browser", + "@aws-crypto/sha256-js", + "@aws-sdk/core@3.821.0", + "@aws-sdk/middleware-host-header@3.821.0", + "@aws-sdk/middleware-logger@3.821.0", + "@aws-sdk/middleware-recursion-detection@3.821.0", + "@aws-sdk/middleware-user-agent@3.821.0", + "@aws-sdk/region-config-resolver@3.821.0", + "@aws-sdk/types@3.821.0", + "@aws-sdk/util-endpoints@3.821.0", + "@aws-sdk/util-user-agent-browser@3.821.0", + "@aws-sdk/util-user-agent-node@3.821.0", + "@smithy/config-resolver@4.1.4", + "@smithy/core@3.5.1", + "@smithy/fetch-http-handler@5.0.4", + "@smithy/hash-node@4.0.4", + "@smithy/invalid-dependency@4.0.4", + "@smithy/middleware-content-length@4.0.4", + "@smithy/middleware-endpoint@4.1.9", + "@smithy/middleware-retry@4.1.10", + "@smithy/middleware-serde@4.0.8", + "@smithy/middleware-stack@4.0.4", + "@smithy/node-config-provider@4.1.3", + "@smithy/node-http-handler@4.0.6", + "@smithy/protocol-http@5.1.2", + "@smithy/smithy-client@4.4.1", + "@smithy/types@4.3.1", + "@smithy/url-parser@4.0.4", "@smithy/util-base64", "@smithy/util-body-length-browser", "@smithy/util-body-length-node", - "@smithy/util-defaults-mode-browser", - "@smithy/util-defaults-mode-node", - "@smithy/util-endpoints", - "@smithy/util-middleware", - "@smithy/util-retry", + "@smithy/util-defaults-mode-browser@4.0.17", + "@smithy/util-defaults-mode-node@4.0.17", + "@smithy/util-endpoints@3.0.6", + "@smithy/util-middleware@4.0.4", + "@smithy/util-retry@4.0.5", "@smithy/util-utf8@4.0.0", "tslib" ] @@ -815,11 +1119,22 @@ "@aws-sdk/region-config-resolver@3.775.0": { "integrity": "sha512-40iH3LJjrQS3LKUJAl7Wj0bln7RFPEvUYKFxtP8a+oKFDO0F65F52xZxIJbPn6sHkxWDAnZlGgdjZXM3p2g5wQ==", "dependencies": [ - "@aws-sdk/types", - "@smithy/node-config-provider", - "@smithy/types", + "@aws-sdk/types@3.775.0", + "@smithy/node-config-provider@4.0.2", + "@smithy/types@4.2.0", "@smithy/util-config-provider", - "@smithy/util-middleware", + "@smithy/util-middleware@4.0.2", + "tslib" + ] + }, + "@aws-sdk/region-config-resolver@3.821.0": { + "integrity": "sha512-t8og+lRCIIy5nlId0bScNpCkif8sc0LhmtaKsbm0ZPm3sCa/WhCbSZibjbZ28FNjVCV+p0D9RYZx0VDDbtWyjw==", + "dependencies": [ + "@aws-sdk/types@3.821.0", + "@smithy/node-config-provider@4.1.3", + "@smithy/types@4.3.1", + "@smithy/util-config-provider", + "@smithy/util-middleware@4.0.4", "tslib" ] }, @@ -827,10 +1142,10 @@ "integrity": "sha512-cnGk8GDfTMJ8p7+qSk92QlIk2bmTmFJqhYxcXZ9PysjZtx0xmfCMxnG3Hjy1oU2mt5boPCVSOptqtWixayM17g==", "dependencies": [ "@aws-sdk/middleware-sdk-s3@3.775.0", - "@aws-sdk/types", - "@smithy/protocol-http", + "@aws-sdk/types@3.775.0", + "@smithy/protocol-http@5.1.0", "@smithy/signature-v4@5.0.2", - "@smithy/types", + "@smithy/types@4.2.0", "tslib" ] }, @@ -838,10 +1153,10 @@ "integrity": "sha512-JAOLdvazTc9HlTFslSrIOrKRMuOruuM3FeGw0hyfLP/RIbjd9bqe/xLIzDSJr3wpCpJs0sXoofwJgXtgTipvjA==", "dependencies": [ "@aws-sdk/middleware-sdk-s3@3.796.0", - "@aws-sdk/types", - "@smithy/protocol-http", + "@aws-sdk/types@3.775.0", + "@smithy/protocol-http@5.1.0", "@smithy/signature-v4@5.1.0", - "@smithy/types", + "@smithy/types@4.2.0", "tslib" ] }, @@ -849,10 +1164,10 @@ "integrity": "sha512-4tPuk/3+THPrzKaXW4jE2R67UyGwHLFizZ47pcjJWbhb78IIJAy94vbeqEQ+veS84KF5TXcU7g5jGTXC0D70Wg==", "dependencies": [ "@aws-sdk/nested-clients@3.782.0", - "@aws-sdk/types", - "@smithy/property-provider", - "@smithy/shared-ini-file-loader", - "@smithy/types", + "@aws-sdk/types@3.775.0", + "@smithy/property-provider@4.0.2", + "@smithy/shared-ini-file-loader@4.0.2", + "@smithy/types@4.2.0", "tslib" ] }, @@ -860,17 +1175,36 @@ "integrity": "sha512-TLFkP4BBdkH2zCXhG3JjaYrRft25MMZ+6/YDz1C/ikq2Zk8krUbVoSmhtYMVz10JtxAPiQ++w0vI/qbz2JSDXg==", "dependencies": [ "@aws-sdk/nested-clients@3.797.0", - "@aws-sdk/types", - "@smithy/property-provider", - "@smithy/shared-ini-file-loader", - "@smithy/types", + "@aws-sdk/types@3.775.0", + "@smithy/property-provider@4.0.2", + "@smithy/shared-ini-file-loader@4.0.2", + "@smithy/types@4.2.0", + "tslib" + ] + }, + "@aws-sdk/token-providers@3.821.0": { + "integrity": "sha512-qJ7wgKhdxGbPg718zWXbCYKDuSWZNU3TSw64hPRW6FtbZrIyZxObpiTKC6DKwfsVoZZhHEoP/imGykN1OdOTJA==", + "dependencies": [ + "@aws-sdk/core@3.821.0", + "@aws-sdk/nested-clients@3.821.0", + "@aws-sdk/types@3.821.0", + "@smithy/property-provider@4.0.4", + "@smithy/shared-ini-file-loader@4.0.4", + "@smithy/types@4.3.1", "tslib" ] }, "@aws-sdk/types@3.775.0": { "integrity": "sha512-ZoGKwa4C9fC9Av6bdfqcW6Ix5ot05F/S4VxWR2nHuMv7hzfmAjTOcUiWT7UR4hM/U0whf84VhDtXN/DWAk52KA==", "dependencies": [ - "@smithy/types", + "@smithy/types@4.2.0", + "tslib" + ] + }, + "@aws-sdk/types@3.821.0": { + "integrity": "sha512-Znroqdai1a90TlxGaJ+FK1lwC0fHpo97Xjsp5UKGR5JODYm7f9+/fF17ebO1KdoBr/Rm0UIFiF5VmI8ts9F1eA==", + "dependencies": [ + "@smithy/types@4.3.1", "tslib" ] }, @@ -883,18 +1217,27 @@ "@aws-sdk/util-endpoints@3.782.0": { "integrity": "sha512-/RJOAO7o7HI6lEa4ASbFFLHGU9iPK876BhsVfnl54MvApPVYWQ9sHO0anOUim2S5lQTwd/6ghuH3rFYSq/+rdw==", "dependencies": [ - "@aws-sdk/types", - "@smithy/types", - "@smithy/util-endpoints", + "@aws-sdk/types@3.775.0", + "@smithy/types@4.2.0", + "@smithy/util-endpoints@3.0.2", "tslib" ] }, "@aws-sdk/util-endpoints@3.787.0": { "integrity": "sha512-fd3zkiOkwnbdbN0Xp9TsP5SWrmv0SpT70YEdbb8wAj2DWQwiCmFszaSs+YCvhoCdmlR3Wl9Spu0pGpSAGKeYvQ==", "dependencies": [ - "@aws-sdk/types", - "@smithy/types", - "@smithy/util-endpoints", + "@aws-sdk/types@3.775.0", + "@smithy/types@4.2.0", + "@smithy/util-endpoints@3.0.2", + "tslib" + ] + }, + "@aws-sdk/util-endpoints@3.821.0": { + "integrity": "sha512-Uknt/zUZnLE76zaAAPEayOeF5/4IZ2puTFXvcSCWHsi9m3tqbb9UozlnlVqvCZLCRWfQryZQoG2W4XSS3qgk5A==", + "dependencies": [ + "@aws-sdk/types@3.821.0", + "@smithy/types@4.3.1", + "@smithy/util-endpoints@3.0.6", "tslib" ] }, @@ -907,8 +1250,17 @@ "@aws-sdk/util-user-agent-browser@3.775.0": { "integrity": "sha512-txw2wkiJmZKVdDbscK7VBK+u+TJnRtlUjRTLei+elZg2ADhpQxfVAQl436FUeIv6AhB/oRHW6/K/EAGXUSWi0A==", "dependencies": [ - "@aws-sdk/types", - "@smithy/types", + "@aws-sdk/types@3.775.0", + "@smithy/types@4.2.0", + "bowser", + "tslib" + ] + }, + "@aws-sdk/util-user-agent-browser@3.821.0": { + "integrity": "sha512-irWZHyM0Jr1xhC+38OuZ7JB6OXMLPZlj48thElpsO1ZSLRkLZx5+I7VV6k3sp2yZ7BYbKz/G2ojSv4wdm7XTLw==", + "dependencies": [ + "@aws-sdk/types@3.821.0", + "@smithy/types@4.3.1", "bowser", "tslib" ] @@ -917,9 +1269,9 @@ "integrity": "sha512-dMFkUBgh2Bxuw8fYZQoH/u3H4afQ12VSkzEi//qFiDTwbKYq+u+RYjc8GLDM6JSK1BShMu5AVR7HD4ap1TYUnA==", "dependencies": [ "@aws-sdk/middleware-user-agent@3.782.0", - "@aws-sdk/types", - "@smithy/node-config-provider", - "@smithy/types", + "@aws-sdk/types@3.775.0", + "@smithy/node-config-provider@4.0.2", + "@smithy/types@4.2.0", "tslib" ] }, @@ -927,16 +1279,26 @@ "integrity": "sha512-9fQpNcHgVFitf1tbTT8V1xGRoRHSmOAWjrhevo6Tc0WoINMAKz+4JNqfVGWRE5Tmtpq0oHKo1RmvxXQQtJYciA==", "dependencies": [ "@aws-sdk/middleware-user-agent@3.796.0", - "@aws-sdk/types", - "@smithy/node-config-provider", - "@smithy/types", + "@aws-sdk/types@3.775.0", + "@smithy/node-config-provider@4.0.2", + "@smithy/types@4.2.0", + "tslib" + ] + }, + "@aws-sdk/util-user-agent-node@3.821.0": { + "integrity": "sha512-YwMXc9EvuzJgnLBTyiQly2juPujXwDgcMHB0iSN92tHe7Dd1jJ1feBmTgdClaaqCeHFUaFpw+3JU/ZUJ6LjR+A==", + "dependencies": [ + "@aws-sdk/middleware-user-agent@3.821.0", + "@aws-sdk/types@3.821.0", + "@smithy/node-config-provider@4.1.3", + "@smithy/types@4.3.1", "tslib" ] }, "@aws-sdk/xml-builder@3.775.0": { "integrity": "sha512-b9NGO6FKJeLGYnV7Z1yvcP1TNU4dkD5jNsLWOF1/sygZoASaQhNOlaiJ/1OH331YQ1R1oWk38nBb0frsYkDsOQ==", "dependencies": [ - "@smithy/types", + "@smithy/types@4.2.0", "tslib" ] }, @@ -985,7 +1347,14 @@ "@smithy/abort-controller@4.0.2": { "integrity": "sha512-Sl/78VDtgqKxN2+1qduaVE140XF+Xg+TafkncspwM4jFP/LHr76ZHmIY/y3V1M0mMLNk+Je6IGbzxy23RSToMw==", "dependencies": [ - "@smithy/types", + "@smithy/types@4.2.0", + "tslib" + ] + }, + "@smithy/abort-controller@4.0.4": { + "integrity": "sha512-gJnEjZMvigPDQWHrW3oPrFhQtkrgqBkyjj3pCIdF3A5M6vsZODG93KNlfJprv6bp4245bdT32fsHK4kkH3KYDA==", + "dependencies": [ + "@smithy/types@4.3.1", "tslib" ] }, @@ -1005,22 +1374,46 @@ "@smithy/config-resolver@4.1.0": { "integrity": "sha512-8smPlwhga22pwl23fM5ew4T9vfLUCeFXlcqNOCD5M5h8VmNPNUE9j6bQSuRXpDSV11L/E/SwEBQuW8hr6+nS1A==", "dependencies": [ - "@smithy/node-config-provider", - "@smithy/types", + "@smithy/node-config-provider@4.0.2", + "@smithy/types@4.2.0", "@smithy/util-config-provider", - "@smithy/util-middleware", + "@smithy/util-middleware@4.0.2", + "tslib" + ] + }, + "@smithy/config-resolver@4.1.4": { + "integrity": "sha512-prmU+rDddxHOH0oNcwemL+SwnzcG65sBF2yXRO7aeXIn/xTlq2pX7JLVbkBnVLowHLg4/OL4+jBmv9hVrVGS+w==", + "dependencies": [ + "@smithy/node-config-provider@4.1.3", + "@smithy/types@4.3.1", + "@smithy/util-config-provider", + "@smithy/util-middleware@4.0.4", "tslib" ] }, "@smithy/core@3.2.0": { "integrity": "sha512-k17bgQhVZ7YmUvA8at4af1TDpl0NDMBuBKJl8Yg0nrefwmValU+CnA5l/AriVdQNthU/33H3nK71HrLgqOPr1Q==", "dependencies": [ - "@smithy/middleware-serde", - "@smithy/protocol-http", - "@smithy/types", + "@smithy/middleware-serde@4.0.3", + "@smithy/protocol-http@5.1.0", + "@smithy/types@4.2.0", "@smithy/util-body-length-browser", - "@smithy/util-middleware", - "@smithy/util-stream", + "@smithy/util-middleware@4.0.2", + "@smithy/util-stream@4.2.0", + "@smithy/util-utf8@4.0.0", + "tslib" + ] + }, + "@smithy/core@3.5.1": { + "integrity": "sha512-xSw7bZEFKwOKrm/iv8e2BLt2ur98YZdrRD6nII8ditQeUsY2Q1JmIQ0rpILOhaLKYxxG2ivnoOpokzr9qLyDWA==", + "dependencies": [ + "@smithy/middleware-serde@4.0.8", + "@smithy/protocol-http@5.1.2", + "@smithy/types@4.3.1", + "@smithy/util-base64", + "@smithy/util-body-length-browser", + "@smithy/util-middleware@4.0.4", + "@smithy/util-stream@4.2.2", "@smithy/util-utf8@4.0.0", "tslib" ] @@ -1028,10 +1421,20 @@ "@smithy/credential-provider-imds@4.0.2": { "integrity": "sha512-32lVig6jCaWBHnY+OEQ6e6Vnt5vDHaLiydGrwYMW9tPqO688hPGTYRamYJ1EptxEC2rAwJrHWmPoKRBl4iTa8w==", "dependencies": [ - "@smithy/node-config-provider", - "@smithy/property-provider", - "@smithy/types", - "@smithy/url-parser", + "@smithy/node-config-provider@4.0.2", + "@smithy/property-provider@4.0.2", + "@smithy/types@4.2.0", + "@smithy/url-parser@4.0.2", + "tslib" + ] + }, + "@smithy/credential-provider-imds@4.0.6": { + "integrity": "sha512-hKMWcANhUiNbCJouYkZ9V3+/Qf9pteR1dnwgdyzR09R4ODEYx8BbUysHwRSyex4rZ9zapddZhLFTnT4ZijR4pw==", + "dependencies": [ + "@smithy/node-config-provider@4.1.3", + "@smithy/property-provider@4.0.4", + "@smithy/types@4.3.1", + "@smithy/url-parser@4.0.4", "tslib" ] }, @@ -1039,7 +1442,7 @@ "integrity": "sha512-p+f2kLSK7ZrXVfskU/f5dzksKTewZk8pJLPvER3aFHPt76C2MxD9vNatSfLzzQSQB4FNO96RK4PSXfhD1TTeMQ==", "dependencies": [ "@aws-crypto/crc32", - "@smithy/types", + "@smithy/types@4.2.0", "@smithy/util-hex-encoding", "tslib" ] @@ -1048,14 +1451,14 @@ "integrity": "sha512-CepZCDs2xgVUtH7ZZ7oDdZFH8e6Y2zOv8iiX6RhndH69nlojCALSKK+OXwZUgOtUZEUaZ5e1hULVCHYbCn7pug==", "dependencies": [ "@smithy/eventstream-serde-universal", - "@smithy/types", + "@smithy/types@4.2.0", "tslib" ] }, "@smithy/eventstream-serde-config-resolver@4.1.0": { "integrity": "sha512-1PI+WPZ5TWXrfj3CIoKyUycYynYJgZjuQo8U+sphneOtjsgrttYybdqESFReQrdWJ+LKt6NEdbYzmmfDBmjX2A==", "dependencies": [ - "@smithy/types", + "@smithy/types@4.2.0", "tslib" ] }, @@ -1063,7 +1466,7 @@ "integrity": "sha512-C5bJ/C6x9ENPMx2cFOirspnF9ZsBVnBMtP6BdPl/qYSuUawdGQ34Lq0dMcf42QTjUZgWGbUIZnz6+zLxJlb9aw==", "dependencies": [ "@smithy/eventstream-serde-universal", - "@smithy/types", + "@smithy/types@4.2.0", "tslib" ] }, @@ -1071,16 +1474,26 @@ "integrity": "sha512-St8h9JqzvnbB52FtckiHPN4U/cnXcarMniXRXTKn0r4b4XesZOGiAyUdj1aXbqqn1icSqBlzzUsCl6nPB018ng==", "dependencies": [ "@smithy/eventstream-codec", - "@smithy/types", + "@smithy/types@4.2.0", "tslib" ] }, "@smithy/fetch-http-handler@5.0.2": { "integrity": "sha512-+9Dz8sakS9pe7f2cBocpJXdeVjMopUDLgZs1yWeu7h++WqSbjUYv/JAJwKwXw1HV6gq1jyWjxuyn24E2GhoEcQ==", "dependencies": [ - "@smithy/protocol-http", - "@smithy/querystring-builder", - "@smithy/types", + "@smithy/protocol-http@5.1.0", + "@smithy/querystring-builder@4.0.2", + "@smithy/types@4.2.0", + "@smithy/util-base64", + "tslib" + ] + }, + "@smithy/fetch-http-handler@5.0.4": { + "integrity": "sha512-AMtBR5pHppYMVD7z7G+OlHHAcgAN7v0kVKEpHuTO4Gb199Gowh0taYi9oDStFeUhetkeP55JLSVlTW1n9rFtUw==", + "dependencies": [ + "@smithy/protocol-http@5.1.2", + "@smithy/querystring-builder@4.0.4", + "@smithy/types@4.3.1", "@smithy/util-base64", "tslib" ] @@ -1090,14 +1503,23 @@ "dependencies": [ "@smithy/chunked-blob-reader", "@smithy/chunked-blob-reader-native", - "@smithy/types", + "@smithy/types@4.2.0", "tslib" ] }, "@smithy/hash-node@4.0.2": { "integrity": "sha512-VnTpYPnRUE7yVhWozFdlxcYknv9UN7CeOqSrMH+V877v4oqtVYuoqhIhtSjmGPvYrYnAkaM61sLMKHvxL138yg==", "dependencies": [ - "@smithy/types", + "@smithy/types@4.2.0", + "@smithy/util-buffer-from@4.0.0", + "@smithy/util-utf8@4.0.0", + "tslib" + ] + }, + "@smithy/hash-node@4.0.4": { + "integrity": "sha512-qnbTPUhCVnCgBp4z4BUJUhOEkVwxiEi1cyFM+Zj6o+aY8OFGxUQleKWq8ltgp3dujuhXojIvJWdoqpm6dVO3lQ==", + "dependencies": [ + "@smithy/types@4.3.1", "@smithy/util-buffer-from@4.0.0", "@smithy/util-utf8@4.0.0", "tslib" @@ -1106,7 +1528,7 @@ "@smithy/hash-stream-node@4.0.2": { "integrity": "sha512-POWDuTznzbIwlEXEvvXoPMS10y0WKXK790soe57tFRfvf4zBHyzE529HpZMqmDdwG9MfFflnyzndUQ8j78ZdSg==", "dependencies": [ - "@smithy/types", + "@smithy/types@4.2.0", "@smithy/util-utf8@4.0.0", "tslib" ] @@ -1114,7 +1536,14 @@ "@smithy/invalid-dependency@4.0.2": { "integrity": "sha512-GatB4+2DTpgWPday+mnUkoumP54u/MDM/5u44KF9hIu8jF0uafZtQLcdfIKkIcUNuF/fBojpLEHZS/56JqPeXQ==", "dependencies": [ - "@smithy/types", + "@smithy/types@4.2.0", + "tslib" + ] + }, + "@smithy/invalid-dependency@4.0.4": { + "integrity": "sha512-bNYMi7WKTJHu0gn26wg8OscncTt1t2b8KcsZxvOv56XA6cyXtOAAAaNP7+m45xfppXfOatXF3Sb1MNsLUgVLTw==", + "dependencies": [ + "@smithy/types@4.3.1", "tslib" ] }, @@ -1133,7 +1562,7 @@ "@smithy/md5-js@4.0.2": { "integrity": "sha512-Hc0R8EiuVunUewCse2syVgA2AfSRco3LyAv07B/zCOMa+jpXI9ll+Q21Nc6FAlYPcpNcAXqBzMhNs1CD/pP2bA==", "dependencies": [ - "@smithy/types", + "@smithy/types@4.2.0", "@smithy/util-utf8@4.0.0", "tslib" ] @@ -1141,34 +1570,69 @@ "@smithy/middleware-content-length@4.0.2": { "integrity": "sha512-hAfEXm1zU+ELvucxqQ7I8SszwQ4znWMbNv6PLMndN83JJN41EPuS93AIyh2N+gJ6x8QFhzSO6b7q2e6oClDI8A==", "dependencies": [ - "@smithy/protocol-http", - "@smithy/types", + "@smithy/protocol-http@5.1.0", + "@smithy/types@4.2.0", + "tslib" + ] + }, + "@smithy/middleware-content-length@4.0.4": { + "integrity": "sha512-F7gDyfI2BB1Kc+4M6rpuOLne5LOcEknH1n6UQB69qv+HucXBR1rkzXBnQTB2q46sFy1PM/zuSJOB532yc8bg3w==", + "dependencies": [ + "@smithy/protocol-http@5.1.2", + "@smithy/types@4.3.1", "tslib" ] }, "@smithy/middleware-endpoint@4.1.0": { "integrity": "sha512-xhLimgNCbCzsUppRTGXWkZywksuTThxaIB0HwbpsVLY5sceac4e1TZ/WKYqufQLaUy+gUSJGNdwD2jo3cXL0iA==", "dependencies": [ - "@smithy/core", - "@smithy/middleware-serde", - "@smithy/node-config-provider", - "@smithy/shared-ini-file-loader", - "@smithy/types", - "@smithy/url-parser", - "@smithy/util-middleware", + "@smithy/core@3.2.0", + "@smithy/middleware-serde@4.0.3", + "@smithy/node-config-provider@4.0.2", + "@smithy/shared-ini-file-loader@4.0.2", + "@smithy/types@4.2.0", + "@smithy/url-parser@4.0.2", + "@smithy/util-middleware@4.0.2", + "tslib" + ] + }, + "@smithy/middleware-endpoint@4.1.9": { + "integrity": "sha512-AjDgX4UjORLltD/LZCBQTwjQqEfyrx/GeDTHcYLzIgf87pIT70tMWnN87NQpJru1K4ITirY2htSOxNECZJCBOg==", + "dependencies": [ + "@smithy/core@3.5.1", + "@smithy/middleware-serde@4.0.8", + "@smithy/node-config-provider@4.1.3", + "@smithy/shared-ini-file-loader@4.0.4", + "@smithy/types@4.3.1", + "@smithy/url-parser@4.0.4", + "@smithy/util-middleware@4.0.4", "tslib" ] }, "@smithy/middleware-retry@4.1.0": { "integrity": "sha512-2zAagd1s6hAaI/ap6SXi5T3dDwBOczOMCSkkYzktqN1+tzbk1GAsHNAdo/1uzxz3Ky02jvZQwbi/vmDA6z4Oyg==", "dependencies": [ - "@smithy/node-config-provider", - "@smithy/protocol-http", - "@smithy/service-error-classification", - "@smithy/smithy-client", - "@smithy/types", - "@smithy/util-middleware", - "@smithy/util-retry", + "@smithy/node-config-provider@4.0.2", + "@smithy/protocol-http@5.1.0", + "@smithy/service-error-classification@4.0.2", + "@smithy/smithy-client@4.2.0", + "@smithy/types@4.2.0", + "@smithy/util-middleware@4.0.2", + "@smithy/util-retry@4.0.2", + "tslib", + "uuid" + ] + }, + "@smithy/middleware-retry@4.1.10": { + "integrity": "sha512-RyhcA3sZIIvAo6r48b2Nx2qfg0OnyohlaV0fw415xrQyx5HQ2bvHl9vs/WBiDXIP49mCfws5wX4308c9Pi/isw==", + "dependencies": [ + "@smithy/node-config-provider@4.1.3", + "@smithy/protocol-http@5.1.2", + "@smithy/service-error-classification@4.0.5", + "@smithy/smithy-client@4.4.1", + "@smithy/types@4.3.1", + "@smithy/util-middleware@4.0.4", + "@smithy/util-retry@4.0.5", "tslib", "uuid" ] @@ -1176,54 +1640,110 @@ "@smithy/middleware-serde@4.0.3": { "integrity": "sha512-rfgDVrgLEVMmMn0BI8O+8OVr6vXzjV7HZj57l0QxslhzbvVfikZbVfBVthjLHqib4BW44QhcIgJpvebHlRaC9A==", "dependencies": [ - "@smithy/types", + "@smithy/types@4.2.0", + "tslib" + ] + }, + "@smithy/middleware-serde@4.0.8": { + "integrity": "sha512-iSSl7HJoJaGyMIoNn2B7czghOVwJ9nD7TMvLhMWeSB5vt0TnEYyRRqPJu/TqW76WScaNvYYB8nRoiBHR9S1Ddw==", + "dependencies": [ + "@smithy/protocol-http@5.1.2", + "@smithy/types@4.3.1", "tslib" ] }, "@smithy/middleware-stack@4.0.2": { "integrity": "sha512-eSPVcuJJGVYrFYu2hEq8g8WWdJav3sdrI4o2c6z/rjnYDd3xH9j9E7deZQCzFn4QvGPouLngH3dQ+QVTxv5bOQ==", "dependencies": [ - "@smithy/types", + "@smithy/types@4.2.0", + "tslib" + ] + }, + "@smithy/middleware-stack@4.0.4": { + "integrity": "sha512-kagK5ggDrBUCCzI93ft6DjteNSfY8Ulr83UtySog/h09lTIOAJ/xUSObutanlPT0nhoHAkpmW9V5K8oPyLh+QA==", + "dependencies": [ + "@smithy/types@4.3.1", "tslib" ] }, "@smithy/node-config-provider@4.0.2": { "integrity": "sha512-WgCkILRZfJwJ4Da92a6t3ozN/zcvYyJGUTmfGbgS/FkCcoCjl7G4FJaCDN1ySdvLvemnQeo25FdkyMSTSwulsw==", "dependencies": [ - "@smithy/property-provider", - "@smithy/shared-ini-file-loader", - "@smithy/types", + "@smithy/property-provider@4.0.2", + "@smithy/shared-ini-file-loader@4.0.2", + "@smithy/types@4.2.0", + "tslib" + ] + }, + "@smithy/node-config-provider@4.1.3": { + "integrity": "sha512-HGHQr2s59qaU1lrVH6MbLlmOBxadtzTsoO4c+bF5asdgVik3I8o7JIOzoeqWc5MjVa+vD36/LWE0iXKpNqooRw==", + "dependencies": [ + "@smithy/property-provider@4.0.4", + "@smithy/shared-ini-file-loader@4.0.4", + "@smithy/types@4.3.1", "tslib" ] }, "@smithy/node-http-handler@4.0.4": { "integrity": "sha512-/mdqabuAT3o/ihBGjL94PUbTSPSRJ0eeVTdgADzow0wRJ0rN4A27EOrtlK56MYiO1fDvlO3jVTCxQtQmK9dZ1g==", "dependencies": [ - "@smithy/abort-controller", - "@smithy/protocol-http", - "@smithy/querystring-builder", - "@smithy/types", + "@smithy/abort-controller@4.0.2", + "@smithy/protocol-http@5.1.0", + "@smithy/querystring-builder@4.0.2", + "@smithy/types@4.2.0", + "tslib" + ] + }, + "@smithy/node-http-handler@4.0.6": { + "integrity": "sha512-NqbmSz7AW2rvw4kXhKGrYTiJVDHnMsFnX4i+/FzcZAfbOBauPYs2ekuECkSbtqaxETLLTu9Rl/ex6+I2BKErPA==", + "dependencies": [ + "@smithy/abort-controller@4.0.4", + "@smithy/protocol-http@5.1.2", + "@smithy/querystring-builder@4.0.4", + "@smithy/types@4.3.1", "tslib" ] }, "@smithy/property-provider@4.0.2": { "integrity": "sha512-wNRoQC1uISOuNc2s4hkOYwYllmiyrvVXWMtq+TysNRVQaHm4yoafYQyjN/goYZS+QbYlPIbb/QRjaUZMuzwQ7A==", "dependencies": [ - "@smithy/types", + "@smithy/types@4.2.0", + "tslib" + ] + }, + "@smithy/property-provider@4.0.4": { + "integrity": "sha512-qHJ2sSgu4FqF4U/5UUp4DhXNmdTrgmoAai6oQiM+c5RZ/sbDwJ12qxB1M6FnP+Tn/ggkPZf9ccn4jqKSINaquw==", + "dependencies": [ + "@smithy/types@4.3.1", "tslib" ] }, "@smithy/protocol-http@5.1.0": { "integrity": "sha512-KxAOL1nUNw2JTYrtviRRjEnykIDhxc84qMBzxvu1MUfQfHTuBlCG7PA6EdVwqpJjH7glw7FqQoFxUJSyBQgu7g==", "dependencies": [ - "@smithy/types", + "@smithy/types@4.2.0", + "tslib" + ] + }, + "@smithy/protocol-http@5.1.2": { + "integrity": "sha512-rOG5cNLBXovxIrICSBm95dLqzfvxjEmuZx4KK3hWwPFHGdW3lxY0fZNXfv2zebfRO7sJZ5pKJYHScsqopeIWtQ==", + "dependencies": [ + "@smithy/types@4.3.1", "tslib" ] }, "@smithy/querystring-builder@4.0.2": { "integrity": "sha512-NTOs0FwHw1vimmQM4ebh+wFQvOwkEf/kQL6bSM1Lock+Bv4I89B3hGYoUEPkmvYPkDKyp5UdXJYu+PoTQ3T31Q==", "dependencies": [ - "@smithy/types", + "@smithy/types@4.2.0", + "@smithy/util-uri-escape", + "tslib" + ] + }, + "@smithy/querystring-builder@4.0.4": { + "integrity": "sha512-SwREZcDnEYoh9tLNgMbpop+UTGq44Hl9tdj3rf+yeLcfH7+J8OXEBaMc2kDxtyRHu8BhSg9ADEx0gFHvpJgU8w==", + "dependencies": [ + "@smithy/types@4.3.1", "@smithy/util-uri-escape", "tslib" ] @@ -1231,20 +1751,40 @@ "@smithy/querystring-parser@4.0.2": { "integrity": "sha512-v6w8wnmZcVXjfVLjxw8qF7OwESD9wnpjp0Dqry/Pod0/5vcEA3qxCr+BhbOHlxS8O+29eLpT3aagxXGwIoEk7Q==", "dependencies": [ - "@smithy/types", + "@smithy/types@4.2.0", + "tslib" + ] + }, + "@smithy/querystring-parser@4.0.4": { + "integrity": "sha512-6yZf53i/qB8gRHH/l2ZwUG5xgkPgQF15/KxH0DdXMDHjesA9MeZje/853ifkSY0x4m5S+dfDZ+c4x439PF0M2w==", + "dependencies": [ + "@smithy/types@4.3.1", "tslib" ] }, "@smithy/service-error-classification@4.0.2": { "integrity": "sha512-LA86xeFpTKn270Hbkixqs5n73S+LVM0/VZco8dqd+JT75Dyx3Lcw/MraL7ybjmz786+160K8rPOmhsq0SocoJQ==", "dependencies": [ - "@smithy/types" + "@smithy/types@4.2.0" + ] + }, + "@smithy/service-error-classification@4.0.5": { + "integrity": "sha512-LvcfhrnCBvCmTee81pRlh1F39yTS/+kYleVeLCwNtkY8wtGg8V/ca9rbZZvYIl8OjlMtL6KIjaiL/lgVqHD2nA==", + "dependencies": [ + "@smithy/types@4.3.1" ] }, "@smithy/shared-ini-file-loader@4.0.2": { "integrity": "sha512-J9/gTWBGVuFZ01oVA6vdb4DAjf1XbDhK6sLsu3OS9qmLrS6KB5ygpeHiM3miIbj1qgSJ96GYszXFWv6ErJ8QEw==", "dependencies": [ - "@smithy/types", + "@smithy/types@4.2.0", + "tslib" + ] + }, + "@smithy/shared-ini-file-loader@4.0.4": { + "integrity": "sha512-63X0260LoFBjrHifPDs+nM9tV0VMkOTl4JRMYNuKh/f5PauSjowTfvF3LogfkWdcPoxsA9UjqEOgjeYIbhb7Nw==", + "dependencies": [ + "@smithy/types@4.3.1", "tslib" ] }, @@ -1252,10 +1792,10 @@ "integrity": "sha512-Mz+mc7okA73Lyz8zQKJNyr7lIcHLiPYp0+oiqiMNc/t7/Kf2BENs5d63pEj7oPqdjaum6g0Fc8wC78dY1TgtXw==", "dependencies": [ "@smithy/is-array-buffer@4.0.0", - "@smithy/protocol-http", - "@smithy/types", + "@smithy/protocol-http@5.1.0", + "@smithy/types@4.2.0", "@smithy/util-hex-encoding", - "@smithy/util-middleware", + "@smithy/util-middleware@4.0.2", "@smithy/util-uri-escape", "@smithy/util-utf8@4.0.0", "tslib" @@ -1265,10 +1805,23 @@ "integrity": "sha512-4t5WX60sL3zGJF/CtZsUQTs3UrZEDO2P7pEaElrekbLqkWPYkgqNW1oeiNYC6xXifBnT9dVBOnNQRvOE9riU9w==", "dependencies": [ "@smithy/is-array-buffer@4.0.0", - "@smithy/protocol-http", - "@smithy/types", + "@smithy/protocol-http@5.1.0", + "@smithy/types@4.2.0", "@smithy/util-hex-encoding", - "@smithy/util-middleware", + "@smithy/util-middleware@4.0.2", + "@smithy/util-uri-escape", + "@smithy/util-utf8@4.0.0", + "tslib" + ] + }, + "@smithy/signature-v4@5.1.2": { + "integrity": "sha512-d3+U/VpX7a60seHziWnVZOHuEgJlclufjkS6zhXvxcJgkJq4UWdH5eOBLzHRMx6gXjsdT9h6lfpmLzbrdupHgQ==", + "dependencies": [ + "@smithy/is-array-buffer@4.0.0", + "@smithy/protocol-http@5.1.2", + "@smithy/types@4.3.1", + "@smithy/util-hex-encoding", + "@smithy/util-middleware@4.0.4", "@smithy/util-uri-escape", "@smithy/util-utf8@4.0.0", "tslib" @@ -1277,12 +1830,24 @@ "@smithy/smithy-client@4.2.0": { "integrity": "sha512-Qs65/w30pWV7LSFAez9DKy0Koaoh3iHhpcpCCJ4waj/iqwsuSzJna2+vYwq46yBaqO5ZbP9TjUsATUNxrKeBdw==", "dependencies": [ - "@smithy/core", - "@smithy/middleware-endpoint", - "@smithy/middleware-stack", - "@smithy/protocol-http", - "@smithy/types", - "@smithy/util-stream", + "@smithy/core@3.2.0", + "@smithy/middleware-endpoint@4.1.0", + "@smithy/middleware-stack@4.0.2", + "@smithy/protocol-http@5.1.0", + "@smithy/types@4.2.0", + "@smithy/util-stream@4.2.0", + "tslib" + ] + }, + "@smithy/smithy-client@4.4.1": { + "integrity": "sha512-XPbcHRfd0iwx8dY5XCBCGyI7uweMW0oezYezxXcG8ANgvZ5YPuC6Ylh+n0bTHpdU3SCMZOnhzgVklYz+p3fIhw==", + "dependencies": [ + "@smithy/core@3.5.1", + "@smithy/middleware-endpoint@4.1.9", + "@smithy/middleware-stack@4.0.4", + "@smithy/protocol-http@5.1.2", + "@smithy/types@4.3.1", + "@smithy/util-stream@4.2.2", "tslib" ] }, @@ -1292,11 +1857,25 @@ "tslib" ] }, + "@smithy/types@4.3.1": { + "integrity": "sha512-UqKOQBL2x6+HWl3P+3QqFD4ncKq0I8Nuz9QItGv5WuKuMHuuwlhvqcZCoXGfc+P1QmfJE7VieykoYYmrOoFJxA==", + "dependencies": [ + "tslib" + ] + }, "@smithy/url-parser@4.0.2": { "integrity": "sha512-Bm8n3j2ScqnT+kJaClSVCMeiSenK6jVAzZCNewsYWuZtnBehEz4r2qP0riZySZVfzB+03XZHJeqfmJDkeeSLiQ==", "dependencies": [ - "@smithy/querystring-parser", - "@smithy/types", + "@smithy/querystring-parser@4.0.2", + "@smithy/types@4.2.0", + "tslib" + ] + }, + "@smithy/url-parser@4.0.4": { + "integrity": "sha512-eMkc144MuN7B0TDA4U2fKs+BqczVbk3W+qIvcoCY6D1JY3hnAdCuhCZODC+GAeaxj0p6Jroz4+XMUn3PCxQQeQ==", + "dependencies": [ + "@smithy/querystring-parser@4.0.4", + "@smithy/types@4.3.1", "tslib" ] }, @@ -1340,33 +1919,63 @@ "tslib" ] }, + "@smithy/util-defaults-mode-browser@4.0.17": { + "integrity": "sha512-HXq5181qnXmIwB7VrwqwP8rsJybHMoYuJnNoXy4PROs2pfSI4sWDMASF2i+7Lo+u64Y6xowhegcdxczowgJtZg==", + "dependencies": [ + "@smithy/property-provider@4.0.4", + "@smithy/smithy-client@4.4.1", + "@smithy/types@4.3.1", + "bowser", + "tslib" + ] + }, "@smithy/util-defaults-mode-browser@4.0.8": { "integrity": "sha512-ZTypzBra+lI/LfTYZeop9UjoJhhGRTg3pxrNpfSTQLd3AJ37r2z4AXTKpq1rFXiiUIJsYyFgNJdjWRGP/cbBaQ==", "dependencies": [ - "@smithy/property-provider", - "@smithy/smithy-client", - "@smithy/types", + "@smithy/property-provider@4.0.2", + "@smithy/smithy-client@4.2.0", + "@smithy/types@4.2.0", "bowser", "tslib" ] }, + "@smithy/util-defaults-mode-node@4.0.17": { + "integrity": "sha512-RfU2A5LjFhEHw4Nwl1GZNitK4AUWu5jGtigAUDoQtfDUvYHpQxcuLw2QGAdKDtKRflIiHSZ8wXBDR36H9R2Ang==", + "dependencies": [ + "@smithy/config-resolver@4.1.4", + "@smithy/credential-provider-imds@4.0.6", + "@smithy/node-config-provider@4.1.3", + "@smithy/property-provider@4.0.4", + "@smithy/smithy-client@4.4.1", + "@smithy/types@4.3.1", + "tslib" + ] + }, "@smithy/util-defaults-mode-node@4.0.8": { "integrity": "sha512-Rgk0Jc/UDfRTzVthye/k2dDsz5Xxs9LZaKCNPgJTRyoyBoeiNCnHsYGOyu1PKN+sDyPnJzMOz22JbwxzBp9NNA==", "dependencies": [ - "@smithy/config-resolver", - "@smithy/credential-provider-imds", - "@smithy/node-config-provider", - "@smithy/property-provider", - "@smithy/smithy-client", - "@smithy/types", + "@smithy/config-resolver@4.1.0", + "@smithy/credential-provider-imds@4.0.2", + "@smithy/node-config-provider@4.0.2", + "@smithy/property-provider@4.0.2", + "@smithy/smithy-client@4.2.0", + "@smithy/types@4.2.0", "tslib" ] }, "@smithy/util-endpoints@3.0.2": { "integrity": "sha512-6QSutU5ZyrpNbnd51zRTL7goojlcnuOB55+F9VBD+j8JpRY50IGamsjlycrmpn8PQkmJucFW8A0LSfXj7jjtLQ==", "dependencies": [ - "@smithy/node-config-provider", - "@smithy/types", + "@smithy/node-config-provider@4.0.2", + "@smithy/types@4.2.0", + "tslib" + ] + }, + "@smithy/util-endpoints@3.0.6": { + "integrity": "sha512-YARl3tFL3WgPuLzljRUnrS2ngLiUtkwhQtj8PAL13XZSyUiNLQxwG3fBBq3QXFqGFUXepIN73pINp3y8c2nBmA==", + "dependencies": [ + "@smithy/node-config-provider@4.1.3", + "@smithy/types@4.3.1", "tslib" ] }, @@ -1379,24 +1988,52 @@ "@smithy/util-middleware@4.0.2": { "integrity": "sha512-6GDamTGLuBQVAEuQ4yDQ+ti/YINf/MEmIegrEeg7DdB/sld8BX1lqt9RRuIcABOhAGTA50bRbPzErez7SlDtDQ==", "dependencies": [ - "@smithy/types", + "@smithy/types@4.2.0", + "tslib" + ] + }, + "@smithy/util-middleware@4.0.4": { + "integrity": "sha512-9MLKmkBmf4PRb0ONJikCbCwORACcil6gUWojwARCClT7RmLzF04hUR4WdRprIXal7XVyrddadYNfp2eF3nrvtQ==", + "dependencies": [ + "@smithy/types@4.3.1", "tslib" ] }, "@smithy/util-retry@4.0.2": { "integrity": "sha512-Qryc+QG+7BCpvjloFLQrmlSd0RsVRHejRXd78jNO3+oREueCjwG1CCEH1vduw/ZkM1U9TztwIKVIi3+8MJScGg==", "dependencies": [ - "@smithy/service-error-classification", - "@smithy/types", + "@smithy/service-error-classification@4.0.2", + "@smithy/types@4.2.0", + "tslib" + ] + }, + "@smithy/util-retry@4.0.5": { + "integrity": "sha512-V7MSjVDTlEt/plmOFBn1762Dyu5uqMrV2Pl2X0dYk4XvWfdWJNe9Bs5Bzb56wkCuiWjSfClVMGcsuKrGj7S/yg==", + "dependencies": [ + "@smithy/service-error-classification@4.0.5", + "@smithy/types@4.3.1", "tslib" ] }, "@smithy/util-stream@4.2.0": { "integrity": "sha512-Vj1TtwWnuWqdgQI6YTUF5hQ/0jmFiOYsc51CSMgj7QfyO+RF4EnT2HNjoviNlOOmgzgvf3f5yno+EiC4vrnaWQ==", "dependencies": [ - "@smithy/fetch-http-handler", - "@smithy/node-http-handler", - "@smithy/types", + "@smithy/fetch-http-handler@5.0.2", + "@smithy/node-http-handler@4.0.4", + "@smithy/types@4.2.0", + "@smithy/util-base64", + "@smithy/util-buffer-from@4.0.0", + "@smithy/util-hex-encoding", + "@smithy/util-utf8@4.0.0", + "tslib" + ] + }, + "@smithy/util-stream@4.2.2": { + "integrity": "sha512-aI+GLi7MJoVxg24/3J1ipwLoYzgkB4kUfogZfnslcYlynj3xsQ0e7vk4TnTro9hhsS5PvX1mwmkRqqHQjwcU7w==", + "dependencies": [ + "@smithy/fetch-http-handler@5.0.4", + "@smithy/node-http-handler@4.0.6", + "@smithy/types@4.3.1", "@smithy/util-base64", "@smithy/util-buffer-from@4.0.0", "@smithy/util-hex-encoding", @@ -1427,8 +2064,8 @@ "@smithy/util-waiter@4.0.3": { "integrity": "sha512-JtaY3FxmD+te+KSI2FJuEcfNC9T/DGGVf551babM7fAaXhjJUt7oSYurH1Devxd2+BOSUACCgt3buinx4UnmEA==", "dependencies": [ - "@smithy/abort-controller", - "@smithy/types", + "@smithy/abort-controller@4.0.2", + "@smithy/types@4.2.0", "tslib" ] }, @@ -1441,6 +2078,9 @@ "bowser@2.11.0": { "integrity": "sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA==" }, + "email-addresses@5.0.0": { + "integrity": "sha512-4OIPYlA6JXqtVn8zpHpGiI7vE6EQOAg16aGnDMIAlZVinnoZ8208tW1hAbjWydgN/4PLTT9q+O1K6AH/vALJGw==" + }, "fast-xml-parser@4.4.1": { "integrity": "sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw==", "dependencies": [ @@ -1478,13 +2118,18 @@ "dependencies": [ "jsr:@db/sqlite@0.12", "jsr:@std/cli@^1.0.17", + "jsr:@std/csv@^1.0.6", "jsr:@std/encoding@^1.0.10", "jsr:@std/expect@^1.0.16", + "jsr:@std/io@~0.225.2", "jsr:@std/path@^1.0.9", "jsr:@std/testing@^1.0.12", "npm:@aws-sdk/client-s3@^3.797.0", "npm:@aws-sdk/client-sesv2@^3.782.0", + "npm:@aws-sdk/client-sns@^3.821.0", "npm:@hono/zod-validator@0.5", + "npm:@smithy/fetch-http-handler@^5.0.4", + "npm:email-addresses@5", "npm:hono@^4.7.10", "npm:kysely@~0.28.2", "npm:zod@^3.25.20" diff --git a/services/docker/mail-server/relay/dovecot.ts b/services/docker/mail-server/relay/dovecot.ts index 6f962a3..bb96e7b 100644 --- a/services/docker/mail-server/relay/dovecot.ts +++ b/services/docker/mail-server/relay/dovecot.ts @@ -1,38 +1,94 @@ -import { getLogger } from "./logger.ts"; -import { Mail, MailDeliverer } from "./mail.ts"; +import { basename } from "@std/path"; + +import { getConfigValue } from "./config.ts"; +import logger, { log } from "./logger.ts"; +import { + Mail, + MailDeliverContext, + MailDeliverer, + MailDeliverReceiptResult, + ReceiptsFromHeadersHook, +} from "./mail.ts"; export class DovecotMailDeliverer extends MailDeliverer { readonly name = "dovecot"; - readonly ldaBin = "dovecot-lda"; - protected override async doDeliver(mail: Mail): Promise<void> { - const { ldaBin } = this; + constructor() { + super(); + this.preHooks.push( + new ReceiptsFromHeadersHook(), + ); + } + + protected override async doDeliver( + mail: Mail, + context: MailDeliverContext, + ): Promise<void> { + const ldaPath = getConfigValue("ldaPath"); + const ldaBinName = basename(ldaPath); + const utf8Stream = mail.toUtf8Bytes(); - let status; - try { - const utf8Stream = mail.toUtf8Bytes(); + const receipts = [...context.receipts]; + if (receipts.length === 0) { + throw new Error("No receipts found."); + } - const ldaCommand = new Deno.Command(ldaBin, { - stdin: "piped", - stdout: "piped", - stderr: "piped", - }); + log(`Deliver to ${receipts.join(", ")}.`); - const ldaProcess = ldaCommand.spawn(); - getLogger().logProgramOutput(ldaProcess, ldaBin); + for (const receipt of receipts) { + log(`Call ${ldaBinName} for ${receipt}...`); - const stdinWriter = ldaProcess.stdin.getWriter(); - await stdinWriter.ready; - await stdinWriter.write(utf8Stream); - await stdinWriter.ready; + const result: MailDeliverReceiptResult = { + kind: "done", + message: `${ldaBinName} exited with success.`, + }; - status = await ldaProcess.status; - } catch (cause) { - mail.throwDeliverError(this, "external error.", cause); - } + try { + const ldaCommand = new Deno.Command(ldaPath, { + args: ["-d", receipt], + stdin: "piped", + stdout: "piped", + stderr: "piped", + }); + + const ldaProcess = ldaCommand.spawn(); + using logFiles = await logger.openLogForProgram(ldaBinName); + ldaProcess.stdout.pipeTo(logFiles.stdout.writable); + ldaProcess.stderr.pipeTo(logFiles.stderr.writable); + + const stdinWriter = ldaProcess.stdin.getWriter(); + await stdinWriter.write(utf8Stream); + await stdinWriter.close(); + + const status = await ldaProcess.status; + + if (!status.success) { + result.kind = "fail"; + result.message = + `${ldaBinName} exited with error code ${status.code}`; + + if (status.signal != null) { + result.message += ` (signal ${status.signal})`; + } + + // https://doc.dovecot.org/main/core/man/dovecot-lda.1.html + switch (status.code) { + case 67: + result.message += ", receipt user not known"; + break; + case 75: + result.kind = "retry"; + break; + } - if (!status.success) { - mail.throwDeliverError(this, `${ldaBin} exited with non-zero.`); + result.message += "."; + } + } catch (e) { + result.kind = "fail"; + result.message = "An error was thrown when running lda process: " + e; + result.cause = e; + } + context.result.set(receipt, result); } } } diff --git a/services/docker/mail-server/relay/dumb-smtp-server.ts b/services/docker/mail-server/relay/dumb-smtp-server.ts new file mode 100644 index 0000000..12f682a --- /dev/null +++ b/services/docker/mail-server/relay/dumb-smtp-server.ts @@ -0,0 +1,122 @@ +import config from "./config.ts"; +import { error, log, warn } from "./logger.ts"; +import { MailDeliverer } from "./mail.ts"; + +const CRLF = "\r\n"; + +const SERVER_NAME = `[${config.SMTP_HOST}]:${config.SMTP_PORT}`; + +const RESPONSES = { + "READY": `220 ${SERVER_NAME} SMTP Ready`, + "EHLO": `250 ${SERVER_NAME}`, + "MAIL": "250 2.1.0 Sender OK", + "RCPT": "250 2.1.5 Recipient OK", + "DATA": "354 Start mail input; end with <CRLF>.<CRLF>", + "QUIT": `211 2.0.0 ${SERVER_NAME} closing connection`, + "INVALID": "500 5.5.1 Error: command not recognized", +} as const; + +export class DumbSMTPServer { + #deliverer: MailDeliverer; + + constructor(deliverer: MailDeliverer) { + this.#deliverer = deliverer; + } + + async #send(rawMail: string): Promise<{ message: string }> { + const mail = await this.#deliverer.deliverRaw(rawMail); + return { + message: mail.deliverMessage ?? "Success", + }; + } + + async #handleConnection(conn: Deno.Conn) { + using disposeStack = new DisposableStack(); + disposeStack.defer(() => { + log("Close smtp session tcp connection."); + conn.close(); + }); + const writer = conn.writable.getWriter(); + disposeStack.defer(() => writer.releaseLock()); + const reader = conn.readable.getReader(); + disposeStack.defer(() => reader.releaseLock()); + + const [decoder, encoder] = [new TextDecoder(), new TextEncoder()]; + const decode = (data: Uint8Array) => decoder.decode(data); + const send = async (s: string) => + await writer.write(encoder.encode(s + CRLF)); + + let buffer: string = ""; + let rawMail: string | null = null; + + await send(RESPONSES["READY"]); + + while (true) { + const { value, done } = await reader.read(); + if (done) break; + + buffer += decode(value); + + while (true) { + const eolPos = buffer.indexOf(CRLF); + if (eolPos === -1) break; + + const line = buffer.slice(0, eolPos); + buffer = buffer.slice(eolPos + CRLF.length); + + if (rawMail == null) { + log("Smtp server received line:", line); + const upperLine = line.toUpperCase(); + if (upperLine.startsWith("EHLO") || upperLine.startsWith("HELO")) { + await send(RESPONSES["EHLO"]); + } else if (upperLine.startsWith("MAIL FROM:")) { + await send(RESPONSES["MAIL"]); + } else if (upperLine.startsWith("RCPT TO:")) { + await send(RESPONSES["RCPT"]); + } else if (upperLine === "DATA") { + await send(RESPONSES["DATA"]); + log("Begin to receive mail data..."); + rawMail = ""; + } else if (upperLine === "QUIT") { + await send(RESPONSES["QUIT"]); + return; + } else { + warn("Smtp server command unrecognized:", line); + await send(RESPONSES["INVALID"]); + return; + } + } else { + if (line === ".") { + try { + log("Done receiving mail data..."); + const { message } = await this.#send(rawMail); + await send(`250 2.6.0 ${message}`); + rawMail = null; + log("Done SMTP mail session."); + } catch (err) { + error(err); + await send("554 5.3.0 Error: check server log"); + return; + } + } else { + const dataLine = line.startsWith("..") ? line.slice(1) : line; + rawMail += dataLine + CRLF; + } + } + } + } + } + + async serve() { + const listener = Deno.listen({ + hostname: config.SMTP_HOST, + port: config.SMTP_PORT, + }); + listener.unref(); + log(`Dumb SMTP server running on port ${config.SMTP_PORT}.`); + + for await (const conn of listener) { + await this.#handleConnection(conn); + } + } +} diff --git a/services/docker/mail-server/relay/logger.ts b/services/docker/mail-server/relay/logger.ts index 160d70a..dc6acfe 100644 --- a/services/docker/mail-server/relay/logger.ts +++ b/services/docker/mail-server/relay/logger.ts @@ -1,32 +1,83 @@ -import * as path from "@std/path"; +import { join } from "@std/path"; +import { toWritableStream, Writer } from "@std/io"; -import { createSingleton, generateTimeStringForFileName } from "./util.ts"; +import "./util.ts"; + +export interface LogOptions { + time?: Date; + error?: boolean; +} + +export type LogFile = Pick<Deno.FsFile, "writable"> & Disposable; export class Logger { - constructor(public readonly path: string) {} + #path: string | null = null; - warn(message: string) { - console.log(message); + #wrapWriter(writer: Writer): LogFile { + return { + writable: toWritableStream(writer, { autoClose: false }), + [Symbol.dispose]() {}, + }; } - generateLogFilePath( - prefix: string = "", - suffix: string = "", - instant?: Temporal.Instant | Date, - ): string { - return path.join( - this.path, - `${prefix}-${generateTimeStringForFileName(instant)}-${suffix}`, - ); + #stdoutWrapper: LogFile = this.#wrapWriter(Deno.stdout); + #stderrWrapper: LogFile = this.#wrapWriter(Deno.stderr); + + constructor() { + } + + get path() { + return this.#path; + } + + set path(path) { + this.#path = path; + if (path != null) { + Deno.mkdirSync(path, { recursive: true }); + } } - openLogFile( - prefix: string = "", - suffix: string = "", - instant?: Temporal.Instant | Date, - ): Promise<Deno.FsFile> { - const logPath = this.generateLogFilePath(prefix, suffix, instant); - return Deno.open(logPath, { + log(...args: unknown[]) { + console.log(...args); + } + + warn(...args: unknown[]) { + console.warn(...args); + } + + error(...args: unknown[]) { + console.error(...args); + } + + #extractOptions(options?: LogOptions): Required<LogOptions> { + return { + time: options?.time ?? new Date(), + error: options?.error ?? false, + }; + } + + async openLog( + prefix: string, + suffix: string, + options?: LogOptions, + ): Promise<LogFile> { + if (prefix.includes("/")) { + throw new Error(`Log file prefix ${prefix} contains '/'.`); + } + if (suffix.includes("/")) { + throw new Error(`Log file suffix ${suffix} contains '/'.`); + } + + const { time, error } = this.#extractOptions(options); + if (this.#path == null) { + return error ? this.#stderrWrapper : this.#stdoutWrapper; + } + + const logPath = join( + this.#path, + `${prefix}-${time.toFileNameString()}-${suffix}`, + ); + return await Deno.open(logPath, { read: false, write: true, append: true, @@ -34,17 +85,31 @@ export class Logger { }); } - async logProgramOutput( - process: Deno.ChildProcess, + async openLogForProgram( program: string, - instant?: Temporal.Instant | Date, - ): Promise<void> { - const stdoutFile = await this.openLogFile(program, "stdout", instant); - const stderrFile = await this.openLogFile(program, "stderr", instant); - - process.stdout.pipeTo(stdoutFile.writable); - process.stderr.pipeTo(stderrFile.writable); + options?: Omit<LogOptions, "error">, + ): Promise<{ stdout: LogFile; stderr: LogFile } & Disposable> { + const stdout = await this.openLog(program, "stdout", { + ...options, + error: false, + }); + const stderr = await this.openLog(program, "stderr", { + ...options, + error: true, + }); + return { + stdout, + stderr, + [Symbol.dispose]: () => { + stdout[Symbol.dispose](); + stderr[Symbol.dispose](); + }, + }; } } -export const [getLogger, setLogger] = createSingleton<Logger>("Logger"); +const logger = new Logger(); +export default logger; +export const log = logger.log.bind(logger); +export const warn = logger.warn.bind(logger); +export const error = logger.error.bind(logger); diff --git a/services/docker/mail-server/relay/mail.test.ts b/services/docker/mail-server/relay/mail.test.ts index b734c70..1741efc 100644 --- a/services/docker/mail-server/relay/mail.test.ts +++ b/services/docker/mail-server/relay/mail.test.ts @@ -3,28 +3,50 @@ import { expect, fn } from "@std/expect"; import { Mail, MailDeliverer } from "./mail.ts"; -describe("Mail", () => { - const mockDate = "Fri, 02 May 2025 08:33:02 +0000"; - const mockBodyStr = `This is body content. +const mockDate = "Fri, 02 May 2025 08:33:02 +0000"; +const mockBodyStr = `This is body content. Line 2 Line 4`; - const mockHeaders = [ - ["Content-Disposition", "inline"], - ["Content-Transfer-Encoding", "quoted-printable"], - ["MIME-Version", "1.0"], - ["X-Mailer", "MIME-tools 5.509 (Entity 5.509)"], - ["Content-Type", "text/plain; charset=utf-8"], - ["From", '"Mock From" <mock@from.mock>'], - ["To", "Mock To <mock@to.mock>"], - ["CC", "Mock CC <mock@cc.mock"], - ["Subject", "A very long mock\n subject"], - ["Message-ID", "<abcdef@from.mock>"], - ["Date", mockDate], - ]; - const mockHeaderStr = mockHeaders.map((h) => h[0] + ": " + h[1]).join("\n"); - const mockMailStr = mockHeaderStr + "\n\n" + mockBodyStr; +const mockHeaders = [ + ["Content-Disposition", "inline"], + ["Content-Transfer-Encoding", "quoted-printable"], + ["MIME-Version", "1.0"], + ["X-Mailer", "MIME-tools 5.509 (Entity 5.509)"], + ["Content-Type", "text/plain; charset=utf-8"], + ["From", '"Mock From" <mock@from.mock>'], + [ + "To", + `"John \\"Big\\" Doe" <john@example.com>, "Alice (Work)" <alice+work@example.com>, + undisclosed-recipients:;, "Group: Team" <team@company.com>, + "Escaped, Name" <escape@test.com>, just@email.com, + "Comment (This is valid)" <comment@domain.net>, + "Odd @Chars" <weird!#$%'*+-/=?^_\`{|}~@char-test.com>, + "Non-ASCII 用户" <user@例子.中国>, + admin@[192.168.1.1]`, + ], + ["CC", "Mock CC <mock@cc.mock>"], + ["Subject", "A very long mock\n subject"], + ["Message-ID", "<abcdef@from.mock>"], + ["Date", mockDate], +]; +const mockHeaderStr = mockHeaders.map((h) => h[0] + ": " + h[1]).join("\n"); +const mockMailStr = mockHeaderStr + "\n\n" + mockBodyStr; +const mockCrlfMailStr = mockMailStr.replaceAll("\n", "\r\n"); +const mockToAddresses = [ + "john@example.com", + "alice+work@example.com", + "team@company.com", + "escape@test.com", + "just@email.com", + "comment@domain.net", + "weird!#$%'*+-/=?^_`{|}~@char-test.com", + "user@例子.中国", + "admin@[192.168.1.1]", +]; +const mockCcAddresses = ["mock@cc.mock"]; +describe("Mail", () => { it("simple parse", () => { const parsed = new Mail(mockMailStr).simpleParse(); expect(parsed.sections.header).toEqual(mockHeaderStr); @@ -33,6 +55,12 @@ Line 4`; expect(parsed.eol).toBe("\n"); }); + it("simple parse crlf", () => { + const parsed = new Mail(mockCrlfMailStr).simpleParse(); + expect(parsed.sep).toBe("\r\n"); + expect(parsed.eol).toBe("\r\n"); + }); + it("simple parse date", () => { expect(new Mail(mockMailStr).simpleParseDate()).toEqual(new Date(mockDate)); }); @@ -59,6 +87,18 @@ Line 4`; "\n\n" + mockBodyStr, ); }); + + it("parse receipts", () => { + const mail = new Mail(mockMailStr); + expect(mail.simpleParseReceipts()).toEqual([ + ...mockToAddresses, + ...mockCcAddresses, + ]); + expect(mail.simpleParseReceipts({domain: "example.com"})).toEqual([ + ...mockToAddresses, + ...mockCcAddresses, + ].filter(a => a.endsWith("example.com"))); + }); }); describe("MailDeliverer", () => { @@ -69,12 +109,7 @@ describe("MailDeliverer", () => { const mockDeliverer = new MockMailDeliverer(); it("deliver success", async () => { - const mail = await mockDeliverer.deliverRaw("mock mail"); + await mockDeliverer.deliverRaw(mockMailStr); expect(mockDeliverer.doDeliver).toHaveBeenCalledTimes(1); - expect(mail.deliverState).toEqual({ - kind: "delivered", - error: undefined, - deliverer: mockDeliverer, - }); }); }); diff --git a/services/docker/mail-server/relay/mail.ts b/services/docker/mail-server/relay/mail.ts index 859ce63..08335ed 100644 --- a/services/docker/mail-server/relay/mail.ts +++ b/services/docker/mail-server/relay/mail.ts @@ -1,22 +1,9 @@ import { encodeBase64 } from "@std/encoding/base64"; +import { parse } from "@std/csv/parse"; +import emailAddresses from "email-addresses"; -import { getLogger } from "./logger.ts"; - -export type MailDeliverStateNotSent = { kind: "not-sent" }; -export type MailDeliverStateDelivered = { - kind: "delivered"; - deliverer: MailDeliverer; - error?: Error; -}; -export type MailDeliverStateError = { - kind: "error"; - deliverer: MailDeliverer; - error: Error; -}; -export type MailDeliverState = - | MailDeliverStateNotSent - | MailDeliverStateDelivered - | MailDeliverStateError; +import { log, warn } from "./logger.ts"; +import { getConfigValue } from "./config.ts"; class MailParseError extends Error { constructor( @@ -30,22 +17,6 @@ class MailParseError extends Error { } } -class MailDeliverError extends Error { - constructor( - message: string, - public readonly mail: Mail, - options?: ErrorOptions, - ) { - super(message, options); - } -} - -const eolNames = new Map([ - ["\n", "\\n"], - ["\r", "\\r"], - ["\n\r", "\\n\\r"], -]); - interface ParsedMail { sections: { header: string; @@ -61,28 +32,10 @@ interface ParsedMail { export class Mail { date?: Date; messageId?: string; - deliverState: MailDeliverState = { kind: "not-sent" }; + deliverMessage?: string; constructor(public raw: string) {} - setDelivered(deliverer: MailDeliverer, error?: Error) { - this.deliverState = { "kind": "delivered", deliverer, error }; - } - - throwDeliverError( - deliverer: MailDeliverer, - reason: string, - cause?: unknown, - ): never { - const error = new MailDeliverError( - `Failed to deliver mail with ${deliverer.name}: ${reason}`, - this, - { cause }, - ); - this.deliverState = { "kind": "error", deliverer, error }; - throw error; - } - toUtf8Bytes(): Uint8Array { const utf8Encoder = new TextEncoder(); return utf8Encoder.encode(this.raw); @@ -93,9 +46,8 @@ export class Mail { } simpleParse(): ParsedMail { - const twoEolMatch = this.raw.match(/(\r\n|\n|\r)(\r\n|\n|\r)/); - // "\r\n" is a false positive. - if (twoEolMatch == null || twoEolMatch[0] === "\r\n") { + const twoEolMatch = this.raw.match(/(\r?\n)(\r?\n)/); + if (twoEolMatch == null) { throw new MailParseError( "No header/body section separator (2 successive EOLs) found.", this, @@ -105,9 +57,7 @@ export class Mail { const [eol, sep] = [twoEolMatch[1], twoEolMatch[2]]; if (eol !== sep) { - getLogger().warn( - `Different EOLs (${eolNames.get(eol)} and ${eolNames.get(sep)}) found.`, - ); + warn("Different EOLs (\\r\\n, \\n) found."); } return { @@ -171,7 +121,7 @@ export class Mail { if (key.toLowerCase() === "date") { const date = new Date(value); if (isNaN(date.getTime())) { - getLogger().warn(`Invalid date string (${value}) found in header.`); + warn(`Invalid date string (${value}) found in header.`); return invalidValue; } return date; @@ -180,6 +130,26 @@ export class Mail { return undefined; } + simpleParseReceipts( + options?: { domain?: string; headers?: string[] }, + ): Set<string> { + const domain = options?.domain; + const headers = options?.headers ?? ["to", "cc", "bcc", "x-original-to"]; + const receipts = new Set<string>(); + for (const [key, value] of this.simpleParseHeaders()) { + if (headers.includes(key.toLowerCase())) { + emailAddresses.parseAddressList(value)?.flatMap((a) => + a.type === "mailbox" ? a.address : a.addresses.map((a) => a.address) + )?.forEach((a) => { + if (domain == null || a.endsWith(domain)) { + receipts.add(a); + } + }); + } + } + return receipts; + } + // TODO: Add folding. appendHeaders(headers: [key: string, value: string][]) { const { sections, sep, eol } = this.simpleParse(); @@ -190,14 +160,59 @@ export class Mail { } } -export type MailDeliverHook = (mail: Mail) => Promise<void>; +export type MailDeliverResultKind = "done" | "fail" | "retry"; + +export interface MailDeliverReceiptResult { + kind: MailDeliverResultKind; + message: string; + cause?: unknown; +} + +export class MailDeliverResult { + readonly receipts: Map<string, MailDeliverReceiptResult> = new Map(); + + add( + receipt: string, + kind: MailDeliverResultKind, + message: string, + cause?: unknown, + ) { + this.receipts.set(receipt, { kind, message, cause }); + } + + set(receipt: string, result: MailDeliverReceiptResult) { + this.receipts.set(receipt, result); + } + + [Symbol.for("Deno.customInspect")]() { + return [ + ...this.receipts.entries().map(([receipt, result]) => + `${receipt}[${result.kind}]: ${result.message}` + ), + ].join("\n"); + } +} + +export class MailDeliverContext { + readonly receipts: Set<string> = new Set(); + readonly result: MailDeliverResult = new MailDeliverResult(); + + constructor(public mail: Mail) {} +} + +export interface MailDeliverHook { + callback(context: MailDeliverContext): Promise<void>; +} export abstract class MailDeliverer { abstract readonly name: string; preHooks: MailDeliverHook[] = []; postHooks: MailDeliverHook[] = []; - protected abstract doDeliver(mail: Mail): Promise<void>; + protected abstract doDeliver( + mail: Mail, + context: MailDeliverContext, + ): Promise<void>; async deliverRaw(rawMail: string): Promise<Mail> { const mail = new Mail(rawMail); @@ -205,19 +220,89 @@ export abstract class MailDeliverer { return mail; } - async deliver(mail: Mail): Promise<void> { + async deliver(mail: Mail): Promise<MailDeliverResult> { + log(`Begin to deliver mail via ${this.name}...`); + + const context = new MailDeliverContext(mail); + for (const hook of this.preHooks) { - await hook(mail); + await hook.callback(context); } - await this.doDeliver(mail); + await this.doDeliver(context.mail, context); - if (mail.deliverState.kind === "not-sent") { - mail.setDelivered(this); + for (const hook of this.postHooks) { + await hook.callback(context); } - for (const hook of this.postHooks) { - await hook(mail); + log("Deliver result:", context.result); + + if (context.result.receipts.values().some((r) => r.kind !== "done")) { + throw new Error("Mail failed to deliver."); + } + + return context.result; + } +} + +export class ReceiptsFromHeadersHook implements MailDeliverHook { + callback(context: MailDeliverContext) { + if (context.receipts.size !== 0) { + warn("Receipts are already filled. Won't set them with ones in headers."); + } else { + context.mail.simpleParseReceipts({ + domain: getConfigValue("mailDomain"), + }).forEach((r) => context.receipts.add(r)); + + if (context.receipts.size === 0) { + warn("No receipts found from mail headers."); + } + } + return Promise.resolve(); + } +} + +export class FallbackReceiptsHook implements MailDeliverHook { + constructor(public fallback: Set<string> = new Set()) {} + + callback(context: MailDeliverContext) { + if (context.receipts.size === 0) { + log(`No receipts, fill with fallback ${[...this.fallback].join(" ")}.`); + this.fallback.forEach((a) => context.receipts.add(a)); + } + return Promise.resolve(); + } +} + +export class AliasFileMailHook implements MailDeliverHook { + #aliasFile; + + constructor(aliasFile: string) { + this.#aliasFile = aliasFile; + } + + async #parseAliasFile(): Promise<Map<string, string>> { + const result = new Map(); + if ((await Deno.stat(this.#aliasFile)).isFile) { + log(`Found receipts alias file: ${this.#aliasFile}.`); + const text = await Deno.readTextFile(this.#aliasFile); + const csv = parse(text); + for (const [real, ...aliases] of csv) { + aliases.forEach((a) => result.set(a, real)); + } + } + return result; + } + + async callback(context: MailDeliverContext) { + const aliases = await this.#parseAliasFile(); + for (const receipt of [...context.receipts]) { + const realReceipt = aliases.get(receipt); + if (realReceipt != null) { + log(`Receipt alias resolved: ${receipt} => ${realReceipt}.`); + context.receipts.delete(receipt); + context.receipts.add(realReceipt); + } } } } diff --git a/services/docker/mail-server/relay/main.ts b/services/docker/mail-server/relay/main.ts deleted file mode 100644 index 5a021d8..0000000 --- a/services/docker/mail-server/relay/main.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { parseArgs } from "@std/cli"; - -import { AwsRelayApp } from "./aws/app.ts"; - -if (import.meta.main) { - const app = new AwsRelayApp(); - - const args = parseArgs(Deno.args); - if (args._.length === 0) { - throw new Error("You must specify a command."); - } - - const commands = { - "list-lives": () => { - console.log("absdf") - }, - }; - - const command = args._[0]; - if (command in commands) { - commands[command as keyof typeof commands](); - Deno.exit(0); - } else { - throw new Error(command + " is not a valid command."); - } - - await app.run(); -} diff --git a/services/docker/mail-server/relay/util.ts b/services/docker/mail-server/relay/util.ts index 29cda8b..3f7f989 100644 --- a/services/docker/mail-server/relay/util.ts +++ b/services/docker/mail-server/relay/util.ts @@ -1,25 +1,17 @@ -function getZonedDateTime(instant?: Temporal.Instant | Date) { - if (instant == null) { - instant = Temporal.Now.instant(); - } else if (instant instanceof Date) { - instant = instant.toTemporalInstant(); +declare global { + interface Date { + toFileNameString(dateOnly?: boolean): string; } - - return instant.toZonedDateTimeISO("UTC"); } -export function generateTimeStringForFileName( - instant?: Temporal.Instant | Date, - dateOnly: boolean = false, -): string { - const time = getZonedDateTime(instant); - - if (dateOnly) { - return time.toPlainDate().toString(); - } else { - return time.toPlainDateTime().toString().replaceAll(/:|\./g, "-"); - } -} +Object.defineProperty(Date.prototype, "toFileNameString", { + value: function (dateOnly?: boolean) { + const str = (this as Date).toISOString(); + return dateOnly === true + ? str.slice(0, str.indexOf("T")) + : str.replaceAll(/:|\./g, "-"); + }, +}); export function transformProperties<T extends object, N>( object: T, @@ -32,22 +24,6 @@ export function transformProperties<T extends object, N>( ) as { [k in keyof T]: N }; } -export function createSingleton<T>( - name: string, -): [() => T, (v: T | null) => void] { - let singleton: T | null = null; - - return [ - () => { - if (singleton == null) { - throw new Error(`Singleton ${name} is not set now.`); - } - return singleton; - }, - (newValue: T | null) => singleton = newValue, - ]; -} - export function withDefaults<T extends object>( partial: Partial<T> | null | undefined, defaults: T, diff --git a/services/templates/envs/mail-server.env.template b/services/templates/envs/mail-server.env.template index e85e863..687d4f9 100644 --- a/services/templates/envs/mail-server.env.template +++ b/services/templates/envs/mail-server.env.template @@ -1,2 +1,6 @@ +CRUPEST_MAILSERVER_MAIL_DOMAIN=@@CRUPEST_DOMAIN@@ +CRUPEST_MAILSERVER_DATA_PATH=/data/crupest-relay/ +CRUPEST_MAILSERVER_AWS_REGION=@@CRUPEST_MAILSERVER_AWS_REGION@@ CRUPEST_MAILSERVER_AWS_USER=@@CRUPEST_MAILSERVER_AWS_USER@@ CRUPEST_MAILSERVER_AWS_PASSWORD=@@CRUPEST_MAILSERVER_AWS_PASSWORD@@ +CRUPEST_MAILSERVER_AWS_MAIL_BUCKET=@@CRUPEST_MAILSERVER_AWS_MAIL_BUCKET@@ |