@andrewheberle/serverless-ssh-ca 0.17.13 → 0.17.16

package/README.md

@@ -1,16 +1,9 @@
-# Serverless SSH CA on Cloudflare Workers
-
-[![Deploy to Cloudflare](https://deploy.workers.cloudflare.com/button)](https://deploy.workers.cloudflare.com/?url=https%3A%2F%2Fgithub.com%2Fandrewheberle%2Fserverless-ssh-ca-template)
-
-[![codecov](https://codecov.io/gh/andrewheberle/serverless-ssh-ca/graph/badge.svg?flag=worker&token=AZLFIBTTFK)](https://codecov.io/gh/andrewheberle/serverless-ssh-ca)
-
-This repository contains a serverless Certificate Authority (CA) that can be used
-to provide signed certificates for SSH users and hosts running on Cloudflare Workers.
-
 ## @andrewheberle/serverless-ssh-ca
 
 This is the package that implements the SSH CA functionality which can be deployed
-to Cloudflare as a working solution using the "Deploy to Cloudflare" button.
+to Cloudflare as a working solution using the "Deploy to Cloudflare" button below:
+
+[![Deploy to Cloudflare](https://deploy.workers.cloudflare.com/button)](https://deploy.workers.cloudflare.com/?url=https%3A%2F%2Fgithub.com%2Fandrewheberle%2Fserverless-ssh-ca-template)
 
 To use the package in your own Worker manually (assuming you have the requried
 bindings in place), the following code in `src/index.ts` (your Worker's main
@@ -30,8 +23,8 @@ See the following respositories for additional information:
 
 | Repostitory | Details |
 |---|---|
-| https://github.com/andrewheberle/ssh-ca-client | Contains client code for issuing user and host certificates |
-| https://github.com/andrewheberle/severless-ssh-ca-template | Contains a template repository for deployment to Cloudflare Workers |
+| [https://github.com/andrewheberle/ssh-ca-client](https://github.com/andrewheberle/ssh-ca-client) | Contains client code for issuing user and host certificates |
+| [https://github.com/andrewheberle/serverless-ssh-ca-template](https://github.com/andrewheberle/serverless-ssh-ca-template) | Contains a template repository for deployment to Cloudflare Workers |
 
 ## Architecture
 
@@ -184,20 +177,20 @@ sequenceDiagram
 This example shows the configuration in Cloudflare Access, however other
 OIDC IdP's should be generally equivalent:
 
-![Basic OIDC Settings](images/oidc-example_01.png)
+![Basic OIDC Settings](docs/images/oidc-example_01.png)
 
 The `Redirect URL` must match the configured value in the client.
 
 Transfer the IdP settings as follows:
 
-![IdP Settings](images/oidc-example_02.png)
+![IdP Settings](docs/images/oidc-example_02.png)
 
 The `openid` and `email` scopes are required, with enabling of refresh tokens
 (the `offline_access` scope) being optional, but recommended.
 
 ### Client
 
-Please visit the client repository for further information:
+Please visit the ssh-ca-client repository for further information:
 
 https://github.com/andrewheberle/ssh-ca-client
 
@@ -262,7 +255,3 @@ curl https://ssh-ca.example.com/api/v3/ca
 Once the above configuration is completed and host certificates are in place
 clients will not require "trust on first use" (TOFU) as the certificate will be
 verified as being signed by the configured SSH CA.
-
-# Attributions
-
-The icons used by the client are made by Freepik from [www.flaticon.com](https://www.flaticon.com).

package/dist/api/v3/index.d.ts

@@ -1,2 +1,3 @@
 import type { SshCaBindings } from "../../types";
 export declare const createApi: (env: SshCaBindings) => import("chanfana").HonoOpenAPIRouterType<import("hono/types").BlankEnv, import("hono/types").BlankSchema, "/">;
+//# sourceMappingURL=index.d.ts.map

package/dist/api/v3/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/api/v3/index.ts"],"names":[],"mappings":"AAiDA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAsWhD,eAAO,MAAM,SAAS,GAAI,KAAK,aAAa,mHAW3C,CAAA"}

package/dist/api/v3/index.js

@@ -79,7 +79,7 @@ const UserCertificateRequestEndpoint = (env) => {
 };
 const RevocationListEndpoint = (env) => {
     return class extends OpenAPIRoute {
-        schema = createRevocationListEndpointSchema(env);
+        schema = createRevocationListEndpointSchema();
         async handle(c) {
             const data = await this.getValidatedData();
             const l = logger(env).with(...group("request", "type", data.params.certificateType, "action", "krl"));
@@ -276,3 +276,4 @@ export const createApi = (env) => {
     api.post("/:certificateType/revoke", RevokeCertificateEndpoint(env));
     return api;
 };
+//# sourceMappingURL=index.js.map

package/dist/api/v3/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/v3/index.ts"],"names":[],"mappings":"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"}

package/dist/api/v3/schema.d.ts

@@ -1,5 +1,19 @@
 import z from "zod";
 import type { SshCaBindings } from "../../types";
+export declare const createIdentityTokenSchema: (env: SshCaBindings) => z.ZodPipe<z.ZodString, z.ZodTransform<{
+    sub: string;
+    principals: string[];
+}, string>>;
+export declare const createAccessTokenSchema: (env: SshCaBindings) => z.ZodPipe<z.ZodString, z.ZodTransform<{
+    email: string;
+    sub: string;
+}, string>>;
+export declare const createHeaderSchema: (env: SshCaBindings) => z.ZodObject<{
+    Authorization: z.ZodPipe<z.ZodString, z.ZodTransform<{
+        email: string;
+        sub: string;
+    }, string>>;
+}, z.core.$strip>;
 export declare const CaPublicKeyEndpointSchema: {
     responses: {
         "200": {
@@ -12,6 +26,16 @@ export declare const CaPublicKeyEndpointSchema: {
         };
     };
 };
+export declare const userCertificateRequestEndpointBodySchema: (env: SshCaBindings) => z.ZodObject<{
+    public_key: z.ZodPipe<z.ZodPipe<z.ZodBase64, z.ZodTransform<Buffer<ArrayBuffer>, string>>, z.ZodTransform<import("sshpk").Key, Buffer<ArrayBuffer>>>;
+    proof: z.ZodPipe<z.ZodString, z.ZodTransform<import("../../proof").ProofOfPossession, string>>;
+    identity: z.ZodPipe<z.ZodString, z.ZodTransform<{
+        sub: string;
+        principals: string[];
+    }, string>>;
+    extensions: z.ZodDefault<z.ZodArray<z.ZodString>>;
+    lifetime: z.ZodDefault<z.ZodInt>;
+}, z.core.$strip>;
 export declare const createUserCertificateRequestEndpointSchema: (env: SshCaBindings) => {
     security: {
         oidcAuth: never[];
@@ -64,7 +88,7 @@ export declare const createUserCertificateRequestEndpointSchema: (env: SshCaBind
         };
     };
 };
-export declare const createRevocationListEndpointSchema: (env: SshCaBindings) => {
+export declare const createRevocationListEndpointSchema: () => {
     request: {
         params: z.ZodObject<{
             certificateType: z.ZodEnum<{
@@ -90,6 +114,16 @@ export declare const createRevocationListEndpointSchema: (env: SshCaBindings) =>
         };
     };
 };
+export declare const hostCertificateRequestEndpointBodySchema: (env: SshCaBindings) => z.ZodObject<{
+    public_key: z.ZodPipe<z.ZodPipe<z.ZodBase64, z.ZodTransform<Buffer<ArrayBuffer>, string>>, z.ZodTransform<import("sshpk").Key, Buffer<ArrayBuffer>>>;
+    proof: z.ZodPipe<z.ZodString, z.ZodTransform<import("../../proof").ProofOfPossession, string>>;
+    identity: z.ZodPipe<z.ZodString, z.ZodTransform<{
+        sub: string;
+        principals: string[];
+    }, string>>;
+    principals: z.ZodArray<z.ZodString>;
+    lifetime: z.ZodDefault<z.ZodInt>;
+}, z.core.$strip>;
 export declare const createHostCertificateRequestEndpointSchema: (env: SshCaBindings) => {
     security: {
         oidcAuth: never[];
@@ -142,6 +176,12 @@ export declare const createHostCertificateRequestEndpointSchema: (env: SshCaBind
         };
     };
 };
+export declare const hostCertificateRenewEndpointBodySchema: (env: SshCaBindings) => z.ZodObject<{
+    certificate: z.ZodPipe<z.ZodPipe<z.ZodBase64, z.ZodTransform<Buffer<ArrayBuffer>, string>>, z.ZodTransform<import("sshpk").Certificate, Buffer<ArrayBuffer>>>;
+    public_key: z.ZodPipe<z.ZodPipe<z.ZodBase64, z.ZodTransform<Buffer<ArrayBuffer>, string>>, z.ZodTransform<import("sshpk").Key, Buffer<ArrayBuffer>>>;
+    proof: z.ZodPipe<z.ZodString, z.ZodTransform<import("../../proof").RenewalProofOfPossession, string>>;
+    lifetime: z.ZodDefault<z.ZodInt>;
+}, z.core.$strip>;
 export declare const createHostCertificateRenewEndpointSchema: (env: SshCaBindings) => {
     request: {
         body: {
@@ -177,6 +217,11 @@ export declare const createHostCertificateRenewEndpointSchema: (env: SshCaBindin
         };
     };
 };
+export declare const revokeCertificateEndpointBodySchema: (env: SshCaBindings) => z.ZodObject<{
+    serial: z.ZodBigInt;
+    public_key: z.ZodPipe<z.ZodPipe<z.ZodBase64, z.ZodTransform<Buffer<ArrayBuffer>, string>>, z.ZodTransform<import("sshpk").Key, Buffer<ArrayBuffer>>>;
+    proof: z.ZodPipe<z.ZodString, z.ZodTransform<import("../../proof").ProofOfPossession, string>>;
+}, z.core.$strip>;
 export declare const createRevokeCertificateEndpointSchema: (env: SshCaBindings) => {
     request: {
         params: z.ZodObject<{
@@ -216,3 +261,4 @@ export declare const createRevokeCertificateEndpointSchema: (env: SshCaBindings)
         };
     };
 };
+//# sourceMappingURL=schema.d.ts.map

package/dist/api/v3/schema.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/api/v3/schema.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,KAAK,CAAA;AACnB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAkDhD,eAAO,MAAM,yBAAyB,GAAI,KAAK,aAAa;;;WAO3D,CAAA;AAED,eAAO,MAAM,uBAAuB,GAAI,KAAK,aAAa;;;WAOzD,CAAA;AAKD,eAAO,MAAM,kBAAkB,GAAI,KAAK,aAAa;;;;;iBAIpD,CAAA;AAKD,eAAO,MAAM,yBAAyB;;;;;;;;;;;CAYrC,CAAA;AAED,eAAO,MAAM,wCAAwC,GAAI,KAAK,aAAa;;;;;;;;;iBAiB1E,CAAA;AAED,eAAO,MAAM,0CAA0C,GAAI,KAAK,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqB3E,CAAA;AAEF,eAAO,MAAM,kCAAkC;;;;;;;;;;;;;;;;;;;;;;;;;CAkB7C,CAAA;AAEF,eAAO,MAAM,wCAAwC,GAAI,KAAK,aAAa;;;;;;;;;iBAgB1E,CAAA;AAED,eAAO,MAAM,0CAA0C,GAAI,KAAK,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqB3E,CAAA;AAEF,eAAO,MAAM,sCAAsC,GAAI,KAAK,aAAa;;;;;iBAgBxE,CAAA;AAED,eAAO,MAAM,wCAAwC,GAAI,KAAK,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmBzE,CAAA;AAEF,eAAO,MAAM,mCAAmC,GAAI,KAAK,aAAa;;;;iBAUrE,CAAA;AAED,eAAO,MAAM,qCAAqC,GAAI,KAAK,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuBtE,CAAA"}

package/dist/api/v3/schema.js

@@ -20,22 +20,21 @@ const publicKey = openapiStringByte
     description: "SSH public key to sign",
     example: "ZWNkc2Etc2hhMi1uaXN0cDI1NiBBQUFBRTJWalpITmhMWE5vWVRJdGJtbHpkSEF5TlRZQUFBQUlibWx6ZEhBeU5UWUFBQUJCQkdNcFNKdHRmMEl0dE5DVmMyOFR6WEZSMUQweHZPM25wNjdWemVBUXNiZFpza3JEY1lqU2x3SjZIUERtVHBYYVUwbEVhWDlMNFloYy9jQ2YxTWU5RlRrPQo="
 });
-const createIdentityTokenSchema = (env) => (z.string()
+export const createIdentityTokenSchema = (env) => (z.string()
     .meta({
     description: "Identity Token JWT from OIDC IdP",
     example: "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwiZW1haWwiOiJ1c2VyQGV4YW1wbGUuY29tIiwiaWF0IjoxNzc1NzAzMDk1fQ.ri_neAWnhMNK3LzlsrBcQYymSM4yRjmNSZZSeZiXhrEqtEz6c3cXk0Esq765umGjpUsWcosL-OFrDJlyAjTDnhrd9oV08uc_CW0rQRsJIGEuRo3ryxkLdVu9mGoZWEUb9KwjGJrwxvr-0cPWx5jaDyKwJcqMvtV_bEITUD51sDB1Vm89QfYRO_pGJo2vrRzSvMjpUenRpwPay4lYIBxl41_4YpR9Rc6VrIZuYsjV2iqEZ4eBrygMA7zPR_hN7l7s95FddLOzj5NsK57VT4uLHwYohx2oqMzw3M-B9HsZIQin_9q61pZFQXepzJth0woXiZheU27llnfHX967PhNQyg"
 })
     .transform((val, ctx) => transformIdentityToken(env, val, ctx)));
-const createAccessTokenSchema = (env) => (z.string()
+export const createAccessTokenSchema = (env) => (z.string()
     .meta({
     description: "Access Token JWT from OIDC IdP",
-    example: "Bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwiZW1haWwiOiJ1c2VyQGV4YW1wbGUuY29tIiwiaWF0IjoxNzc1NzAzMDk1fQ.ri_neAWnhMNK3LzlsrBcQYymSM4yRjmNSZZSeZiXhrEqtEz6c3cXk0Esq765umGjpUsWcosL-OFrDJlyAjTDnhrd9oV08uc_CW0rQRsJIGEuRo3ryxkLdVu9mGoZWEUb9KwjGJrwxvr-0cPWx5jaDyKwJcqMvtV_bEITUD51sDB1Vm89QfYRO_pGJo2vrRzSvMjpUenRpwPay4lYIBxl41_4YpR9Rc6VrIZuYsjV2iqEZ4eBrygMA7zPR_hN7l7s95FddLOzj5NsK57VT4uLHwYohx2oqMzw3M-B9HsZIQin_9q61pZFQXepzJth0woXiZheU27llnfHX967PhNQyg"
+    example: "Bearer eyJ..."
 })
-    .startsWith("Bearer ")
     .transform((val, ctx) => transformAuthorizationHeader(env, val, ctx)));
 const krl = openapiStringByte
     .meta({ description: "Key Revocation List" });
-const createHeaderSchema = (env) => (z.object({
+export const createHeaderSchema = (env) => (z.object({
     "Authorization": createAccessTokenSchema(env)
 }));
 const certificate = openapiStringByte
@@ -53,26 +52,27 @@ export const CaPublicKeyEndpointSchema = {
         ...InternalServerErrorException.schema(),
     }
 };
+export const userCertificateRequestEndpointBodySchema = (env) => (z.object({
+    public_key: publicKey,
+    proof: proofOfPossession
+        .transform((val, ctx) => transformProofOfPossession(env, val, ctx)),
+    identity: createIdentityTokenSchema(env),
+    extensions: z.array(z.string())
+        .default(split(env.SSH_CERTIFICATE_EXTENSIONS))
+        .meta({ description: "Extensions to include in the issued SSH certificate" }),
+    lifetime: z.int()
+        .min(seconds("5 minutes"))
+        .max(seconds(env.SSH_CERTIFICATE_LIFETIME))
+        .default(seconds(env.SSH_CERTIFICATE_LIFETIME))
+        .meta({ description: "Lifetime of issued SSH certificate" }),
+})
+    .superRefine((val, ctx) => refineCertificateRequest(env, val, ctx))
+    .openapi("User Certificate Request"));
 export const createUserCertificateRequestEndpointSchema = (env) => ({
     security: [{ oidcAuth: [] }],
     request: {
         headers: createHeaderSchema(env),
-        body: contentJson(z.object({
-            public_key: publicKey,
-            proof: proofOfPossession
-                .transform((val, ctx) => transformProofOfPossession(env, val, ctx)),
-            identity: createIdentityTokenSchema(env),
-            extensions: z.array(z.string())
-                .default(split(env.SSH_CERTIFICATE_EXTENSIONS))
-                .meta({ description: "Extensions to include in the issued SSH certificate" }),
-            lifetime: z.int()
-                .min(seconds("5 minutes"))
-                .max(seconds(env.SSH_CERTIFICATE_LIFETIME))
-                .default(seconds(env.SSH_CERTIFICATE_LIFETIME))
-                .meta({ description: "Lifetime of issued SSH certificate" }),
-        })
-            .superRefine((val, ctx) => refineCertificateRequest(env, val, ctx))
-            .openapi("User Certificate Request"))
+        body: contentJson(userCertificateRequestEndpointBodySchema(env)),
     },
     responses: {
         "200": {
@@ -89,7 +89,7 @@ export const createUserCertificateRequestEndpointSchema = (env) => ({
         ...InternalServerErrorException.schema(),
     }
 });
-export const createRevocationListEndpointSchema = (env) => ({
+export const createRevocationListEndpointSchema = () => ({
     request: {
         params: z.object({
             certificateType: z.enum(["user", "host"])
@@ -107,25 +107,26 @@ export const createRevocationListEndpointSchema = (env) => ({
         ...InternalServerErrorException.schema(),
     }
 });
+export const hostCertificateRequestEndpointBodySchema = (env) => (z.object({
+    public_key: publicKey,
+    proof: proofOfPossession
+        .transform((val, ctx) => transformProofOfPossession(env, val, ctx)),
+    identity: createIdentityTokenSchema(env),
+    principals: z.array(z.string()).min(1)
+        .meta({ description: "List of principals to include on the issued certificate" }),
+    lifetime: z.int()
+        .min(seconds("24 hours"))
+        .max(seconds(env.SSH_HOST_CERTIFICATE_LIFETIME))
+        .default(seconds(env.SSH_HOST_CERTIFICATE_LIFETIME))
+        .meta({ description: "Lifetime of issued Host SSH certificate" }),
+})
+    .superRefine((val, ctx) => refineHostCertificateRequest(env, val, ctx))
+    .openapi("Host Certificate Request"));
 export const createHostCertificateRequestEndpointSchema = (env) => ({
     security: [{ oidcAuth: [] }],
     request: {
         headers: createHeaderSchema(env),
-        body: contentJson(z.object({
-            public_key: publicKey,
-            proof: proofOfPossession
-                .transform((val, ctx) => transformProofOfPossession(env, val, ctx)),
-            identity: createIdentityTokenSchema(env),
-            principals: z.array(z.string()).min(1)
-                .meta({ description: "List of principals to include on the issued certificate" }),
-            lifetime: z.int()
-                .min(seconds("24 hours"))
-                .max(seconds(env.SSH_HOST_CERTIFICATE_LIFETIME))
-                .default(seconds(env.SSH_HOST_CERTIFICATE_LIFETIME))
-                .meta({ description: "Lifetime of issued Host SSH certificate" }),
-        })
-            .superRefine((val, ctx) => refineHostCertificateRequest(env, val, ctx))
-            .openapi("Host Certificate Request"))
+        body: contentJson(hostCertificateRequestEndpointBodySchema(env))
     },
     responses: {
         "200": {
@@ -142,23 +143,24 @@ export const createHostCertificateRequestEndpointSchema = (env) => ({
         ...InternalServerErrorException.schema(),
     }
 });
+export const hostCertificateRenewEndpointBodySchema = (env) => (z.object({
+    certificate: openapiStringByte
+        .transform(transformCertificate)
+        .meta({ description: "SSH certificate to renew" }),
+    public_key: publicKey,
+    proof: proofOfPossession
+        .transform((val, ctx) => transformRenewalProofOfPossession(env, val, ctx)),
+    lifetime: z.int()
+        .min(seconds("24 hours"))
+        .max(seconds(env.SSH_HOST_CERTIFICATE_LIFETIME))
+        .default(seconds(env.SSH_HOST_CERTIFICATE_LIFETIME))
+        .meta({ description: "Lifetime of renewed Host SSH certificate" }),
+})
+    .superRefine((val, ctx) => refineHostCertificateRenewal(env, isRevoked, val, ctx))
+    .openapi("Host Certificate Renew"));
 export const createHostCertificateRenewEndpointSchema = (env) => ({
     request: {
-        body: contentJson(z.object({
-            certificate: openapiStringByte
-                .transform(transformCertificate)
-                .meta({ description: "SSH certificate to renew" }),
-            public_key: publicKey,
-            proof: proofOfPossession
-                .transform((val, ctx) => transformRenewalProofOfPossession(env, val, ctx)),
-            lifetime: z.int()
-                .min(seconds("24 hours"))
-                .max(seconds(env.SSH_HOST_CERTIFICATE_LIFETIME))
-                .default(seconds(env.SSH_HOST_CERTIFICATE_LIFETIME))
-                .meta({ description: "Lifetime of renewed Host SSH certificate" }),
-        })
-            .superRefine((val, ctx) => refineHostCertificateRenewal(env, isRevoked, val, ctx))
-            .openapi("Host Certificate Renew"))
+        body: contentJson(hostCertificateRenewEndpointBodySchema(env))
     },
     responses: {
         "200": {
@@ -175,20 +177,21 @@ export const createHostCertificateRenewEndpointSchema = (env) => ({
         ...InternalServerErrorException.schema(),
     }
 });
+export const revokeCertificateEndpointBodySchema = (env) => (z.object({
+    serial: z.bigint()
+        .meta({ description: "Serial number of certificate to revoke" }),
+    public_key: publicKey,
+    proof: proofOfPossession
+        .transform((val, ctx) => transformProofOfPossession(env, val, ctx)),
+})
+    .openapi("Certificate Revocation")
+    .superRefine((val, ctx) => refineRevokeCertificate(env, val, ctx)));
 export const createRevokeCertificateEndpointSchema = (env) => ({
     request: {
         params: z.object({
             certificateType: z.enum(["user", "host"])
         }),
-        body: contentJson(z.object({
-            serial: z.bigint()
-                .meta({ description: "Serial number of certificate to revoke" }),
-            public_key: publicKey,
-            proof: proofOfPossession
-                .transform((val, ctx) => transformProofOfPossession(env, val, ctx)),
-        })
-            .openapi("Certificate Revocation")
-            .superRefine((val, ctx) => refineRevokeCertificate(env, val, ctx)))
+        body: contentJson(revokeCertificateEndpointBodySchema(env))
     },
     responses: {
         "200": {
@@ -206,3 +209,4 @@ export const createRevokeCertificateEndpointSchema = (env) => ({
         ...ConflictException.schema()
     }
 });
+//# sourceMappingURL=schema.js.map

package/dist/api/v3/schema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../src/api/v3/schema.ts"],"names":[],"mappings":"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"}

package/dist/certificate.d.ts

@@ -28,3 +28,4 @@ export declare class BadIssuerError extends Error {
 }
 export declare function createSignedHostCertificate(env: SshCaBindings, public_key: Key, options?: CreateHostCertificateOptions): Promise<Certificate>;
 export declare const generateSerial: (serial?: bigint) => Buffer<ArrayBuffer>;
+//# sourceMappingURL=certificate.d.ts.map

package/dist/certificate.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"certificate.d.ts","sourceRoot":"","sources":["../src/certificate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAqB,QAAQ,EAAoD,GAAG,EAAmB,UAAU,EAAE,MAAM,OAAO,CAAA;AAGpJ,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAI5C,MAAM,MAAM,wBAAwB,GAAG;IACtC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;CACrB,CAAA;AAQD,qBAAa,gBAAiB,SAAQ,KAAK;gBAC9B,OAAO,EAAE,MAAM;CAO3B;AAED,MAAM,MAAM,0BAA0B,GAAG;IACxC;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,CAAA;CACf,GAAG,wBAAwB,CAAA;AAE5B,eAAO,MAAM,mBAAmB,GAAI,KAAK,aAAa,EAAE,OAAO,MAAM,EAAE,KAAK,UAAU,EAAE,YAAY,GAAG,EAAE,UAAU,0BAA0B,KAAG,WAuF/I,CAAA;AAED,wBAAsB,uBAAuB,CAAC,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,wBAAwB,GAAG,OAAO,CAAC,WAAW,CAAC,CAgB1J;AAED,MAAM,MAAM,4BAA4B,GAAG;IAC1C,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,QAAQ,CAAC,EAAE,QAAQ,EAAE,CAAA;CACrB,CAAA;AAOD,qBAAa,cAAe,SAAQ,KAAK;gBAC5B,OAAO,EAAE,MAAM;CAM3B;AAED,wBAAsB,2BAA2B,CAAC,GAAG,EAAE,aAAa,EAAE,UAAU,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,4BAA4B,GAAG,OAAO,CAAC,WAAW,CAAC,CAyCnJ;AAED,eAAO,MAAM,cAAc,GAAI,SAAS,MAAM,KAAG,MAAM,CAAC,WAAW,CAUlE,CAAA"}

package/dist/certificate.js

@@ -15,9 +15,15 @@ export class CertificateError extends Error {
     }
 }
 export const generateCertificate = (env, email, key, public_key, options) => {
-    let { lifetime, principals, extensions, serial } = options ?? {};
+    let { lifetime } = options ?? {};
+    const { principals, extensions, serial } = options ?? {};
     // add identities
-    const identity = env.SSH_CERTIFICATE_INCLUDE_SELF === "true"
+    const includeSelf = env.SSH_CERTIFICATE_INCLUDE_SELF === undefined
+        ? false
+        : typeof env.SSH_CERTIFICATE_INCLUDE_SELF === "string"
+            ? env.SSH_CERTIFICATE_INCLUDE_SELF === "true"
+            : env.SSH_CERTIFICATE_INCLUDE_SELF;
+    const identity = includeSelf
         ? [identityForUser(email.split("@")[0])]
         : [];
     if (principals !== undefined) {
@@ -25,10 +31,8 @@ export const generateCertificate = (env, email, key, public_key, options) => {
             identity.push(identityForUser(p));
         }
     }
-    if (env.SSH_CERTIFICATE_PRINCIPALS !== "") {
-        for (const p of split(env.SSH_CERTIFICATE_PRINCIPALS)) {
-            identity.push(identityForUser(p));
-        }
+    for (const p of split(env.SSH_CERTIFICATE_PRINCIPALS)) {
+        identity.push(identityForUser(p));
     }
     // lifetime is the smaller of what was provided in the options or the default
     lifetime = lifetime !== undefined
@@ -152,3 +156,4 @@ export const generateSerial = (serial) => {
     const randomBytes = crypto.getRandomValues(new Uint8Array(8));
     return Buffer.from(randomBytes);
 };
+//# sourceMappingURL=certificate.js.map

package/dist/certificate.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"certificate.js","sourceRoot":"","sources":["../src/certificate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAAe,iBAAiB,EAAY,eAAe,EAAE,eAAe,EAAE,cAAc,EAAO,eAAe,EAAc,MAAM,OAAO,CAAA;AAEpJ,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAW/B;;;;IAII;AAEJ,MAAM,OAAO,gBAAiB,SAAQ,KAAK;IAC1C,YAAY,OAAe;QAC1B,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAA;QAE9B,yDAAyD;QACzD,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAA;IACxD,CAAC;CACD;AAWD,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,GAAkB,EAAE,KAAa,EAAE,GAAe,EAAE,UAAe,EAAE,OAAoC,EAAe,EAAE;IAC7J,IAAI,EAAE,QAAQ,EAAE,GAAG,OAAO,IAAI,EAAE,CAAA;IAChC,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,IAAI,EAAE,CAAA;IAExD,iBAAiB;IACjB,MAAM,WAAW,GAAG,GAAG,CAAC,4BAA4B,KAAK,SAAS;QACjE,CAAC,CAAC,KAAK;QACP,CAAC,CAAC,OAAO,GAAG,CAAC,4BAA4B,KAAK,QAAQ;YACrD,CAAC,CAAC,GAAG,CAAC,4BAA4B,KAAK,MAAM;YAC7C,CAAC,CAAC,GAAG,CAAC,4BAA4B,CAAA;IACpC,MAAM,QAAQ,GAAG,WAAW;QAC3B,CAAC,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAE,CAAC,CAAC;QACzC,CAAC,CAAC,EAAE,CAAA;IACL,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC9B,KAAK,MAAM,CAAC,IAAI,UAAU,EAAE,CAAC;YAC5B,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAA;QAClC,CAAC;IACF,CAAC;IAED,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,0BAA0B,CAAC,EAAE,CAAC;QACvD,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAA;IAClC,CAAC;IAGD,6EAA6E;IAC7E,QAAQ,GAAG,QAAQ,KAAK,SAAS;QAChC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;QAC3D,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAA;IAExC,2CAA2C;IAC3C,MAAM,CAAC,GAAG,cAAc,CAAC,MAAM,CAAC,CAAA;IAEhC,+CAA+C;IAC/C,MAAM,MAAM,GAAG,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;IAE5C,qBAAqB;IACrB,MAAM,WAAW,GAAG,iBAAiB,CAAC,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAA;IAE3G,oEAAoE;IACpE,IAAI,WAAW,CAAC,UAAU,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;QAClD,MAAM,IAAI,gBAAgB,CAAC,4CAA4C,CAAC,CAAA;IACzE,CAAC;IAED,MAAM,wBAAwB,GAAG,KAAK,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAA;IAEtE,uBAAuB;IACvB,MAAM,aAAa,GAAmB,EAAE,CAAA;IACxC,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC9B,yGAAyG;QACzG,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;YAC9B,IAAI,CAAC,wBAAwB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC7C,MAAM,IAAI,gBAAgB,CAAC,GAAG,GAAG,iBAAiB,CAAC,CAAA;YACpD,CAAC;YAED,oCAAoC;YACpC,aAAa,CAAC,IAAI,CAAC;gBAClB,QAAQ,EAAE,KAAK;gBACf,IAAI,EAAE,GAAG;gBACT,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;aACrB,CAAC,CAAA;QACH,CAAC;IACF,CAAC;SAAM,CAAC;QACP,+BAA+B;QAC/B,wBAAwB,CAAC,OAAO,CAAC,CAAC,GAAW,EAAE,EAAE;YAChD,aAAa,CAAC,IAAI,CAAC;gBAClB,QAAQ,EAAE,KAAK;gBACf,IAAI,EAAE,GAAG;gBACT,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;aACrB,CAAC,CAAA;QACH,CAAC,CAAC,CAAA;IAEH,CAAC;IAED,0BAA0B;IAC1B,WAAW,CAAC,UAAU,GAAG;QACxB,OAAO,EAAE;YACR,KAAK,EAAE,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK;YAC3C,KAAK,EAAE,KAAK;YACZ,SAAS,EAAE,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS;YACnD,IAAI,EAAE,aAAa;SACnB;KACD,CAAA;IAED,wBAAwB;IACxB,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;IAEzB,OAAO,WAAW,CAAA;AACnB,CAAC,CAAA;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,GAAkB,EAAE,KAAa,EAAE,UAAe,EAAE,OAAkC;IACnI,qCAAqC;IACrC,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,WAAW,CAAC,GAAG,EAAE,CAAA;IAE1C,YAAY;IACZ,MAAM,GAAG,GAAG,eAAe,CAAC,MAAM,CAAC,CAAA;IAEnC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC3B,OAAO,GAAG;YACT,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC;YAC/C,UAAU,EAAE,EAAE;YACd,UAAU,EAAE,KAAK,CAAC,GAAG,CAAC,0BAA0B,CAAC;SACjD,CAAA;IACF,CAAC;IAED,OAAO,mBAAmB,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,UAAU,EAAE,OAAO,CAAC,CAAA;AACjE,CAAC;AAQD;;;IAGI;AAEJ,MAAM,OAAO,cAAe,SAAQ,KAAK;IACxC,YAAY,OAAe;QAC1B,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,IAAI,GAAG,gBAAgB,CAAA;QAE5B,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,cAAc,CAAC,SAAS,CAAC,CAAA;IACtD,CAAC;CACD;AAED,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAAC,GAAkB,EAAE,UAAe,EAAE,OAAsC;IAC5H,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC3B,OAAO,GAAG;YACT,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC;YACpD,UAAU,EAAE,EAAE;SACd,CAAA;IACF,CAAC;IACD,2CAA2C;IAC3C,MAAM,QAAQ,GAAe,EAAE,CAAA;IAC/B,IAAI,OAAO,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;QACtC,KAAK,MAAM,CAAC,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;YACpC,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAA;QAClC,CAAC;IACF,CAAC;IAED,wDAAwD;IACxD,IAAI,OAAO,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;QACpC,QAAQ,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;IACnC,CAAC;IAED,qCAAqC;IACrC,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,WAAW,CAAC,GAAG,EAAE,CAAA;IAE1C,oBAAoB;IACpB,MAAM,GAAG,GAAG,eAAe,CAAC,MAAM,CAAC,CAAA;IAEnC,6EAA6E;IAC7E,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,KAAK,SAAS;QAC9C,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;QACxE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAA;IAE7C,2CAA2C;IAC3C,MAAM,MAAM,GAAG,cAAc,EAAE,CAAA;IAE/B,+CAA+C;IAC/C,MAAM,MAAM,GAAG,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;IAE5C,qBAAqB;IACrB,MAAM,WAAW,GAAG,iBAAiB,CAAC,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;IAEhH,OAAO,WAAW,CAAA;AACnB,CAAC;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,MAAe,EAAuB,EAAE;IACtE,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QAC1B,MAAM,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QACzB,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAA;QAE1B,OAAO,CAAC,CAAA;IACT,CAAC;IAED,MAAM,WAAW,GAAG,MAAM,CAAC,eAAe,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,CAAA;IAC7D,OAAO,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;AAChC,CAAC,CAAA"}

package/dist/{db.d.ts → db/index.d.ts}

@@ -1,5 +1,5 @@
 import { Certificate } from "sshpk";
-import type { SshCaBindings } from "./types";
+import type { SshCaBindings } from "../types";
 export declare enum CertificateType {
     User = 0,
     Host = 1
@@ -16,8 +16,9 @@ export type CertificateRecord = {
     certificate_type: CertificateType;
     public_key: string | null;
 };
-export declare const runStatement: <T = Record<string, unknown>>(stmt: D1PreparedStatement) => Promise<D1Result<T>>;
-export declare const shouldRetry: (err: unknown, nextAttempt: number) => boolean;
+export type DatabaseSchema = {
+    certificates: CertificateRecord;
+};
 export declare const dbCleanup: (env: SshCaBindings) => Promise<void>;
 export declare const recordCertificate: (env: SshCaBindings, certificate: Certificate, keyid: string, certificateType?: CertificateType) => Promise<void>;
 export declare const isRevoked: (env: SshCaBindings, serial: bigint) => Promise<boolean>;
@@ -29,8 +30,7 @@ export declare enum RevocationStatus {
 }
 export declare const revocationStatus: (env: SshCaBindings, serial: bigint, publickey: string, certificateType: CertificateType) => Promise<RevocationStatus>;
 export declare const getRevocationList: (env: SshCaBindings, certificateType: CertificateType) => Promise<string[]>;
-type RevokedCertificate = {
-    revoked_at: string;
-};
+type RevokedCertificate = Pick<CertificateRecord, "revoked_at">;
 export declare const revokeCertificate: (env: SshCaBindings, serial: bigint) => Promise<RevokedCertificate[]>;
 export {};
+//# sourceMappingURL=index.d.ts.map

package/dist/db/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/db/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAoB,MAAM,OAAO,CAAA;AAErD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAI7C,oBAAY,eAAe;IAC1B,IAAI,IAAA;IACJ,IAAI,IAAA;CACJ;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC/B,EAAE,EAAE,MAAM,CAAA;IACV,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;IACzB,WAAW,EAAE,IAAI,CAAA;IACjB,YAAY,EAAE,IAAI,CAAA;IAClB,UAAU,EAAE,IAAI,GAAG,IAAI,CAAA;IACvB,gBAAgB,EAAE,eAAe,CAAA;IACjC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;CACzB,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC5B,YAAY,EAAE,iBAAiB,CAAA;CAC/B,CAAA;AAqBD,eAAO,MAAM,SAAS,GAAU,KAAK,aAAa,kBAqBjD,CAAA;AAED,eAAO,MAAM,iBAAiB,GAAU,KAAK,aAAa,EAAE,aAAa,WAAW,EAAE,OAAO,MAAM,EAAE,kBAAiB,eAAsC,kBA2B3J,CAAA;AAED,eAAO,MAAM,SAAS,GAAU,KAAK,aAAa,EAAE,QAAQ,MAAM,KAAG,OAAO,CAAC,OAAO,CAYnF,CAAA;AAED,oBAAY,gBAAgB;IAC3B,QAAQ,IAAA;IACR,OAAO,IAAA;IACP,SAAS,IAAA;IACT,WAAW,IAAA;CACX;AAED,eAAO,MAAM,gBAAgB,GAAU,KAAK,aAAa,EAAE,QAAQ,MAAM,EAAE,WAAW,MAAM,EAAE,iBAAiB,eAAe,KAAG,OAAO,CAAC,gBAAgB,CAwBxJ,CAAA;AAED,eAAO,MAAM,iBAAiB,GAAU,KAAK,aAAa,EAAE,iBAAiB,eAAe,KAAG,OAAO,CAAC,MAAM,EAAE,CAoB9G,CAAA;AAED,KAAK,kBAAkB,GAAG,IAAI,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAA;AAE/D,eAAO,MAAM,iBAAiB,GAAU,KAAK,aAAa,EAAE,QAAQ,MAAM,KAAG,OAAO,CAAC,kBAAkB,EAAE,CAuBxG,CAAA"}