update info for blocked domains

.ruby-version

@@ -1 +1 @@
-3.1.3
+3.0.2

Dockerfile

@@ -1,9 +1,12 @@
 FROM internetee/ruby:3.0.2
 
-RUN apt-get update -y > /dev/null
-RUN apt-get install whois -y > /dev/null
-RUN mkdir -p /opt/webapps/app/tmp/pids
+# RUN apt-get update -y > /dev/null
+# RUN apt-get install whois -y > /dev/null
 WORKDIR /opt/webapps/app
+
+RUN mkdir -p /opt/webapps/app/tmp/pids
+RUN touch /opt/webapps/app/tmp/pids/.keep
+
 COPY Gemfile Gemfile.lock ./
 RUN gem install bundler && bundle install --jobs 20 --retry 5
 

Gemfile

@@ -21,6 +21,6 @@ group :development do
 end
 
 group :development, :test do
-  gem 'minitest'
+  gem 'minitest', '~> 5.16.3'  # Обновлено до последней версии
   gem 'simplecov', '0.17.1', require: false # CC last supported v0.17
 end

Gemfile.lock

@@ -73,12 +73,12 @@ DEPENDENCIES
   dotenv
   eventmachine (~> 1.2.7)
   mina (~> 1.2.4)
-  minitest
+  minitest (~> 5.16.3)
   pg (~> 1.4.0)
   pry (~> 0.14.1)
   rubocop
   simplecov (= 0.17.1)
   simpleidn (~> 0.2.1)
 
 BUNDLED WITH
-   2.2.17
+   2.5.22

lib/whois_server.rb

@@ -53,17 +53,23 @@ def receive_data(data)
       return
     end
 
-    name = data.strip
-    name = name.downcase
+    name = data.strip.downcase
     name = SimpleIDN.to_unicode(name)
-    whois_record = WhoisRecord.find_by(name: name)
-
-    if whois_record
-      logger.info "#{ip}: requested: #{data} [searched by: #{name}; Record found with id: #{whois_record.try(:id)}]"
-      send_data whois_record.unix_body
+
+    # Add special handling for .ee second-level domains
+    if %w[pri.ee fie.ee med.ee com.ee].include?(name)
+      logger.info "#{ip}: requested: #{data} [searched by: #{name}; Special .ee second-level domain]"
+      send_data special_ee_domain_msg(name)
     else
-      logger.info "#{ip}: requested: #{data} [searched by: #{name}; No record found]"
-      provide_data_body(name)
+      whois_record = WhoisRecord.find_by(name: name)
+
+      if whois_record
+        logger.info "#{ip}: requested: #{data} [searched by: #{name}; Record found with id: #{whois_record.try(:id)}]"
+        send_data whois_record.unix_body
+      else
+        logger.info "#{ip}: requested: #{data} [searched by: #{name}; No record found]"
+        provide_data_body(name)
+      end
     end
     close_connection_after_writing
   end
@@ -107,6 +113,20 @@ def footer_msg
     "\n\nEstonia .ee Top Level Domain WHOIS server\n" \
     "More information at http://internet.ee\n"
   end
+
+  def special_ee_domain_msg(domain)
+    <<~MSG
+      Estonia .ee Top Level Domain WHOIS server
+
+      Domain:
+      name:       #{domain}
+      status:     Blocked
+
+      Estonia .ee Top Level Domain WHOIS server
+      More information at http://internet.ee
+
+    MSG
+  end
 end
 
 EventMachine.run do

log/.gitignore

@@ -1,3 +1,5 @@
 *
 */
 !.gitignore
+tmp/pids/
+.DS_Store

test/models/whois_record_test.rb

@@ -107,4 +107,25 @@ def test_disputed_record_is_inactive_if_unregistered
     assert !@whois_record.active?
   end
 
+  def test_special_ee_second_level_domains
+    special_domains = %w[pri.ee fie.ee med.ee com.ee]
+    special_domains.each do |domain|
+      @whois_record = WhoisRecord.new(name: domain, json: { name: domain, status: ['Blocked'] })
+
+      expected_output = <<~OUTPUT
+        Estonia .ee Top Level Domain WHOIS server
+
+        Domain:
+        name:       #{domain}
+        status:     Blocked
+
+        Estonia .ee Top Level Domain WHOIS server
+        More information at http://internet.ee
+
+      OUTPUT
+
+      assert_equal expected_output, @whois_record.unix_body
+    end
+  end
+
 end

tmp/pids/whois_server.pid

@@ -0,0 +1 @@
+1