bgeminiserver 1.0.2 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11ece503be3e6903fb2f59e49994bbc7a73612247063f3769d8628d03308d54b
-  data.tar.gz: d47146808a64104e457618c6b9df1376ab135c1bf3737234f6f1c57804027b58
+  metadata.gz: bd1e280a4c3dcf85d33674f3fc2fbe3c5c6071d9a7c23f17b590bf9b73929aa5
+  data.tar.gz: e83851c3efe97e4c651c58cf906c7be1e3436e7aaa8c1be9ef6dac01ce5d4ee8
 SHA512:
-  metadata.gz: 87df4dd3a6a0f399d15ccf431eaf37d56624fd2a53f34784edced5f02ca67890c40792643a717e398bd6b15da7e3160c7221896739c43185e1cbb70f4ef6948c
-  data.tar.gz: 04d384a26126a4453f16a92f3cc12108b49fa1d8dacd3ac5ae739d6f93cce61da903966400fc70fbb883c7c46dd9ebf0e1fd42fe45831e9cbee3e03b476ca5ef
+  metadata.gz: 0b7f6e394db408730b41f058df94ca20ecbdaee43a3c29c0686d68c837b813b1d56f1facc411b8c37114ba6d09410e4ae68b0a3df3bdb17dca0a87fdba2fb1fa
+  data.tar.gz: 21110d66e79b6cf8bebaa8fe07c1fabf06c354114d8bb2a946e95258191cae2d29164e59df8f37a34ae4dfad09bd679e1ba9d5693d6cdac559870d516bfab4e1

data/lib/geminiserver.rb

@@ -2,6 +2,7 @@
 require "socket"
 require "openssl"
 require "uri"
+require "timeout"
 
 module GeminiPage
   
@@ -107,6 +108,24 @@ module GeminiPage
   end
 end
 
+class GenericGeminiError < RuntimeError
+  def initialize msg
+    super msg
+  end
+end
+
+class BadRequestGemini < GenericGeminiError
+  def initialize msg
+    super msg
+  end
+end
+
+class ProxyRequestRefusedGemini < GenericGeminiError
+  def initialize msg
+    super msg
+  end
+end
+
 # @example A test server
 #   cert = OpenSSL::X509::Certificate.new File.read "cert.crt"
 #   key  = OpenSSL::PKey::RSA.new File.read "priv.pem"
@@ -187,7 +206,7 @@ end
 #   serv.listen true
 class GeminiServer
   
-  attr_accessor :not_found_page
+  attr_accessor :not_found_page, :client_timeout
   
   # Creates a Gemini Server
   #
@@ -208,6 +227,7 @@ class GeminiServer
     @context.verify_callback = ->(passed, cert) { return true }
     @handlers = {}
     @not_found_page = GeminiPage.static_page("51", "Not found")
+    @client_timeout = 10
   end
   
   # Starts the server. However, the server does not yet respond to requests.
@@ -266,10 +286,24 @@ class GeminiServer
       begin
         Thread.new(@secure.accept) do |conn|
           begin
-            uri = URI(conn.gets.chomp)
+            request_line = Timeout::timeout(@client_timeout) {
+              conn.gets.chomp
+            }
 
-            if uri.scheme != "gemini"
-              conn.print "59 Unknown scheme: #{uri.scheme}\r\n"
+            if request_line == ""
+              raise BadRequestGemini.new "Request line is empty"
+            end
+            
+            if request_line.length > 1024
+              raise BadRequestGemini.new "URI is too longs"
+            end
+            
+            uri = URI(request_line)
+       
+            if uri.scheme == nil
+              raise BadRequestGemini.new "No scheme"
+            elsif uri.scheme != "gemini"
+              raise ProxyRequestRefusedGemini.new "Unknown scheme: #{uri.scheme}"
             end
 
             if @handlers[uri.path]
@@ -279,11 +313,16 @@ class GeminiServer
               page = @not_found_page.(conn, conn.peer_cert, URI.decode_www_form_component(uri.query.to_s))
             end
             
-            conn.flush
-            conn.close
+          rescue ProxyRequestRefusedGemini
+            conn.print "53 #{$!}"
+          rescue URI::InvalidURIError, BadRequestGemini
+            conn.print "59 #{$!}"
+          rescue Timeout::Error
+            conn.print "40 Timeout"
           rescue
             $stderr.puts $!
           end
+          conn.close
         end
       rescue
         $stderr.puts $!
@@ -291,4 +330,4 @@ class GeminiServer
     end
   end
   
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bgeminiserver
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.1
 platform: ruby
 authors:
 - Marek Kuethe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-18 00:00:00.000000000 Z
+date: 2022-07-22 00:00:00.000000000 Z
 dependencies: []
 description: A small Gemini server, to customize with static and dynamic content.
   The Gem is documented with example. Before I extended the server, the server was