From 7198e788d1a38675af78588de205a9aff8c97fd5 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Fri, 13 Jan 2017 20:06:59 +0000 Subject: [PATCH 1/4] No http follow, more debug info on errors --- workers/lets_encrypt_worker.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/workers/lets_encrypt_worker.rb b/workers/lets_encrypt_worker.rb index bdb4f4b3..0cbc21af 100644 --- a/workers/lets_encrypt_worker.rb +++ b/workers/lets_encrypt_worker.rb @@ -62,8 +62,9 @@ class LetsEncryptWorker puts "testing #{challenge_url}" begin - res = HTTP.timeout(:global, write: 5, connect: 10, read: 10).follow.get(challenge_url) - rescue + res = HTTP.timeout(:global, write: 5, connect: 10, read: 10).get(challenge_url) + rescue => e + puts e.inspect puts "error with #{challenge_url}" next end From 154abfc167bc9ce991505589604ee7345a4798ea Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Fri, 13 Jan 2017 20:07:31 +0000 Subject: [PATCH 2/4] Disable delete cache worker for the moment, we don't use it --- workers/delete_cache_worker.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/workers/delete_cache_worker.rb b/workers/delete_cache_worker.rb index 87e046be..51dd8080 100644 --- a/workers/delete_cache_worker.rb +++ b/workers/delete_cache_worker.rb @@ -6,7 +6,7 @@ require 'open-uri' # It's some nginx bug. I'm not going to deal with it. class DeleteCacheWorker - HTTP_TIMEOUT = 5 + HTTP_TIMEOUT = 10 include Sidekiq::Worker sidekiq_options queue: :deletecache, retry: 3, backtrace: false, average_scheduled_poll_interval: 1 @@ -16,15 +16,17 @@ class DeleteCacheWorker end def perform(proxy_ip, username, path) + # DOES NOTHING RIGHT NOW SO WE JUST RETURN + return # Must always have a forward slash path = '/' + path if path[0] != '/' url = Addressable::URI.encode_component( - "https://#{proxy_ip}/:cache/purge#{path}", + "http://#{proxy_ip}/:cache/purge#{path}", Addressable::URI::CharacterClasses::QUERY ) - HTTP.timeout(read: 10, write: 10, connect: 2). + HTTP.follow.timeout(read: 10, write: 10, connect: 2). headers(host: URI::encode("#{username}.neocities.org")). get(url) end From 60a4ad470d1a86b435e234d8df16a491349ad89b Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Fri, 13 Jan 2017 20:20:25 +0000 Subject: [PATCH 3/4] Root url for reported site screenshot --- app/admin.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/admin.rb b/app/admin.rb index 0ef3cc27..18827734 100644 --- a/app/admin.rb +++ b/app/admin.rb @@ -251,7 +251,7 @@ post '/admin/banhammer' do username: site.username, email: site.email, ip: site.ip, - evidence: "#{params[:classifier]}\n#{site.screenshot_url(Site::SCREENSHOT_RESOLUTIONS.first)}" + evidence: "#{params[:classifier]}\nhttps://neocities.org#{site.screenshot_url('index.html', Site::SCREENSHOT_RESOLUTIONS.first)}" ) end end From 5178ea4e782951ce75f03e83bb90327b853df935 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Sat, 14 Jan 2017 06:12:36 +0000 Subject: [PATCH 4/4] Compare with year for root domain check for lets encrypt --- workers/lets_encrypt_worker.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workers/lets_encrypt_worker.rb b/workers/lets_encrypt_worker.rb index 7503349e..2510b0bd 100644 --- a/workers/lets_encrypt_worker.rb +++ b/workers/lets_encrypt_worker.rb @@ -131,7 +131,7 @@ class LetsEncryptWorker end end - if verified_domains.empty? || (site.created_at >= 2017 && !verified_domains.include?(domain_raw)) + if verified_domains.empty? || (site.created_at.year >= 2017 && !verified_domains.include?(domain_raw)) if @international_domain puts "still waiting on IDN support, ignoring failure for now" clean_wellknown_turds site