♻️ rename destinationDomain to destinationHost to include the Scheme

messages/en-US.json

@@ -4421,12 +4421,12 @@
     "redirectDeleteConfirm": "Confirm Delete Redirect",
     "redirectQuestionRemove": "Are you sure you want to remove this redirect?",
     "redirectMessageRemove": "Once removed, requests matching this redirect will no longer be forwarded.",
-    "redirectDestinationDomain": "Destination Domain",
+    "redirectDestinationHost": "Destination",
-    "redirectDestinationDomainDescription": "The domain requests are sent to, such as example.com",
+    "redirectDestinationHostDescription": "Where requests are sent, including the scheme, such as https://example.com",
-    "redirectDestinationDomainRequired": "Enter a destination domain",
+    "redirectDestinationHostRequired": "Enter a destination",
     "redirectSameDomainAsSource": "Same domain as source",
     "redirectSameDomainAsSourceDescription": "Keep the destination on the source domain and only change the path",
-    "redirectDestinationDomainInvalid": "Enter a valid domain, such as example.com",
+    "redirectDestinationHostInvalid": "Enter a valid destination with a scheme, such as https://example.com",
     "redirectMatchPathDescription": "Which incoming paths this redirect applies to",
     "redirectRewritePathDescription": "Optionally change the path before redirecting. Leave unset to keep the original path.",
     "redirectRewritePathRequired": "Enter a rewrite path, or choose Strip Prefix",

server/db/pg/schema/schema.ts

@@ -243,7 +243,7 @@ export const redirects = pgTable("redirects", {
     niceId: text("niceId").notNull(),
     name: varchar("name").notNull(),
     subdomain: varchar("subdomain"),
-    destinationDomain: varchar("destinationDomain").notNull(),
+    destinationHost: varchar("destinationHost").notNull(), // scheme://host[:port]
     pathMatchType: varchar("pathMatchType")
         .$type<"exact" | "prefix" | "regex">()
         .notNull()

server/db/queries/verifySessionQueries.ts

@@ -60,7 +60,7 @@ export type RedirectByHost = {
     orgId: string;
     matchPath: string | null;
     pathMatchType: string;
-    destinationDomain: string;
+    destinationHost: string;
     rewritePath: string | null;
     rewritePathType: string | null;
     permanent: boolean;
@@ -102,7 +102,7 @@ export async function getRedirectsByHost(
             orgId: redirects.orgId,
             matchPath: redirects.matchPath,
             pathMatchType: redirects.pathMatchType,
-            destinationDomain: redirects.destinationDomain,
+            destinationHost: redirects.destinationHost,
             rewritePath: redirects.rewritePath,
             rewritePathType: redirects.rewritePathType,
             permanent: redirects.permanent,

server/db/sqlite/schema/schema.ts

@@ -259,7 +259,7 @@ export const redirects = sqliteTable("redirects", {
     niceId: text("niceId").notNull(),
     name: text("name").notNull(),
     subdomain: text("subdomain"),
-    destinationDomain: text("destinationDomain").notNull(),
+    destinationHost: text("destinationHost").notNull(), // scheme://host[:port]
     pathMatchType: text("pathMatchType")
         .$type<"exact" | "prefix" | "regex">()
         .notNull()

server/routers/badger/verifySession.ts

@@ -1060,8 +1060,8 @@ async function findRedirect(
 }
 
 /**
- * Destination for a configured redirect: the request's scheme and query are
+ * Destination for a configured redirect: the scheme and host come from the
- * kept, the host is swapped for the destination domain and the path is run
+ * redirect's destination, the request's query is kept and the path is run
  * through the redirect's rewrite rules (if any).
  */
 function buildRedirectUrl(
@@ -1083,7 +1083,7 @@ function buildRedirectUrl(
         // originalRequestURL is validated as a URL, so this is only defensive
     }
 
-    return `${request.scheme}://${redirect.destinationDomain}${newPath}${search}`;
+    return `${redirect.destinationHost}${newPath}${search}`;
 }
 
 // Like a notAllowed login bounce, but the destination is the configured

server/routers/redirect/createRedirect.ts

@@ -10,7 +10,7 @@ import { fromError } from "zod-validation-error";
 import { OpenAPITags, registry } from "@server/openApi";
 import { and, eq } from "drizzle-orm";
 import {
-    redirectDestinationDomainSchema,
+    redirectDestinationHostSchema,
     redirectMatchPathSchema,
     redirectPathMatchTypeSchema,
     redirectRewritePathSchema,
@@ -36,7 +36,7 @@ const bodySchema = z
         resourceId: z.number().int().positive().optional().nullable(),
         domainId: z.string().nonempty().optional().nullable(),
         subdomain: z.string().nonempty().optional().nullable(),
-        destinationDomain: redirectDestinationDomainSchema,
+        destinationHost: redirectDestinationHostSchema,
         pathMatchType: redirectPathMatchTypeSchema.optional(),
         matchPath: redirectMatchPathSchema.optional().nullable(),
         rewritePath: redirectRewritePathSchema.optional().nullable(),
@@ -126,7 +126,7 @@ export async function createRedirect(
             resourceId,
             domainId,
             subdomain,
-            destinationDomain,
+            destinationHost,
             pathMatchType,
             matchPath,
             rewritePath,
@@ -200,7 +200,7 @@ export async function createRedirect(
                 resourceId: resourceId ?? null,
                 domainId: domainId ?? null,
                 subdomain: subdomain ?? null,
-                destinationDomain,
+                destinationHost,
                 pathMatchType: pathMatchType ?? "regex",
                 matchPath: matchPath ?? null,
                 rewritePath: rewritePath ?? null,

server/routers/redirect/getRedirect.ts

@@ -17,7 +17,7 @@ export type GetRedirectResponse = {
         niceId: string;
         name: string;
         subdomain: string | null;
-        destinationDomain: string;
+        destinationHost: string;
         pathMatchType: "exact" | "prefix" | "regex";
         matchPath: string | null;
         rewritePath: string | null;
@@ -43,7 +43,7 @@ const redirectColumns = {
     niceId: redirects.niceId,
     name: redirects.name,
     subdomain: redirects.subdomain,
-    destinationDomain: redirects.destinationDomain,
+    destinationHost: redirects.destinationHost,
     pathMatchType: redirects.pathMatchType,
     matchPath: redirects.matchPath,
     rewritePath: redirects.rewritePath,

server/routers/redirect/listRedirects.ts

@@ -17,7 +17,7 @@ export type ListRedirectsResponse = PaginatedResponse<{
         niceId: string;
         name: string;
         subdomain: string | null;
-        destinationDomain: string;
+        destinationHost: string;
         pathMatchType: "exact" | "prefix" | "regex";
         matchPath: string | null;
         rewritePath: string | null;
@@ -130,7 +130,7 @@ export async function listRedirects(
                 or(
                     like(sql`LOWER(${redirects.name})`, term),
                     like(sql`LOWER(${redirects.matchPath})`, term),
-                    like(sql`LOWER(${redirects.destinationDomain})`, term)
+                    like(sql`LOWER(${redirects.destinationHost})`, term)
                 )!
             );
         }
@@ -142,7 +142,7 @@ export async function listRedirects(
                 niceId: redirects.niceId,
                 name: redirects.name,
                 subdomain: redirects.subdomain,
-                destinationDomain: redirects.destinationDomain,
+                destinationHost: redirects.destinationHost,
                 pathMatchType: redirects.pathMatchType,
                 matchPath: redirects.matchPath,
                 rewritePath: redirects.rewritePath,

server/routers/redirect/updateRedirect.ts

@@ -11,7 +11,7 @@ import { OpenAPITags, registry } from "@server/openApi";
 import { and, eq, ne } from "drizzle-orm";
 import {
     redirectNiceIdSchema,
-    redirectDestinationDomainSchema,
+    redirectDestinationHostSchema,
     redirectMatchPathSchema,
     redirectPathMatchTypeSchema,
     redirectRewritePathSchema,
@@ -37,7 +37,7 @@ const bodySchema = z.strictObject({
     resourceId: z.number().int().positive().optional().nullable(),
     domainId: z.string().nonempty().optional().nullable(),
     subdomain: z.string().nonempty().optional().nullable(),
-    destinationDomain: redirectDestinationDomainSchema.optional(),
+    destinationHost: redirectDestinationHostSchema.optional(),
     pathMatchType: redirectPathMatchTypeSchema.optional(),
     matchPath: redirectMatchPathSchema.optional().nullable(),
     rewritePath: redirectRewritePathSchema.optional().nullable(),
@@ -253,8 +253,8 @@ export async function updateRedirect(
         if (body.subdomain !== undefined) {
             updateData.subdomain = body.subdomain;
         }
-        if (body.destinationDomain !== undefined) {
+        if (body.destinationHost !== undefined) {
-            updateData.destinationDomain = body.destinationDomain;
+            updateData.destinationHost = body.destinationHost;
         }
         if (body.pathMatchType !== undefined) {
             updateData.pathMatchType = body.pathMatchType;

server/routers/redirect/validation.ts

@@ -49,11 +49,20 @@ export const redirectRewritePathSchema = z.string().nonempty();
 // Same range as target priorities; 100 means "let the system order it".
 export const redirectPrioritySchema = z.int().min(1).max(1000);
 
-export const redirectDestinationDomainSchema = z
+/**
+ * A destination is `scheme://host[:port]` with no path, query or fragment;
+ * the request path (after any rewrite) is appended to it by badger.
+ */
+export function isValidDestinationHost(value: string): boolean {
+    const match = /^https?:\/\/([^/:?#]+)(:\d{1,5})?$/.exec(value);
+    return match !== null && isValidDomain(match[1]);
+}
+
+export const redirectDestinationHostSchema = z
     .string()
     .nonempty()
-    .refine(isValidDomain, {
+    .refine(isValidDestinationHost, {
-        message: "Invalid domain"
+        message: "Invalid destination, expected scheme://host such as https://example.com"
     });
 
 /**

src/app/[orgId]/settings/redirects/page.tsx

@@ -49,7 +49,7 @@ export default async function RedirectIndexPage(props: RedirectIndexPageProps) {
         niceId: redirect.niceId,
         name: redirect.name,
         subdomain: redirect.subdomain,
-        destinationDomain: redirect.destinationDomain,
+        destinationHost: redirect.destinationHost,
         pathMatchType: redirect.pathMatchType,
         matchPath: redirect.matchPath,
         rewritePath: redirect.rewritePath,

src/components/RedirectForm.tsx

@@ -40,8 +40,10 @@ import {
 import { useEnvContext } from "@app/hooks/useEnvContext";
 import { toast } from "@app/hooks/useToast";
 import { createApiClient, formatAxiosError } from "@app/lib/api";
-import { isValidDomain } from "@server/lib/validators";
+import {
-import { isValidRegex } from "@server/routers/redirect/validation";
+    isValidDestinationHost,
+    isValidRegex
+} from "@server/routers/redirect/validation";
 import { build } from "@server/build";
 import { cn } from "@app/lib/cn";
 import { CaretSortIcon } from "@radix-ui/react-icons";
@@ -119,14 +121,14 @@ export default function RedirectForm({
                     domainId: z.string().nullable(),
                     subdomain: z.string().nullable(),
                     resourceId: z.number().int().positive().nullable(),
-                    destinationDomain: z
+                    destinationHost: z
                         .string()
                         .trim()
                         .min(1, {
-                            message: t("redirectDestinationDomainRequired")
+                            message: t("redirectDestinationHostRequired")
                         })
-                        .refine(isValidDomain, {
+                        .refine(isValidDestinationHost, {
-                            message: t("redirectDestinationDomainInvalid")
+                            message: t("redirectDestinationHostInvalid")
                         }),
                     pathMatchType: z.enum(["exact", "prefix", "regex"]),
                     matchPath: z.string().trim().nullable(),
@@ -196,7 +198,7 @@ export default function RedirectForm({
             domainId: redirect?.domainId ?? null,
             subdomain: redirect?.subdomain ?? null,
             resourceId: redirect?.resourceId ?? null,
-            destinationDomain: redirect?.destinationDomain ?? "",
+            destinationHost: redirect?.destinationHost ?? "",
             pathMatchType: redirect?.pathMatchType ?? DEFAULT_PATH_MATCH_TYPE,
             matchPath: redirect?.matchPath ?? null,
             rewritePath: redirect?.rewritePath ?? null,
@@ -209,29 +211,32 @@ export default function RedirectForm({
     });
 
     const attachTo = form.watch("attachTo");
+    const ssl = form.watch("ssl");
 
     const sourceFullDomain =
         attachTo === "domain"
             ? domainFullDomain
             : (selectedResource?.fullDomain ?? null);
+    // Resource-attached redirects inherit the resource's ssl setting
+    const sourceSsl =
+        attachTo === "domain" ? ssl : (selectedResource?.ssl ?? true);
+    const sourceHost = sourceFullDomain
+        ? `${sourceSsl ? "https" : "http"}://${sourceFullDomain}`
+        : null;
 
     // Mirror is UI-only state; on edit, infer it from whether the saved
     // destination already equals the source host.
     const [sameDomainAsSource, setSameDomainAsSource] = useState(
-        Boolean(
+        Boolean(redirect && sourceHost && redirect.destinationHost === sourceHost)
-            redirect &&
-                sourceFullDomain &&
-                redirect.destinationDomain === sourceFullDomain
-        )
     );
 
     useEffect(() => {
-        if (sameDomainAsSource && sourceFullDomain) {
+        if (sameDomainAsSource && sourceHost) {
-            form.setValue("destinationDomain", sourceFullDomain, {
+            form.setValue("destinationHost", sourceHost, {
                 shouldValidate: true
             });
         }
-    }, [sameDomainAsSource, sourceFullDomain, form]);
+    }, [sameDomainAsSource, sourceHost, form]);
     const pathMatchType = form.watch("pathMatchType");
     const rewritePath = form.watch("rewritePath");
     const rewritePathType = form.watch("rewritePathType");
@@ -253,7 +258,7 @@ export default function RedirectForm({
                 values.attachTo === "domain" ? values.subdomain || null : null,
             resourceId:
                 values.attachTo === "resource" ? values.resourceId : null,
-            destinationDomain: values.destinationDomain.trim(),
+            destinationHost: values.destinationHost.trim(),
             pathMatchType: values.pathMatchType,
             matchPath: values.matchPath?.trim() || null,
             rewritePath: values.rewritePath?.trim() || null,
@@ -674,18 +679,18 @@ export default function RedirectForm({
                                         <SettingsFormCell span="full">
                                             <FormField
                                                 control={form.control}
-                                                name="destinationDomain"
+                                                name="destinationHost"
                                                 render={({ field }) => (
                                                     <FormItem>
                                                         <FormLabel>
                                                             {t(
-                                                                "redirectDestinationDomain"
+                                                                "redirectDestinationHost"
                                                             )}
                                                         </FormLabel>
                                                         <FormControl>
                                                             <Input
                                                                 autoComplete="off"
-                                                                placeholder="example.com"
+                                                                placeholder="https://example.com"
                                                                 readOnly={
                                                                     sameDomainAsSource
                                                                 }
@@ -694,7 +699,7 @@ export default function RedirectForm({
                                                         </FormControl>
                                                         <FormDescription>
                                                             {t(
-                                                                "redirectDestinationDomainDescription"
+                                                                "redirectDestinationHostDescription"
                                                             )}
                                                         </FormDescription>
                                                         <FormMessage />

src/components/RedirectsTable.tsx

@@ -50,7 +50,7 @@ export type RedirectRow = {
     niceId: string;
     name: string;
     subdomain: string | null;
-    destinationDomain: string;
+    destinationHost: string;
     pathMatchType: "exact" | "prefix" | "regex";
     matchPath: string | null;
     rewritePath: string | null;
@@ -301,7 +301,7 @@ export default function RedirectsTable({
             },
             {
                 id: "destination",
-                accessorKey: "destinationDomain",
+                accessorKey: "destinationHost",
                 friendlyName: t("redirectDestination"),
                 header: () => (
                     <span className="p-3">{t("redirectDestination")}</span>
@@ -310,7 +310,7 @@ export default function RedirectsTable({
                     const redirect = row.original;
                     return (
                         <code className="text-sm truncate">
-                            {redirect.destinationDomain}
+                            {redirect.destinationHost}
                             {redirect.rewritePath && (
                                 <span className="text-muted-foreground">
                                     {redirect.rewritePathType === "prefix"