📈 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!
TypeScript chartsclickhousedockergdprgoogle-analyticsmetricsmonitoringmysqlnestjsprivacyredisself-hostedselfhostedstatisticstailwindcssweb-analyticswebanalyticswebsite
added ipBlacklist support
Blue Mouse11fb83d2de29
diff --git a/src/common/utils.ts b/src/common/utils.tsindex 8092959e9..ad61d1c23 100644--- a/src/common/utils.ts+++ b/src/common/utils.ts@@ -53,7 +53,13 @@ const marketingTips = {const RATE_LIMIT_REQUESTS_AMOUNT = 3const RATE_LIMIT_TIMEOUT = 86400 // 24 hours-const allowedToUpdateKeys = ['name', 'origins', 'active', 'public']+const allowedToUpdateKeys = [+ 'name',+ 'origins',+ 'ipBlacklist',+ 'active',+ 'public',+]const getRateLimitHash = (ipOrApiKey: string, salt = '') =>`rl:${hash(`${ipOrApiKey}${salt}`).toString('hex')}`diff --git a/src/project/project.controller.ts b/src/project/project.controller.tsindex d94ecd5e5..2574c87b6 100644--- a/src/project/project.controller.ts+++ b/src/project/project.controller.ts@@ -509,7 +509,7 @@ export class ProjectController {@Post('/secret-gen/:pid')@HttpCode(200)- @UseGuards(JwtAccessTokenGuard, RolesGuard)+ @UseGuards(SelfhostedGuard, JwtAccessTokenGuard, RolesGuard)@Roles(UserType.CUSTOMER, UserType.ADMIN)@ApiResponse({ status: 200, description: 'A regenerated CAPTCHA secret key' })async secretGen(@@ -524,38 +524,21 @@ export class ProjectController {)}- 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)+ const project = await this.projectService.findOne(pid, {+ relations: ['admin'],+ })+ const user = await this.userService.findOne(uid)- if (_isEmpty(project)) {- throw new NotFoundException()- }+ if (_isEmpty(project)) {+ throw new NotFoundException()+ }- this.projectService.allowedToManage(project, uid, user.roles)+ this.projectService.allowedToManage(project, uid, user.roles)- secret = generateRandomString(CAPTCHA_SECRET_KEY_LENGTH)+ const secret = generateRandomString(CAPTCHA_SECRET_KEY_LENGTH)- // @ts-ignore- await this.projectService.update(pid, { captchaSecretKey: secret })- }+ // @ts-ignore+ await this.projectService.update(pid, { captchaSecretKey: secret })await deleteProjectRedis(pid)diff --git a/src/project/project.service.ts b/src/project/project.service.tsindex e231f147c..e2240f1c3 100644--- a/src/project/project.service.ts+++ b/src/project/project.service.ts@@ -15,6 +15,8 @@ import * as _join from 'lodash/join'import * as _find from 'lodash/find'import * as _map from 'lodash/map'import * as _pick from 'lodash/pick'+import * as _isNull from 'lodash/isNull'+import * as _split from 'lodash/split'import * as _trim from 'lodash/trim'import * as _findIndex from 'lodash/findIndex'import * as _includes from 'lodash/includes'@@ -126,7 +128,7 @@ export class ProjectService {if (_isEmpty(project)) {if (isSelfhosted) {- project = await getProjectsClickhouse(pid)+ project = this.formatFromClickhouse(await getProjectsClickhouse(pid))} else {// todo: optimise the relations - select// select only required columns@@ -379,18 +381,35 @@ export class ProjectService {const updProject = { ...project }updProject.active = Number(updProject.active)updProject.public = Number(updProject.public)- updProject.origins = _isString(updProject.origins)- ? updProject.origins- : _join(updProject.origins, ',')++ if (!_isNull(updProject.origins)) {+ updProject.origins = _isString(updProject.origins)+ ? updProject.origins+ : _join(updProject.origins, ',')+ }++ if (!_isNull(updProject.ipBlacklist)) {+ updProject.ipBlacklist = _isString(updProject.ipBlacklist)+ ? updProject.ipBlacklist+ : _join(updProject.ipBlacklist, ',')+ }return updProject}- formatFromClickhouse(project: any): object {+ formatFromClickhouse(project: any): Project {const updProject = { ...project }updProject.active = Boolean(updProject.active)updProject.public = Boolean(updProject.public)+ updProject.origins = _isNull(updProject.origins)+ ? []+ : _split(updProject.origins, ',')++ updProject.ipBlacklist = _isNull(updProject.ipBlacklist)+ ? []+ : _split(updProject.ipBlacklist, ',')+return updProject}