diff --git a/app/index.rb b/app/index.rb
index 6e2d3280..40dfc5d3 100644
--- a/app/index.rb
+++ b/app/index.rb
@@ -67,12 +67,13 @@ def trump_plan_eligible?
ranges = []
if File.exist? trumpplan_path
+ parsed_ip = IPAddress.parse request.ip
+ return false if parsed_ip.ipv6? # NOT EXCLUSIVE ENOUGH
+
File.readlines(trumpplan_path).each do |range|
ranges << IPAddress.parse(range.strip)
end
- parsed_ip = IPAddress.parse(request.ip)
-
matched_ip = false
ranges.each do |range|
if range.include? parsed_ip
diff --git a/views/index_layout.erb b/views/index_layout.erb
index ffbe6f4b..d94281c8 100644
--- a/views/index_layout.erb
+++ b/views/index_layout.erb
@@ -4,7 +4,7 @@
-
+
Neocities: Create your own free website!
diff --git a/views/layout.erb b/views/layout.erb
index 4b3123d0..a367acc4 100644
--- a/views/layout.erb
+++ b/views/layout.erb
@@ -3,7 +3,7 @@
<%= title %>
-
+
diff --git a/workers/purge_cache_worker.rb b/workers/purge_cache_worker.rb
index a362119d..28be4319 100644
--- a/workers/purge_cache_worker.rb
+++ b/workers/purge_cache_worker.rb
@@ -1,7 +1,7 @@
require 'open-uri'
class PurgeCacheWorker
- HTTP_TIMEOUT = 3
+ HTTP_TIMEOUT = 10
include Sidekiq::Worker
sidekiq_options queue: :purgecache, retry: 2, backtrace: false, average_scheduled_poll_interval: 1
@@ -22,9 +22,13 @@ class PurgeCacheWorker
retry_encoded = false
begin
- HTTP.timeout(read: 10, write: 10, connect: 2).
+ #cmd = %{timeout 5 curl -k -I -H "Host: #{URI::encode("#{username}.neocities.org")}" -H "Cache-Purge: 1" "#{url}"}
+ #`#{cmd}`
+ ctx = OpenSSL::SSL::SSLContext.new
+ ctx.verify_mode = OpenSSL::SSL::VERIFY_NONE
+ HTTP.follow.timeout(read: 10, write: 10, connect: 5).
headers(host: URI::encode("#{username}.neocities.org"), cache_purge: '1').
- head(url)
+ head(url, ssl_context: ctx)
rescue URI::InvalidURIError
raise if retry_encoded == true
url = URI.encode url