Skip to content

Commit a426140

Browse files
committed
fix: don't leak git provider secrets to non-owner org members
gitlab.one, github.one, gitea.one and bitbucket.one returned the full DB record (OAuth access/refresh tokens, client secrets, private keys, webhook secrets, app passwords) to any org member who merely had access to *use* a shared provider (sharedWithOrganization: true), not just its owner or an org owner/admin. Add canViewGitProviderSecrets() and null out the secret fields in each .one response when the caller isn't the provider owner or an org owner/admin.
1 parent e1a432d commit a426140

5 files changed

Lines changed: 72 additions & 2 deletions

File tree

‎apps/dokploy/server/api/routers/bitbucket.ts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import {
22
assertGitProviderAccess,
3+
canViewGitProviderSecrets,
34
createBitbucket,
45
findBitbucketById,
56
getAccessibleGitProviderIds,
@@ -55,6 +56,17 @@ export const bitbucketRouter = createTRPCRouter({
5556
.query(async ({ input, ctx }) => {
5657
const bitbucket = await findBitbucketById(input.bitbucketId);
5758
await assertGitProviderAccess(ctx.session, bitbucket.gitProvider);
59+
60+
if (
61+
!(await canViewGitProviderSecrets(ctx.session, bitbucket.gitProvider))
62+
) {
63+
return {
64+
...bitbucket,
65+
appPassword: null,
66+
apiToken: null,
67+
};
68+
}
69+
5870
return bitbucket;
5971
}),
6072
bitbucketProviders: protectedProcedure.query(async ({ ctx }) => {

‎apps/dokploy/server/api/routers/gitea.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import {
22
assertGitProviderAccess,
3+
canViewGitProviderSecrets,
34
createGitea,
45
findGiteaById,
56
getAccessibleGitProviderIds,
@@ -59,6 +60,16 @@ export const giteaRouter = createTRPCRouter({
5960
.query(async ({ input, ctx }) => {
6061
const gitea = await findGiteaById(input.giteaId);
6162
await assertGitProviderAccess(ctx.session, gitea.gitProvider);
63+
64+
if (!(await canViewGitProviderSecrets(ctx.session, gitea.gitProvider))) {
65+
return {
66+
...gitea,
67+
clientSecret: null,
68+
accessToken: null,
69+
refreshToken: null,
70+
};
71+
}
72+
6273
return gitea;
6374
}),
6475

‎apps/dokploy/server/api/routers/github.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import {
22
assertGitProviderAccess,
3+
canViewGitProviderSecrets,
34
findGithubById,
45
getAccessibleGitProviderIds,
56
getGithubBranches,
@@ -28,6 +29,16 @@ export const githubRouter = createTRPCRouter({
2829
.query(async ({ input, ctx }) => {
2930
const github = await findGithubById(input.githubId);
3031
await assertGitProviderAccess(ctx.session, github.gitProvider);
32+
33+
if (!(await canViewGitProviderSecrets(ctx.session, github.gitProvider))) {
34+
return {
35+
...github,
36+
githubClientSecret: null,
37+
githubPrivateKey: null,
38+
githubWebhookSecret: null,
39+
};
40+
}
41+
3142
return github;
3243
}),
3344
getGithubRepositories: protectedProcedure

‎apps/dokploy/server/api/routers/gitlab.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import {
22
assertGitProviderAccess,
3+
canViewGitProviderSecrets,
34
createGitlab,
45
findGitlabById,
56
getAccessibleGitProviderIds,
@@ -57,6 +58,16 @@ export const gitlabRouter = createTRPCRouter({
5758
.query(async ({ input, ctx }) => {
5859
const gitlab = await findGitlabById(input.gitlabId);
5960
await assertGitProviderAccess(ctx.session, gitlab.gitProvider);
61+
62+
if (!(await canViewGitProviderSecrets(ctx.session, gitlab.gitProvider))) {
63+
return {
64+
...gitlab,
65+
secret: null,
66+
accessToken: null,
67+
refreshToken: null,
68+
};
69+
}
70+
6071
return gitlab;
6172
}),
6273
gitlabProviders: protectedProcedure.query(async ({ ctx }) => {

‎packages/server/src/services/git-provider.ts‎

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,12 @@ export const getAccessibleGitProviderIds = async (session: {
124124
* Authorizes read access to a specific git provider for the current session.
125125
* Throws if the provider belongs to a different organization (cross-org IDOR)
126126
* or if the caller is not entitled to it within the active organization.
127-
* Must be called before returning any git-provider record that carries secrets
128-
* (OAuth tokens, app private keys, webhook secrets).
127+
*
128+
* This only proves the caller may *use* the provider (e.g. pick it as a repo
129+
* source when creating a deploy) - it does NOT mean they may see its raw
130+
* credentials. Being able to use a shared provider and being able to read its
131+
* OAuth tokens / client secrets / private keys are different privileges; gate
132+
* the latter with canViewGitProviderSecrets before returning secret fields.
129133
*/
130134
export const assertGitProviderAccess = async (
131135
session: { userId: string; activeOrganizationId: string },
@@ -146,3 +150,24 @@ export const assertGitProviderAccess = async (
146150
});
147151
}
148152
};
153+
154+
// Being allowed to use a shared provider (assertGitProviderAccess) must not
155+
// imply being allowed to read its raw OAuth tokens / client secrets / private
156+
// keys. Only the provider's owner or an org owner/admin gets those back.
157+
export const canViewGitProviderSecrets = async (
158+
session: { userId: string; activeOrganizationId: string },
159+
provider: { userId: string; organizationId: string },
160+
): Promise<boolean> => {
161+
if (provider.organizationId !== session.activeOrganizationId) return false;
162+
if (provider.userId === session.userId) return true;
163+
164+
const memberRecord = await db.query.member.findFirst({
165+
where: and(
166+
eq(member.userId, session.userId),
167+
eq(member.organizationId, session.activeOrganizationId),
168+
),
169+
columns: { role: true },
170+
});
171+
172+
return memberRecord?.role === "owner" || memberRecord?.role === "admin";
173+
};

0 commit comments

Comments
 (0)