ActivityPub-federated video streaming platform using P2P directly in your web browser
Do not sanitize twice
Chocobozzz6b3b57ccd8b2
diff --git a/client/src/app/+admin/moderation/registration-list/registration-list.component.ts b/client/src/app/+admin/moderation/registration-list/registration-list.component.tsindex 248ea28bea..6e04963c37 100644--- a/client/src/app/+admin/moderation/registration-list/registration-list.component.ts+++ b/client/src/app/+admin/moderation/registration-list/registration-list.component.ts@@ -1,4 +1,5 @@-import { Component, OnInit, inject, viewChild, ChangeDetectionStrategy } from '@angular/core'+import { ChangeDetectionStrategy, Component, OnInit, inject, viewChild } from '@angular/core'+import { DomSanitizer, SafeHtml } from '@angular/platform-browser'import { RouterLink } from '@angular/router'import { ConfirmService, MarkdownService, Notifier, ServerService } from '@app/core'import { formatICU } from '@app/helpers'@@ -21,7 +22,7 @@ import { UserEmailInfoComponent } from '../../shared/user-email-info.component'import { AdminRegistrationService } from './admin-registration.service'import { ProcessRegistrationModalComponent } from './process-registration-modal.component'-type UserRegistration = UserRegistrationServer & { registrationReasonHTML?: string, moderationResponseHTML?: string }+type UserRegistration = UserRegistrationServer & { registrationReasonHTML?: SafeHtml, moderationResponseHTML?: SafeHtml }type ColumnName = 'account' | 'email' | 'channel' | 'registrationReason' | 'state' | 'moderationResponse' | 'createdAt'type DataLoaderParameter = Parameters<RegistrationListComponent['_dataLoader']>[0]@@ -45,6 +46,7 @@ type DataLoaderParameter = Parameters<RegistrationListComponent['_dataLoader']>[export class RegistrationListComponent implements OnInit {private server = inject(ServerService)private notifier = inject(Notifier)+ private domSanitizer = inject(DomSanitizer)private markdownRenderer = inject(MarkdownService)private confirmService = inject(ConfirmService)private adminRegistrationService = inject(AdminRegistrationService)@@ -189,7 +191,8 @@ export class RegistrationListComponent implements OnInit {})}- private toHtml (text: string) {- return this.markdownRenderer.textMarkdownToHTML({ markdown: text })+ private async toHtml (text: string) {+ // Already sanitized by MarkdownService+ return this.domSanitizer.bypassSecurityTrustHtml(await this.markdownRenderer.textMarkdownToHTML({ markdown: text }))}}diff --git a/client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.tsindex ee462f3940..45d04fefe8 100644--- a/client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts+++ b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts@@ -1,4 +1,5 @@-import { Component, OnInit, inject, viewChild, ChangeDetectionStrategy } from '@angular/core'+import { ChangeDetectionStrategy, Component, OnInit, inject, viewChild } from '@angular/core'+import { DomSanitizer, SafeHtml } from '@angular/platform-browser'import { ConfirmService, MarkdownService, Notifier, ServerService } from '@app/core'import { formatICU } from '@app/helpers'import { buildDropdownSimpleAndBulkActions } from '@app/shared/shared-main/buttons/action-dropdown-helpers'@@ -25,7 +26,7 @@ import { VideoCellComponent } from '../../../shared/shared-tables/video-cell.comimport { VideoNSFWBadgeComponent } from '../../../shared/shared-video/video-nsfw-badge.component'type DataLoaderParameter = Parameters<VideoBlockListComponent['_dataLoader']>[0]-type VideoBlacklist = VideoBlacklistServer & { reasonHtml?: string }+type VideoBlacklist = VideoBlacklistServer & { reasonHtml?: SafeHtml }@Component({selector: 'my-video-block-list',@@ -53,6 +54,7 @@ export class VideoBlockListComponent implements OnInit {private videoBlocklistService = inject(VideoBlockService)private blocklistService = inject(BlocklistService)private markdownRenderer = inject(MarkdownService)+ private domSanitizer = inject(DomSanitizer)private videoService = inject(VideoService)readonly table = viewChild<TableComponent<VideoBlacklist, DataLoaderParameter>>('table')@@ -147,8 +149,9 @@ export class VideoBlockListComponent implements OnInit {}}- toHtml (text: string) {- return this.markdownRenderer.textMarkdownToHTML({ markdown: text })+ async toHtml (text: string) {+ // Already sanitized by MarkdownService+ return this.domSanitizer.bypassSecurityTrustHtml(await this.markdownRenderer.textMarkdownToHTML({ markdown: text }))}async unblockVideo (entry: VideoBlacklist) {diff --git a/client/src/app/shared/shared-abuse-list/abuse-list-table.component.ts b/client/src/app/shared/shared-abuse-list/abuse-list-table.component.tsindex 13e563898a..357b03f998 100644--- a/client/src/app/shared/shared-abuse-list/abuse-list-table.component.ts+++ b/client/src/app/shared/shared-abuse-list/abuse-list-table.component.ts@@ -1,4 +1,5 @@-import { Component, inject, input, OnDestroy, OnInit, viewChild, ChangeDetectionStrategy } from '@angular/core'+import { ChangeDetectionStrategy, Component, inject, input, OnDestroy, OnInit, viewChild } from '@angular/core'+import { DomSanitizer, SafeHtml } from '@angular/platform-browser'import { ConfirmService, HooksService, MarkdownService, Notifier, PluginService } from '@app/core'import { formatICU } from '@app/helpers'import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'@@ -62,6 +63,7 @@ export class AbuseListTableComponent implements OnInit, OnDestroy {private videoBlocklistService = inject(VideoBlockService)private confirmService = inject(ConfirmService)private markdownRenderer = inject(MarkdownService)+ private domSanitizer = inject(DomSanitizer)private hooks = inject(HooksService)private pluginService = inject(PluginService)@@ -272,16 +274,19 @@ export class AbuseListTableComponent implements OnInit, OnDestroy {video.channel.ownerAccount = new Account(abuse.video.channel.ownerAccount)}- let commentHTML: string+ let commentHTML: SafeHtmlif (abuse.comment) {if (abuse.comment.deleted) {- commentHTML = $localize`Deleted comment`+ commentHTML = this.domSanitizer.bypassSecurityTrustHtml($localize`Deleted comment`)} else {- commentHTML = await this.markdownRenderer.textMarkdownToHTML({- markdown: abuse.comment.text,- withHtml: true- })+ // Already sanitized by MarkdownService+ commentHTML = this.domSanitizer.bypassSecurityTrustHtml(+ await this.markdownRenderer.textMarkdownToHTML({+ markdown: abuse.comment.text,+ withHtml: true+ })+ )}}@@ -719,7 +724,8 @@ export class AbuseListTableComponent implements OnInit, OnDestroy {})}- private toHtml (text: string) {- return this.markdownRenderer.textMarkdownToHTML({ markdown: text })+ private async toHtml (text: string) {+ // Already sanitized by MarkdownService+ return this.domSanitizer.bypassSecurityTrustHtml(await this.markdownRenderer.textMarkdownToHTML({ markdown: text }))}}diff --git a/client/src/app/shared/shared-abuse-list/abuse-message-modal.component.ts b/client/src/app/shared/shared-abuse-list/abuse-message-modal.component.tsindex 258c28ed20..1fe87da97e 100644--- a/client/src/app/shared/shared-abuse-list/abuse-message-modal.component.ts+++ b/client/src/app/shared/shared-abuse-list/abuse-message-modal.component.ts@@ -1,6 +1,7 @@import { NgClass } from '@angular/common'-import { Component, OnInit, inject, input, output, viewChild, ChangeDetectionStrategy } from '@angular/core'+import { ChangeDetectionStrategy, Component, OnInit, inject, input, output, viewChild } from '@angular/core'import { FormsModule, ReactiveFormsModule } from '@angular/forms'+import { DomSanitizer, SafeHtml } from '@angular/platform-browser'import { AuthService, HtmlRendererService, Notifier } from '@app/core'import { FormReactive } from '@app/shared/shared-forms/form-reactive'import { FormReactiveService } from '@app/shared/shared-forms/form-reactive.service'@@ -22,6 +23,7 @@ export class AbuseMessageModalComponent extends FormReactive implements OnInit {protected formReactiveService = inject(FormReactiveService)private modalService = inject(NgbModal)private htmlRenderer = inject(HtmlRendererService)+ private domSanitizer = inject(DomSanitizer)private auth = inject(AuthService)private notifier = inject(Notifier)private abuseService = inject(AbuseService)@@ -35,7 +37,7 @@ export class AbuseMessageModalComponent extends FormReactive implements OnInit {countMessages: number}>()- abuseMessages: (AbuseMessage & { messageHtml: string })[] = []+ abuseMessages: (AbuseMessage & { messageHtml: SafeHtml })[] = []textareaMessage: stringsendingMessage = falsenoResults = false@@ -115,7 +117,8 @@ export class AbuseMessageModalComponent extends FormReactive implements OnInit {for (const m of res.data) {this.abuseMessages.push(Object.assign(m, {- messageHtml: this.htmlRenderer.convertToBr(m.message)+ // Already sanitized by MarkdownService+ messageHtml: this.domSanitizer.bypassSecurityTrustHtml(this.htmlRenderer.convertToBr(m.message))}))}diff --git a/client/src/app/shared/shared-abuse-list/processed-abuse.model.ts b/client/src/app/shared/shared-abuse-list/processed-abuse.model.tsindex bbc09ebcf5..1aa6caaad0 100644--- a/client/src/app/shared/shared-abuse-list/processed-abuse.model.ts+++ b/client/src/app/shared/shared-abuse-list/processed-abuse.model.ts@@ -1,18 +1,19 @@+import { SafeHtml } from '@angular/platform-browser'import { AdminAbuse } from '@peertube/peertube-models'import { Account } from '../shared-main/account/account.model'// Don't use an abuse model because we need external services to compute some properties// And this model is only used in this componentexport type ProcessedAbuse = Omit<AdminAbuse, 'reporterAccount' | 'flaggedAccount'> & {- moderationCommentHtml?: string- reasonHtml?: string+ moderationCommentHtml?: SafeHtml+ reasonHtml?: SafeHtmlupdatedAt?: Date// override bare server-side definitions with rich client-side definitionsreporterAccount?: AccountflaggedAccount?: Account- commentHTML?: string+ commentHTML?: SafeHtmlvideo: AdminAbuse['video'] & {channel: AdminAbuse['video']['channel'] & {diff --git a/client/src/app/shared/shared-main/common/nl2br.pipe.ts b/client/src/app/shared/shared-main/common/nl2br.pipe.tsindex 7c424b9315..430b3443e9 100644--- a/client/src/app/shared/shared-main/common/nl2br.pipe.ts+++ b/client/src/app/shared/shared-main/common/nl2br.pipe.ts@@ -1,4 +1,5 @@import { Pipe, PipeTransform, inject } from '@angular/core'+import { DomSanitizer, SafeHtml } from '@angular/platform-browser'import { HtmlRendererService } from '@app/core'@Pipe({@@ -7,8 +8,10 @@ import { HtmlRendererService } from '@app/core'})export class Nl2BrPipe implements PipeTransform {private htmlRenderer = inject(HtmlRendererService)+ private domSanitizer = inject(DomSanitizer)- transform (value: string, allowFormatting = false): string {- return this.htmlRenderer.convertToBr(value, allowFormatting)+ transform (value: string, allowFormatting = false): SafeHtml {+ // Already sanitized by HtmlRendererService+ return this.domSanitizer.bypassSecurityTrustHtml(this.htmlRenderer.convertToBr(value, allowFormatting))}}diff --git a/client/src/app/shared/shared-video-comment/video-comment-list-admin-owner.component.ts b/client/src/app/shared/shared-video-comment/video-comment-list-admin-owner.component.tsindex e5c003e1da..fca3dea838 100644--- a/client/src/app/shared/shared-video-comment/video-comment-list-admin-owner.component.ts+++ b/client/src/app/shared/shared-video-comment/video-comment-list-admin-owner.component.ts@@ -1,4 +1,5 @@import { ChangeDetectionStrategy, Component, OnDestroy, OnInit, inject, input, viewChild } from '@angular/core'+import { DomSanitizer } from '@angular/platform-browser'import { RouterLink } from '@angular/router'import { AuthService, ConfirmService, HooksService, MarkdownService, Notifier, PluginService } from '@app/core'import { formatICU } from '@app/helpers'@@ -51,6 +52,7 @@ export class VideoCommentListAdminOwnerComponent implements OnInit, OnDestroy {private confirmService = inject(ConfirmService)private videoCommentService = inject(VideoCommentService)private markdownRenderer = inject(MarkdownService)+ private domSanitizer = inject(DomSanitizer)private bulkService = inject(BulkService)private hooks = inject(HooksService)private pluginService = inject(PluginService)@@ -302,8 +304,10 @@ export class VideoCommentListAdminOwnerComponent implements OnInit, OnDestroy {]}- toHtml (text: string) {- return this.markdownRenderer.textMarkdownToHTML({ markdown: text, withHtml: true, withEmoji: true })+ async toHtml (text: string) {+ // Already sanitized by MarkdownService+ const html = await this.markdownRenderer.textMarkdownToHTML({ markdown: text, withHtml: true, withEmoji: true })+ return this.domSanitizer.bypassSecurityTrustHtml(html)}private _dataLoader (diff --git a/client/src/app/shared/shared-video-comment/video-comment.model.ts b/client/src/app/shared/shared-video-comment/video-comment.model.tsindex 15b1600fc1..d7237f6a73 100644--- a/client/src/app/shared/shared-video-comment/video-comment.model.ts+++ b/client/src/app/shared/shared-video-comment/video-comment.model.ts@@ -1,3 +1,4 @@+import { SafeHtml } from '@angular/platform-browser'import { getBackendHost } from '@app/helpers'import {Account as AccountInterface,@@ -55,7 +56,7 @@ export class VideoCommentForAdminOrUser implements VideoCommentForAdminOrUserSerid: numberurl: stringtext: string- textHtml: string+ textHtml: SafeHtmlthreadId: numberinReplyToCommentId: number@@ -88,7 +89,7 @@ export class VideoCommentForAdminOrUser implements VideoCommentForAdminOrUserSerby: string- constructor (hash: VideoCommentForAdminOrUserServerModel, textHtml: string) {+ constructor (hash: VideoCommentForAdminOrUserServerModel, textHtml: SafeHtml) {this.id = hash.idthis.url = hash.urlthis.text = hash.text