diff --git a/cli/commands/generateOrgCaKeys.ts b/cli/commands/generateOrgCaKeys.ts index af822c81..fe38e0c5 100644 --- a/cli/commands/generateOrgCaKeys.ts +++ b/cli/commands/generateOrgCaKeys.ts @@ -3,7 +3,7 @@ import { db, orgs } from "@server/db"; import { eq } from "drizzle-orm"; import { encrypt } from "@server/lib/crypto"; import { configFilePath1, configFilePath2 } from "@server/lib/consts"; -import { generateCA } from "@server/private/lib/sshCA"; +import { generateCA } from "@server/lib/sshCA"; import fs from "fs"; import yaml from "js-yaml"; diff --git a/server/private/lib/sshCA.ts b/server/lib/sshCA.ts similarity index 97% rename from server/private/lib/sshCA.ts rename to server/lib/sshCA.ts index 6c9d1209..5291c831 100644 --- a/server/private/lib/sshCA.ts +++ b/server/lib/sshCA.ts @@ -1,16 +1,3 @@ -/* - * This file is part of a proprietary work. - * - * Copyright (c) 2025 Fossorial, Inc. - * All rights reserved. - * - * This file is licensed under the Fossorial Commercial License. - * You may not use this file except in compliance with the License. - * Unauthorized use, copying, modification, or distribution is strictly prohibited. - * - * This file is not licensed under the AGPLv3. - */ - import * as crypto from "crypto"; /** diff --git a/server/private/routers/ssh/signSshKey.ts b/server/private/routers/ssh/signSshKey.ts index 501b29bd..0e4c4e9e 100644 --- a/server/private/routers/ssh/signSshKey.ts +++ b/server/private/routers/ssh/signSshKey.ts @@ -32,7 +32,7 @@ import { fromError } from "zod-validation-error"; import { OpenAPITags, registry } from "@server/openApi"; import { eq, or, and } from "drizzle-orm"; import { canUserAccessSiteResource } from "@server/auth/canUserAccessSiteResource"; -import { signPublicKey, getOrgCAKeys } from "#private/lib/sshCA"; +import { signPublicKey, getOrgCAKeys } from "@server/lib/sshCA"; import config from "@server/lib/config"; import { sendToClient } from "#private/routers/ws"; diff --git a/server/routers/org/createOrg.ts b/server/routers/org/createOrg.ts index 1a5d8799..ec9581e7 100644 --- a/server/routers/org/createOrg.ts +++ b/server/routers/org/createOrg.ts @@ -28,7 +28,7 @@ import { FeatureId, limitsService, freeLimitSet } from "@server/lib/billing"; import { build } from "@server/build"; import { calculateUserClientsForOrgs } from "@server/lib/calculateUserClientsForOrgs"; import { doCidrsOverlap } from "@server/lib/ip"; -import { generateCA } from "@server/private/lib/sshCA"; +import { generateCA } from "@server/lib/sshCA"; import { encrypt } from "@server/lib/crypto"; const validOrgIdRegex = /^[a-z0-9_]+(-[a-z0-9_]+)*$/; diff --git a/server/setup/scriptsPg/1.16.0.ts b/server/setup/scriptsPg/1.16.0.ts index f87bd7f2..0bcfdc4a 100644 --- a/server/setup/scriptsPg/1.16.0.ts +++ b/server/setup/scriptsPg/1.16.0.ts @@ -2,7 +2,7 @@ import { db } from "@server/db/pg/driver"; import { sql } from "drizzle-orm"; import { configFilePath1, configFilePath2 } from "@server/lib/consts"; import { encrypt } from "@server/lib/crypto"; -import { generateCA } from "@server/private/lib/sshCA"; +import { generateCA } from "@server/lib/sshCA"; import fs from "fs"; import yaml from "js-yaml"; diff --git a/server/setup/scriptsSqlite/1.16.0.ts b/server/setup/scriptsSqlite/1.16.0.ts index 0abc9e0c..67f87c28 100644 --- a/server/setup/scriptsSqlite/1.16.0.ts +++ b/server/setup/scriptsSqlite/1.16.0.ts @@ -1,6 +1,6 @@ import { APP_PATH, configFilePath1, configFilePath2 } from "@server/lib/consts"; import { encrypt } from "@server/lib/crypto"; -import { generateCA } from "@server/private/lib/sshCA"; +import { generateCA } from "@server/lib/sshCA"; import Database from "better-sqlite3"; import fs from "fs"; import path from "path";