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

Add to blueprints

Browse Source
This commit is contained in:
Owen
2025-10-06 11:02:08 -07:00
parent 2c46a37a53
commit e121dd0d1d
2 changed files with 56 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
server/lib/blueprints/proxyResources.ts
View File

@@ -2,6 +2,7 @@ import {
domains,
orgDomains,
Resource,
resourceHeaderAuth,
resourcePincode,
resourceRules,
resourceWhitelist,
@@ -122,7 +123,9 @@ export async function updateProxyResources(
const healthcheckData = targetData.healthcheck;
const hcHeaders = healthcheckData?.headers ? JSON.stringify(healthcheckData.headers) : null;
const hcHeaders = healthcheckData?.headers
? JSON.stringify(healthcheckData.headers)
: null;
const [newHealthcheck] = await trx
.insert(targetHealthCheck)
@@ -263,6 +266,32 @@ export async function updateProxyResources(
});
}
await trx
.delete(resourceHeaderAuth)
.where(
eq(
resourceHeaderAuth.resourceId,
existingResource.resourceId
)
);
if (resourceData.auth?.["basic-auth"]) {
const headerAuthUser =
resourceData.auth?.["basic-auth"]?.user;
const headerAuthPassword =
resourceData.auth?.["basic-auth"]?.password;
if (headerAuthUser && headerAuthPassword) {
const headerAuthHash = await hashPassword(
Buffer.from(
`${headerAuthUser}:${headerAuthPassword}`
).toString("base64")
);
await trx.insert(resourceHeaderAuth).values({
resourceId: existingResource.resourceId,
headerAuthHash
});
}
}
if (resourceData.auth?.["sso-roles"]) {
const ssoRoles = resourceData.auth?.["sso-roles"];
await syncRoleResources(
@@ -406,7 +435,9 @@ export async function updateProxyResources(
)
.limit(1);
const hcHeaders = healthcheckData?.headers ? JSON.stringify(healthcheckData.headers) : null;
const hcHeaders = healthcheckData?.headers
? JSON.stringify(healthcheckData.headers)
: null;
const [newHealthcheck] = await trx
.update(targetHealthCheck)
@@ -591,6 +622,25 @@ export async function updateProxyResources(
});
}
if (resourceData.auth?.["basic-auth"]) {
const headerAuthUser = resourceData.auth?.["basic-auth"]?.user;
const headerAuthPassword =
resourceData.auth?.["basic-auth"]?.password;
if (headerAuthUser && headerAuthPassword) {
const headerAuthHash = await hashPassword(
Buffer.from(
`${headerAuthUser}:${headerAuthPassword}`
).toString("base64")
);
await trx.insert(resourceHeaderAuth).values({
resourceId: newResource.resourceId,
headerAuthHash
});
}
}
resource = newResource;
const [adminRole] = await trx

4
server/lib/blueprints/types.ts
View File

@@ -41,6 +41,10 @@ export const AuthSchema = z.object({
// pincode has to have 6 digits
pincode: z.number().min(100000).max(999999).optional(),
password: z.string().min(1).optional(),
"basic-auth": z.object({
user: z.string().min(1),
password: z.string().min(1)
}).optional(),
"sso-enabled": z.boolean().optional().default(false),
"sso-roles": z
.array(z.string())