mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-30 12:00:13 -05:00
395f17ca17
* Fix streaming sessions not being closed when revoking access to an app * Add tests for GHSA-7w3c-p9j8-mq3x
52 lines
1.6 KiB
Ruby
52 lines
1.6 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class Oauth::AuthorizedApplicationsController < Doorkeeper::AuthorizedApplicationsController
|
|
skip_before_action :authenticate_resource_owner!
|
|
|
|
before_action :store_current_location
|
|
before_action :authenticate_resource_owner!
|
|
before_action :require_not_suspended!, only: :destroy
|
|
before_action :set_body_classes
|
|
before_action :set_cache_headers
|
|
|
|
before_action :set_last_used_at_by_app, only: :index, unless: -> { request.format == :json }
|
|
|
|
skip_before_action :require_functional!
|
|
|
|
include Localized
|
|
|
|
def destroy
|
|
Web::PushSubscription.unsubscribe_for(params[:id], current_resource_owner)
|
|
Doorkeeper::Application.find_by(id: params[:id])&.close_streaming_sessions(current_resource_owner)
|
|
super
|
|
end
|
|
|
|
private
|
|
|
|
def set_body_classes
|
|
@body_classes = 'admin'
|
|
end
|
|
|
|
def store_current_location
|
|
store_location_for(:user, request.url)
|
|
end
|
|
|
|
def require_not_suspended!
|
|
forbidden if current_account.unavailable?
|
|
end
|
|
|
|
def set_cache_headers
|
|
response.cache_control.replace(private: true, no_store: true)
|
|
end
|
|
|
|
def set_last_used_at_by_app
|
|
@last_used_at_by_app = Doorkeeper::AccessToken
|
|
.select('DISTINCT ON (application_id) application_id, last_used_at')
|
|
.where(resource_owner_id: current_resource_owner.id)
|
|
.where.not(last_used_at: nil)
|
|
.order(application_id: :desc, last_used_at: :desc)
|
|
.pluck(:application_id, :last_used_at)
|
|
.to_h
|
|
end
|
|
end
|