calvin.erfmann/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-07-06 12:19:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3245 from fosrl/dev

Browse Source 
Bugfixes
This commit is contained in:
Owen Schwartz
2026-06-11 16:17:41 -07:00
committed by GitHub
parent a724b07846 820f66e58f
commit 6e271028f3
10 changed files with 214 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.dockerignore
View File

@@ -35,3 +35,4 @@ tsconfig.json
Dockerfile* Dockerfile*
drizzle.config.ts drizzle.config.ts
allowedDevOrigins.json allowedDevOrigins.json
scratch/

2
messages/en-US.json
View File

@@ -984,7 +984,7 @@
"sharedPolicy": "Shared Policy", "sharedPolicy": "Shared Policy",
"sharedPolicyNoneDescription": "This resource has its own policy.", "sharedPolicyNoneDescription": "This resource has its own policy.",
"resourceSharedPolicyOwnDescription": "This resource has its own authentication and access rules controls.", "resourceSharedPolicyOwnDescription": "This resource has its own authentication and access rules controls.",
"resourceSharedPolicyInheritedDescription": "This resource inherits authentication and access rules controls from <policyLink>{policyName}</policyLink>.", "resourceSharedPolicyInheritedDescription": "This resource inherits from <policyLink>{policyName}</policyLink>.",
"resourceSharedPolicyAuthenticationNotice": "This resource is using a shared policy. Some authentication settings can be edited on this resource to add to the policy. To change the underlying policy, you must edit to <policyLink>{policyName}</policyLink>.", "resourceSharedPolicyAuthenticationNotice": "This resource is using a shared policy. Some authentication settings can be edited on this resource to add to the policy. To change the underlying policy, you must edit to <policyLink>{policyName}</policyLink>.",
"resourceSharedPolicyRulesNotice": "This resource is using a shared policy. Some access rules can be edited on this resource. To change the underlying policy, you must edit <policyLink>{policyName}</policyLink>.", "resourceSharedPolicyRulesNotice": "This resource is using a shared policy. Some access rules can be edited on this resource. To change the underlying policy, you must edit <policyLink>{policyName}</policyLink>.",
"resourceUsersRoles": "Access Controls", "resourceUsersRoles": "Access Controls",

8
server/setup/scriptsSqlite/1.19.0.ts
View File

@@ -228,7 +228,7 @@ export default async function migration() {
).run(); ).run();
db.prepare( db.prepare(
` `
UPDATE 'siteResources' SET 'destination2' = 'destination'; UPDATE 'siteResources' SET "destination2" = "destination";
` `
).run(); ).run();
db.prepare( db.prepare(
@@ -349,9 +349,9 @@ export default async function migration() {
db.prepare( db.prepare(
` `
UPDATE 'targets' UPDATE 'targets'
SET 'mode' = ( SET "mode" = (
SELECT 'mode' FROM 'resources' SELECT "mode" FROM 'resources'
WHERE 'resources'.'resourceId' = 'targets'.'resourceId' WHERE "resources"."resourceId" = "targets"."resourceId"
); );
` `
).run(); ).run();

68
src/app/[orgId]/settings/general/page.tsx
View File

@@ -43,6 +43,7 @@ import { usePaidStatus } from "@app/hooks/usePaidStatus";
import { tierMatrix, TierFeature } from "@server/lib/billing/tierMatrix"; import { tierMatrix, TierFeature } from "@server/lib/billing/tierMatrix";
import { PaidFeaturesAlert } from "@app/components/PaidFeaturesAlert"; import { PaidFeaturesAlert } from "@app/components/PaidFeaturesAlert";
import { ExternalLink } from "lucide-react"; import { ExternalLink } from "lucide-react";
import { env } from "process";
// Schema for general organization settings // Schema for general organization settings
const GeneralFormSchema = z.object({ const GeneralFormSchema = z.object({
@@ -165,6 +166,7 @@ function DeleteForm({ org }: SectionFormProps) {
function GeneralSectionForm({ org }: SectionFormProps) { function GeneralSectionForm({ org }: SectionFormProps) {
const { updateOrg } = useOrgContext(); const { updateOrg } = useOrgContext();
const { env } = useEnvContext();
const form = useForm({ const form = useForm({
resolver: zodResolver( resolver: zodResolver(
GeneralFormSchema.pick({ GeneralFormSchema.pick({
@@ -265,36 +267,42 @@ function GeneralSectionForm({ org }: SectionFormProps) {
<PaidFeaturesAlert <PaidFeaturesAlert
tiers={tierMatrix.newtAutoUpdate} tiers={tierMatrix.newtAutoUpdate}
/> />
<FormField {!env.flags.disableEnterpriseFeatures && (
control={form.control} <FormField
name="settingsEnableGlobalNewtAutoUpdate" control={form.control}
render={({ field }) => ( name="settingsEnableGlobalNewtAutoUpdate"
<FormItem> render={({ field }) => (
<FormControl> <FormItem>
<SwitchInput <FormControl>
id="settings-enable-global-newt-auto-update" <SwitchInput
label={t("newtAutoUpdate")} id="settings-enable-global-newt-auto-update"
checked={field.value} label={t("newtAutoUpdate")}
onCheckedChange={field.onChange} checked={field.value}
disabled={!hasAutoUpdateFeature} onCheckedChange={
/> field.onChange
</FormControl> }
<FormDescription> disabled={
{t("newtAutoUpdateDescription")}{" "} !hasAutoUpdateFeature
<a }
href="https://docs.pangolin.net/manage/sites/auto-update" />
target="_blank" </FormControl>
rel="noopener noreferrer" <FormDescription>
className="text-primary hover:underline inline-flex items-center gap-1" {t("newtAutoUpdateDescription")}{" "}
> <a
{t("learnMore")} href="https://docs.pangolin.net/manage/sites/auto-update"
<ExternalLink className="size-3.5 shrink-0" /> target="_blank"
</a> rel="noopener noreferrer"
</FormDescription> className="text-primary hover:underline inline-flex items-center gap-1"
<FormMessage /> >
</FormItem> {t("learnMore")}
)} <ExternalLink className="size-3.5 shrink-0" />
/> </a>
</FormDescription>
<FormMessage />
</FormItem>
)}
/>
)}
</form> </form>
</Form> </Form>
</SettingsSectionForm> </SettingsSectionForm>

2
src/app/[orgId]/settings/resources/public/[niceId]/general/page.tsx
View File

@@ -455,7 +455,7 @@ export default function GeneralForm() {
)} )}
{ !["tcp", "udp"].includes( { !["tcp", "udp"].includes(
resource.mode resource.mode
) && ( ) && !env.flags.disableEnterpriseFeatures && (
<> <>
<SettingsFormCell span="full"> <SettingsFormCell span="full">
<SettingsSubsectionHeader> <SettingsSubsectionHeader>

129
src/app/[orgId]/settings/resources/public/[niceId]/maintenance/page.tsx
View File

@@ -169,20 +169,27 @@ export default function ResourceMaintenancePage() {
{ {
id: "automatic", id: "automatic",
title: `${t("automatic")} (${t("recommended")})`, title: `${t("automatic")} (${t("recommended")})`,
description: t("automaticModeDescription"), description: t("automaticModeDescription")
disabled: isMaintenanceDisabled
}, },
{ {
id: "forced", id: "forced",
title: t("forced"), title: t("forced"),
description: t("forcedModeDescription"), description: t("forcedModeDescription")
disabled: isMaintenanceDisabled
} }
]; ];
return ( return (
<SettingsContainer> <>
<SettingsSection> <PaidFeaturesAlert tiers={tierMatrix.maintencePage} />
<div
className={
isMaintenanceDisabled
? "pointer-events-none opacity-50"
: undefined
}
>
<SettingsContainer>
<SettingsSection>
<SettingsSectionHeader> <SettingsSectionHeader>
<SettingsSectionTitle> <SettingsSectionTitle>
{t("maintenanceMode")} {t("maintenanceMode")}
@@ -193,7 +200,6 @@ export default function ResourceMaintenancePage() {
</SettingsSectionHeader> </SettingsSectionHeader>
<SettingsSectionBody> <SettingsSectionBody>
<PaidFeaturesAlert tiers={tierMatrix.maintencePage} />
<SettingsSectionForm variant="half"> <SettingsSectionForm variant="half">
<Form {...maintenanceForm}> <Form {...maintenanceForm}>
<form <form
@@ -205,46 +211,33 @@ export default function ResourceMaintenancePage() {
<FormField <FormField
control={maintenanceForm.control} control={maintenanceForm.control}
name="maintenanceModeEnabled" name="maintenanceModeEnabled"
render={({ field }) => { render={({ field }) => (
const isDisabled = !isPaidUser( <FormItem>
tierMatrix.maintencePage <FormControl>
); <SwitchInput
id="enable-maintenance"
return ( checked={
<FormItem> field.value
<FormControl> }
<SwitchInput label={t(
id="enable-maintenance" "enableMaintenanceMode"
checked={ )}
field.value description={t(
} "enableMaintenanceModeDescription"
label={t( )}
"enableMaintenanceMode" onCheckedChange={(
)} val
description={t( ) => {
"enableMaintenanceModeDescription" maintenanceForm.setValue(
)} "maintenanceModeEnabled",
disabled={
isDisabled
}
onCheckedChange={(
val val
) => { );
if ( }}
!isDisabled />
) { </FormControl>
maintenanceForm.setValue( <FormMessage />
"maintenanceModeEnabled", </FormItem>
val )}
);
}
}}
/>
</FormControl>
<FormMessage />
</FormItem>
);
}}
/> />
</SettingsFormCell> </SettingsFormCell>
@@ -329,11 +322,6 @@ export default function ResourceMaintenancePage() {
<FormControl> <FormControl>
<Input <Input
{...field} {...field}
disabled={
!isPaidUser(
tierMatrix.maintencePage
)
}
placeholder="We'll be back soon!" placeholder="We'll be back soon!"
/> />
</FormControl> </FormControl>
@@ -365,11 +353,6 @@ export default function ResourceMaintenancePage() {
<Textarea <Textarea
{...field} {...field}
rows={4} rows={4}
disabled={
!isPaidUser(
tierMatrix.maintencePage
)
}
placeholder={t( placeholder={t(
"maintenancePageMessagePlaceholder" "maintenancePageMessagePlaceholder"
)} )}
@@ -402,11 +385,6 @@ export default function ResourceMaintenancePage() {
<FormControl> <FormControl>
<Input <Input
{...field} {...field}
disabled={
!isPaidUser(
tierMatrix.maintencePage
)
}
placeholder={t( placeholder={t(
"maintenanceTime" "maintenanceTime"
)} )}
@@ -430,20 +408,19 @@ export default function ResourceMaintenancePage() {
</SettingsSectionForm> </SettingsSectionForm>
</SettingsSectionBody> </SettingsSectionBody>
<SettingsSectionFooter> <SettingsSectionFooter>
<Button <Button
type="submit" type="submit"
loading={maintenanceSaveLoading} loading={maintenanceSaveLoading}
disabled={ disabled={maintenanceSaveLoading}
maintenanceSaveLoading || form="maintenance-settings-form"
!isPaidUser(tierMatrix.maintencePage) >
} {t("saveSettings")}
form="maintenance-settings-form" </Button>
> </SettingsSectionFooter>
{t("saveSettings")} </SettingsSection>
</Button> </SettingsContainer>
</SettingsSectionFooter> </div>
</SettingsSection> </>
</SettingsContainer>
); );
} }

150
src/app/[orgId]/settings/sites/[niceId]/general/page.tsx
View File

@@ -253,85 +253,87 @@ export default function GeneralPage() {
<PaidFeaturesAlert <PaidFeaturesAlert
tiers={tierMatrix.newtAutoUpdate} tiers={tierMatrix.newtAutoUpdate}
/> />
{site && site.type === "newt" && ( {site &&
<FormField site.type === "newt" &&
control={form.control} !env.flags.disableEnterpriseFeatures && (
name="autoUpdateEnabled" <FormField
render={({ field }) => { control={form.control}
const isOverriding = form.watch( name="autoUpdateEnabled"
"autoUpdateOverrideOrg" render={({ field }) => {
); const isOverriding = form.watch(
return ( "autoUpdateOverrideOrg"
<FormItem> );
<FormControl> return (
<div className=""> <FormItem>
<SwitchInput <FormControl>
id="auto-update-enabled" <div className="">
label={t( <SwitchInput
"siteAutoUpdateLabel" id="auto-update-enabled"
)} label={t(
checked={ "siteAutoUpdateLabel"
field.value )}
} checked={
onCheckedChange={( field.value
checked }
) => { onCheckedChange={(
field.onChange(
checked checked
); ) => {
form.setValue( field.onChange(
"autoUpdateOverrideOrg", checked
true );
);
}}
disabled={
!hasAutoUpdateFeature
}
/>
{isOverriding && (
<ButtonUI
type="button"
variant="link"
size="sm"
className="text-sm text-muted-foreground px-0"
onClick={() => {
form.setValue( form.setValue(
"autoUpdateOverrideOrg", "autoUpdateOverrideOrg",
false true
);
form.setValue(
"autoUpdateEnabled",
orgAutoUpdate
); );
}} }}
> disabled={
{t( !hasAutoUpdateFeature
"siteAutoUpdateResetToOrg" }
)} />
</ButtonUI> {isOverriding && (
)} <ButtonUI
</div> type="button"
</FormControl> variant="link"
<FormDescription> size="sm"
{t( className="text-sm text-muted-foreground px-0"
"siteAutoUpdateDescription" onClick={() => {
)}{" "} form.setValue(
<a "autoUpdateOverrideOrg",
href="https://docs.pangolin.net/manage/sites/auto-update" false
target="_blank" );
rel="noopener noreferrer" form.setValue(
className="text-primary hover:underline inline-flex items-center gap-1" "autoUpdateEnabled",
> orgAutoUpdate
{t("learnMore")} );
<ExternalLink className="size-3.5 shrink-0" /> }}
</a> >
</FormDescription> {t(
<FormMessage /> "siteAutoUpdateResetToOrg"
</FormItem> )}
); </ButtonUI>
}} )}
/> </div>
)} </FormControl>
<FormDescription>
{t(
"siteAutoUpdateDescription"
)}{" "}
<a
href="https://docs.pangolin.net/manage/sites/auto-update"
target="_blank"
rel="noopener noreferrer"
className="text-primary hover:underline inline-flex items-center gap-1"
>
{t("learnMore")}
<ExternalLink className="size-3.5 shrink-0" />
</a>
</FormDescription>
<FormMessage />
</FormItem>
);
}}
/>
)}
</form> </form>
</Form> </Form>
</SettingsSectionForm> </SettingsSectionForm>

11
src/app/[orgId]/settings/sites/create/page.tsx
View File

@@ -23,7 +23,7 @@ import {
} from "@app/components/ui/form"; } from "@app/components/ui/form";
import HeaderTitle from "@app/components/SettingsSectionTitle"; import HeaderTitle from "@app/components/SettingsSectionTitle";
import { z } from "zod"; import { z } from "zod";
import { createElement, useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod"; import { zodResolver } from "@hookform/resolvers/zod";
import { Input } from "@app/components/ui/input"; import { Input } from "@app/components/ui/input";
@@ -37,15 +37,6 @@ import {
InfoSections, InfoSections,
InfoSectionTitle InfoSectionTitle
} from "@app/components/InfoSection"; } from "@app/components/InfoSection";
import {
FaApple,
FaCubes,
FaDocker,
FaFreebsd,
FaWindows
} from "react-icons/fa";
import { SiNixos, SiKubernetes } from "react-icons/si";
import { Checkbox, CheckboxWithLabel } from "@app/components/ui/checkbox";
import { Alert, AlertDescription, AlertTitle } from "@app/components/ui/alert"; import { Alert, AlertDescription, AlertTitle } from "@app/components/ui/alert";
import { generateKeypair } from "../[niceId]/wireguardConfig"; import { generateKeypair } from "../[niceId]/wireguardConfig";
import { createApiClient, formatAxiosError } from "@app/lib/api"; import { createApiClient, formatAxiosError } from "@app/lib/api";

9
src/app/navigation.tsx
View File

@@ -156,10 +156,11 @@ export const orgNavSections = (
] ]
: []), : []),
// PaidFeaturesAlert // PaidFeaturesAlert
...((build === "oss" && !env?.flags.disableEnterpriseFeatures) || ...(!env?.flags.disableEnterpriseFeatures &&
build === "saas" || (build === "saas" ||
env?.app.identityProviderMode === "org" || env?.app.identityProviderMode === "org" ||
(env?.app.identityProviderMode === undefined && build !== "oss") (env?.app.identityProviderMode === undefined &&
build !== "oss"))
? [ ? [
{ {
title: "sidebarIdentityProviders", title: "sidebarIdentityProviders",

56
src/components/newt-install-commands.tsx
View File

@@ -20,6 +20,7 @@ import {
} from "react-icons/fa"; } from "react-icons/fa";
import { ExternalLink } from "lucide-react"; import { ExternalLink } from "lucide-react";
import { SiKubernetes, SiNixos } from "react-icons/si"; import { SiKubernetes, SiNixos } from "react-icons/si";
import { useEnvContext } from "@app/hooks/useEnvContext";
export type CommandItem = string | { title: string; command: string }; export type CommandItem = string | { title: string; command: string };
@@ -50,9 +51,12 @@ export function NewtSiteInstallCommands({
version = "latest" version = "latest"
}: NewtSiteInstallCommandsProps) { }: NewtSiteInstallCommandsProps) {
const t = useTranslations(); const t = useTranslations();
const { env } = useEnvContext();
const [acceptClients, setAcceptClients] = useState(true); const [acceptClients, setAcceptClients] = useState(true);
const [allowPangolinSsh, setAllowPangolinSsh] = useState(true); const [allowPangolinSsh, setAllowPangolinSsh] = useState(
!env.flags.disableEnterpriseFeatures
);
const [platform, setPlatform] = useState<Platform>("linux"); const [platform, setPlatform] = useState<Platform>("linux");
const [architecture, setArchitecture] = useState( const [architecture, setArchitecture] = useState(
() => getArchitectures(platform)[0] () => getArchitectures(platform)[0]
@@ -71,7 +75,11 @@ export function NewtSiteInstallCommands({
: ""; : "";
const disableSshFlag = const disableSshFlag =
supportsSshOption && !allowPangolinSsh ? " --disable-ssh" : ""; supportsSshOption &&
!allowPangolinSsh &&
!env.flags.disableEnterpriseFeatures
? " --disable-ssh"
: "";
const runAsRootPrefix = const runAsRootPrefix =
supportsSshOption && allowPangolinSsh ? "sudo " : ""; supportsSshOption && allowPangolinSsh ? "sudo " : "";
@@ -306,27 +314,29 @@ WantedBy=default.target`
> >
{t("siteAcceptClientConnectionsDescription")} {t("siteAcceptClientConnectionsDescription")}
</p> </p>
{supportsSshOption && ( {supportsSshOption &&
<> !env.flags.disableEnterpriseFeatures && (
<div className="flex items-center space-x-2 mb-2 mt-2"> <>
<CheckboxWithLabel <div className="flex items-center space-x-2 mb-2 mt-2">
id="allowPangolinSsh" <CheckboxWithLabel
checked={allowPangolinSsh} id="allowPangolinSsh"
onCheckedChange={(checked) => { checked={allowPangolinSsh}
const value = checked as boolean; onCheckedChange={(checked) => {
setAllowPangolinSsh(value); const value =
}} checked as boolean;
label="Allow Pangolin SSH" setAllowPangolinSsh(value);
/> }}
</div> label="Allow Pangolin SSH"
<p />
id="allowPangolinSsh-desc" </div>
className="text-sm text-muted-foreground" <p
> id="allowPangolinSsh-desc"
{t("sitePangolinSshDescription")} className="text-sm text-muted-foreground"
</p> >
</> {t("sitePangolinSshDescription")}
)} </p>
</>
)}
</div> </div>
)} )}