Browse Source

Sanitize and sandbox toot embeds (#9552)

pull/4/head
ThibG 5 years ago
committed by Eugen Rochko
parent
commit
e25947db4a
2 changed files with 2 additions and 0 deletions
  1. +1
    -0
      app/controllers/api/web/embeds_controller.rb
  2. +1
    -0
      app/javascript/mastodon/features/ui/components/embed_modal.js

+ 1
- 0
app/controllers/api/web/embeds_controller.rb View File

@ -10,6 +10,7 @@ class Api::Web::EmbedsController < Api::Web::BaseController
render json: status, serializer: OEmbedSerializer, width: 400
rescue ActiveRecord::RecordNotFound
oembed = FetchOEmbedService.new.call(params[:url])
oembed[:html] = Formatter.instance.sanitize(oembed[:html], Sanitize::Config::MASTODON_OEMBED) if oembed[:html].present?
if oembed
render json: oembed

+ 1
- 0
app/javascript/mastodon/features/ui/components/embed_modal.js View File

@ -77,6 +77,7 @@ class EmbedModal extends ImmutablePureComponent {
className='embed-modal__iframe'
frameBorder='0'
ref={this.setIframeRef}
sandbox='allow-same-origin'
title='preview'
/>
</div>

Loading…
Cancel
Save