watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-13 00:55:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Cherry pick prisma query protection.

Browse source
This commit is contained in:
Brian Cao 2023-01-12 11:29:37 -08:00
parent 4c202741c2
commit 9a7385e4d5
9 changed files with 68 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

16
queries/analytics/stats/getActiveVisitors.ts
View file

@ -11,16 +11,18 @@ export async function getActiveVisitors(...args: [websiteId: string]) {
}
async function relationalQuery(websiteId: string) {
const date = subMinutes(new Date(), 5);
const params = [date];
const { toUuid, rawQuery } = prisma;
return prisma.rawQuery(
const date = subMinutes(new Date(), 5);
const params: any = [websiteId, date];
return rawQuery(
`select count(distinct session_id) x
from pageview
from website_event
join website
on pageview.website_id = website.website_id
where website.website_id = '${websiteId}'
and pageview.created_at >= $1`,
on website_event.website_id = website.website_id
where website.website_id = $1${toUuid()}
and website_event.created_at >= $2`,
params,
);
}

21
queries/analytics/stats/getWebsiteStats.ts
View file

@ -2,6 +2,7 @@ import prisma from 'lib/prisma';
import clickhouse from 'lib/clickhouse';
import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
import cache from 'lib/cache';
import { EVENT_TYPE } from 'lib/constants';
export async function getWebsiteStats(
...args: [websiteId: string, data: { startDate: Date; endDate: Date; filters: object }]
@ -17,8 +18,8 @@ async function relationalQuery(
data: { startDate: Date; endDate: Date; filters: object },
) {
const { startDate, endDate, filters = {} } = data;
const { getDateQuery, getTimestampInterval, parseFilters, rawQuery } = prisma;
const params = [startDate, endDate];
const { toUuid, getDateQuery, getTimestampInterval, parseFilters, rawQuery } = prisma;
const params: any = [websiteId, startDate, endDate];
const { filterQuery, joinSession } = parseFilters(filters, params);
return rawQuery(
@ -27,16 +28,16 @@ async function relationalQuery(
sum(case when t.c = 1 then 1 else 0 end) as "bounces",
sum(t.time) as "totaltime"
from (
select pageview.session_id,
${getDateQuery('pageview.created_at', 'hour')},
select website_event.session_id,
${getDateQuery('website_event.created_at', 'hour')},
count(*) c,
${getTimestampInterval('pageview.created_at')} as "time"
from pageview
${getTimestampInterval('website_event.created_at')} as "time"
from website_event
join website
on pageview.website_id = website.website_id
on website_event.website_id = website.website_id
${joinSession}
where website.website_id='${websiteId}'
and pageview.created_at between $1 and $2
where website.website_id = $1${toUuid()}
and website_event.created_at between $2 and $3
${filterQuery}
group by 1, 2
) t`,
@ -67,7 +68,7 @@ async function clickhouseQuery(
min(created_at) min_time,
max(created_at) max_time
from event
where event_name = ''
where event_type = ${EVENT_TYPE.pageView}
and website_id = $1
and rev_id = $2
and ${getBetweenDates('created_at', startDate, endDate)}