calvin.erfmann/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-09-01 16:59:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3665 from fosrl/dev

Browse Source 
Fix domain namespaces and country is not in blueprints
This commit is contained in:
Owen Schwartz
2026-08-31 11:03:06 -04:00
committed by GitHub
parent 49dcc590ce e7f38c089f
commit 0dece5fef1
2 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/lib/blueprints/types.ts
+2 -2
View File
@@ -101,7 +101,7 @@ export const AuthSchema = z.object({
export const RuleSchema = z export const RuleSchema = z
.object({ .object({
action: z.enum(["allow", "deny", "pass"]), action: z.enum(["allow", "deny", "pass"]),
match: z.enum(["cidr", "path", "ip", "country", "asn", "region"]), match: z.enum(["cidr", "path", "ip", "country", "country_is_not", "asn", "region"]),
value: z.coerce.string(), value: z.coerce.string(),
priority: z.int().optional(), priority: z.int().optional(),
enabled: z.boolean().optional().default(true) enabled: z.boolean().optional().default(true)
@@ -136,7 +136,7 @@ export const RuleSchema = z
) )
.refine( .refine(
(rule) => { (rule) => {
if (rule.match === "country") { if (rule.match === "country" || rule.match === "country_is_not") {
if (!hasMaxmindCountryDb) { if (!hasMaxmindCountryDb) {
return false; return false;
} }
server/lib/domainUtils.ts
+10 -15
View File
@@ -31,7 +31,6 @@ export async function validateAndConstructDomain(
subdomain?: string | null subdomain?: string | null
): Promise<DomainValidationResult> { ): Promise<DomainValidationResult> {
try { try {
// Query domain with organization access check
const [domainRes] = await db const [domainRes] = await db
.select() .select()
.from(domains) .from(domains)
@@ -42,6 +41,10 @@ export async function validateAndConstructDomain(
eq(orgDomains.orgId, orgId), eq(orgDomains.orgId, orgId),
eq(orgDomains.domainId, domainId) eq(orgDomains.domainId, domainId)
) )
)
.leftJoin(
domainNamespaces,
eq(domainNamespaces.domainId, domainId)
); );
// Check if domain exists // Check if domain exists
@@ -52,7 +55,7 @@ export async function validateAndConstructDomain(
}; };
} }
if (!domainRes.orgDomains) { if (!domainRes.orgDomains && !domainRes.domainNamespaces) {
return { return {
success: false, success: false,
error: `Organization does not have access to domain with ID ${domainId}` error: `Organization does not have access to domain with ID ${domainId}`
@@ -83,19 +86,11 @@ export async function validateAndConstructDomain(
} }
// Wildcard subdomains are not allowed on namespace (provided/free) domains // Wildcard subdomains are not allowed on namespace (provided/free) domains
if (isWildcard) { if (isWildcard && domainRes.domainNamespaces) {
const [namespaceDomain] = await db return {
.select() success: false,
.from(domainNamespaces) error: "Wildcard subdomains are not supported for provided or free domains. Use a specific subdomain instead."
.where(eq(domainNamespaces.domainId, domainId)) };
.limit(1);
if (namespaceDomain) {
return {
success: false,
error: "Wildcard subdomains are not supported for provided or free domains. Use a specific subdomain instead."
};
}
} }
if ( if (