Story#118912395 - EppLog saves resource

This commit is contained in:
Vladimir Krylov 2016-05-20 16:37:38 +03:00
parent a51f536781
commit 714dd1473d
5 changed files with 21 additions and 2 deletions

View file

@ -56,4 +56,8 @@ class Epp::KeyrelaysController < EppController
# domain # domain
end end
def resource
@domain
end
end end

View file

@ -54,4 +54,8 @@ class Epp::PollsController < EppController
def validate_poll def validate_poll
requires_attribute 'poll', 'op', values: %(ack req), allow_blank: true requires_attribute 'poll', 'op', values: %(ack req), allow_blank: true
end end
def resource
@message
end
end end

View file

@ -137,4 +137,9 @@ class Epp::SessionsController < EppController
pw = params[:parsed_frame].css('pw').first.text pw = params[:parsed_frame].css('pw').first.text
{ username: user, password: pw } { username: user, password: pw }
end end
private
def resource
@api_user
end
end end

View file

@ -13,6 +13,7 @@ class EppController < ApplicationController
around_action :catch_epp_errors around_action :catch_epp_errors
helper_method :current_user helper_method :current_user
helper_method :resource
def validate_against_schema def validate_against_schema
return if ['hello', 'error', 'keyrelay'].include?(params[:action]) return if ['hello', 'error', 'keyrelay'].include?(params[:action])
@ -369,7 +370,7 @@ class EppController < ApplicationController
request: trimmed_request, request: trimmed_request,
request_command: request_command, request_command: request_command,
request_successful: epp_errors.empty?, request_successful: epp_errors.empty?,
request_object: params[:epp_object_type], request_object: resource ? "#{params[:epp_object_type]}: #{resource.class} - #{resource.id} - #{resource.name}" : params[:epp_object_type],
response: @response, response: @response,
api_user_name: @api_user.try(:username) || current_user.try(:username) || 'api-public', api_user_name: @api_user.try(:username) || current_user.try(:username) || 'api-public',
api_user_registrar: @api_user.try(:registrar).try(:to_s) || current_user.try(:registrar).try(:to_s), api_user_registrar: @api_user.try(:registrar).try(:to_s) || current_user.try(:registrar).try(:to_s),
@ -385,4 +386,9 @@ class EppController < ApplicationController
return if current_user.blank? return if current_user.blank?
counter_update(current_user.registrar_code, ENV['iptables_server_ip']) counter_update(current_user.registrar_code, ENV['iptables_server_ip'])
end end
def resource
name = self.class.to_s.sub("Epp::","").sub("Controller","").underscore.singularize
instance_variable_get("@#{name}")
end
end end

View file

@ -7,7 +7,7 @@ Rails.application.routes.draw do
post 'command/:action', controller: 'domains', constraints: EppConstraint.new(:domain) post 'command/:action', controller: 'domains', constraints: EppConstraint.new(:domain)
post 'command/:action', controller: 'contacts', constraints: EppConstraint.new(:contact) post 'command/:action', controller: 'contacts', constraints: EppConstraint.new(:contact)
post 'command/poll', to: 'polls#poll', constraints: EppConstraint.new(:poll) post 'command/poll', to: 'polls#poll', constraints: EppConstraint.new(:poll)
post 'command/keyrelay', to: 'keyrelays#keyrelay', constraints: EppConstraint.new(:keyrelay) post 'command/keyrelay', to: 'keyrelays#keyrelay', constraints: EppConstraint.new(:keyrelay)
post 'command/:command', to: 'errors#not_found', constraints: EppConstraint.new(:not_found) # fallback route post 'command/:command', to: 'errors#not_found', constraints: EppConstraint.new(:not_found) # fallback route