htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure Mnemosyne trace is always attached

Browse Source
This commit is contained in:
Sebastian Serth
2021-03-19 20:00:41 +01:00
parent fafa128212
commit fbf9010823
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/application_controller.rb
View File

@ -7,6 +7,7 @@ class ApplicationController < ActionController::Base
MEMBER_ACTIONS = %i[destroy edit show update].freeze MEMBER_ACTIONS = %i[destroy edit show update].freeze
after_action :verify_authorized, except: %i[help welcome] after_action :verify_authorized, except: %i[help welcome]
around_action :mnemosyne_trace
before_action :set_sentry_context, :set_locale, :allow_iframe_requests, :load_embed_options before_action :set_sentry_context, :set_locale, :allow_iframe_requests, :load_embed_options
protect_from_forgery(with: :exception, prepend: true) protect_from_forgery(with: :exception, prepend: true)
rescue_from Pundit::NotAuthorizedError, with: :render_not_authorized rescue_from Pundit::NotAuthorizedError, with: :render_not_authorized
@ -21,13 +22,17 @@ class ApplicationController < ActionController::Base
raise Pundit::NotAuthorizedError unless current_user raise Pundit::NotAuthorizedError unless current_user
end end
def set_sentry_context def mnemosyne_trace
yield
ensure
if ::Mnemosyne::Instrumenter.current_trace.present? if ::Mnemosyne::Instrumenter.current_trace.present?
::Mnemosyne::Instrumenter.current_trace.meta['session_id'] = session[:session_id] ::Mnemosyne::Instrumenter.current_trace.meta['session_id'] = session[:session_id]
::Mnemosyne::Instrumenter.current_trace.meta['csrf_token'] = session[:_csrf_token] ::Mnemosyne::Instrumenter.current_trace.meta['csrf_token'] = session[:_csrf_token]
::Mnemosyne::Instrumenter.current_trace.meta['external_user_id'] = session[:external_user_id] ::Mnemosyne::Instrumenter.current_trace.meta['external_user_id'] = session[:external_user_id]
end end
end
def set_sentry_context
return if current_user.blank? return if current_user.blank?
Sentry.set_user( Sentry.set_user(