Skip to content

📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

added POST secret-gen endpoint

Blue Mouse5622ee47e3ff
diff --git a/src/common/constants.ts b/src/common/constants.ts
index 301e8427a..98ace0008 100644
--- a/src/common/constants.ts
+++ b/src/common/constants.ts
@@ -203,6 +203,7 @@ const PROJECT_INVITE_EXPIRE = 48
const CAPTCHA_COOKIE_KEY = 'swetrix-captcha-token'
const CAPTCHA_TOKEN_LIFETIME = 300 // seconds (5 minutes).
+const CAPTCHA_SECRET_KEY_LENGTH = 50
export {
clickhouse,
@@ -245,4 +246,5 @@ export {
CAPTCHA_COOKIE_KEY,
CAPTCHA_TOKEN_LIFETIME,
PID_REGEX,
+ CAPTCHA_SECRET_KEY_LENGTH,
}
diff --git a/src/common/utils.ts b/src/common/utils.ts
index 6f8c3ce24..99afb0e92 100644
--- a/src/common/utils.ts
+++ b/src/common/utils.ts
@@ -201,6 +201,8 @@ const generateRecoveryCode = () =>
const millisecondsToSeconds = (milliseconds: number) => milliseconds / 1000
+const generateRandomString = (length: number): string => randomstring.generate(length)
+
export {
getRandomTip,
checkRateLimit,
@@ -213,4 +215,5 @@ export {
getPercentageChange,
calculateRelativePercentage,
millisecondsToSeconds,
+ generateRandomString,
}
diff --git a/src/project/entity/project.entity.ts b/src/project/entity/project.entity.ts
index 1bfda9430..78fdab18a 100644
--- a/src/project/entity/project.entity.ts
+++ b/src/project/entity/project.entity.ts
@@ -12,6 +12,7 @@ import { User } from '../../user/entities/user.entity'
import { ProjectShare } from './project-share.entity'
import { Alert } from 'src/alert/entity/alert.entity'
import { ExtensionToProject } from '../../marketplace/extensions/entities/extension-to-project.entity'
+import { CAPTCHA_SECRET_KEY_LENGTH } from '../../common/constants'
// In case of modifying some properties here, make sure to also edit them in common/constants.ts -> selfhosted -> clickhouse
// and to add them to the GDPR data export email template
@@ -25,7 +26,7 @@ export class Project {
id: string
@ApiProperty()
- @Column('varchar', { length: 50 })
+ @Column('varchar', { length: CAPTCHA_SECRET_KEY_LENGTH })
name: string
@ApiProperty()
diff --git a/src/project/project.controller.ts b/src/project/project.controller.ts
index 0d34842e3..849aaee03 100644
--- a/src/project/project.controller.ts
+++ b/src/project/project.controller.ts
@@ -47,12 +47,14 @@ import {
clickhouse,
isSelfhosted,
PROJECT_INVITE_EXPIRE,
+ CAPTCHA_SECRET_KEY_LENGTH,
} from '../common/constants'
import {
getProjectsClickhouse,
createProjectClickhouse,
updateProjectClickhouse,
deleteProjectClickhouse,
+ generateRandomString,
} from '../common/utils'
import { JwtAccessTokenGuard } from 'src/auth/guards'
import { Auth, Public } from 'src/auth/decorators'
@@ -518,6 +520,59 @@ export class ProjectController {
return project
}
+ @Post('/secret-gen/:pid')
+ @HttpCode(200)
+ @UseGuards(JwtAccessTokenGuard, RolesGuard)
+ @Roles(UserType.CUSTOMER, UserType.ADMIN)
+ @ApiResponse({ status: 200, description: 'A regenerated CAPTCHA secret key' })
+ async secretGen(
+ @Param('pid') pid: string,
+ @CurrentUserId() uid: string,
+ ): Promise<any> {
+ this.logger.log({ uid, pid }, 'POST /project/secret-gen/:pid')
+
+ if (!isValidPID(pid)) {
+ throw new BadRequestException(
+ 'The provided Project ID (pid) is incorrect',
+ )
+ }
+
+ let secret: string = null
+
+ if (isSelfhosted) {
+ const project = await getProjectsClickhouse(pid)
+
+ if (_isEmpty(project)) {
+ throw new NotFoundException()
+ }
+ secret = generateRandomString(CAPTCHA_SECRET_KEY_LENGTH)
+
+ project.captchaSecretKey = secret
+
+ await updateProjectClickhouse(
+ this.projectService.formatToClickhouse(project),
+ )
+ } else {
+ const project = await this.projectService.findOne(pid, {
+ relations: ['admin'],
+ })
+ const user = await this.userService.findOne(uid)
+
+ if (_isEmpty(project)) {
+ throw new NotFoundException()
+ }
+
+ this.projectService.allowedToManage(project, uid, user.roles)
+
+ secret = generateRandomString(CAPTCHA_SECRET_KEY_LENGTH)
+
+ // @ts-ignore
+ await this.projectService.update(pid, { captchaSecretKey: secret })
+ }
+
+ return secret
+ }
+
@Delete('/:id')
@HttpCode(204)
@UseGuards(JwtAccessTokenGuard, RolesGuard)
diff --git a/src/project/project.service.ts b/src/project/project.service.ts
index 7de0f7b80..3f5628c7b 100644
--- a/src/project/project.service.ts
+++ b/src/project/project.service.ts
@@ -210,7 +210,7 @@ export class ProjectService {
async update(
id: string,
- projectDTO: ProjectDTO,
+ projectDTO: ProjectDTO | Project,
): Promise<any> {
return this.projectsRepository.update(id, projectDTO)
}