From 1882af7282cdcc197eae8f042f8bdeed03c74aa7 Mon Sep 17 00:00:00 2001 From: Stas Date: Tue, 29 Mar 2016 15:45:19 +0300 Subject: [PATCH 01/13] 115693873-log_update_for_cron --- app/jobs/domain_delete_confirm_job.rb | 1 + app/jobs/domain_update_confirm_job.rb | 1 + app/models/domain_cron.rb | 6 ++++++ 3 files changed, 8 insertions(+) diff --git a/app/jobs/domain_delete_confirm_job.rb b/app/jobs/domain_delete_confirm_job.rb index cce230234..f78c231ae 100644 --- a/app/jobs/domain_delete_confirm_job.rb +++ b/app/jobs/domain_delete_confirm_job.rb @@ -13,6 +13,7 @@ class DomainDeleteConfirmJob < Que::Job domain.poll_message!(:poll_pending_delete_rejected_by_registrant) domain.cancel_pending_delete end + ::PaperTrail.whodunnit = "job - #{self.class.name} - #{action}" destroy # it's best to destroy the job in the same transaction end end diff --git a/app/jobs/domain_update_confirm_job.rb b/app/jobs/domain_update_confirm_job.rb index 098b9853e..6fa6bb414 100644 --- a/app/jobs/domain_update_confirm_job.rb +++ b/app/jobs/domain_update_confirm_job.rb @@ -14,6 +14,7 @@ class DomainUpdateConfirmJob < Que::Job domain.poll_message!(:poll_pending_update_rejected_by_registrant) domain.clean_pendings_lowlevel end + ::PaperTrail.whodunnit = "job - #{self.class.name} - #{action}" destroy # it's best to destroy the job in the same transaction end end diff --git a/app/models/domain_cron.rb b/app/models/domain_cron.rb index 9a12e1f93..25586fabb 100644 --- a/app/models/domain_cron.rb +++ b/app/models/domain_cron.rb @@ -25,6 +25,7 @@ class DomainCron STDOUT << "#{Time.zone.now.utc} DomainCron.clean_expired_pendings: ##{domain.id} (#{domain.name})\n" end UpdateWhoisRecordJob.enqueue domain.name, 'domain' + ::PaperTrail.whodunnit = "cron - #{__method__}" end STDOUT << "#{Time.zone.now.utc} - Successfully cancelled #{count} domain pendings\n" unless Rails.env.test? count @@ -41,6 +42,7 @@ class DomainCron real += 1 domain.set_graceful_expired STDOUT << "#{Time.zone.now.utc} DomainCron.start_expire_period: ##{domain.id} (#{domain.name}) #{domain.changes}\n" unless Rails.env.test? + ::PaperTrail.whodunnit = "cron - #{__method__}" domain.save(validate: false) and marked += 1 end @@ -58,6 +60,7 @@ class DomainCron real += 1 domain.statuses << DomainStatus::SERVER_HOLD STDOUT << "#{Time.zone.now.utc} DomainCron.start_redemption_grace_period: ##{domain.id} (#{domain.name}) #{domain.changes}\n" unless Rails.env.test? + ::PaperTrail.whodunnit = "cron - #{__method__}" domain.save(validate: false) and marked += 1 end @@ -77,6 +80,7 @@ class DomainCron real += 1 domain.statuses << DomainStatus::DELETE_CANDIDATE STDOUT << "#{Time.zone.now.utc} DomainCron.start_delete_period: ##{domain.id} (#{domain.name}) #{domain.changes}\n" unless Rails.env.test? + ::PaperTrail.whodunnit = "cron - #{__method__}" domain.save(validate: false) and marked += 1 end ensure # the operator should see what was accomplished @@ -90,6 +94,7 @@ class DomainCron c = 0 Domain.where("statuses @> '{deleteCandidate}'::varchar[]").each do |x| + ::PaperTrail.whodunnit = "cron - #{__method__} case statuses" WhoisRecord.where(domain_id: x.id).destroy_all destroy_with_message x STDOUT << "#{Time.zone.now.utc} Domain.destroy_delete_candidates: by deleteCandidate ##{x.id} (#{x.name})\n" unless Rails.env.test? @@ -98,6 +103,7 @@ class DomainCron end Domain.where('force_delete_at <= ?', Time.zone.now).each do |x| + ::PaperTrail.whodunnit = "cron - #{__method__} case force_deleted_at" WhoisRecord.where(domain_id: x.id).destroy_all destroy_with_message x STDOUT << "#{Time.zone.now.utc} DomainCron.destroy_delete_candidates: by force delete time ##{x.id} (#{x.name})\n" unless Rails.env.test? From c447bc4d6412ce2bf3d63b9b2784a172ed9c349e Mon Sep 17 00:00:00 2001 From: Stas Date: Fri, 8 Apr 2016 16:52:27 +0300 Subject: [PATCH 02/13] 115693873-pt_added --- app/jobs/update_whois_record_job.rb | 1 + app/models/domain.rb | 1 + 2 files changed, 2 insertions(+) diff --git a/app/jobs/update_whois_record_job.rb b/app/jobs/update_whois_record_job.rb index 71f2b7e19..c397dfdc9 100644 --- a/app/jobs/update_whois_record_job.rb +++ b/app/jobs/update_whois_record_job.rb @@ -14,6 +14,7 @@ class UpdateWhoisRecordJob < Que::Job else send "delete_#{type}", name end + ::PaperTrail.whodunnit = "job - #{self.class.name} - #{type}" end end diff --git a/app/models/domain.rb b/app/models/domain.rb index 8bac1c2dc..428f43c8c 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -434,6 +434,7 @@ class Domain < ActiveRecord::Base # TODO: if this were to ever return true, that would be wrong. EPP would report sucess pending return true unless registrant_verification_asked? pending_delete_confirmation! + ::PaperTrail.whodunnit = "#{self.class.name} - #{__method__}" save(validate: false) # should check if this did succeed DomainMailer.pending_deleted(id, registrant_id_was, deliver_emails).deliver From 1524e8eda988af65ceea1d0d2a6c13c4b71c53ba Mon Sep 17 00:00:00 2001 From: Stas Date: Sun, 17 Apr 2016 16:07:02 +0300 Subject: [PATCH 03/13] 115693873-added_pt --- app/models/domain.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/domain.rb b/app/models/domain.rb index 428f43c8c..b277ed9c9 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -353,6 +353,7 @@ class Domain < ActiveRecord::Base status_notes[DomainStatus::PENDING_UPDATE] = '' status_notes[DomainStatus::PENDING_DELETE] = '' + ::PaperTrail.whodunnit = "#{self.class.name} - #{__method__}" update_columns( registrant_verification_token: nil, From d8e43e0b64268247d9dd9cc1a8bdf132ef615e70 Mon Sep 17 00:00:00 2001 From: Stas Date: Fri, 20 May 2016 17:08:15 +0300 Subject: [PATCH 04/13] 115693873-whodunnit-upd --- app/jobs/update_whois_record_job.rb | 2 +- app/models/domain_cron.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/jobs/update_whois_record_job.rb b/app/jobs/update_whois_record_job.rb index c397dfdc9..6851f6121 100644 --- a/app/jobs/update_whois_record_job.rb +++ b/app/jobs/update_whois_record_job.rb @@ -8,13 +8,13 @@ class UpdateWhoisRecordJob < Que::Job end Array(names).each do |name| + ::PaperTrail.whodunnit = "job - #{self.class.name} - #{type}" record = klass.find_by(name: name) if record send "update_#{type}", record else send "delete_#{type}", name end - ::PaperTrail.whodunnit = "job - #{self.class.name} - #{type}" end end diff --git a/app/models/domain_cron.rb b/app/models/domain_cron.rb index 25586fabb..300dec9e2 100644 --- a/app/models/domain_cron.rb +++ b/app/models/domain_cron.rb @@ -13,6 +13,7 @@ class DomainCron STDOUT << msg unless Rails.env.test? next end + ::PaperTrail.whodunnit = "cron - #{__method__}" count += 1 if domain.pending_update? DomainMailer.pending_update_expired_notification_for_new_registrant(domain.id).deliver @@ -25,7 +26,6 @@ class DomainCron STDOUT << "#{Time.zone.now.utc} DomainCron.clean_expired_pendings: ##{domain.id} (#{domain.name})\n" end UpdateWhoisRecordJob.enqueue domain.name, 'domain' - ::PaperTrail.whodunnit = "cron - #{__method__}" end STDOUT << "#{Time.zone.now.utc} - Successfully cancelled #{count} domain pendings\n" unless Rails.env.test? count From 248a04f63af62c6ddafdedcdda90932491025f03 Mon Sep 17 00:00:00 2001 From: Stas Date: Fri, 20 May 2016 17:08:55 +0300 Subject: [PATCH 05/13] 115693873-class_name_msg --- app/models/domain.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/domain.rb b/app/models/domain.rb index b277ed9c9..978839832 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -353,7 +353,7 @@ class Domain < ActiveRecord::Base status_notes[DomainStatus::PENDING_UPDATE] = '' status_notes[DomainStatus::PENDING_DELETE] = '' - ::PaperTrail.whodunnit = "#{self.class.name} - #{__method__}" + ::PaperTrail.whodunnit = "Domain - #{__method__}" update_columns( registrant_verification_token: nil, From 24aec79ceb76019b5fe7b7d6ab4c84a2057adf6a Mon Sep 17 00:00:00 2001 From: Stas Date: Wed, 25 May 2016 15:58:39 +0300 Subject: [PATCH 06/13] 115693873-log_changes --- app/jobs/domain_delete_confirm_job.rb | 2 +- app/jobs/domain_update_confirm_job.rb | 2 +- app/jobs/update_whois_record_job.rb | 3 ++- app/models/domain.rb | 2 -- app/models/domain_cron.rb | 6 +++--- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/app/jobs/domain_delete_confirm_job.rb b/app/jobs/domain_delete_confirm_job.rb index f78c231ae..e3bb47dae 100644 --- a/app/jobs/domain_delete_confirm_job.rb +++ b/app/jobs/domain_delete_confirm_job.rb @@ -1,5 +1,6 @@ class DomainDeleteConfirmJob < Que::Job def run(domain_id, action) + ::PaperTrail.whodunnit = "job - #{self.class.name} - #{action}" # it's recommended to keep transaction against job table as short as possible. ActiveRecord::Base.transaction do domain = Epp::Domain.find(domain_id) @@ -13,7 +14,6 @@ class DomainDeleteConfirmJob < Que::Job domain.poll_message!(:poll_pending_delete_rejected_by_registrant) domain.cancel_pending_delete end - ::PaperTrail.whodunnit = "job - #{self.class.name} - #{action}" destroy # it's best to destroy the job in the same transaction end end diff --git a/app/jobs/domain_update_confirm_job.rb b/app/jobs/domain_update_confirm_job.rb index 6fa6bb414..718ecc7be 100644 --- a/app/jobs/domain_update_confirm_job.rb +++ b/app/jobs/domain_update_confirm_job.rb @@ -1,5 +1,6 @@ class DomainUpdateConfirmJob < Que::Job def run(domain_id, action) + ::PaperTrail.whodunnit = "job - #{self.class.name} - #{action}" # it's recommended to keep transaction against job table as short as possible. ActiveRecord::Base.transaction do domain = Epp::Domain.find(domain_id) @@ -14,7 +15,6 @@ class DomainUpdateConfirmJob < Que::Job domain.poll_message!(:poll_pending_update_rejected_by_registrant) domain.clean_pendings_lowlevel end - ::PaperTrail.whodunnit = "job - #{self.class.name} - #{action}" destroy # it's best to destroy the job in the same transaction end end diff --git a/app/jobs/update_whois_record_job.rb b/app/jobs/update_whois_record_job.rb index 6851f6121..acfafa3d4 100644 --- a/app/jobs/update_whois_record_job.rb +++ b/app/jobs/update_whois_record_job.rb @@ -1,6 +1,8 @@ class UpdateWhoisRecordJob < Que::Job def run(names, type) + ::PaperTrail.whodunnit = "job - #{self.class.name} - #{type}" + klass = case type when 'reserved'then ReservedDomain when 'blocked' then BlockedDomain @@ -8,7 +10,6 @@ class UpdateWhoisRecordJob < Que::Job end Array(names).each do |name| - ::PaperTrail.whodunnit = "job - #{self.class.name} - #{type}" record = klass.find_by(name: name) if record send "update_#{type}", record diff --git a/app/models/domain.rb b/app/models/domain.rb index 978839832..8bac1c2dc 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -353,7 +353,6 @@ class Domain < ActiveRecord::Base status_notes[DomainStatus::PENDING_UPDATE] = '' status_notes[DomainStatus::PENDING_DELETE] = '' - ::PaperTrail.whodunnit = "Domain - #{__method__}" update_columns( registrant_verification_token: nil, @@ -435,7 +434,6 @@ class Domain < ActiveRecord::Base # TODO: if this were to ever return true, that would be wrong. EPP would report sucess pending return true unless registrant_verification_asked? pending_delete_confirmation! - ::PaperTrail.whodunnit = "#{self.class.name} - #{__method__}" save(validate: false) # should check if this did succeed DomainMailer.pending_deleted(id, registrant_id_was, deliver_emails).deliver diff --git a/app/models/domain_cron.rb b/app/models/domain_cron.rb index 300dec9e2..16736a338 100644 --- a/app/models/domain_cron.rb +++ b/app/models/domain_cron.rb @@ -3,6 +3,7 @@ class DomainCron def self.clean_expired_pendings STDOUT << "#{Time.zone.now.utc} - Clean expired domain pendings\n" unless Rails.env.test? + ::PaperTrail.whodunnit = "cron - #{__method__}" expire_at = Setting.expire_pending_confirmation.hours.ago count = 0 expired_pending_domains = Domain.where('registrant_verification_asked_at <= ?', expire_at) @@ -13,7 +14,6 @@ class DomainCron STDOUT << msg unless Rails.env.test? next end - ::PaperTrail.whodunnit = "cron - #{__method__}" count += 1 if domain.pending_update? DomainMailer.pending_update_expired_notification_for_new_registrant(domain.id).deliver @@ -34,6 +34,7 @@ class DomainCron def self.start_expire_period STDOUT << "#{Time.zone.now.utc} - Expiring domains\n" unless Rails.env.test? + ::PaperTrail.whodunnit = "cron - #{__method__}" domains = Domain.where('valid_to <= ?', Time.zone.now) marked = 0 real = 0 @@ -42,7 +43,6 @@ class DomainCron real += 1 domain.set_graceful_expired STDOUT << "#{Time.zone.now.utc} DomainCron.start_expire_period: ##{domain.id} (#{domain.name}) #{domain.changes}\n" unless Rails.env.test? - ::PaperTrail.whodunnit = "cron - #{__method__}" domain.save(validate: false) and marked += 1 end @@ -52,6 +52,7 @@ class DomainCron def self.start_redemption_grace_period STDOUT << "#{Time.zone.now.utc} - Setting server_hold to domains\n" unless Rails.env.test? + ::PaperTrail.whodunnit = "cron - #{__method__}" d = Domain.where('outzone_at <= ?', Time.zone.now) marked = 0 real = 0 @@ -60,7 +61,6 @@ class DomainCron real += 1 domain.statuses << DomainStatus::SERVER_HOLD STDOUT << "#{Time.zone.now.utc} DomainCron.start_redemption_grace_period: ##{domain.id} (#{domain.name}) #{domain.changes}\n" unless Rails.env.test? - ::PaperTrail.whodunnit = "cron - #{__method__}" domain.save(validate: false) and marked += 1 end From 2f9a9bd6809c65b0f7ffd1826f0694e6cf7a9f67 Mon Sep 17 00:00:00 2001 From: Stas Date: Tue, 7 Jun 2016 16:02:17 +0300 Subject: [PATCH 07/13] 115693873-job-initiator_added --- .../admin/pending_updates_controller.rb | 4 ++-- .../domain_update_confirms_controller.rb | 4 ++-- app/jobs/domain_delete_confirm_job.rb | 2 +- app/jobs/domain_update_confirm_job.rb | 4 ++-- app/models/registrant_verification.rb | 16 ++++++++-------- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/controllers/admin/pending_updates_controller.rb b/app/controllers/admin/pending_updates_controller.rb index 6e41a6c57..8da05c480 100644 --- a/app/controllers/admin/pending_updates_controller.rb +++ b/app/controllers/admin/pending_updates_controller.rb @@ -5,7 +5,7 @@ class Admin::PendingUpdatesController < AdminController def update authorize! :update, :pending - if registrant_verification.domain_registrant_change_confirm! + if registrant_verification.domain_registrant_change_confirm!("admin #{current_user.username}") redirect_to admin_domain_path(@domain.id), notice: t(:pending_applied) else redirect_to edit_admin_domain_path(@domain.id), alert: t(:failure) @@ -14,7 +14,7 @@ class Admin::PendingUpdatesController < AdminController def destroy authorize! :destroy, :pending - if registrant_verification.domain_registrant_change_reject! + if registrant_verification.domain_registrant_change_reject!("admin #{current_user.username}") redirect_to admin_domain_path(@domain.id), notice: t(:pending_removed) else redirect_to admin_domain_path(@domain.id), alert: t(:failure) diff --git a/app/controllers/registrant/domain_update_confirms_controller.rb b/app/controllers/registrant/domain_update_confirms_controller.rb index 598681d7a..75f313ea8 100644 --- a/app/controllers/registrant/domain_update_confirms_controller.rb +++ b/app/controllers/registrant/domain_update_confirms_controller.rb @@ -21,7 +21,7 @@ class Registrant::DomainUpdateConfirmsController < RegistrantController domain_name: @domain.name, verification_token: params[:token]) if params[:rejected] - if @registrant_verification.domain_registrant_change_reject! + if @registrant_verification.domain_registrant_change_reject!("email link #{current_user.username}") flash[:notice] = t(:registrant_domain_verification_rejected) redirect_to registrant_domain_update_confirm_path(@domain.id, rejected: true) else @@ -29,7 +29,7 @@ class Registrant::DomainUpdateConfirmsController < RegistrantController return render 'show' end elsif params[:confirmed] - if @registrant_verification.domain_registrant_change_confirm! + if @registrant_verification.domain_registrant_change_confirm!("email link #{current_user.username}") flash[:notice] = t(:registrant_domain_verification_confirmed) redirect_to registrant_domain_update_confirm_path(@domain.id, confirmed: true) else diff --git a/app/jobs/domain_delete_confirm_job.rb b/app/jobs/domain_delete_confirm_job.rb index e3bb47dae..f1f821d8d 100644 --- a/app/jobs/domain_delete_confirm_job.rb +++ b/app/jobs/domain_delete_confirm_job.rb @@ -1,5 +1,5 @@ class DomainDeleteConfirmJob < Que::Job - def run(domain_id, action) + def run(domain_id, action, initiator) ::PaperTrail.whodunnit = "job - #{self.class.name} - #{action}" # it's recommended to keep transaction against job table as short as possible. ActiveRecord::Base.transaction do diff --git a/app/jobs/domain_update_confirm_job.rb b/app/jobs/domain_update_confirm_job.rb index 718ecc7be..94ecc6b17 100644 --- a/app/jobs/domain_update_confirm_job.rb +++ b/app/jobs/domain_update_confirm_job.rb @@ -1,6 +1,6 @@ class DomainUpdateConfirmJob < Que::Job - def run(domain_id, action) - ::PaperTrail.whodunnit = "job - #{self.class.name} - #{action}" + def run(domain_id, action, initiator) + ::PaperTrail.whodunnit = "job - #{self.class.name} - #{action} by #{initiator}" # it's recommended to keep transaction against job table as short as possible. ActiveRecord::Base.transaction do domain = Epp::Domain.find(domain_id) diff --git a/app/models/registrant_verification.rb b/app/models/registrant_verification.rb index 253bac630..95e24d36b 100644 --- a/app/models/registrant_verification.rb +++ b/app/models/registrant_verification.rb @@ -13,27 +13,27 @@ class RegistrantVerification < ActiveRecord::Base validates :verification_token, :domain_name, :domain, :action, :action_type, presence: true - def domain_registrant_change_confirm! + def domain_registrant_change_confirm!(initiator) self.action_type = DOMAIN_REGISTRANT_CHANGE self.action = CONFIRMED - DomainUpdateConfirmJob.enqueue domain.id, CONFIRMED if save + DomainUpdateConfirmJob.enqueue domain.id, CONFIRMED, initiator if save end - def domain_registrant_change_reject! + def domain_registrant_change_reject!(initiator) self.action_type = DOMAIN_REGISTRANT_CHANGE self.action = REJECTED - DomainUpdateConfirmJob.run domain.id, REJECTED if save + DomainUpdateConfirmJob.run domain.id, REJECTED, initiator if save end - def domain_registrant_delete_confirm! + def domain_registrant_delete_confirm!(initiator) self.action_type = DOMAIN_DELETE self.action = CONFIRMED - DomainDeleteConfirmJob.enqueue domain.id, CONFIRMED if save + DomainDeleteConfirmJob.enqueue domain.id, CONFIRMED, initiator if save end - def domain_registrant_delete_reject! + def domain_registrant_delete_reject!(initiator) self.action_type = DOMAIN_DELETE self.action = REJECTED - DomainDeleteConfirmJob.enqueue domain.id, REJECTED if save + DomainDeleteConfirmJob.enqueue domain.id, REJECTED, initiator if save end end From b03e6c01ac1529aeab40aaf44021fb91f33a95b9 Mon Sep 17 00:00:00 2001 From: Vladimir Krylov Date: Fri, 10 Jun 2016 14:21:46 +0300 Subject: [PATCH 08/13] Story#115693873 - Job's initiator may be nil for migration period --- app/jobs/domain_delete_confirm_job.rb | 2 +- app/jobs/domain_update_confirm_job.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/jobs/domain_delete_confirm_job.rb b/app/jobs/domain_delete_confirm_job.rb index f1f821d8d..fc3ed924e 100644 --- a/app/jobs/domain_delete_confirm_job.rb +++ b/app/jobs/domain_delete_confirm_job.rb @@ -1,5 +1,5 @@ class DomainDeleteConfirmJob < Que::Job - def run(domain_id, action, initiator) + def run(domain_id, action, initiator = nil) ::PaperTrail.whodunnit = "job - #{self.class.name} - #{action}" # it's recommended to keep transaction against job table as short as possible. ActiveRecord::Base.transaction do diff --git a/app/jobs/domain_update_confirm_job.rb b/app/jobs/domain_update_confirm_job.rb index 94ecc6b17..ce3602719 100644 --- a/app/jobs/domain_update_confirm_job.rb +++ b/app/jobs/domain_update_confirm_job.rb @@ -1,5 +1,5 @@ class DomainUpdateConfirmJob < Que::Job - def run(domain_id, action, initiator) + def run(domain_id, action, initiator = nil) ::PaperTrail.whodunnit = "job - #{self.class.name} - #{action} by #{initiator}" # it's recommended to keep transaction against job table as short as possible. ActiveRecord::Base.transaction do From abf736e540a96ae321a4c81a10af10838ff260e1 Mon Sep 17 00:00:00 2001 From: Stas Date: Wed, 15 Jun 2016 18:27:28 +0300 Subject: [PATCH 09/13] 115693873-initiator_catches --- app/controllers/admin/pending_deletes_controller.rb | 4 ++-- .../registrant/domain_delete_confirms_controller.rb | 4 ++-- app/jobs/domain_delete_confirm_job.rb | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/admin/pending_deletes_controller.rb b/app/controllers/admin/pending_deletes_controller.rb index 2eda703bd..1f3511e6b 100644 --- a/app/controllers/admin/pending_deletes_controller.rb +++ b/app/controllers/admin/pending_deletes_controller.rb @@ -5,7 +5,7 @@ class Admin::PendingDeletesController < AdminController def update authorize! :update, :pending - if registrant_verification.domain_registrant_delete_confirm! + if registrant_verification.domain_registrant_delete_confirm!("admin #{current_user.username}") redirect_to admin_domain_path(@domain.id), notice: t(:pending_applied) else redirect_to admin_edit_domain_path(@domain.id), alert: t(:failure) @@ -15,7 +15,7 @@ class Admin::PendingDeletesController < AdminController def destroy authorize! :destroy, :pending - if registrant_verification.domain_registrant_delete_reject! + if registrant_verification.domain_registrant_delete_reject!("admin #{current_user.username}") redirect_to admin_domain_path(@domain.id), notice: t(:pending_removed) else redirect_to admin_domain_path(@domain.id), alert: t(:failure) diff --git a/app/controllers/registrant/domain_delete_confirms_controller.rb b/app/controllers/registrant/domain_delete_confirms_controller.rb index f6f05d628..ae4d8cb5f 100644 --- a/app/controllers/registrant/domain_delete_confirms_controller.rb +++ b/app/controllers/registrant/domain_delete_confirms_controller.rb @@ -21,7 +21,7 @@ class Registrant::DomainDeleteConfirmsController < RegistrantController domain_name: @domain.name, verification_token: params[:token]) if params[:rejected] - if @registrant_verification.domain_registrant_delete_reject! + if @registrant_verification.domain_registrant_delete_reject!("email link #{current_user.username}") flash[:notice] = t(:registrant_domain_verification_rejected) redirect_to registrant_domain_delete_confirm_path(@domain.id, rejected: true) else @@ -29,7 +29,7 @@ class Registrant::DomainDeleteConfirmsController < RegistrantController return render 'show' end elsif params[:confirmed] - if @registrant_verification.domain_registrant_delete_confirm! + if @registrant_verification.domain_registrant_delete_confirm!("email link #{current_user.username}") flash[:notice] = t(:registrant_domain_verification_confirmed) redirect_to registrant_domain_delete_confirm_path(@domain.id, confirmed: true) else diff --git a/app/jobs/domain_delete_confirm_job.rb b/app/jobs/domain_delete_confirm_job.rb index fc3ed924e..c2766f22d 100644 --- a/app/jobs/domain_delete_confirm_job.rb +++ b/app/jobs/domain_delete_confirm_job.rb @@ -1,6 +1,6 @@ class DomainDeleteConfirmJob < Que::Job def run(domain_id, action, initiator = nil) - ::PaperTrail.whodunnit = "job - #{self.class.name} - #{action}" + ::PaperTrail.whodunnit = "job - #{self.class.name} - #{action} by #{initiator}" # it's recommended to keep transaction against job table as short as possible. ActiveRecord::Base.transaction do domain = Epp::Domain.find(domain_id) From f97bab5f872486a7f4cea3d517192b583e7f3295 Mon Sep 17 00:00:00 2001 From: Stas Date: Mon, 20 Jun 2016 14:21:14 +0300 Subject: [PATCH 10/13] 115693873-wrong_route --- app/controllers/admin/pending_deletes_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/admin/pending_deletes_controller.rb b/app/controllers/admin/pending_deletes_controller.rb index 1f3511e6b..369e007cd 100644 --- a/app/controllers/admin/pending_deletes_controller.rb +++ b/app/controllers/admin/pending_deletes_controller.rb @@ -8,7 +8,7 @@ class Admin::PendingDeletesController < AdminController if registrant_verification.domain_registrant_delete_confirm!("admin #{current_user.username}") redirect_to admin_domain_path(@domain.id), notice: t(:pending_applied) else - redirect_to admin_edit_domain_path(@domain.id), alert: t(:failure) + redirect_to admin_domain_path(@domain.id), alert: t(:failure) end end From dce585344eefbcccf934622b6da5c30c6ea14fd5 Mon Sep 17 00:00:00 2001 From: Stas Date: Sun, 10 Jul 2016 22:44:56 +0300 Subject: [PATCH 11/13] 115693873-initiator_fix --- .../registrant/domain_delete_confirms_controller.rb | 7 +++++-- .../registrant/domain_update_confirms_controller.rb | 7 +++++-- config/locales/en.yml | 1 + 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/controllers/registrant/domain_delete_confirms_controller.rb b/app/controllers/registrant/domain_delete_confirms_controller.rb index ae4d8cb5f..bfc481771 100644 --- a/app/controllers/registrant/domain_delete_confirms_controller.rb +++ b/app/controllers/registrant/domain_delete_confirms_controller.rb @@ -20,8 +20,11 @@ class Registrant::DomainDeleteConfirmsController < RegistrantController @registrant_verification = RegistrantVerification.new(domain_id: @domain.id, domain_name: @domain.name, verification_token: params[:token]) + + initiator = current_user ? current_user.username : t(:user_not_authorized) + if params[:rejected] - if @registrant_verification.domain_registrant_delete_reject!("email link #{current_user.username}") + if @registrant_verification.domain_registrant_delete_reject!("email link #{initiator}") flash[:notice] = t(:registrant_domain_verification_rejected) redirect_to registrant_domain_delete_confirm_path(@domain.id, rejected: true) else @@ -29,7 +32,7 @@ class Registrant::DomainDeleteConfirmsController < RegistrantController return render 'show' end elsif params[:confirmed] - if @registrant_verification.domain_registrant_delete_confirm!("email link #{current_user.username}") + if @registrant_verification.domain_registrant_delete_confirm!("email link #{initiator}") flash[:notice] = t(:registrant_domain_verification_confirmed) redirect_to registrant_domain_delete_confirm_path(@domain.id, confirmed: true) else diff --git a/app/controllers/registrant/domain_update_confirms_controller.rb b/app/controllers/registrant/domain_update_confirms_controller.rb index 75f313ea8..daa695818 100644 --- a/app/controllers/registrant/domain_update_confirms_controller.rb +++ b/app/controllers/registrant/domain_update_confirms_controller.rb @@ -20,8 +20,11 @@ class Registrant::DomainUpdateConfirmsController < RegistrantController @registrant_verification = RegistrantVerification.new(domain_id: @domain.id, domain_name: @domain.name, verification_token: params[:token]) + + initiator = current_user ? current_user.username : t(:user_not_authorized) + if params[:rejected] - if @registrant_verification.domain_registrant_change_reject!("email link #{current_user.username}") + if @registrant_verification.domain_registrant_change_reject!("email link, #{initiator}") flash[:notice] = t(:registrant_domain_verification_rejected) redirect_to registrant_domain_update_confirm_path(@domain.id, rejected: true) else @@ -29,7 +32,7 @@ class Registrant::DomainUpdateConfirmsController < RegistrantController return render 'show' end elsif params[:confirmed] - if @registrant_verification.domain_registrant_change_confirm!("email link #{current_user.username}") + if @registrant_verification.domain_registrant_change_confirm!("email link, #{initiator}") flash[:notice] = t(:registrant_domain_verification_confirmed) redirect_to registrant_domain_update_confirm_path(@domain.id, confirmed: true) else diff --git a/config/locales/en.yml b/config/locales/en.yml index a807c53e8..1da83d9d5 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -940,3 +940,4 @@ en: edit_pw: 'Edit Pw' optional: 'Optional' test_registrar: "Test registrar" + user_not_authorized: "user not authorized" From 0b3a7cedb4d79659f2f281d4631f246df66a8eac Mon Sep 17 00:00:00 2001 From: Stas Paaslane Date: Mon, 8 Aug 2016 12:20:37 +0300 Subject: [PATCH 12/13] 115693873-user_overwrite_removed --- app/models/epp/domain.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb index d1da30a2f..d418ba3a3 100644 --- a/app/models/epp/domain.rb +++ b/app/models/epp/domain.rb @@ -518,7 +518,6 @@ class Epp::Domain < Domain self.deliver_emails = true # turn on email delivery self.statuses.delete(DomainStatus::PENDING_UPDATE) - ::PaperTrail.whodunnit = user.id_role_username # updator str should be the request originator not the approval user send_mail :registrant_updated_notification_for_old_registrant return unless update(frame, user, false) From bdf011214ca924e79aef66c64a028eff2e5e3743 Mon Sep 17 00:00:00 2001 From: Stas Paaslane Date: Fri, 12 Aug 2016 14:38:07 +0300 Subject: [PATCH 13/13] 115693873-translation_string_change --- app/controllers/registrant/domain_delete_confirms_controller.rb | 2 +- app/controllers/registrant/domain_update_confirms_controller.rb | 2 +- config/locales/en.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/registrant/domain_delete_confirms_controller.rb b/app/controllers/registrant/domain_delete_confirms_controller.rb index bfc481771..bb2bdb5e8 100644 --- a/app/controllers/registrant/domain_delete_confirms_controller.rb +++ b/app/controllers/registrant/domain_delete_confirms_controller.rb @@ -21,7 +21,7 @@ class Registrant::DomainDeleteConfirmsController < RegistrantController domain_name: @domain.name, verification_token: params[:token]) - initiator = current_user ? current_user.username : t(:user_not_authorized) + initiator = current_user ? current_user.username : t(:user_not_authenticated) if params[:rejected] if @registrant_verification.domain_registrant_delete_reject!("email link #{initiator}") diff --git a/app/controllers/registrant/domain_update_confirms_controller.rb b/app/controllers/registrant/domain_update_confirms_controller.rb index daa695818..471a35ee3 100644 --- a/app/controllers/registrant/domain_update_confirms_controller.rb +++ b/app/controllers/registrant/domain_update_confirms_controller.rb @@ -21,7 +21,7 @@ class Registrant::DomainUpdateConfirmsController < RegistrantController domain_name: @domain.name, verification_token: params[:token]) - initiator = current_user ? current_user.username : t(:user_not_authorized) + initiator = current_user ? current_user.username : t(:user_not_authenticated) if params[:rejected] if @registrant_verification.domain_registrant_change_reject!("email link, #{initiator}") diff --git a/config/locales/en.yml b/config/locales/en.yml index 1da83d9d5..b145de325 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -940,4 +940,4 @@ en: edit_pw: 'Edit Pw' optional: 'Optional' test_registrar: "Test registrar" - user_not_authorized: "user not authorized" + user_not_authenticated: "user not authenticated"