Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Fix unprotected JSON.parse in Redis.getObject() crashing viewer stats processing (#7537)

chaoliang yan27314c4f0308
diff --git a/server/core/lib/redis.ts b/server/core/lib/redis.ts
index f6609b0ec8..7ff3ae4cce 100644
--- a/server/core/lib/redis.ts
+++ b/server/core/lib/redis.ts
@@ -525,7 +525,12 @@ class Redis {
const value = await this.getValue(key)
if (!value) return null
- return JSON.parse(value)
+ try {
+ return JSON.parse(value)
+ } catch (err) {
+ logger.warn('Cannot parse Redis key %s.', key, { err, ...lTags() })
+ return null
+ }
}
private setObject (key: string, value: { [id: string]: number | string }, expirationMilliseconds?: number) {
diff --git a/server/core/lib/stats/shared/video-viewer-stats.ts b/server/core/lib/stats/shared/video-viewer-stats.ts
index 6e9b423fde..b37df1845f 100644
--- a/server/core/lib/stats/shared/video-viewer-stats.ts
+++ b/server/core/lib/stats/shared/video-viewer-stats.ts
@@ -156,6 +156,16 @@ export class VideoViewerStats {
for (const key of allKeys) {
const stats: LocalViewerStats = await this.getLocalVideoViewerByKey(key)
+ if (!stats) {
+ logger.warn('Cannot read viewer stats for Redis key %s, removing invalid entry.', key, lTags())
+ try {
+ await this.deleteLocalVideoViewersKeys(key)
+ } catch (err) {
+ logger.error('Cannot delete invalid viewer stats for Redis key %s.', key, { err, ...lTags() })
+ }
+ continue
+ }
+
// Process expired stats
if (stats.lastUpdated > now - VIEW_LIFETIME.VIEWER_STATS) {
continue