fix: cdn and controlplane not respecting nested subdomains

cdn-server/src/s3.ts

@@ -91,15 +91,19 @@ export const createS3BlobStorage = (storageUrl: string): BlobStorage => {
   const endpoint = url.searchParams.get('endpoint') ?? process.env.S3_ENDPOINT;
   const username = process.env.S3_ACCESS_KEY_ID || '';
   const password = process.env.S3_SECRET_ACCESS_KEY || '';
+  const forcePathStyle = process.env.S3_FORCE_PATH_STYLE === 'true';
 
-  const bucketName = extractS3BucketName(storageUrl);
-  const s3Config = createS3ClientConfig(bucketName, {
+  const opts = {
     url: storageUrl,
     region,
     endpoint,
     username,
     password,
-  });
+    forcePathStyle,
+  };
+
+  const bucketName = extractS3BucketName(opts);
+  const s3Config = createS3ClientConfig(bucketName, opts);
   const s3Client = new S3Client(s3Config);
 
   return new S3BlobStorage(s3Client, bucketName);

cdn-server/src/utils.ts

@@ -12,12 +12,13 @@ interface S3StorageOptions {
   endpoint?: string;
   username?: string;
   password?: string;
+  forcePathStyle?: boolean;
 }
 
 export function createS3ClientConfig(bucketName: string, opts: S3StorageOptions): S3ClientConfig {
   const url = new URL(opts.url);
   const { region, username, password } = opts;
-  const forcePathStyle = !isVirtualHostStyleUrl(url);
+  const forcePathStyle = opts.forcePathStyle ?? !isVirtualHostStyleUrl(url);
   const endpoint = opts.endpoint || (forcePathStyle ? url.origin : url.origin.replace(`${bucketName}.`, ''));
 
   const accessKeyId = url.username || username || '';
@@ -42,15 +43,14 @@ export function createS3ClientConfig(bucketName: string, opts: S3StorageOptions)
   };
 }
 
-export function extractS3BucketName(s3Url: string) {
-  const url = new URL(s3Url);
+export function extractS3BucketName(opts: S3StorageOptions) {
+  const url = new URL(opts.url);
 
-  if (isVirtualHostStyleUrl(url)) {
-    return url.hostname.split('.')[0];
+  if (opts.forcePathStyle || !isVirtualHostStyleUrl(url)) {
+    return url.pathname.slice(1);
   }
 
-  // path based style
-  return url.pathname.slice(1);
+  return url.hostname.split('.')[0];
 }
 
 export function isVirtualHostStyleUrl(url: URL) {

controlplane/src/core/build-server.ts

@@ -92,6 +92,7 @@ export interface BuildConfig {
     region?: string;
     username?: string;
     password?: string;
+    forcePathStyle?: boolean;
   };
   mailer: {
     smtpEnabled: boolean;
@@ -353,7 +354,7 @@ export default async function build(opts: BuildConfig) {
     throw new Error('S3 storage URL is required');
   }
 
-  const bucketName = extractS3BucketName(opts.s3Storage.url);
+  const bucketName = extractS3BucketName(opts.s3Storage);
   const s3Config = createS3ClientConfig(bucketName, opts.s3Storage);
 
   const s3Client = new S3Client(s3Config);

controlplane/src/core/env.schema.ts

@@ -126,7 +126,22 @@ export const envVariables = z
      */
     S3_ACCESS_KEY_ID: z.string().optional(),
     S3_SECRET_ACCESS_KEY: z.string().optional(),
-
+    /**
+     * Enforces path style URLs handling, e.g.:
+     *   https://username:[email protected]/cosmo-cdn
+     *
+     * S3_STORAGE_URL="https://username:[email protected]/cosmo-cdn"
+     *
+     * S3_REGION="auto"
+     * S3_ENDPOINT="https://virtualhost.r2.cloudflarestorage.com"
+     * S3_FORCE_PATH_STYLE="true"
+     *
+     * The bucket will be "cosmo-cdn" otherwise it would be "virtualhost"
+     */
+    S3_FORCE_PATH_STYLE: z
+      .string()
+      .transform((val) => val === 'true')
+      .default('true'),
     /**
      * Email
      */

controlplane/src/core/util.ts

@@ -377,7 +377,7 @@ export function webhookAxiosRetryCond(err: AxiosError) {
 export function createS3ClientConfig(bucketName: string, opts: S3StorageOptions): S3ClientConfig {
   const url = new URL(opts.url);
   const { region, username, password } = opts;
-  const forcePathStyle = !isVirtualHostStyleUrl(url);
+  const forcePathStyle = opts.forcePathStyle ?? !isVirtualHostStyleUrl(url);
   const endpoint = opts.endpoint || (forcePathStyle ? url.origin : url.origin.replace(`${bucketName}.`, ''));
 
   const accessKeyId = url.username || username || '';
@@ -402,15 +402,14 @@ export function createS3ClientConfig(bucketName: string, opts: S3StorageOptions)
   };
 }
 
-export function extractS3BucketName(s3Url: string) {
-  const url = new URL(s3Url);
+export function extractS3BucketName(opts: S3StorageOptions) {
+  const url = new URL(opts.url);
 
-  if (isVirtualHostStyleUrl(url)) {
-    return url.hostname.split('.')[0];
+  if (opts.forcePathStyle || !isVirtualHostStyleUrl(url)) {
+    return url.pathname.slice(1);
   }
 
-  // path based style
-  return url.pathname.slice(1);
+  return url.hostname.split('.')[0];
 }
 
 export function isVirtualHostStyleUrl(url: URL) {

controlplane/src/index.ts

@@ -45,6 +45,7 @@ const {
   S3_REGION,
   S3_ACCESS_KEY_ID,
   S3_SECRET_ACCESS_KEY,
+  S3_FORCE_PATH_STYLE,
   SMTP_ENABLED,
   SMTP_HOST,
   SMTP_PORT,
@@ -126,6 +127,7 @@ const options: BuildConfig = {
     endpoint: S3_ENDPOINT,
     username: S3_ACCESS_KEY_ID,
     password: S3_SECRET_ACCESS_KEY,
+    forcePathStyle: S3_FORCE_PATH_STYLE,
   },
   mailer: {
     smtpEnabled: SMTP_ENABLED,

controlplane/src/types/index.ts

@@ -583,4 +583,5 @@ export interface S3StorageOptions {
   endpoint?: string;
   username?: string;
   password?: string;
+  forcePathStyle?: boolean;
 }