pangolin_mirror/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-02-23 05:16:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into dev

Browse Source
This commit is contained in:
Owen
2025-08-10 10:16:47 -07:00
parent d6d2e052dd 9ccf77b99c
commit 55b4a9eddb
43 changed files with 898 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/routers/accessToken/listAccessTokens.ts
View File

@@ -222,7 +222,7 @@ export async function listAccessTokens(
(resource) => resource.resourceId
);
let countQuery: any = db
const countQuery: any = db
.select({ count: count() })
.from(resources)
.where(inArray(resources.resourceId, accessibleResourceIds));

4
server/routers/gerbil/getAllRelays.ts
View File

@@ -48,7 +48,7 @@ export async function getAllRelays(
}
// Fetch exit node
let [exitNode] = await db.select().from(exitNodes).where(eq(exitNodes.publicKey, publicKey));
const [exitNode] = await db.select().from(exitNodes).where(eq(exitNodes.publicKey, publicKey));
if (!exitNode) {
return next(createHttpError(HttpCode.NOT_FOUND, "Exit node not found"));
}
@@ -63,7 +63,7 @@ export async function getAllRelays(
}
// Initialize mappings object for multi-peer support
let mappings: { [key: string]: ProxyMapping } = {};
const mappings: { [key: string]: ProxyMapping } = {};
// Process each site
for (const site of sitesRes) {

2
server/routers/gerbil/getConfig.ts
View File

@@ -112,7 +112,7 @@ export async function getConfig(
)
);
let peers = await Promise.all(
const peers = await Promise.all(
sitesRes.map(async (site) => {
if (site.type === "wireguard") {
return {

2
server/routers/idp/createOidcIdp.ts
View File

@@ -68,7 +68,7 @@ export async function createOidcIdp(
);
}
let {
const {
clientId,
clientSecret,
authUrl,

2
server/routers/idp/updateOidcIdp.ts
View File

@@ -85,7 +85,7 @@ export async function updateOidcIdp(
}
const { idpId } = parsedParams.data;
let {
const {
clientId,
clientSecret,
authUrl,

4
server/routers/idp/validateOidcCallback.ts
View File

@@ -238,7 +238,7 @@ export async function validateOidcCallback(
const defaultRoleMapping = existingIdp.idp.defaultRoleMapping;
const defaultOrgMapping = existingIdp.idp.defaultOrgMapping;
let userOrgInfo: { orgId: string; roleId: number }[] = [];
const userOrgInfo: { orgId: string; roleId: number }[] = [];
for (const org of allOrgs) {
const [idpOrgRes] = await db
.select()
@@ -314,7 +314,7 @@ export async function validateOidcCallback(
let existingUserId = existingUser?.userId;
let orgUserCounts: { orgId: string; userCount: number }[] = [];
const orgUserCounts: { orgId: string; userCount: number }[] = [];
// sync the user with the orgs and roles
await db.transaction(async (trx) => {

2
server/routers/newt/handleNewtPingRequestMessage.ts
View File

@@ -55,7 +55,7 @@ export const handleNewtPingRequestMessage: MessageHandler = async (context) => {
);
if (currentConnections.count >= maxConnections) {
return null
return null;
}
weight =

4
server/routers/olm/handleOlmPingMessage.ts
View File

@@ -37,7 +37,7 @@ export const startOfflineChecker = (): void => {
}, OFFLINE_CHECK_INTERVAL);
logger.info("Started offline checker interval");
}
};
/**
* Stops the background interval that checks for offline clients
@@ -48,7 +48,7 @@ export const stopOfflineChecker = (): void => {
offlineCheckerInterval = null;
logger.info("Stopped offline checker interval");
}
}
};
/**
* Handles ping messages from clients and responds with pong

2
server/routers/olm/handleOlmRegisterMessage.ts
View File

@@ -102,7 +102,7 @@ export const handleOlmRegisterMessage: MessageHandler = async (context) => {
.where(eq(clientSites.clientId, client.clientId));
// Prepare an array to store site configurations
let siteConfigurations = [];
const siteConfigurations = [];
logger.debug(`Found ${sitesData.length} sites for client ${client.clientId}`);
if (sitesData.length === 0) {

4
server/routers/resource/listResourceRules.ts
View File

@@ -35,7 +35,7 @@ const listResourceRulesSchema = z.object({
});
function queryResourceRules(resourceId: number) {
let baseQuery = db
const baseQuery = db
.select({
ruleId: resourceRules.ruleId,
resourceId: resourceRules.resourceId,
@@ -117,7 +117,7 @@ export async function listResourceRules(
const baseQuery = queryResourceRules(resourceId);
let countQuery = db
const countQuery = db
.select({ count: sql<number>`cast(count(*) as integer)` })
.from(resourceRules)
.where(eq(resourceRules.resourceId, resourceId));

2
server/routers/resource/listResources.ts
View File

@@ -231,7 +231,7 @@ export async function listResources(
(resource) => resource.resourceId
);
let countQuery: any = db
const countQuery: any = db
.select({ count: count() })
.from(resources)
.where(inArray(resources.resourceId, accessibleResourceIds));

2
server/routers/role/listRoles.ts
View File

@@ -100,7 +100,7 @@ export async function listRoles(
const { orgId } = parsedParams.data;
let countQuery: any = db
const countQuery: any = db
.select({ count: sql<number>`cast(count(*) as integer)` })
.from(roles)
.where(eq(roles.orgId, orgId));

2
server/routers/site/listSites.ts
View File

@@ -176,7 +176,7 @@ export async function listSites(
const accessibleSiteIds = accessibleSites.map((site) => site.siteId);
const baseQuery = querySites(orgId, accessibleSiteIds);
let countQuery = db
const countQuery = db
.select({ count: count() })
.from(sites)
.where(

2
server/routers/site/pickSiteDefaults.ts
View File

@@ -86,7 +86,7 @@ export async function pickSiteDefaults(
.where(eq(sites.exitNodeId, exitNode.exitNodeId));
// TODO: we need to lock this subnet for some time so someone else does not take it
let subnets = sitesQuery.map((site) => site.subnet).filter((subnet) => subnet !== null);
const subnets = sitesQuery.map((site) => site.subnet).filter((subnet) => subnet !== null);
// exclude the exit node address by replacing after the / with a site block size
subnets.push(
exitNode.address.replace(

6
server/routers/target/helpers.ts
View File

@@ -2,7 +2,7 @@ import { db } from "@server/db";
import { resources, targets } from "@server/db";
import { eq } from "drizzle-orm";
let currentBannedPorts: number[] = [];
const currentBannedPorts: number[] = [];
export async function pickPort(siteId: number): Promise<{
internalPort: number;
@@ -15,8 +15,8 @@ export async function pickPort(siteId: number): Promise<{
// TODO: is this all inefficient?
// Fetch targets for all resources of this site
let targetIps: string[] = [];
let targetInternalPorts: number[] = [];
const targetIps: string[] = [];
const targetInternalPorts: number[] = [];
await Promise.all(
resourcesRes.map(async (resource) => {
const targetsRes = await db

4
server/routers/target/listTargets.ts
View File

@@ -35,7 +35,7 @@ const listTargetsSchema = z.object({
});
function queryTargets(resourceId: number) {
let baseQuery = db
const baseQuery = db
.select({
targetId: targets.targetId,
ip: targets.ip,
@@ -99,7 +99,7 @@ export async function listTargets(
const baseQuery = queryTargets(resourceId);
let countQuery = db
const countQuery = db
.select({ count: sql<number>`cast(count(*) as integer)` })
.from(targets)
.where(eq(targets.resourceId, resourceId));

2
server/routers/ws/ws.ts
View File

@@ -62,7 +62,7 @@ const wss: WebSocketServer = new WebSocketServer({ noServer: true });
const NODE_ID = uuidv4();
// Client tracking map (local to this node)
let connectedClients: Map<string, AuthenticatedWebSocket[]> = new Map();
const connectedClients: Map<string, AuthenticatedWebSocket[]> = new Map();
// Helper to get map key
const getClientMapKey = (clientId: string) => clientId;