ruby-net-text 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95abe1fa0498d496b10d7517d9dc00fcd958091e93c75cb3f86d3274667bf245
-  data.tar.gz: 92855326685c71635f9a3f0c45178112925ecbd2e30027c187d473b3ddc61e07
+  metadata.gz: 0f3d4fbd93c189d283b253e0f0a520bdaee167f09281d3c6a25c95126c07ecf9
+  data.tar.gz: 209152612f6f0dad44282fe17dc02d34fc6457ccc0f01bb993374ceef9491f33
 SHA512:
-  metadata.gz: 7342a84385b98b84f7dc74ad546c78d58f943412da84fb247c3eff4b0affcce5ca9fa446ea527de5f32b983ee86589a57a217ad2debab57c9ede7cda0855d7d8
-  data.tar.gz: 17e634cc19ff48ef976db87c85155dc618a37c3e24d8dc2edd443eae647602aa6d7d9880dbb6968f289d4ad2c6a47b990ae7622abacb9d61788b023a960894bc
+  metadata.gz: e6826cd8ee993dabd7210a329b4349fb059c5007ff1560914d09049dfa7276ff1590d9f5405c31a99c70202511502d30c1d68d9b66643ddbf881774e161cdac3
+  data.tar.gz: 7f756ac8389178ae82a8c11b0a8e3e7491d096cab8dfbd42d55345e277680656ccb64da1fb69e119417fb2de68b75a2740b7fbd60f492ef2c44df31668adcd69

data/lib/net/gemini.rb

@@ -7,7 +7,9 @@ require 'openssl'
 require 'fileutils'
 
 require 'uri/gemini'
+require_relative 'gemini/request'
 require_relative 'gemini/response'
+require_relative 'gemini/ssl'
 
 module Net
   class GeminiError < StandardError; end
@@ -98,10 +100,11 @@ module Net
 
     def request(uri)
       init_sockets
-      @ssl_socket.puts "#{uri}\r\n"
-      r = GeminiResponse.read_new(@ssl_socket)
-      r.uri = uri
-      r.reading_body(@ssl_socket)
+      req = GeminiRequest.new uri
+      req.write @ssl_socket
+      res = GeminiResponse.read_new(@ssl_socket)
+      res.uri = uri
+      res.reading_body(@ssl_socket)
     ensure
       # Stop remaining connection, even if they should be already cut
       # by the server
@@ -112,14 +115,11 @@ module Net
       raise GeminiError, 'Too many Gemini redirects' if limit.zero?
       r = request(uri)
       return r unless r.status[0] == '3'
-      old_url = uri.to_s
       begin
-        new_uri = URI(r.meta)
-        uri.merge!(new_uri)
+        uri = handle_redirect(r)
       rescue ArgumentError, URI::InvalidURIError
         return r
       end
-      raise GeminiError, "Redirect loop on #{uri}" if uri.to_s == old_url
       warn "Redirect to #{uri}" if $VERBOSE
       fetch(uri, limit - 1)
     end
@@ -148,50 +148,17 @@ module Net
 
     private
 
-    def ssl_check_existing(new_cert, cert_file)
-      raw = File.read cert_file
-      saved_one = OpenSSL::X509::Certificate.new raw
-      return true if saved_one == new_cert
-      # TODO: offer some kind of recuperation
-      warn "#{cert_file} does not match the current host cert!"
-      false
-    end
-
-    def ssl_verify_cb(cert)
-      domain = cert.subject.to_s.sub(/^\/CN=/, '')
-      return false if domain != @host
-      cert_file = File.expand_path("#{@certs_path}/#{domain}.pem")
-      return ssl_check_existing(cert, cert_file) if File.exist?(cert_file)
-      FileUtils.mkdir_p(File.expand_path(@certs_path))
-      File.open(cert_file, 'wb') { |f| f.print cert.to_pem }
-      true
-    end
-
-    def ssl_context
-      ssl_context = OpenSSL::SSL::SSLContext.new
-      ssl_context.set_params(verify_mode: OpenSSL::SSL::VERIFY_PEER)
-      ssl_context.min_version = OpenSSL::SSL::TLS1_2_VERSION
-      ssl_context.verify_hostname = true
-      ssl_context.ca_file = '/etc/ssl/certs/ca-certificates.crt'
-      ssl_context.verify_callback = lambda do |preverify_ok, store_context|
-        return true if preverify_ok
-        ssl_verify_cb store_context.current_cert
-      end
-      ssl_context
-    end
-
-    def init_sockets
-      @socket = TCPSocket.new(@host, @port)
-      @ssl_socket = OpenSSL::SSL::SSLSocket.new(@socket, ssl_context)
-      # Close underlying TCP socket with SSL socket
-      @ssl_socket.sync_close = true
-      @ssl_socket.hostname = @host # SNI
-      @ssl_socket.connect
+    def handle_redirect(response)
+      uri = response.uri
+      old_url = uri.to_s
+      new_uri = URI(response.meta)
+      uri.merge!(new_uri)
+      raise GeminiError, "Redirect loop on #{uri}" if uri.to_s == old_url
+      @host = uri.host
+      @port = uri.port
+      uri
     end
 
-    # Closes the SSL and TCP connections.
-    def finish
-      @ssl_socket.close
-    end
+    include ::Gemini::SSL
   end
 end

data/lib/net/gemini/request.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'English'
+
+require 'uri/gemini'
+
+module Net
+  class GeminiBadRequest < StandardError; end
+
+  #
+  # The syntax of Gemini Requests are defined in the Gemini
+  # specification, section 2.
+  #
+  # @see https://gemini.circumlunar.space/docs/specification.html
+  #
+  class GeminiRequest
+    attr_reader :uri
+
+    def initialize(uri_or_str)
+      # In any case, make some sanity check over this uri-like think
+      url = uri_or_str.to_s
+      if url.length > 1024
+        raise GeminiBadRequest, "Request too long: #{url.dump}"
+      end
+      @uri = URI(url)
+      unless uri.is_a? URI::Gemini
+        raise GeminiBadRequest, "Not a Gemini URI: #{url.dump}"
+      end
+    end
+
+    def path
+      @uri.path
+    end
+
+    def write(sock)
+      sock.puts "#{@uri}\r\n"
+    end
+
+    class << self
+      def read_new(sock)
+        # Read up to 1026 bytes:
+        # - 1024 bytes max for the URL
+        # - 2 bytes for <CR><LF>
+        str = sock.gets($INPUT_RECORD_SEPARATOR, 1026)
+        m = /\A(.*)\r\n\z/.match(str)
+        raise GeminiBadRequest, "Malformed request: #{str.dump}" if m.nil?
+        new(m[1])
+      end
+    end
+  end
+end

data/lib/net/gemini/response.rb

@@ -11,9 +11,9 @@ module Net
 
   #
   # The syntax of Gemini Responses are defined in the Gemini
-  #   specification[1], section 3.
+  # specification, section 3.
   #
-  # [1] https://gemini.circumlunar.space/docs/specification.html
+  # @see https://gemini.circumlunar.space/docs/specification.html
   #
   class GeminiResponse
     # The Gemini response <STATUS> string.
@@ -73,20 +73,14 @@ module Net
 
     class << self
       def read_new(sock)
-        code, msg = read_status_line(sock)
-        new(code, msg)
-      end
-
-      private
-
-      def read_status_line(sock)
-        # Read up to 1027 bytes:
+        # Read up to 1029 bytes:
         # - 3 bytes for code and space separator
         # - 1024 bytes max for the message
-        str = sock.gets($INPUT_RECORD_SEPARATOR, 1027)
+        # - 2 bytes for <CR><LF>
+        str = sock.gets($INPUT_RECORD_SEPARATOR, 1029)
         m = /\A([1-6]\d) (.*)\r\n\z/.match(str)
         raise GeminiBadResponse, "wrong status line: #{str.dump}" if m.nil?
-        m.captures
+        new(*m.captures)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-net-text
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Étienne Deparis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-15 00:00:00.000000000 Z
+date: 2020-11-17 00:00:00.000000000 Z
 dependencies: []
 description:
 email: etienne@depar.is
@@ -18,6 +18,7 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - lib/net/gemini.rb
+- lib/net/gemini/request.rb
 - lib/net/gemini/response.rb
 - lib/uri/finger.rb
 - lib/uri/gemini.rb