From 81fa54cb53e698b563793af6c9ec445aa2e25b7b Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Sun, 21 Dec 2014 08:19:19 +0000 Subject: [PATCH 1/4] screenshot worker bugfix --- workers/screenshot_worker.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/workers/screenshot_worker.rb b/workers/screenshot_worker.rb index f3ff32f8..bc172bb4 100644 --- a/workers/screenshot_worker.rb +++ b/workers/screenshot_worker.rb @@ -50,7 +50,8 @@ class ScreenshotWorker # :nocov: puts "#{username}/#{path} is timing out, discontinuing" site = Site[username: username] - site.update is_crashing: true + site.is_crashing = true + site.save_changes validate: false # Don't enable until we know it works well. =begin @@ -102,4 +103,4 @@ class ScreenshotWorker } end end -end \ No newline at end of file +end From ad2e60ad1cfaba11198d2a01447f3ded169c6897 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 21 Dec 2014 08:51:13 +0000 Subject: [PATCH 2/4] Fix for phantomjs --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f6d17b97..358b5caf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -102,7 +102,7 @@ GEM nokogiri (1.6.3.1) mini_portile (= 0.6.0) pg (0.17.1) - phantomjs (1.9.7.0) + phantomjs (1.9.7.1) poltergeist (1.5.1) capybara (~> 2.1) cliver (~> 0.3.1) From 343d6b7c4743000bc13f7314ac01daaa48302715 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Sun, 21 Dec 2014 08:52:43 +0000 Subject: [PATCH 3/4] Fix for file copy to FS --- models/site.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/site.rb b/models/site.rb index bfe5fc81..cf3c3c36 100644 --- a/models/site.rb +++ b/models/site.rb @@ -559,7 +559,7 @@ class Site < Sequel::Model uploaded_size = uploaded.size - FileUtils.mv uploaded.path, path + FileUtils.cp uploaded.path, path File.chmod 0640, path site_file ||= SiteFile.new site_id: self.id, path: relative_path From 128e90398e923875ae1ba00778f7b147c2644e28 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Sun, 21 Dec 2014 08:55:18 +0000 Subject: [PATCH 4/4] Escape query string params --- views/site_files/text_editor.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/site_files/text_editor.erb b/views/site_files/text_editor.erb index 1c5bb0cc..c3657647 100644 --- a/views/site_files/text_editor.erb +++ b/views/site_files/text_editor.erb @@ -113,7 +113,7 @@ if(unsavedChanges == false) return $.ajax({ - url: '/site_files/save/<%= @filename %>?csrf_token=<%= csrf_token %>', + url: '/site_files/save/<%= Rack::Utils.escape @filename %>?csrf_token=<%= Rack::Utils.escape csrf_token %>', data: editor.getValue(), processData: false, contentType: false, @@ -185,4 +185,4 @@ return true }) - \ No newline at end of file +