mirror/fosrl.pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2025-07-27 22:25:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

disable local and wg sites with flag

Browse source
This commit is contained in:
miloschwartz 2025-06-17 16:35:05 -04:00
parent 32e54d0f94
commit 7fd1fb89f1
No known key found for this signature in database
6 changed files with 35 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
server/lib/config.ts
View file

@ -61,6 +61,14 @@ export class Config {
? "true"
: "false";
process.env.DASHBOARD_URL = parsedConfig.app.dashboard_url;
process.env.FLAGS_DISABLE_LOCAL_SITES = parsedConfig.flags
?.disable_local_sites
? "true"
: "false";
process.env.FLAGS_DISABLE_BASIC_WIREGUARD_SITES = parsedConfig.flags
?.disable_basic_wireguard_sites
? "true"
: "false";
license.setServerSecret(parsedConfig.server.secret);

5
server/lib/readConfigFile.ts
View file

@ -249,9 +249,10 @@ export const configSchema = z
disable_user_create_org: z.boolean().optional(),
allow_raw_resources: z.boolean().optional(),
allow_base_domain_resources: z.boolean().optional(),
allow_local_sites: z.boolean().optional(),
enable_integration_api: z.boolean().optional(),
enable_redis: z.boolean().optional()
enable_redis: z.boolean().optional(),
disable_local_sites: z.boolean().optional(),
disable_basic_wireguard_sites: z.boolean().optional(),
})
.optional()
})

11
server/routers/site/createSite.ts
View file

@ -16,6 +16,7 @@ import { OpenAPITags, registry } from "@server/openApi";
import { hashPassword } from "@server/auth/password";
import { isValidIP } from "@server/lib/validators";
import { isIpInCidr } from "@server/lib/ip";
import config from "@server/lib/config";
const createSiteParamsSchema = z
.object({
@ -40,7 +41,15 @@ const createSiteSchema = z
address: z.string().optional(),
type: z.enum(["newt", "wireguard", "local"])
})
.strict();
.strict()
.refine((data) => {
if (data.type === "local") {
return !config.getRawConfig().flags?.disable_local_sites;
} else if (data.type === "wireguard") {
return !config.getRawConfig().flags?.disable_basic_wireguard_sites;
}
return true;
});
export type CreateSiteBody = z.infer<typeof createSiteSchema>;

12
src/app/[orgId]/settings/sites/create/page.tsx
View file

@ -138,17 +138,17 @@ export default function Page() {
description: t('siteNewtTunnelDescription'),
disabled: true
},
{
id: "wireguard",
...(env.flags.disableBasicWireguardSites ? [] : [{
id: "wireguard" as SiteType,
title: t('siteWg'),
description: t('siteWgDescription'),
disabled: true
},
{
id: "local",
}]),
...(env.flags.disableLocalSites ? [] : [{
id: "local" as SiteType,
title: t('local'),
description: t('siteLocalDescription')
}
}])
]);
const [loadingPage, setLoadingPage] = useState(true);

6
src/lib/pullEnv.ts
View file

@ -38,6 +38,12 @@ export function pullEnv(): Env {
process.env.FLAGS_ALLOW_RAW_RESOURCES === "true" ? true : false,
allowBaseDomainResources:
process.env.FLAGS_ALLOW_BASE_DOMAIN_RESOURCES === "true"
? true
: false,
disableLocalSites:
process.env.FLAGS_DISABLE_LOCAL_SITES === "true" ? true : false,
disableBasicWireguardSites:
process.env.FLAGS_DISABLE_BASIC_WIREGUARD_SITES === "true"
? true
: false
}

2
src/lib/types/env.ts
View file

@ -22,5 +22,7 @@ export type Env = {
emailVerificationRequired: boolean;
allowRawResources: boolean;
allowBaseDomainResources: boolean;
disableLocalSites: boolean;
disableBasicWireguardSites: boolean;
};
};