awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove the use of owner everywhere else

Browse Source
This commit is contained in:
Maidul Islam
2023-09-14 18:23:59 -04:00
parent edb3e66267
commit 019024e4ae
5 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
backend/src/queues/secret-scanning/githubScanFullRepository.ts
View File

@@ -4,7 +4,7 @@ import TelemetryService from "../../services/TelemetryService";
import { sendMail } from "../../helpers";
import GitRisks from "../../ee/models/gitRisks";
import { MembershipOrg, User } from "../../models";
import { ADMIN, OWNER } from "../../variables";
import { ADMIN } from "../../variables";
import { convertKeysToLowercase, scanFullRepoContentAndGetFindings } from "../../ee/services/GithubSecretScanning/helper";
import { getSecretScanningGitAppId, getSecretScanningPrivateKey } from "../../config";
import { SecretMatch } from "../../ee/services/GithubSecretScanning/types";
@@ -13,7 +13,7 @@ export const githubFullRepositorySecretScan = new Queue("github-full-repository-
type TScanPushEventQueueDetails = {
organizationId: string,
installationId: number,
installationId: number,
repository: {
id: number,
fullName: string,
@@ -24,22 +24,22 @@ githubFullRepositorySecretScan.process(async (job: Job, done: Queue.DoneCallback
const { organizationId, repository, installationId }: TScanPushEventQueueDetails = job.data
try {
const octokit = new ProbotOctokit({
auth: {
auth: {
appId: await getSecretScanningGitAppId(),
privateKey: await getSecretScanningPrivateKey(),
installationId: installationId
},
},
});
const findings : SecretMatch[] = await scanFullRepoContentAndGetFindings(octokit, installationId, repository.fullName)
const findings: SecretMatch[] = await scanFullRepoContentAndGetFindings(octokit, installationId, repository.fullName)
for (const finding of findings) {
await GitRisks.findOneAndUpdate({ fingerprint: finding.Fingerprint},
await GitRisks.findOneAndUpdate({ fingerprint: finding.Fingerprint },
{
...convertKeysToLowercase(finding),
installationId: installationId,
organization: organizationId,
repositoryFullName: repository.fullName,
repositoryId: repository.id
}, {
...convertKeysToLowercase(finding),
installationId: installationId,
organization: organizationId,
repositoryFullName: repository.fullName,
repositoryId: repository.id
}, {
upsert: true
}).lean()
}
@@ -47,10 +47,7 @@ githubFullRepositorySecretScan.process(async (job: Job, done: Queue.DoneCallback
// get emails of admins
const adminsOfWork = await MembershipOrg.find({
organization: organizationId,
$or: [
{ role: OWNER },
{ role: ADMIN }
]
role: ADMIN,
}).lean()
const userEmails = await User.find({

7
backend/src/queues/secret-scanning/githubScanPushEvent.ts
View File

@@ -5,7 +5,7 @@ import TelemetryService from "../../services/TelemetryService";
import { sendMail } from "../../helpers";
import GitRisks from "../../ee/models/gitRisks";
import { MembershipOrg, User } from "../../models";
import { ADMIN, OWNER } from "../../variables";
import { ADMIN } from "../../variables";
import { convertKeysToLowercase, scanContentAndGetFindings } from "../../ee/services/GithubSecretScanning/helper";
import { getSecretScanningGitAppId, getSecretScanningPrivateKey } from "../../config";
import { SecretMatch } from "../../ee/services/GithubSecretScanning/types";
@@ -88,10 +88,7 @@ githubPushEventSecretScan.process(async (job: Job, done: Queue.DoneCallback) =>
// get emails of admins
const adminsOfWork = await MembershipOrg.find({
organization: organizationId,
$or: [
{ role: OWNER },
{ role: ADMIN }
]
role: ADMIN
}).lean()
const userEmails = await User.find({

4
backend/src/routes/v2/organizations.ts
View File

@@ -4,7 +4,7 @@ import {
requireAuth,
requireOrganizationAuth
} from "../../middleware";
import { ACCEPTED, ADMIN, AuthMode, OWNER } from "../../variables";
import { ACCEPTED, ADMIN, AuthMode } from "../../variables";
import { organizationsController } from "../../controllers/v2";
// TODO: /POST to create membership
@@ -48,7 +48,7 @@ router.get(
acceptedAuthModes: [AuthMode.JWT]
}),
requireOrganizationAuth({
acceptedRoles: [OWNER, ADMIN],
acceptedRoles: [ADMIN],
acceptedStatuses: [ACCEPTED]
}),
organizationsController.getOrganizationServiceAccounts

1
backend/src/utils/setup/backfillData.ts
View File

@@ -32,6 +32,7 @@ import {
OWNER,
VIEWER
} from "../../variables";
import { InternalServerError } from "../errors";
/**

2
backend/src/variables/organization.ts
View File

@@ -1,5 +1,5 @@
// membership roles
export const OWNER = "owner";
export const OWNER = "owner"; // depreciated
export const ADMIN = "admin";
export const MEMBER = "member";
export const VIEWER = "viewer";