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!

using array for filters instead of object

Blue Mouse296c6065100c
diff --git a/src/analytics/analytics.service.ts b/src/analytics/analytics.service.ts
index d5b6bdda1..09faa9c85 100644
--- a/src/analytics/analytics.service.ts
+++ b/src/analytics/analytics.service.ts
@@ -244,22 +244,30 @@ export class AnalyticsService {
}
// returns SQL filters query in a format like 'AND col=value AND ...'
- getFiltersQuery(filters: Object): string {
- if (_isEmpty(filters)) {
- return ''
+ getFiltersQuery(filters: string): string {
+ let parsed = []
+ let query = ''
+
+ try {
+ parsed = JSON.parse(filters)
+ } catch (e) {
+ console.error(`Cannot parse the filters array: ${filters}`)
+ return query
}
- const cols = _keys(filters)
- let query = ''
+ if (_isEmpty(parsed)) {
+ return query
+ }
- for (let i = 0; i < _size(cols); ++i) {
- const column = cols[i]
+ for (let i = 0; i < _size(parsed); ++i) {
+ const { column, filter, isExclusive } = parsed[i]
if (!_includes(cols, column)) {
throw new UnprocessableEntityException(`The provided filter (${column}) is not supported`)
}
- query += ` AND ${column}=${filters[column]}`
+ // todo: fix possible sql injection
+ query += ` ${isExclusive ? 'NOT' : 'AND'} ${column}='${filter}'`
}
return query
diff --git a/src/analytics/dto/getData.dto.ts b/src/analytics/dto/getData.dto.ts
index 34eee804c..f1c10704a 100644
--- a/src/analytics/dto/getData.dto.ts
+++ b/src/analytics/dto/getData.dto.ts
@@ -29,8 +29,7 @@ export class AnalyticsGET_DTO {
to: string
@ApiProperty({
- type: Object,
- description: 'An object of properties to filter: { column: filter }',
+ description: 'A stringified array of properties to filter [{ column, filter, isExclusive }]',
})
- filters: Object
+ filters: string
}