diamant 0.0.7 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 124c00db017955325f9d1c854693310303e9871fd1ce2e64b5fa26280db74f4e
-  data.tar.gz: e50d53f1b57a562c39dbfc1a98599c4d52f09c84aeab8ba207fec32693d0d75a
+  metadata.gz: 5f4a7116de355c0b04280914d27758f287116298d2cde5a36e311382352342b1
+  data.tar.gz: 04a5cd38b4596383a220bd553b6e6d1a9360310810156d009f8cad569db9bd01
 SHA512:
-  metadata.gz: a5933c8f275cc1835af909c6e271e71468b26898e58b851fa67f500e51ef9a0b9841b0db8f3ae318e5b59927adc1bb966aa39ae946440779e25b8a044489e2ac
-  data.tar.gz: 276b5ff6c7ecc14b1b6d7fc74b187eccca41b46fd7dbffee98f61c8aee5e8a5854f9dbc9d88c54239860870edc24f56a6f3e838ba0dd478ca1fbd01cf77510f8
+  metadata.gz: e948fce49088c1b5483a18dd4c4dfccfbaefb7b160d4a9ce0fc880a0bf4487c6ded0eda9a3b58de9ad74fe5a05f3922c790716d26789db0a18621381fe6acefe
+  data.tar.gz: 1113f9c27f505edcc445b116a3d9dbb900c681a5305b48655d72faee52714a1ca7c4b3b71a7123b80e8f93468ecfcfa88afd5f455e2fc4222adef6e73070fa61

data/lib/diamant/cert_generator.rb

@@ -23,15 +23,15 @@ module Diamant
     end
 
     def write
-      IO.write('key.rsa', @key.to_pem)
+      File.write('key.rsa', @key.to_pem)
       File.chmod(0o400, 'key.rsa')
-      IO.write('cert.pem', @cert.to_pem)
+      File.write('cert.pem', @cert.to_pem)
       File.chmod(0o644, 'cert.pem')
     end
 
     private
 
-    def init_cert
+    def init_cert # rubocop:disable Metrics/AbcSize
       @cert = OpenSSL::X509::Certificate.new
       @cert.version = 3
       @cert.serial = 0x0
@@ -40,7 +40,7 @@ module Diamant
       @cert.public_key = @key.public_key
       @cert.not_before = Time.now
       # 1 years validity
-      @cert.not_after = @cert.not_before + 1 * 365 * 24 * 60 * 60
+      @cert.not_after = @cert.not_before + (1 * 365 * 24 * 60 * 60)
       @cert
     end
 

data/lib/diamant/mimetype.rb

@@ -34,6 +34,7 @@ module Diamant
     def extract_info
       @extension = File.extname @path
       raise MimeError, "#{@path} format is not supported!" unless supported?
+
       # Any other supported extension
       @content_type = MIMETYPES[@extension]
     end

data/lib/diamant/response.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'net/gemini/request'
+require 'uri/gemini'
+
 module Diamant
   # Methods to generate requests responses
   module Response
@@ -10,6 +13,7 @@ module Diamant
       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"
@@ -22,9 +26,10 @@ module Diamant
     end
 
     def read_file(client)
-      r = Net::GeminiRequest.read_new(client)
+      r = Net::Gemini::Request.read_new(client)
       [r.uri, route(r.path)]
-    rescue Net::GeminiBadRequest, URI::InvalidURIError
+    rescue Net::Gemini::BadRequest, URI::InvalidURIError => e
+      @logger.error "59 - #{e}"
       [nil, ["59\r\n"]]
     end
 
@@ -38,12 +43,13 @@ module Diamant
       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 = File.readlines route, chomp: true
       answer.prepend "20 #{info.content_type}"
     rescue Diamant::MimeError
       ['50 Not a supported file!']

data/lib/diamant/version.rb

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

data/lib/diamant.rb

@@ -6,9 +6,6 @@ require 'English'
 require 'openssl'
 require 'fileutils'
 
-require 'net/gemini/request'
-require 'uri/gemini'
-
 require 'diamant/version'
 require 'diamant/mimetype'
 require 'diamant/response'
@@ -37,13 +34,7 @@ module Diamant
 
     def main_loop(ssl_serv)
       loop do
-        Thread.new(ssl_serv.accept) do |client|
-          handle_client(client)
-        rescue Errno::ECONNRESET, Errno::ENOTCONN => e
-          @logger.error(e.message)
-        ensure
-          client.close
-        end
+        main_loop_tick ssl_serv.accept
       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
@@ -59,9 +50,21 @@ module Diamant
       end
     end
 
+    # Might raises some errors
+    def main_loop_tick(connection)
+      Thread.new(connection) do |client|
+        handle_client(client)
+      rescue Errno::ECONNRESET, Errno::ENOTCONN, Errno::ETIMEDOUT => e
+        @logger.error(e.message)
+      ensure
+        client.close
+      end
+    end
+
     def handle_client(client)
       current_load = Thread.list.length - 1
       return if reject_request?(client, current_load)
+
       uri, answer = read_file(client)
       log_line = [current_load, client.peeraddr[3], answer[0]]
       log_line << uri if uri
@@ -90,6 +93,7 @@ module Diamant
     def check_option_path_exist(option, default)
       path = File.expand_path(option || default)
       return path if File.exist?(path)
+
       raise ArgumentError, "#{path} does not exist!"
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diamant
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
 platform: ruby
 authors:
 - Étienne Deparis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-18 00:00:00.000000000 Z
+date: 2024-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-net-text
@@ -16,140 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '11.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '11.1'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.14'
-- !ruby/object:Gem::Dependency
-  name: pry-doc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.10'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.18'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.18'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.11'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.21'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.21'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.1'
 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
@@ -170,7 +44,11 @@ files:
 homepage: https://git.umaneti.net/diamant/about/
 licenses:
 - WTFPL
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
+  source_code_uri: https://git.umaneti.net/fronde
+  homepage_uri: https://etienne.depar.is/fronde/
+  funding_uri: https://liberapay.com/milouse
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -186,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.15
 signing_key:
 specification_version: 4
 summary: A simple Gemini server for static files.