From 00391d358200114357d4d53e1cd10bea0bff5f2a Mon Sep 17 00:00:00 2001 From: Stas Date: Mon, 11 Apr 2016 18:46:49 +0300 Subject: [PATCH 1/7] 115595167-colum_for_api_response --- app/controllers/application_controller.rb | 4 ++++ db/migrate/20160411140719_add_matching_column.rb | 12 ++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 db/migrate/20160411140719_add_matching_column.rb diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index ac26e61a3..e3a611656 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -55,6 +55,10 @@ class ApplicationController < ActionController::Base end end + def info_for_paper_trail + { svTRID: request.svTRID } + end + def user_for_paper_trail user_log_str(current_user) end diff --git a/db/migrate/20160411140719_add_matching_column.rb b/db/migrate/20160411140719_add_matching_column.rb new file mode 100644 index 000000000..9432c0ed2 --- /dev/null +++ b/db/migrate/20160411140719_add_matching_column.rb @@ -0,0 +1,12 @@ +class AddMatchingColumn < ActiveRecord::Migration + + def change + tables = [:log_domains, :log_contacts] + + tables.each do |table| + add_column table, :svTRID, :text + end + end + + +end From 9ace5aafb1294ead273dac2b03feeafbaad60784 Mon Sep 17 00:00:00 2001 From: Stas Date: Thu, 14 Apr 2016 17:22:18 +0300 Subject: [PATCH 2/7] 115595167-matching_column_name_changed --- app/controllers/application_controller.rb | 2 +- db/migrate/20160411140719_add_matching_column.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index e3a611656..fac9d29f4 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -56,7 +56,7 @@ class ApplicationController < ActionController::Base end def info_for_paper_trail - { svTRID: request.svTRID } + { uuid: request.uuid } end def user_for_paper_trail diff --git a/db/migrate/20160411140719_add_matching_column.rb b/db/migrate/20160411140719_add_matching_column.rb index 9432c0ed2..1f0774824 100644 --- a/db/migrate/20160411140719_add_matching_column.rb +++ b/db/migrate/20160411140719_add_matching_column.rb @@ -4,7 +4,7 @@ class AddMatchingColumn < ActiveRecord::Migration tables = [:log_domains, :log_contacts] tables.each do |table| - add_column table, :svTRID, :text + add_column table, :uuid, :text end end From c9c4e82989d1e9ab3bf5ac5aaf08fa27b17456be Mon Sep 17 00:00:00 2001 From: Stas Date: Thu, 14 Apr 2016 17:33:07 +0300 Subject: [PATCH 3/7] 115595167-log_table_list_changed --- db/migrate/20160411140719_add_matching_column.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/db/migrate/20160411140719_add_matching_column.rb b/db/migrate/20160411140719_add_matching_column.rb index 1f0774824..c16aef530 100644 --- a/db/migrate/20160411140719_add_matching_column.rb +++ b/db/migrate/20160411140719_add_matching_column.rb @@ -1,7 +1,12 @@ class AddMatchingColumn < ActiveRecord::Migration def change - tables = [:log_domains, :log_contacts] + tables = [:log_account_activities, :log_accounts, :log_addresses, :log_api_users, :log_bank_statements, + :log_bank_transactions, :log_blocked_domains, :log_certificates, :log_contact_statuses, :log_contacts, + :log_countries, :log_dnskeys, :log_domain_contacts, :log_domain_statuses, :log_domain_transfers, + :log_domains, :log_invoice_items, :log_invoices, :log_keyrelays, :log_messages, :log_nameservers, + :log_pricelists, :log_registrars, :log_reserved_domains, :log_settings, :log_users, :log_white_ips, + :log_zonefile_settings] tables.each do |table| add_column table, :uuid, :text From 96d5ae579ca7fa6877e9cdc267a694bd2a4a633d Mon Sep 17 00:00:00 2001 From: Stas Date: Fri, 15 Apr 2016 13:02:49 +0300 Subject: [PATCH 4/7] 115595167-logs_migration --- app/api/repp/api.rb | 3 ++- app/controllers/epp_controller.rb | 3 ++- db/migrate/20160411140719_add_matching_column.rb | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/api/repp/api.rb b/app/api/repp/api.rb index 7a9ecd1e8..f52770920 100644 --- a/app/api/repp/api.rb +++ b/app/api/repp/api.rb @@ -49,7 +49,8 @@ module Repp response_code: status, api_user_name: current_user.try(:username), api_user_registrar: current_user.try(:registrar).try(:to_s), - ip: request.ip + ip: request.ip, + uuid: request.uuid }) end diff --git a/app/controllers/epp_controller.rb b/app/controllers/epp_controller.rb index 49be47848..d692190eb 100644 --- a/app/controllers/epp_controller.rb +++ b/app/controllers/epp_controller.rb @@ -371,7 +371,8 @@ class EppController < ApplicationController response: @response, 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), - ip: request.ip + ip: request.ip, + uuid: request.uuid }) end # rubocop: enable Metrics/CyclomaticComplexity diff --git a/db/migrate/20160411140719_add_matching_column.rb b/db/migrate/20160411140719_add_matching_column.rb index c16aef530..a1b158313 100644 --- a/db/migrate/20160411140719_add_matching_column.rb +++ b/db/migrate/20160411140719_add_matching_column.rb @@ -9,7 +9,7 @@ class AddMatchingColumn < ActiveRecord::Migration :log_zonefile_settings] tables.each do |table| - add_column table, :uuid, :text + add_column table, :uuid, :string end end From 62d6c531802a09ff7ed6ac15396bd201bff978a1 Mon Sep 17 00:00:00 2001 From: Stas Date: Tue, 19 Apr 2016 19:38:33 +0300 Subject: [PATCH 5/7] 115595167-frame_present --- app/controllers/epp_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/epp_controller.rb b/app/controllers/epp_controller.rb index d692190eb..de1002604 100644 --- a/app/controllers/epp_controller.rb +++ b/app/controllers/epp_controller.rb @@ -361,7 +361,7 @@ class EppController < ApplicationController if request_command == 'login' && frame.present? frame.gsub!(/pw>.+<\//, 'pw>[FILTERED]]+)>([^<])+<\/eis:legalDocument>/, "[FILTERED]") + trimmed_request = frame.gsub(/]+)>([^<])+<\/eis:legalDocument>/, "[FILTERED]") if frame.present? ApiLog::EppLog.create({ request: trimmed_request, From da1228a457b646d01a8f43ea8cd14e95e9ac8d5c Mon Sep 17 00:00:00 2001 From: Stas Date: Wed, 20 Apr 2016 13:43:35 +0300 Subject: [PATCH 6/7] 115595167-extra_columns --- db/migrate/20160411140719_add_matching_column.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/db/migrate/20160411140719_add_matching_column.rb b/db/migrate/20160411140719_add_matching_column.rb index a1b158313..48be2ac39 100644 --- a/db/migrate/20160411140719_add_matching_column.rb +++ b/db/migrate/20160411140719_add_matching_column.rb @@ -11,7 +11,9 @@ class AddMatchingColumn < ActiveRecord::Migration tables.each do |table| add_column table, :uuid, :string end + + ApiLog::EppLog.connection.execute("ALTER TABLE epp_logs ADD COLUMN uuid varchar;") + ApiLog::ReppLog.connection.execute("ALTER TABLE repp_logs ADD COLUMN uuid varchar;") + end - - end From 16de6bfaea157c5d9eed35c28370d85ff7d58748 Mon Sep 17 00:00:00 2001 From: Stas Date: Thu, 21 Apr 2016 11:03:13 +0300 Subject: [PATCH 7/7] 115595167-new_migration --- db/migrate/20160411140719_add_matching_column.rb | 4 ---- db/migrate/20160421074023_add_log_matching_column.rb | 9 +++++++++ 2 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 db/migrate/20160421074023_add_log_matching_column.rb diff --git a/db/migrate/20160411140719_add_matching_column.rb b/db/migrate/20160411140719_add_matching_column.rb index 48be2ac39..bbc15d352 100644 --- a/db/migrate/20160411140719_add_matching_column.rb +++ b/db/migrate/20160411140719_add_matching_column.rb @@ -11,9 +11,5 @@ class AddMatchingColumn < ActiveRecord::Migration tables.each do |table| add_column table, :uuid, :string end - - ApiLog::EppLog.connection.execute("ALTER TABLE epp_logs ADD COLUMN uuid varchar;") - ApiLog::ReppLog.connection.execute("ALTER TABLE repp_logs ADD COLUMN uuid varchar;") - end end diff --git a/db/migrate/20160421074023_add_log_matching_column.rb b/db/migrate/20160421074023_add_log_matching_column.rb new file mode 100644 index 000000000..6ea1931a9 --- /dev/null +++ b/db/migrate/20160421074023_add_log_matching_column.rb @@ -0,0 +1,9 @@ +class AddLogMatchingColumn < ActiveRecord::Migration + + def change + + ApiLog::EppLog.connection.execute("ALTER TABLE epp_logs ADD COLUMN uuid varchar;") + ApiLog::ReppLog.connection.execute("ALTER TABLE repp_logs ADD COLUMN uuid varchar;") + + end +end