From 1d3779ffd6212433bb99a3041cb030875e6370a8 Mon Sep 17 00:00:00 2001 From: Leight Johnson <38141161+leightjohnson93@users.noreply.github.com> Date: Thu, 4 Jan 2024 12:00:20 -0700 Subject: [PATCH 1/4] Update rake_tasks_controller.rb skip_before_action :verify_authenticity_token --- app/controllers/rake_ui/rake_tasks_controller.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/controllers/rake_ui/rake_tasks_controller.rb b/app/controllers/rake_ui/rake_tasks_controller.rb index 20d5bba6..81b2af76 100644 --- a/app/controllers/rake_ui/rake_tasks_controller.rb +++ b/app/controllers/rake_ui/rake_tasks_controller.rb @@ -11,6 +11,8 @@ class RakeTasksController < RakeUi::ApplicationController :is_internal_task, :sources].freeze + skip_before_action :verify_authenticity_token + def index @rake_tasks = RakeUi::RakeTask.all From 9f4dd37ad1116904645ed626a64ac9050ac59bf7 Mon Sep 17 00:00:00 2001 From: Leight Johnson Date: Thu, 4 Jan 2024 13:21:00 -0700 Subject: [PATCH 2/4] LJ - move `skip_before_action :verify_authenticity_token` --- app/controllers/rake_ui/application_controller.rb | 1 + app/controllers/rake_ui/rake_tasks_controller.rb | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/controllers/rake_ui/application_controller.rb b/app/controllers/rake_ui/application_controller.rb index 150a06e4..abbfe544 100644 --- a/app/controllers/rake_ui/application_controller.rb +++ b/app/controllers/rake_ui/application_controller.rb @@ -3,6 +3,7 @@ module RakeUi class ApplicationController < ActionController::Base before_action :black_hole_production + skip_before_action :verify_authenticity_token private diff --git a/app/controllers/rake_ui/rake_tasks_controller.rb b/app/controllers/rake_ui/rake_tasks_controller.rb index 81b2af76..20d5bba6 100644 --- a/app/controllers/rake_ui/rake_tasks_controller.rb +++ b/app/controllers/rake_ui/rake_tasks_controller.rb @@ -11,8 +11,6 @@ class RakeTasksController < RakeUi::ApplicationController :is_internal_task, :sources].freeze - skip_before_action :verify_authenticity_token - def index @rake_tasks = RakeUi::RakeTask.all From eb0b44dd7c0f261b81d234a9328b24c5ecfd4cae Mon Sep 17 00:00:00 2001 From: Leight Johnson Date: Thu, 4 Jan 2024 14:57:05 -0700 Subject: [PATCH 3/4] LJ - add guard clause to avoid infinite loop --- app/models/rake_ui/rake_task_log.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/rake_ui/rake_task_log.rb b/app/models/rake_ui/rake_task_log.rb index 861f14b9..08a3447c 100644 --- a/app/models/rake_ui/rake_task_log.rb +++ b/app/models/rake_ui/rake_task_log.rb @@ -151,7 +151,8 @@ def parsed_log_file_name # # { name: 'foo', id: 'baz' } def parsed_file_contents - return @parsed_file_contents if defined? @parsed_file_contents + return @parsed_file_contents if defined?(@parsed_file_contents) + return {} unless log_file_full_path @parsed_file_contents = {}.tap do |parsed| File.foreach(log_file_full_path).first(9).each do |line| From 7b76756d4adf5ebdf81757ae7f81406073463005 Mon Sep 17 00:00:00 2001 From: Leight Johnson Date: Thu, 4 Jan 2024 15:56:05 -0700 Subject: [PATCH 4/4] LJ - remove `log_file_full_path` method --- app/models/rake_ui/rake_task_log.rb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/app/models/rake_ui/rake_task_log.rb b/app/models/rake_ui/rake_task_log.rb index 08a3447c..840c5e91 100644 --- a/app/models/rake_ui/rake_task_log.rb +++ b/app/models/rake_ui/rake_task_log.rb @@ -112,10 +112,6 @@ def log_file_name super || parsed_file_contents[:log_file_name] end - def log_file_full_path - super || parsed_file_contents[:log_file_full_path] - end - def rake_command_with_logging "#{rake_command} 2>&1 >> #{log_file_full_path}" end @@ -151,8 +147,7 @@ def parsed_log_file_name # # { name: 'foo', id: 'baz' } def parsed_file_contents - return @parsed_file_contents if defined?(@parsed_file_contents) - return {} unless log_file_full_path + return @parsed_file_contents if defined? @parsed_file_contents @parsed_file_contents = {}.tap do |parsed| File.foreach(log_file_full_path).first(9).each do |line|