gemini_server 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29f2c81f5db11cffa8974cf4a1a48654ac00565b66f2ce306086f900246b34f9
-  data.tar.gz: 842fee3d9d59845cc851b65c2dc918a4ee850e5ffd6f27e4b1c09131a1181659
+  metadata.gz: e067f64e27db63e071c57585ae24b7ae0cca9b4c408d0c18acf4b99b6e7ddc57
+  data.tar.gz: 30ab2fec9b37e2316dc9b96a9ff18cfe88a892a9d97c5fbbc40ede5336aaba30
 SHA512:
-  metadata.gz: 62be452faaec4d6c4b59a15f3847f6776f795a57d7037ec7ff54452ba15ec1ad3410e645e0c595c2358dd53ff0da54410765be27e6448f3519cc5c0ebb857edb
-  data.tar.gz: 1cce37852838f92ced3fb4e504ff4356d0d098ef27a47d6638d6cb0123b4d2b8c8a63a0412260c15c71da9c78ab37df8f267328e9c331c3d5643614e95510cbe
+  metadata.gz: 34222c9438fda88020863ebf5c05dc454a43b02334fec1fe63af28594c418dc01d1024829ddbf275597af6fe72f196dd854e7b35932934e8805c411bfb5ed354
+  data.tar.gz: cd906abfa205f29f7470c7844043c266655c35d63da00aa95bcc27e9a2c418aced3f537ea2b44707d0353ff41dded57edb5c0e0c249f6f9bdba0583ffc5b00db

data/README.md

@@ -4,6 +4,23 @@ A simple server for the Gemini protocol, with an API inspired by Sinatra.
 
 ## Usage
 
+Use the built-in executable to serve the current directory.
+
+```
+$ gem install gemini_server
+Successfully installed gemini_server-0.1.0
+1 gem installed
+$ gemini_server -h
+Usage: gemini_server [options]
+    -p, --port PORT                  Port to listen on
+        --cert-path PATH             Path to cert file
+        --key-path PATH              Path to key file
+        --charset CHARSET            Charset of text/* files
+        --lang LANG                  Language of text/* files
+```
+
+Or require the library to declare custom routes in Ruby.
+
 ```ruby
 require "gemini_server"
 

data/lib/gemini_server/version.rb

@@ -1,3 +1,3 @@
 module GeminiServer
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/gemini_server.rb

@@ -17,7 +17,7 @@ class GeminiServer
     @views_folder = File.expand_path(options[:views_folder] || ".")
     @charset = options[:charset]
     @lang = options[:lang]
-    @ssl_cert, @ssl_key = self.load_cert_and_key(options)
+    @ssl_cert, @ssl_key, @ssl_chain = self.load_cert_and_key(options)
   end
 
   def route r, &blk
@@ -28,7 +28,7 @@ class GeminiServer
   def listen host, port
     Async do
       endpoint = Async::IO::Endpoint.tcp(host, port)
-      endpoint = Async::IO::SSLEndpoint.new(endpoint, ssl_context: self.ssl_context(@ssl_cert, @ssl_key))
+      endpoint = Async::IO::SSLEndpoint.new(endpoint, ssl_context: self.ssl_context(@ssl_cert, @ssl_key, @ssl_chain))
 
       ["INT", "TERM"].each do |signal|
         old_handler = Signal.trap(signal) do
@@ -151,6 +151,26 @@ class GeminiServer
     LOG_FORMAT % [ip, username || '-', Time.now.strftime("%d/%b/%Y:%H:%M:%S %z"), path, status.to_s, body_size.to_s || '-', clock_time - start_time]
   end
 
+  def parse_cert_and_chain input_text
+    # Only works in Ruby 3+
+    if OpenSSL::X509::Certificate.respond_to?(:load)
+      certs = OpenSSL::X509::Certificate.load(input_text)
+      return [certs.shift, certs]
+    end
+
+    # Fallback behavior for .pem certificates
+    certificate_pattern = /-----BEGIN CERTIFICATE-----.*?-----END CERTIFICATE-----/m
+    certs = input_text.scan(certificate_pattern).collect do |text|
+      OpenSSL::X509::Certificate.new(text)
+    end
+
+    # Fallback behavior if above regex yields 0 certs. E.g. with .der certs
+    # This won't parse any chain certs that might be present
+    certs = [OpenSSL::X509::Certificate.new(input_text)] if certs.empty?
+
+    [certs.shift, certs]
+  end
+
   def load_cert_and_key options
     found_cert = options[:cert] || if options[:cert_path]
       File.open(options[:cert_path]) rescue nil
@@ -167,15 +187,24 @@ class GeminiServer
     raise "SSL certificate not found" unless found_cert
     raise "SSL key not found" unless found_key
 
+    if found_cert.is_a?(OpenSSL::X509::Certificate)
+      main_cert = found_cert
+      chain_list = []
+    else
+      main_cert, chain_list = parse_cert_and_chain found_cert.read
+    end
+
     [
-      found_cert.is_a?(OpenSSL::X509::Certificate) ? found_cert : OpenSSL::X509::Certificate.new(found_cert),
+      main_cert,
       found_key.is_a?(OpenSSL::PKey::PKey) ? found_key : OpenSSL::PKey.read(found_key),
+      chain_list
     ]
   end
 
-  def ssl_context cert, key
+  def ssl_context cert, key, chain
     OpenSSL::SSL::SSLContext.new.tap do |context|
       context.add_certificate(cert, key)
+      context.extra_chain_cert = chain
       context.session_id_context = "gemini_server"
       context.min_version = OpenSSL::SSL::TLS1_2_VERSION
       context.max_version = OpenSSL::SSL::TLS1_3_VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemini_server
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jess Bees
@@ -119,7 +119,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: Simple server for the Gemini protocol