diamant 0.0.2 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72a20983fb5689076b1da91f753515fb251f96c73917628ba5d2e975d34c526c
-  data.tar.gz: efed078e4f3f0f2a556da98b2308fdc2d6d2af927b4e7ef61901b08490e4ef55
+  metadata.gz: 92deda334209782c1d9e5c840900c91d446b2528bef1ecfe94d4aaa5f7a75e56
+  data.tar.gz: fbead15265bbc9268652616833877584bec9f8bddb241a4837250ea4457a529c
 SHA512:
-  metadata.gz: c15a92708e8b9bf8ebc746dd850e4f500affbac1fe32e29c0ee2b73efd998b12865ba2e6f68dd130bf42f3f042eed267852ed9a545bcc15797264ccbd39edc3f
-  data.tar.gz: '084cca645aa707d1140a787a35a8a548a2385bb9dfc4aa25110df0f8b75875238595accf4feb21bcc4f7cc9ec5d5e431ec75ace67943f0d48d3abae14f8674c7'
+  metadata.gz: 76406b4875304f04b95457704ab93d51e5e0f183d45defb74362169d7ca98105179202cbcb8ef5f36d779fa890aa8e3fc7da82e0ffabaa267ce1e7f4400edd06
+  data.tar.gz: 9ea81c1019586c2351751d1b69aa0feaae4292dc4cfb597c94fcd5a6f3dd90136e941f8377413633ce612ca046054f46e902739c3cc8fe1bc10ff676bb57ae2c

data/lib/diamant/response.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Diamant
+  # Methods to generate requests responses
+  module Response
+    private
+
+    def reject_request?(sock, current_load)
+      # Accept only 10 thread with no restriction
+      return false if current_load < 11
+      # Seppuku
+      raise 'Server is under heavy load' if current_load > 1965
+      if current_load > 42
+        @logger.warn '41 - Too much threads...'
+        sock.puts "41 See you soon...\r\n"
+        return true
+      end
+      # Please wait a little
+      @logger.warn '44 5 - Too much threads...'
+      sock.puts "44 5\r\n"
+      true
+    end
+
+    def read_file(client)
+      r = Net::GeminiRequest.read_new(client)
+      [r.uri, route(r.path)]
+    rescue Net::GeminiBadRequest
+      [nil, ["59\r\n"]]
+    end
+
+    def route(path)
+      # In any case, remove the / prefix
+      route = File.expand_path path.delete_prefix('/'), Dir.pwd
+      # We better should use some sort of chroot...
+      unless route.start_with?(Dir.pwd)
+        @logger.warn "Bad attempt to get something out of public_dir: #{route}"
+        return ['51 Not found!']
+      end
+      route << '/index.gmi' if File.directory?(route)
+      return ['51 Not found!'] unless File.exist?(route)
+      build_response route
+    end
+
+    def build_response(route)
+      info = Diamant::MimeType.new(route)
+      answer = IO.readlines route, chomp: true
+      answer.prepend "20 #{info.content_type}"
+    rescue Diamant::MimeError
+      ['50 Not a supported file!']
+    end
+  end
+end

data/lib/diamant/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Diamant
-  VERSION = '0.0.2'
+  VERSION = '0.0.6'
 end

data/lib/diamant.rb

@@ -11,6 +11,7 @@ require 'uri/gemini'
 
 require 'diamant/version'
 require 'diamant/mimetype'
+require 'diamant/response'
 
 module Diamant
   # Runs the server request/answer loop.
@@ -25,34 +26,34 @@ module Diamant
     def start
       tcp_serv = TCPServer.new @bind, @port
       ssl_serv = OpenSSL::SSL::SSLServer.new tcp_serv, ssl_context
+      main_loop(ssl_serv)
+    ensure
+      ssl_serv&.shutdown
+    end
+
+    private
+
+    include Diamant::Response
+
+    def main_loop(ssl_serv)
       loop do
         Thread.new(ssl_serv.accept) do |client|
           handle_client(client)
           client.close
         end
+      rescue OpenSSL::SSL::SSLError => e
+        # Do not even try to answer anything as the socket cannot be
+        # built. This will abruptly interrupt the connection from a client
+        # point of view, which must deal with it. Only keep a trace for us.
+        @logger.error(
+          format('SSLError: %<cause>s',
+                 cause: e.message.sub(/.*state=error: (.+)\Z/, '\1'))
+        )
+      rescue Errno::ECONNRESET
+        @logger.error('Connection reset by peer')
       rescue Interrupt
         break
       end
-    ensure
-      ssl_serv&.shutdown
-    end
-
-    private
-
-    def reject_request?(sock, current_load)
-      # Accept only 10 thread with no restriction
-      return false if current_load < 11
-      # Seppuku
-      raise 'Server is under heavy load' if current_load > 1965
-      if current_load > 42
-        @logger.warn '41 - Too much threads...'
-        sock.puts "41 See you soon...\r\n"
-        return true
-      end
-      # Please wait a little
-      @logger.warn '44 5 - Too much threads...'
-      sock.puts "44 5\r\n"
-      true
     end
 
     def handle_client(client)
@@ -67,34 +68,6 @@ module Diamant
       end
     end
 
-    def read_file(client)
-      r = Net::GeminiRequest.read_new(client)
-      [r.uri, route(r.path)]
-    rescue Net::GeminiBadRequest
-      [nil, ["59\r\n"]]
-    end
-
-    def build_response(route)
-      info = Diamant::MimeType.new(route)
-      answer = IO.readlines route, chomp: true
-      answer.prepend "20 #{info.content_type}"
-    rescue Diamant::MimeError
-      ['50 Not a supported file!']
-    end
-
-    def route(path)
-      # In any case, remove the / prefix
-      route = File.expand_path path.delete_prefix('/'), Dir.pwd
-      # We better should use some sort of chroot...
-      unless route.start_with?(Dir.pwd)
-        @logger.warn "Bad attempt to get something out of public_dir: #{route}"
-        return ['51 Not found!']
-      end
-      route << '/index.gmi' if File.directory?(route)
-      return ['51 Not found!'] unless File.exist?(route)
-      build_response route
-    end
-
     def ssl_context
       ssl_context = OpenSSL::SSL::SSLContext.new
       ssl_context.min_version = OpenSSL::SSL::TLS1_2_VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diamant
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.6
 platform: ruby
 authors:
 - Étienne Deparis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-20 00:00:00.000000000 Z
+date: 2022-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-net-text
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: pry-doc
   requirement: !ruby/object:Gem::Requirement
@@ -72,70 +72,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.18'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '0.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -151,9 +151,9 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.9'
 description: |
-  Diamant is a server for the Gemini network protocol. it
-  can only serve static files. Internally, it uses the OpenSSL library to
-  handle the TLS sessions, and threads to handle concurrent requests.
+  Diamant is a server for the Gemini network protocol. It can only serve
+  static files. Internally, it uses the OpenSSL library to handle the TLS
+  sessions, and threads to handle concurrent requests.
 email: etienne@depar.is
 executables:
 - diamant
@@ -165,6 +165,7 @@ files:
 - lib/diamant.rb
 - lib/diamant/cert_generator.rb
 - lib/diamant/mimetype.rb
+- lib/diamant/response.rb
 - lib/diamant/version.rb
 homepage: https://git.umaneti.net/diamant/about/
 licenses:
@@ -185,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: A simple Gemini server for static files.