Merge pull request #1091 from fosrl/dev

Dev

README.md

@@ -38,9 +38,12 @@ _Pangolin tunnels your services to the internet so you can access anything from
 
 <p align="center">
     <strong>
-    Start testing Pangolin at <a href="https://pangolin.fossorial.io/auth/signup">pangolin.fossorial.io</a>
+        Start testing Pangolin at <a href="https://pangolin.fossorial.io/auth/signup">pangolin.fossorial.io</a>
-    <br/>
+    </strong>
-</strong>
+</p>
+
+<p align="center">
+    <a href='https://www.ycombinator.com/launches/O0B-pangolin-open-source-secure-gateway-to-private-networks' target="_blank"><img src='https://www.ycombinator.com/launches/O0B-pangolin-open-source-secure-gateway-to-private-networks/upvote_embed.svg' alt='Launch YC: Pangolin – Open-source secure gateway to private networks'/ ></a>
 </p>
 
 Pangolin is a self-hosted tunneled reverse proxy server with identity and access control, designed to securely expose private resources on distributed networks. Acting as a central hub, it connects isolated networks — even those behind restrictive firewalls — through encrypted tunnels, enabling easy access to remote services without opening ports.

install/config/crowdsec/profiles.yaml

@@ -1,4 +1,4 @@
-iame: captcha_remediation
+name: captcha_remediation
 filters:
   - Alert.Remediation == true && Alert.GetScope() == "Ip" && Alert.GetScenario() contains "http"
 decisions:
@@ -22,4 +22,4 @@ filters:
 decisions:
  - type: ban
    duration: 4h
-on_success: break
+on_success: break

messages/en-US.json

@@ -1162,7 +1162,7 @@
     "selectDomainTypeCnameName": "Single Domain (CNAME)",
     "selectDomainTypeCnameDescription": "Just this specific domain. Use this for individual subdomains or specific domain entries.",
     "selectDomainTypeWildcardName": "Wildcard Domain",
-    "selectDomainTypeWildcardDescription": "This domain and its first level of subdomains.",
+    "selectDomainTypeWildcardDescription": "This domain and its subdomains.",
     "domainDelegation": "Single Domain",
     "selectType": "Select a type",
     "actions": "Actions",

server/emails/index.ts

@@ -18,10 +18,10 @@ function createEmailClient() {
         host: emailConfig.smtp_host,
         port: emailConfig.smtp_port,
         secure: emailConfig.smtp_secure || false,
-        auth: {
+        auth: (emailConfig.smtp_user && emailConfig.smtp_pass) ? {
             user: emailConfig.smtp_user,
             pass: emailConfig.smtp_pass
-        }
+        } : null
     } as SMTPTransport.Options;
 
     if (emailConfig.smtp_tls_reject_unauthorized !== undefined) {

server/lib/consts.ts

@@ -2,7 +2,7 @@ import path from "path";
 import { fileURLToPath } from "url";
 
 // This is a placeholder value replaced by the build process
-export const APP_VERSION = "1.7.0";
+export const APP_VERSION = "1.7.3";
 
 export const __FILENAME = fileURLToPath(import.meta.url);
 export const __DIRNAME = path.dirname(__FILENAME);

server/routers/client/createClient.ts

@@ -144,14 +144,16 @@ export async function createClient(
         const subnetExistsClients = await db
             .select()
             .from(clients)
-            .where(eq(clients.subnet, updatedSubnet))
+            .where(
+                and(eq(clients.subnet, updatedSubnet), eq(clients.orgId, orgId))
+            )
             .limit(1);
 
         if (subnetExistsClients.length > 0) {
             return next(
                 createHttpError(
                     HttpCode.CONFLICT,
-                    `Subnet ${subnet} already exists`
+                    `Subnet ${updatedSubnet} already exists in clients`
                 )
             );
         }
@@ -159,14 +161,16 @@ export async function createClient(
         const subnetExistsSites = await db
             .select()
             .from(sites)
-            .where(eq(sites.address, updatedSubnet))
+            .where(
+                and(eq(sites.address, updatedSubnet), eq(sites.orgId, orgId))
+            )
             .limit(1);
 
         if (subnetExistsSites.length > 0) {
             return next(
                 createHttpError(
                     HttpCode.CONFLICT,
-                    `Subnet ${subnet} already exists`
+                    `Subnet ${updatedSubnet} already exists in sites`
                 )
             );
         }

server/routers/external.ts

@@ -620,8 +620,6 @@ authenticated.post(
 
 authenticated.delete("/idp/:idpId", verifyUserIsServerAdmin, idp.deleteIdp);
 
-authenticated.get("/idp", verifyUserIsServerAdmin, idp.listIdps);
-
 authenticated.get("/idp/:idpId", verifyUserIsServerAdmin, idp.getIdp);
 
 authenticated.put(

server/routers/idp/validateOidcCallback.ts

@@ -162,6 +162,12 @@ export async function validateOidcCallback(
             );
         }
 
+        logger.debug("State verified", {
+            urL: ensureTrailingSlash(existingIdp.idpOidcConfig.tokenUrl),
+            expectedState,
+            state
+        });
+
         const tokens = await client.validateAuthorizationCode(
             ensureTrailingSlash(existingIdp.idpOidcConfig.tokenUrl),
             code,

server/routers/resource/createResource.ts

@@ -261,14 +261,6 @@ async function createHttpResource(
                     )
                 );
             }
-            if (parsedSubdomain.data.includes(".")) {
-                return next(
-                    createHttpError(
-                        HttpCode.BAD_REQUEST,
-                        "Subdomain cannot contain a dot when using wildcard domains"
-                    )
-                );
-            }
             fullDomain = `${subdomain}.${domainRes.domains.baseDomain}`;
         } else {
             fullDomain = domainRes.domains.baseDomain;

server/routers/resource/updateResource.ts

@@ -297,14 +297,6 @@ async function updateHttpResource(
                         )
                     );
                 }
-                if (parsedSubdomain.data.includes(".")) {
-                    return next(
-                        createHttpError(
-                            HttpCode.BAD_REQUEST,
-                            "Subdomain cannot contain a dot when using wildcard domains"
-                        )
-                    );
-                }
                 fullDomain = `${updateData.subdomain}.${domainRes.domains.baseDomain}`;
             } else {
                 fullDomain = domainRes.domains.baseDomain;

server/routers/site/createSite.ts

@@ -1,6 +1,6 @@
 import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
-import { db } from "@server/db";
+import { clients, db } from "@server/db";
 import { roles, userSites, sites, roleSites, Site, orgs } from "@server/db";
 import response from "@server/lib/response";
 import HttpCode from "@server/types/HttpCode";
@@ -129,17 +129,17 @@ export async function createSite(
             );
         }
 
-        if (!org.subnet) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    `Organization with ID ${orgId} has no subnet defined`
-                )
-            );
-        }
-
         let updatedAddress = null;
         if (address) {
+            if (!org.subnet) {
+                return next(
+                    createHttpError(
+                        HttpCode.BAD_REQUEST,
+                        `Organization with ID ${orgId} has no subnet defined`
+                    )
+                );
+            }
+
             if (!isValidIP(address)) {
                 return next(
                     createHttpError(
@@ -148,7 +148,7 @@ export async function createSite(
                     )
                 );
             }
-        
+
             if (!isIpInCidr(address, org.subnet)) {
                 return next(
                     createHttpError(
@@ -157,35 +157,45 @@ export async function createSite(
                     )
                 );
             }
-        
+
             updatedAddress = `${address}/${org.subnet.split("/")[1]}`; // we want the block size of the whole org
-        
+
             // make sure the subnet is unique
             const addressExistsSites = await db
                 .select()
                 .from(sites)
-                .where(eq(sites.address, updatedAddress))
+                .where(
+                    and(
+                        eq(sites.address, updatedAddress),
+                        eq(sites.orgId, orgId)
+                    )
+                )
                 .limit(1);
-        
+
             if (addressExistsSites.length > 0) {
                 return next(
                     createHttpError(
                         HttpCode.CONFLICT,
-                        `Subnet ${subnet} already exists`
+                        `Subnet ${updatedAddress} already exists in sites`
                     )
                 );
             }
-        
+
             const addressExistsClients = await db
                 .select()
-                .from(sites)
+                .from(clients)
-                .where(eq(sites.subnet, updatedAddress))
+                .where(
+                    and(
+                        eq(clients.subnet, updatedAddress),
+                        eq(clients.orgId, orgId)
+                    )
+                )
                 .limit(1);
             if (addressExistsClients.length > 0) {
                 return next(
                     createHttpError(
                         HttpCode.CONFLICT,
-                        `Subnet ${subnet} already exists`
+                        `Subnet ${updatedAddress} already exists in clients`
                     )
                 );
             }

src/app/[orgId]/settings/access/users/create/page.tsx

@@ -9,7 +9,7 @@ import {
     SettingsSectionHeader,
     SettingsSectionTitle
 } from "@app/components/Settings";
-import { StrategySelect } from "@app/components/StrategySelect";
+import { StrategyOption, StrategySelect } from "@app/components/StrategySelect";
 import HeaderTitle from "@app/components/SettingsSectionTitle";
 import { Button } from "@app/components/ui/button";
 import { useParams, useRouter } from "next/navigation";
@@ -45,15 +45,10 @@ import { createApiClient } from "@app/lib/api";
 import { Checkbox } from "@app/components/ui/checkbox";
 import { ListIdpsResponse } from "@server/routers/idp";
 import { useTranslations } from "next-intl";
+import { build } from "@server/build";
 
 type UserType = "internal" | "oidc";
 
-interface UserTypeOption {
-    id: UserType;
-    title: string;
-    description: string;
-}
-
 interface IdpOption {
     idpId: number;
     name: string;
@@ -147,13 +142,20 @@ export default function Page() {
         }
     }, [userType, env.email.emailEnabled, internalForm, externalForm]);
 
-    const userTypes: UserTypeOption[] = [
+    const [userTypes, setUserTypes] = useState<StrategyOption<string>[]>([
         {
             id: "internal",
             title: t("userTypeInternal"),
-            description: t("userTypeInternalDescription")
+            description: t("userTypeInternalDescription"),
+            disabled: false
+        },
+        {
+            id: "oidc",
+            title: t("userTypeExternal"),
+            description: t("userTypeExternalDescription"),
+            disabled: true
         }
-    ];
+    ]);
 
     useEffect(() => {
         if (!userType) {
@@ -177,9 +179,6 @@ export default function Page() {
 
             if (res?.status === 200) {
                 setRoles(res.data.data.roles);
-                if (userType === "internal") {
-                    setDataLoaded(true);
-                }
             }
         }
 
@@ -200,24 +199,32 @@ export default function Page() {
 
             if (res?.status === 200) {
                 setIdps(res.data.data.idps);
-                setDataLoaded(true);
 
                 if (res.data.data.idps.length) {
-                    userTypes.push({
+                    setUserTypes((prev) =>
-                        id: "oidc",
+                        prev.map((type) => {
-                        title: t("userTypeExternal"),
+                            if (type.id === "oidc") {
-                        description: t("userTypeExternalDescription")
+                                return {
-                    });
+                                    ...type,
+                                    disabled: false
+                                };
+                            }
+                            return type;
+                        })
+                    );
                 }
             }
         }
 
-        setDataLoaded(false);
+        async function fetchInitialData() {
-        fetchRoles();
+            setDataLoaded(false);
-        if (userType !== "internal") {
+            await fetchRoles();
-            fetchIdps();
+            await fetchIdps();
+            setDataLoaded(true);
         }
-    }, [userType]);
+
+        fetchInitialData();
+    }, []);
 
     async function onSubmitInternal(
         values: z.infer<typeof internalFormSchema>
@@ -323,7 +330,7 @@ export default function Page() {
 
             <div>
                 <SettingsContainer>
-                    {!inviteLink && userTypes.length > 1 ? (
+                    {!inviteLink && build !== "saas" ? (
                         <SettingsSection>
                             <SettingsSectionHeader>
                                 <SettingsSectionTitle>
@@ -610,7 +617,7 @@ export default function Page() {
                                                                     idp || null
                                                                 );
                                                             }}
-                                                            cols={3}
+                                                            cols={2}
                                                         />
                                                         <FormMessage />
                                                     </FormItem>

src/app/page.tsx

@@ -12,6 +12,7 @@ import { cleanRedirect } from "@app/lib/cleanRedirect";
 import { Layout } from "@app/components/Layout";
 import { InitialSetupCompleteResponse } from "@server/routers/auth";
 import { cookies } from "next/headers";
+import { build } from "@server/build";
 
 export const dynamic = "force-dynamic";
 
@@ -83,25 +84,27 @@ export default async function Page(props: {
         if (ownedOrg) {
             redirect(`/${ownedOrg.orgId}`);
         } else {
-            redirect("/setup");
+            if (!env.flags.disableUserCreateOrg || user.serverAdmin) {
+                redirect("/setup");
+            }
         }
     }
 
-    // return (
+    return (
-    //     <UserProvider user={user}>
+        <UserProvider user={user}>
-    //         <Layout orgs={orgs} navItems={[]}>
+            <Layout orgs={orgs} navItems={[]}>
-    //             <div className="w-full max-w-md mx-auto md:mt-32 mt-4">
+                <div className="w-full max-w-md mx-auto md:mt-32 mt-4">
-    //                 <OrganizationLanding
+                    <OrganizationLanding
-    //                     disableCreateOrg={
+                        disableCreateOrg={
-    //                         env.flags.disableUserCreateOrg && !user.serverAdmin
+                            env.flags.disableUserCreateOrg && !user.serverAdmin
-    //                     }
+                        }
-    //                     organizations={orgs.map((org) => ({
+                        organizations={orgs.map((org) => ({
-    //                         name: org.name,
+                            name: org.name,
-    //                         id: org.orgId
+                            id: org.orgId
-    //                     }))}
+                        }))}
-    //                 />
+                    />
-    //             </div>
+                </div>
-    //         </Layout>
+            </Layout>
-    //     </UserProvider>
+        </UserProvider>
-    // );
+    );
 }

src/components/DomainPicker.tsx

@@ -179,7 +179,7 @@ export default function DomainPicker({
                     });
                 }
             } else if (orgDomain.type === "wildcard") {
-                // For wildcard domains, allow the base domain or one level up
+                // For wildcard domains, allow the base domain or multiple levels up
                 const userInputLower = userInput.toLowerCase();
                 const baseDomainLower = orgDomain.baseDomain.toLowerCase();
 
@@ -194,24 +194,22 @@ export default function DomainPicker({
                         domainId: orgDomain.domainId
                     });
                 }
-                // Check if user input is one level up (subdomain.baseDomain)
+                // Check if user input ends with the base domain (allows multiple level subdomains)
                 else if (userInputLower.endsWith(`.${baseDomainLower}`)) {
                     const subdomain = userInputLower.slice(
                         0,
                         -(baseDomainLower.length + 1)
                     );
-                    // Only allow one level up (no dots in subdomain)
+                    // Allow multiple levels (subdomain can contain dots)
-                    if (!subdomain.includes(".")) {
+                    options.push({
-                        options.push({
+                        id: `org-${orgDomain.domainId}`,
-                            id: `org-${orgDomain.domainId}`,
+                        domain: userInput,
-                            domain: userInput,
+                        type: "organization",
-                            type: "organization",
+                        verified: orgDomain.verified,
-                            verified: orgDomain.verified,
+                        domainType: "wildcard",
-                            domainType: "wildcard",
+                        domainId: orgDomain.domainId,
-                            domainId: orgDomain.domainId,
+                        subdomain: subdomain
-                            subdomain: subdomain
+                    });
-                        });
-                    }
                 }
             }
         });
@@ -320,7 +318,7 @@ export default function DomainPicker({
                         setUserInput(validInput);
                     }}
                 />
-                <p className="text-xs text-muted-foreground">
+                <p className="text-sm text-muted-foreground">
                     {build === "saas"
                         ? t("domainPickerDescriptionSaas")
                         : t("domainPickerDescription")}
@@ -328,42 +326,44 @@ export default function DomainPicker({
             </div>
 
             {/* Tabs and Sort Toggle */}
-            <div className="flex justify-between items-center">
+            {build === "saas" && (
-                <Tabs
+                <div className="flex justify-between items-center">
-                    value={activeTab}
+                    <Tabs
-                    onValueChange={(value) =>
+                        value={activeTab}
-                        setActiveTab(
+                        onValueChange={(value) =>
-                            value as "all" | "organization" | "provided"
+                            setActiveTab(
-                        )
+                                value as "all" | "organization" | "provided"
-                    }
+                            )
-                >
+                        }
-                    <TabsList>
+                    >
-                        <TabsTrigger value="all">
+                        <TabsList>
-                            {t("domainPickerTabAll")}
+                            <TabsTrigger value="all">
-                        </TabsTrigger>
+                                {t("domainPickerTabAll")}
-                        <TabsTrigger value="organization">
-                            {t("domainPickerTabOrganization")}
-                        </TabsTrigger>
-                        {build == "saas" && (
-                            <TabsTrigger value="provided">
-                                {t("domainPickerTabProvided")}
                             </TabsTrigger>
-                        )}
+                            <TabsTrigger value="organization">
-                    </TabsList>
+                                {t("domainPickerTabOrganization")}
-                </Tabs>
+                            </TabsTrigger>
-                <Button
+                            {build == "saas" && (
-                    variant="outline"
+                                <TabsTrigger value="provided">
-                    size="sm"
+                                    {t("domainPickerTabProvided")}
-                    onClick={() =>
+                                </TabsTrigger>
-                        setSortOrder(sortOrder === "asc" ? "desc" : "asc")
+                            )}
-                    }
+                        </TabsList>
-                >
+                    </Tabs>
-                    <ArrowUpDown className="h-4 w-4 mr-2" />
+                    <Button
-                    {sortOrder === "asc"
+                        variant="outline"
-                        ? t("domainPickerSortAsc")
+                        size="sm"
-                        : t("domainPickerSortDesc")}
+                        onClick={() =>
-                </Button>
+                            setSortOrder(sortOrder === "asc" ? "desc" : "asc")
-            </div>
+                        }
+                    >
+                        <ArrowUpDown className="h-4 w-4 mr-2" />
+                        {sortOrder === "asc"
+                            ? t("domainPickerSortAsc")
+                            : t("domainPickerSortDesc")}
+                    </Button>
+                </div>
+            )}
 
             {/* Loading State */}
             {isChecking && (

src/components/OrganizationLanding.tsx

@@ -41,35 +41,31 @@ export default function OrganizationLanding({
     function getDescriptionText() {
         if (organizations.length === 0) {
             if (!disableCreateOrg) {
-                return t('componentsErrorNoMemberCreate');
+                return t("componentsErrorNoMemberCreate");
             } else {
-                return t('componentsErrorNoMember');
+                return t("componentsErrorNoMember");
             }
         }
 
-        return t('componentsMember', {count: organizations.length});
+        return t("componentsMember", { count: organizations.length });
     }
 
     return (
         <Card>
             <CardHeader>
-                <CardTitle>{t('welcome')}</CardTitle>
+                <CardTitle>{t("welcome")}</CardTitle>
                 <CardDescription>{getDescriptionText()}</CardDescription>
             </CardHeader>
             <CardContent>
                 {organizations.length === 0 ? (
-                    disableCreateOrg ? (
+                    !disableCreateOrg && (
-                        <p className="text-center text-muted-foreground">
-                            t('componentsErrorNoMember')
-                        </p>
-                    ) : (
                         <Link href="/setup">
                             <Button
                                 className="w-full h-auto py-3 text-lg"
                                 size="lg"
                             >
                                 <Plus className="mr-2 h-5 w-5" />
-                                {t('componentsCreateOrg')}
+                                {t("componentsCreateOrg")}
                             </Button>
                         </Link>
                     )

src/components/SecurityKeyForm.tsx

@@ -103,8 +103,10 @@ export default function SecurityKeyForm({
     });
 
     useEffect(() => {
-        loadSecurityKeys();
+        if (open) {
-    }, []);
+            loadSecurityKeys();
+        }
+    }, [open]);
 
     const registerSchema = z.object({
         name: z.string().min(1, { message: t("securityKeyNameRequired") }),

src/components/StrategySelect.tsx

@@ -4,7 +4,7 @@ import { cn } from "@app/lib/cn";
 import { RadioGroup, RadioGroupItem } from "./ui/radio-group";
 import { useState } from "react";
 
-interface StrategyOption<TValue extends string> {
+export interface StrategyOption<TValue extends string> {
     id: TValue;
     title: string;
     description: string;

src/components/ui/popover.tsx

@@ -18,7 +18,7 @@ function PopoverTrigger({
 
 function PopoverContent({
     className,
-    align = "center",
+    align = "start",
     sideOffset = 4,
     ...props
 }: React.ComponentProps<typeof PopoverPrimitive.Content>) {