basic setup for rewriting requests to another path

This commit is contained in:
Pallavi Kumari
2025-09-28 11:25:11 +05:30
parent 70914e836f
commit 149a4b916b
8 changed files with 557 additions and 145 deletions

View File

@@ -1522,5 +1522,7 @@
"resourceAddEntrypointsEditFile": "Edit file: config/traefik/traefik_config.yml", "resourceAddEntrypointsEditFile": "Edit file: config/traefik/traefik_config.yml",
"resourceExposePortsEditFile": "Edit file: docker-compose.yml", "resourceExposePortsEditFile": "Edit file: docker-compose.yml",
"emailVerificationRequired": "Email verification is required. Please log in again via {dashboardUrl}/auth/login complete this step. Then, come back here.", "emailVerificationRequired": "Email verification is required. Please log in again via {dashboardUrl}/auth/login complete this step. Then, come back here.",
"twoFactorSetupRequired": "Two-factor authentication setup is required. Please log in again via {dashboardUrl}/auth/login complete this step. Then, come back here." "twoFactorSetupRequired": "Two-factor authentication setup is required. Please log in again via {dashboardUrl}/auth/login complete this step. Then, come back here.",
} "rewritePath": "Rewrite Path",
"rewritePathDescription": "Optionally rewrite the path before forwarding to the target."
}

View File

@@ -123,7 +123,9 @@ export const targets = pgTable("targets", {
internalPort: integer("internalPort"), internalPort: integer("internalPort"),
enabled: boolean("enabled").notNull().default(true), enabled: boolean("enabled").notNull().default(true),
path: text("path"), path: text("path"),
pathMatchType: text("pathMatchType") // exact, prefix, regex pathMatchType: text("pathMatchType"), // exact, prefix, regex
rewritePath: text("rewritePath"), // if set, rewrites the path to this value before sending to the target
rewritePathType: text("rewritePathType") // exact, prefix, regex, stripPrefix
}); });
export const exitNodes = pgTable("exitNodes", { export const exitNodes = pgTable("exitNodes", {

View File

@@ -135,7 +135,9 @@ export const targets = sqliteTable("targets", {
internalPort: integer("internalPort"), internalPort: integer("internalPort"),
enabled: integer("enabled", { mode: "boolean" }).notNull().default(true), enabled: integer("enabled", { mode: "boolean" }).notNull().default(true),
path: text("path"), path: text("path"),
pathMatchType: text("pathMatchType") // exact, prefix, regex pathMatchType: text("pathMatchType"), // exact, prefix, regex
rewritePath: text("rewritePath"), // if set, rewrites the path to this value before sending to the target
rewritePathType: text("rewritePathType") // exact, prefix, regex, stripPrefix
}); });
export const exitNodes = sqliteTable("exitNodes", { export const exitNodes = sqliteTable("exitNodes", {

View File

@@ -32,7 +32,9 @@ const createTargetSchema = z
port: z.number().int().min(1).max(65535), port: z.number().int().min(1).max(65535),
enabled: z.boolean().default(true), enabled: z.boolean().default(true),
path: z.string().optional().nullable(), path: z.string().optional().nullable(),
pathMatchType: z.enum(["exact", "prefix", "regex"]).optional().nullable() pathMatchType: z.enum(["exact", "prefix", "regex"]).optional().nullable(),
rewritePath: z.string().optional().nullable(),
rewritePathType: z.enum(["exact", "prefix", "regex", "stripPrefix"]).optional().nullable() // NEW: rewrite path type
}) })
.strict(); .strict();

View File

@@ -46,7 +46,9 @@ function queryTargets(resourceId: number) {
siteId: targets.siteId, siteId: targets.siteId,
siteType: sites.type, siteType: sites.type,
path: targets.path, path: targets.path,
pathMatchType: targets.pathMatchType pathMatchType: targets.pathMatchType,
rewritePath: targets.rewritePath,
rewritePathType: targets.rewritePathType
}) })
.from(targets) .from(targets)
.leftJoin(sites, eq(sites.siteId, targets.siteId)) .leftJoin(sites, eq(sites.siteId, targets.siteId))

View File

@@ -28,7 +28,9 @@ const updateTargetBodySchema = z
port: z.number().int().min(1).max(65535).optional(), port: z.number().int().min(1).max(65535).optional(),
enabled: z.boolean().optional(), enabled: z.boolean().optional(),
path: z.string().optional().nullable(), path: z.string().optional().nullable(),
pathMatchType: z.enum(["exact", "prefix", "regex"]).optional().nullable() pathMatchType: z.enum(["exact", "prefix", "regex"]).optional().nullable(),
rewritePath: z.string().optional().nullable(),
rewritePathType: z.enum(["exact", "prefix", "regex", "stripPrefix"]).optional().nullable()
}) })
.strict() .strict()
.refine((data) => Object.keys(data).length > 0, { .refine((data) => Object.keys(data).length > 0, {

View File

@@ -90,6 +90,217 @@ export async function traefikConfigProvider(
} }
} }
function validatePathRewriteConfig(
path: string | null,
pathMatchType: string | null,
rewritePath: string | null,
rewritePathType: string | null
): { isValid: boolean; error?: string } {
// If no path matching is configured, no rewriting is possible
if (!path || !pathMatchType) {
if (rewritePath || rewritePathType) {
return {
isValid: false,
error: "Path rewriting requires path matching to be configured"
};
}
return { isValid: true };
}
if ((rewritePath && !rewritePathType) || (!rewritePath && rewritePathType)) {
return {
isValid: false,
error: "Both rewritePath and rewritePathType must be specified together"
};
}
if (!rewritePath || !rewritePathType) {
return { isValid: true };
}
const validPathMatchTypes = ["exact", "prefix", "regex"];
if (!validPathMatchTypes.includes(pathMatchType)) {
return {
isValid: false,
error: `Invalid pathMatchType: ${pathMatchType}. Must be one of: ${validPathMatchTypes.join(", ")}`
};
}
const validRewritePathTypes = ["exact", "prefix", "regex", "stripPrefix"];
if (!validRewritePathTypes.includes(rewritePathType)) {
return {
isValid: false,
error: `Invalid rewritePathType: ${rewritePathType}. Must be one of: ${validRewritePathTypes.join(", ")}`
};
}
if (pathMatchType === "regex") {
try {
new RegExp(path);
} catch (e) {
return {
isValid: false,
error: `Invalid regex pattern in path: ${path}`
};
}
}
if (rewritePathType === "regex") {
// For regex rewrite type, we don't validate the replacement pattern
// as it may contain capture groups like $1, $2, etc.
// The regex engine will handle validation at runtime
}
// Validate path formats for non-regex types
if (pathMatchType !== "regex" && !path.startsWith("/")) {
return {
isValid: false,
error: "Path must start with '/' for exact and prefix matching"
};
}
// Additional validation for stripPrefix
if (rewritePathType === "stripPrefix") {
if (pathMatchType !== "prefix") {
logger.warn(`stripPrefix rewrite type is most effective with prefix path matching. Current match type: ${pathMatchType}`);
}
// For stripPrefix, rewritePath is optional (can be empty to just strip)
if (rewritePath && !rewritePath.startsWith("/") && rewritePath !== "") {
return {
isValid: false,
error: "stripPrefix rewritePath must start with '/' or be empty"
};
}
}
return { isValid: true };
}
function createPathRewriteMiddleware(
middlewareName: string,
path: string,
pathMatchType: string,
rewritePath: string,
rewritePathType: string
): { [key: string]: any } {
const middlewares: { [key: string]: any } = {};
switch (rewritePathType) {
case "exact":
// Replace the entire path with the exact rewrite path
middlewares[middlewareName] = {
replacePathRegex: {
regex: "^.*$",
replacement: rewritePath
}
};
break;
case "prefix":
// Replace matched prefix with new prefix, preserve the rest
switch (pathMatchType) {
case "prefix":
middlewares[middlewareName] = {
replacePathRegex: {
regex: `^${escapeRegex(path)}(.*)`,
replacement: `${rewritePath}$1`
}
};
break;
case "exact":
middlewares[middlewareName] = {
replacePathRegex: {
regex: `^${escapeRegex(path)}$`,
replacement: rewritePath
}
};
break;
case "regex":
// For regex path matching with prefix rewrite, we assume the regex has capture groups
middlewares[middlewareName] = {
replacePathRegex: {
regex: path,
replacement: rewritePath
}
};
break;
}
break;
case "regex":
// Use advanced regex replacement - works with any match type
let regexPattern: string;
if (pathMatchType === "regex") {
regexPattern = path;
} else if (pathMatchType === "prefix") {
regexPattern = `^${escapeRegex(path)}(.*)`;
} else { // exact
regexPattern = `^${escapeRegex(path)}$`;
}
middlewares[middlewareName] = {
replacePathRegex: {
regex: regexPattern,
replacement: rewritePath
}
};
break;
case "stripPrefix":
// Strip the matched prefix and optionally add new path
if (pathMatchType === "prefix") {
middlewares[middlewareName] = {
stripPrefix: {
prefixes: [path]
}
};
// If rewritePath is provided and not empty, add it as a prefix after stripping
if (rewritePath && rewritePath !== "" && rewritePath !== "/") {
const addPrefixMiddlewareName = `${middlewareName.replace('-rewrite', '')}-add-prefix-middleware`;
middlewares[addPrefixMiddlewareName] = {
addPrefix: {
prefix: rewritePath
}
};
// Return both middlewares with a special flag to indicate chaining
return {
middlewares,
chain: [middlewareName, addPrefixMiddlewareName]
};
}
} else {
// For exact and regex matches, use replacePathRegex to strip
let regexPattern: string;
if (pathMatchType === "exact") {
regexPattern = `^${escapeRegex(path)}$`;
} else if (pathMatchType === "regex") {
regexPattern = path;
} else {
// This shouldn't happen due to earlier validation, but handle gracefully
regexPattern = `^${escapeRegex(path)}`;
}
const replacement = rewritePath || "/";
middlewares[middlewareName] = {
replacePathRegex: {
regex: regexPattern,
replacement: replacement
}
};
}
break;
default:
logger.error(`Unknown rewritePathType: ${rewritePathType}`);
throw new Error(`Unknown rewritePathType: ${rewritePathType}`);
}
return { middlewares };
}
export async function getTraefikConfig( export async function getTraefikConfig(
exitNodeId: number, exitNodeId: number,
siteTypes: string[] siteTypes: string[]
@@ -133,7 +344,8 @@ export async function getTraefikConfig(
internalPort: targets.internalPort, internalPort: targets.internalPort,
path: targets.path, path: targets.path,
pathMatchType: targets.pathMatchType, pathMatchType: targets.pathMatchType,
rewritePath: targets.rewritePath,
rewritePathType: targets.rewritePathType,
// Site fields // Site fields
siteId: sites.siteId, siteId: sites.siteId,
siteType: sites.type, siteType: sites.type,
@@ -163,12 +375,28 @@ export async function getTraefikConfig(
const resourceId = row.resourceId; const resourceId = row.resourceId;
const targetPath = sanitizePath(row.path) || ""; // Handle null/undefined paths const targetPath = sanitizePath(row.path) || ""; // Handle null/undefined paths
const pathMatchType = row.pathMatchType || ""; const pathMatchType = row.pathMatchType || "";
const rewritePath = row.rewritePath || "";
const rewritePathType = row.rewritePathType || "";
// Create a unique key combining resourceId and path+pathMatchType // Create a unique key combining resourceId, path config, and rewrite config
const pathKey = [targetPath, pathMatchType].filter(Boolean).join("-"); const pathKey = [targetPath, pathMatchType, rewritePath, rewritePathType]
.filter(Boolean)
.join("-");
const mapKey = [resourceId, pathKey].filter(Boolean).join("-"); const mapKey = [resourceId, pathKey].filter(Boolean).join("-");
if (!resourcesMap.has(mapKey)) { if (!resourcesMap.has(mapKey)) {
const validation = validatePathRewriteConfig(
row.path,
row.pathMatchType,
row.rewritePath,
row.rewritePathType
);
if (!validation.isValid) {
logger.error(`Invalid path rewrite configuration for resource ${resourceId}: ${validation.error}`);
return;
}
resourcesMap.set(mapKey, { resourcesMap.set(mapKey, {
resourceId: row.resourceId, resourceId: row.resourceId,
fullDomain: row.fullDomain, fullDomain: row.fullDomain,
@@ -186,7 +414,9 @@ export async function getTraefikConfig(
targets: [], targets: [],
headers: row.headers, headers: row.headers,
path: row.path, // the targets will all have the same path path: row.path, // the targets will all have the same path
pathMatchType: row.pathMatchType // the targets will all have the same pathMatchType pathMatchType: row.pathMatchType, // the targets will all have the same pathMatchType
rewritePath: row.rewritePath,
rewritePathType: row.rewritePathType
}); });
} }
@@ -199,6 +429,8 @@ export async function getTraefikConfig(
port: row.port, port: row.port,
internalPort: row.internalPort, internalPort: row.internalPort,
enabled: row.targetEnabled, enabled: row.targetEnabled,
rewritePath: row.rewritePath,
rewritePathType: row.rewritePathType,
site: { site: {
siteId: row.siteId, siteId: row.siteId,
type: row.siteType, type: row.siteType,
@@ -241,19 +473,14 @@ export async function getTraefikConfig(
} }
if (resource.http) { if (resource.http) {
if (!resource.domainId) { if (!resource.domainId || !resource.fullDomain) {
continue; continue;
} }
if (!resource.fullDomain) { // Initialize routers and services if they don't exist
continue;
}
// add routers and services empty objects if they don't exist
if (!config_output.http.routers) { if (!config_output.http.routers) {
config_output.http.routers = {}; config_output.http.routers = {};
} }
if (!config_output.http.services) { if (!config_output.http.services) {
config_output.http.services = {}; config_output.http.services = {};
} }
@@ -288,24 +515,66 @@ export async function getTraefikConfig(
certResolver: certResolver, certResolver: certResolver,
...(preferWildcardCert ...(preferWildcardCert
? { ? {
domains: [ domains: [
{ {
main: wildCard main: wildCard
} }
] ]
} }
: {}) : {})
}; };
} }
const additionalMiddlewares = const additionalMiddlewares =
config.getRawConfig().traefik.additional_middlewares || []; config.getRawConfig().traefik.additional_middlewares || [];
const routerMiddlewares = [ const routerMiddlewares = [
badgerMiddlewareName, badgerMiddlewareName,
...additionalMiddlewares ...additionalMiddlewares
]; ];
// Handle path rewriting middleware
if (resource.rewritePath &&
resource.path &&
resource.pathMatchType &&
resource.rewritePathType) {
const rewriteMiddlewareName = `${resource.id}-${key}-rewrite`;
try {
const rewriteResult = createPathRewriteMiddleware(
rewriteMiddlewareName,
resource.path,
resource.pathMatchType,
resource.rewritePath,
resource.rewritePathType
);
// Initialize middlewares object if it doesn't exist
if (!config_output.http.middlewares) {
config_output.http.middlewares = {};
}
// Add the middleware(s) to the config
Object.assign(config_output.http.middlewares, rewriteResult.middlewares);
// Add middleware(s) to the router middleware chain
if (rewriteResult.chain) {
// For chained middlewares (like stripPrefix + addPrefix)
routerMiddlewares.push(...rewriteResult.chain);
} else {
// Single middleware
routerMiddlewares.push(rewriteMiddlewareName);
}
logger.info(`Created path rewrite middleware for ${key}: ${resource.pathMatchType}(${resource.path}) -> ${resource.rewritePathType}(${resource.rewritePath})`);
} catch (error) {
logger.error(`Failed to create path rewrite middleware for ${key}: ${error}`);
// Continue without the rewrite middleware rather than failing completely
}
}
// Handle custom headers middleware
if (resource.headers || resource.setHostHeader) { if (resource.headers || resource.setHostHeader) {
// if there are headers, parse them into an object // if there are headers, parse them into an object
const headersObj: { [key: string]: string } = {}; const headersObj: { [key: string]: string } = {};
@@ -406,15 +675,15 @@ export async function getTraefikConfig(
return ( return (
(targets as TargetWithSite[]) (targets as TargetWithSite[])
.filter((target: TargetWithSite) => { .filter((target: TargetWithSite) => {
if (!target.enabled) { if (!target.enabled) {
return false; return false;
} }
// If any sites are online, exclude offline sites // If any sites are online, exclude offline sites
if (anySitesOnline && !target.site.online) { if (anySitesOnline && !target.site.online) {
return false; return false;
} }
if ( if (
target.site.type === "local" || target.site.type === "local" ||
@@ -427,33 +696,33 @@ export async function getTraefikConfig(
) { ) {
return false; return false;
} }
} else if (target.site.type === "newt") { } else if (target.site.type === "newt") {
if ( if (
!target.internalPort || !target.internalPort ||
!target.method || !target.method ||
!target.site.subnet !target.site.subnet
) { ) {
return false; return false;
} }
} }
return true; return true;
}) })
.map((target: TargetWithSite) => { .map((target: TargetWithSite) => {
if ( if (
target.site.type === "local" || target.site.type === "local" ||
target.site.type === "wireguard" target.site.type === "wireguard"
) { ) {
return { return {
url: `${target.method}://${target.ip}:${target.port}` url: `${target.method}://${target.ip}:${target.port}`
}; };
} else if (target.site.type === "newt") { } else if (target.site.type === "newt") {
const ip = const ip =
target.site.subnet!.split("/")[0]; target.site.subnet!.split("/")[0];
return { return {
url: `${target.method}://${ip}:${target.internalPort}` url: `${target.method}://${ip}:${target.internalPort}`
}; };
} }
}) })
// filter out duplicates // filter out duplicates
.filter( .filter(
(v, i, a) => (v, i, a) =>
@@ -465,14 +734,14 @@ export async function getTraefikConfig(
})(), })(),
...(resource.stickySession ...(resource.stickySession
? { ? {
sticky: { sticky: {
cookie: { cookie: {
name: "p_sticky", // TODO: make this configurable via config.yml like other cookies name: "p_sticky", // TODO: make this configurable via config.yml like other cookies
secure: resource.ssl, secure: resource.ssl,
httpOnly: true httpOnly: true
} }
} }
} }
: {}) : {})
} }
}; };
@@ -549,7 +818,7 @@ export async function getTraefikConfig(
!target.internalPort || !target.internalPort ||
!target.site.subnet !target.site.subnet
) { ) {
return false; return false;
} }
} }
return true; return true;
@@ -573,13 +842,13 @@ export async function getTraefikConfig(
})(), })(),
...(resource.stickySession ...(resource.stickySession
? { ? {
sticky: { sticky: {
ipStrategy: { ipStrategy: {
depth: 0, depth: 0,
sourcePort: true sourcePort: true
} }
} }
} }
: {}) : {})
} }
}; };
@@ -590,10 +859,19 @@ export async function getTraefikConfig(
function sanitizePath(path: string | null | undefined): string | undefined { function sanitizePath(path: string | null | undefined): string | undefined {
if (!path) return undefined; if (!path) return undefined;
// clean any non alphanumeric characters from the path and replace with dashes
// the path cant be too long either, so limit to 50 characters // For path rewriting, we need to be more careful about sanitization
// Only limit length and ensure it's a valid path structure
if (path.length > 50) { if (path.length > 50) {
path = path.substring(0, 50); path = path.substring(0, 50);
logger.warn(`Path truncated to 50 characters: ${path}`);
} }
return path.replace(/[^a-zA-Z0-9]/g, "");
// Don't remove special characters as they might be part of regex patterns
// Just ensure it's not empty after trimming
return path.trim() || undefined;
} }
function escapeRegex(string: string): string {
return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
}

View File

@@ -105,7 +105,9 @@ const addTargetSchema = z.object({
port: z.coerce.number().int().positive(), port: z.coerce.number().int().positive(),
siteId: z.number().int().positive(), siteId: z.number().int().positive(),
path: z.string().optional().nullable(), path: z.string().optional().nullable(),
pathMatchType: z.enum(["exact", "prefix", "regex"]).optional().nullable() pathMatchType: z.enum(["exact", "prefix", "regex"]).optional().nullable(),
rewritePath: z.string().optional().nullable(),
rewritePathType: z.enum(["exact", "prefix", "regex", "stripPrefix"]).optional().nullable()
}).refine( }).refine(
(data) => { (data) => {
// If path is provided, pathMatchType must be provided // If path is provided, pathMatchType must be provided
@@ -138,7 +140,23 @@ const addTargetSchema = z.object({
{ {
message: "Invalid path configuration" message: "Invalid path configuration"
} }
); )
.refine(
(data) => {
// If rewritePath is provided, rewritePathType must be provided
if (data.rewritePath && !data.rewritePathType) {
return false;
}
// If rewritePathType is provided, rewritePath must be provided
if (data.rewritePathType && !data.rewritePath) {
return false;
}
return true;
},
{
message: "Invalid rewrite path configuration"
}
);
const targetsSettingsSchema = z.object({ const targetsSettingsSchema = z.object({
stickySession: z.boolean() stickySession: z.boolean()
@@ -259,8 +277,10 @@ export default function ReverseProxyTargets(props: {
method: resource.http ? "http" : null, method: resource.http ? "http" : null,
port: "" as any as number, port: "" as any as number,
path: null, path: null,
pathMatchType: null pathMatchType: null,
} rewritePath: null,
rewritePathType: null,
} as z.infer<typeof addTargetSchema>
}); });
const watchedIp = addTargetForm.watch("ip"); const watchedIp = addTargetForm.watch("ip");
@@ -436,6 +456,8 @@ export default function ReverseProxyTargets(props: {
...data, ...data,
path: data.path || null, path: data.path || null,
pathMatchType: data.pathMatchType || null, pathMatchType: data.pathMatchType || null,
rewritePath: data.rewritePath || null,
rewritePathType: data.rewritePathType || null,
siteType: site?.type || null, siteType: site?.type || null,
enabled: true, enabled: true,
targetId: new Date().getTime(), targetId: new Date().getTime(),
@@ -449,7 +471,9 @@ export default function ReverseProxyTargets(props: {
method: resource.http ? "http" : null, method: resource.http ? "http" : null,
port: "" as any as number, port: "" as any as number,
path: null, path: null,
pathMatchType: null pathMatchType: null,
rewritePath: null,
rewritePathType: null,
}); });
} }
@@ -469,11 +493,11 @@ export default function ReverseProxyTargets(props: {
targets.map((target) => targets.map((target) =>
target.targetId === targetId target.targetId === targetId
? { ? {
...target, ...target,
...data, ...data,
updated: true, updated: true,
siteType: site?.type || null siteType: site?.type || null
} }
: target : target
) )
); );
@@ -494,7 +518,9 @@ export default function ReverseProxyTargets(props: {
enabled: target.enabled, enabled: target.enabled,
siteId: target.siteId, siteId: target.siteId,
path: target.path, path: target.path,
pathMatchType: target.pathMatchType pathMatchType: target.pathMatchType,
rewritePath: target.rewritePath,
rewritePathType: target.rewritePathType
}; };
if (target.new) { if (target.new) {
@@ -590,7 +616,7 @@ export default function ReverseProxyTargets(props: {
} }
}} }}
> >
+ {t("matchPath")} + {t("matchPath")}
</Button> </Button>
); );
} }
@@ -693,7 +719,7 @@ export default function ReverseProxyTargets(props: {
className={cn( className={cn(
"justify-between flex-1", "justify-between flex-1",
!row.original.siteId && !row.original.siteId &&
"text-muted-foreground" "text-muted-foreground"
)} )}
> >
{row.original.siteId {row.original.siteId
@@ -772,31 +798,31 @@ export default function ReverseProxyTargets(props: {
}, },
...(resource.http ...(resource.http
? [ ? [
{ {
accessorKey: "method", accessorKey: "method",
header: t("method"), header: t("method"),
cell: ({ row }: { row: Row<LocalTarget> }) => ( cell: ({ row }: { row: Row<LocalTarget> }) => (
<Select <Select
defaultValue={row.original.method ?? ""} defaultValue={row.original.method ?? ""}
onValueChange={(value) => onValueChange={(value) =>
updateTarget(row.original.targetId, { updateTarget(row.original.targetId, {
...row.original, ...row.original,
method: value method: value
}) })
} }
> >
<SelectTrigger> <SelectTrigger>
{row.original.method} {row.original.method}
</SelectTrigger> </SelectTrigger>
<SelectContent> <SelectContent>
<SelectItem value="http">http</SelectItem> <SelectItem value="http">http</SelectItem>
<SelectItem value="https">https</SelectItem> <SelectItem value="https">https</SelectItem>
<SelectItem value="h2c">h2c</SelectItem> <SelectItem value="h2c">h2c</SelectItem>
</SelectContent> </SelectContent>
</Select> </Select>
) )
} }
] ]
: []), : []),
{ {
accessorKey: "ip", accessorKey: "ip",
@@ -856,6 +882,102 @@ export default function ReverseProxyTargets(props: {
/> />
) )
}, },
{
accessorKey: "rewritePath",
header: t("rewritePath"),
cell: ({ row }) => {
const [showRewritePathInput, setShowRewritePathInput] = useState(
!!(row.original.rewritePath || row.original.rewritePathType)
);
if (!showRewritePathInput) {
const noPathMatch =
!row.original.path && !row.original.pathMatchType;
return (
<Button
variant="outline"
disabled={noPathMatch}
onClick={() => {
setShowRewritePathInput(true);
// Set default rewritePathType when first showing path input
if (!row.original.rewritePathType) {
updateTarget(row.original.targetId, {
...row.original,
rewritePathType: "prefix"
});
}
}}
>
+ {t("rewritePath")}
</Button>
);
}
return (
<div className="flex gap-2 min-w-[200px] items-center">
<Button
variant="outline"
onClick={() => {
setShowRewritePathInput(false);
updateTarget(row.original.targetId, {
...row.original,
rewritePath: null,
rewritePathType: null
});
}}
>
×
</Button>
<MoveRight className="ml-4 h-4 w-4" />
<Select
defaultValue={row.original.rewritePathType || "prefix"}
onValueChange={(value) =>
updateTarget(row.original.targetId, {
...row.original,
rewritePathType: value as "exact" | "prefix" | "regex"
})
}
>
<SelectTrigger className="w-25">
<SelectValue />
</SelectTrigger>
<SelectContent>
<SelectItem value="prefix">Prefix</SelectItem>
<SelectItem value="exact">Exact</SelectItem>
<SelectItem value="regex">Regex</SelectItem>
<SelectItem value="stripPrefix">Strip Prefix</SelectItem>
</SelectContent>
</Select>
<Input
placeholder={
row.original.rewritePathType === "regex"
? "^/api/.*"
: "/path"
}
defaultValue={row.original.rewritePath || ""}
className="flex-1 min-w-[150px]"
onBlur={(e) => {
const value = e.target.value.trim();
if (!value) {
setShowRewritePathInput(false);
updateTarget(row.original.targetId, {
...row.original,
rewritePath: null,
rewritePathType: null
});
} else {
updateTarget(row.original.targetId, {
...row.original,
rewritePath: value
});
}
}}
/>
</div>
);
}
},
// { // {
// accessorKey: "protocol", // accessorKey: "protocol",
// header: t('targetProtocol'), // header: t('targetProtocol'),
@@ -968,21 +1090,21 @@ export default function ReverseProxyTargets(props: {
className={cn( className={cn(
"justify-between flex-1", "justify-between flex-1",
!field.value && !field.value &&
"text-muted-foreground" "text-muted-foreground"
)} )}
> >
{field.value {field.value
? sites.find( ? sites.find(
( (
site site
) => ) =>
site.siteId === site.siteId ===
field.value field.value
) )
?.name ?.name
: t( : t(
"siteSelect" "siteSelect"
)} )}
<CaretSortIcon className="ml-2 h-4 w-4 shrink-0 opacity-50" /> <CaretSortIcon className="ml-2 h-4 w-4 shrink-0 opacity-50" />
</Button> </Button>
</FormControl> </FormControl>
@@ -1048,34 +1170,34 @@ export default function ReverseProxyTargets(props: {
); );
return selectedSite && return selectedSite &&
selectedSite.type === selectedSite.type ===
"newt" "newt"
? (() => { ? (() => {
const dockerState = const dockerState =
getDockerStateForSite( getDockerStateForSite(
selectedSite.siteId selectedSite.siteId
); );
return ( return (
<ContainersSelector <ContainersSelector
site={ site={
selectedSite selectedSite
} }
containers={ containers={
dockerState.containers dockerState.containers
} }
isAvailable={ isAvailable={
dockerState.isAvailable dockerState.isAvailable
} }
onContainerSelect={ onContainerSelect={
handleContainerSelect handleContainerSelect
} }
onRefresh={() => onRefresh={() =>
refreshContainersForSite( refreshContainersForSite(
selectedSite.siteId selectedSite.siteId
) )
} }
/> />
); );
})() })()
: null; : null;
})()} })()}
</div> </div>
@@ -1303,12 +1425,12 @@ export default function ReverseProxyTargets(props: {
{header.isPlaceholder {header.isPlaceholder
? null ? null
: flexRender( : flexRender(
header header
.column .column
.columnDef .columnDef
.header, .header,
header.getContext() header.getContext()
)} )}
</TableHead> </TableHead>
) )
)} )}