localhost 1.1.3 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b86e2157a0bb7ccb760179614cc9a49f2b4301870838f049aa9802a76cb2dec
-  data.tar.gz: ecb0ee7388befd62714e953f89cf2cdaf1d721bf628384dc9f5d3faf09e0d25a
+  metadata.gz: 7a8bb85b8e82b1ceaec73363ba246313ee46da6d47c948ed2b57bfa1f931b51a
+  data.tar.gz: 8953521fbcd8eb215ddfaaa59a65b96715c8e69dfb925b0794d1e5e41c204613
 SHA512:
-  metadata.gz: 2d8269e428c27e72cbc812d8c3201e0d06fc10e650036245b46e5c2f12f37d871a7bdb49a764d10540ba81f86105791e123381ba42dcb60553a4d88299b811ac
-  data.tar.gz: 42e81d392df2945a45ec85ffce3e6e3402bc9d2d0e1ad3fd5eef9541102e26ab530abfeb6442d662a8389fea46103bf5112324b9bd5f9478335e7d6cbbdb17e4
+  metadata.gz: 16e6781fb5b9caf6180ae68579066d2ab0006fbbb5107d81a6ed475dabeb37a0362ecb67a4e19a7f4d527794e56848c9c367286a1a6424494e0f3bc81cfc9704
+  data.tar.gz: 93a1b52e82b6abf55413b9af17f3769bc659cfcc857da9e6a0c9860120137247490abd11d9261d17539f1ef9ef234db29827c3ce07745ac89a0dd1ebad28b2fb

data/lib/localhost/authority.rb

@@ -49,8 +49,18 @@ module Localhost
 			@store = nil
 		end
 		
+		BITS = 1024*2
+		
+		def ecdh_key
+			@ecdh_key ||= OpenSSL::PKey::EC.new "prime256v1"
+		end
+		
+		def dh_key
+			@dh_key ||= OpenSSL::PKey::DH.new(BITS)
+		end
+		
 		def key
-			@key ||= OpenSSL::PKey::RSA.new(1024*2)
+			@key ||= OpenSSL::PKey::RSA.new(BITS)
 		end
 		
 		def key= key
@@ -58,7 +68,7 @@ module Localhost
 		end
 		
 		def name
-			@name ||= OpenSSL::X509::Name.parse("O=Development/CN=#{@hostname}")
+			@name ||= OpenSSL::X509::Name.parse("/O=Development/CN=#{@hostname}")
 		end
 		
 		def name= name
@@ -111,8 +121,19 @@ module Localhost
 				
 				context.session_id_context = "localhost"
 				
+				if context.respond_to? :tmp_dh_callback=
+					context.tmp_dh_callback = proc {self.dh_key}
+				end
+				
+				if context.respond_to? :ecdh_curves=
+					context.ecdh_curves = 'P-256:P-384:P-521'
+				elsif context.respond_to? :tmp_ecdh_callback=
+					context.tmp_ecdh_callback = proc {self.ecdh_key}
+				end
+				
 				context.set_params(
-					ciphers: SERVER_CIPHERS
+					ciphers: SERVER_CIPHERS,
+					verify_mode: OpenSSL::SSL::VERIFY_NONE,
 				)
 			end
 		end
@@ -128,7 +149,7 @@ module Localhost
 		end
 		
 		def load(path)
-			if File.directory? path	
+			if File.directory? path
 				certificate_path = File.join(path, "#{@hostname}.crt")
 				key_path = File.join(path, "#{@hostname}.key")
 				
@@ -148,15 +169,21 @@ module Localhost
 		end
 		
 		def save(path)
-			File.write(
-				File.join(path, "#{@hostname}.crt"),
-				self.certificate.to_pem
-			)
+			lockfile_path = File.join(path, "#{@hostname}.lock")
 			
-			File.write(
-				File.join(path, "#{@hostname}.key"),
-				self.key.to_pem
-			)
+			File.open(lockfile_path, File::RDWR|File::CREAT, 0644) do |lockfile|
+				lockfile.flock(File::LOCK_EX)
+				
+				File.write(
+					File.join(path, "#{@hostname}.crt"),
+					self.certificate.to_pem
+				)
+				
+				File.write(
+					File.join(path, "#{@hostname}.key"),
+					self.key.to_pem
+				)
+			end
 		end
 	end
 end

data/lib/localhost/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Localhost
-	VERSION = "1.1.3"
+	VERSION = "1.1.8"
 end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: localhost
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.8
 platform: ruby
 authors:
 - Samuel Williams
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-08-19 00:00:00.000000000 Z
+date: 2021-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: covered
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -52,29 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: 
+description:
 email:
-- samuel.williams@oriontransfer.co.nz
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- Gemfile
-- README.md
-- Rakefile
 - lib/localhost.rb
 - lib/localhost/authority.rb
 - lib/localhost/version.rb
-- localhost.gemspec
-- media/chrome.png
-- media/safari.png
 homepage: https://github.com/socketry/localhost
-licenses: []
+licenses:
+- MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -89,9 +94,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Manage a local certificate authority for self-signed localhost development
   servers.

data/.gitignore

@@ -1,13 +0,0 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-
-# rspec failure tracking
-.rspec_status
-
-/ssl/

data/.rspec

@@ -1,3 +0,0 @@
---format documentation
---color
---require spec_helper

data/.travis.yml

@@ -1,19 +0,0 @@
-language: ruby
-dist: xenial
-cache: bundler
-
-matrix:
-  include:
-    - rvm: 2.3.6
-    - rvm: 2.3
-    - rvm: 2.4
-    - rvm: 2.5
-    - rvm: 2.6
-    - rvm: jruby-head
-      env: JRUBY_OPTS="--debug -X+O"
-    - rvm: ruby-head
-    - rvm: rbx-3
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head
-    - rvm: rbx-3

data/Gemfile

@@ -1,13 +0,0 @@
-source "https://rubygems.org"
-
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-
-# Specify your gem's dependencies in localhost.gemspec
-gemspec
-
-group :development do
-	gem 'async-io'
-	gem 'async-rspec'
-	
-	gem 'async-process'
-end

data/README.md

@@ -1,120 +0,0 @@
-# Localhost [![Build Status](https://travis-ci.com/socketry/localhost.svg)](https://travis-ci.com/socketry/localhost)
-
-This gem provides a convenient API for generating per-user self-signed root certificates.
-
-## Motivation
-
-HTTP/2 requires SSL in web browsers. If you want to use HTTP/2 for development (and you should), you need to start using URLs like `https://localhost:8080`. In most cases, this requires adding a self-signed certificate to your certificate store (e.g. Keychain on macOS), and storing the private key for the web-server to use.
-
-I wanted to provide a server-agnostic way of doing this, primarily because I think it makes sense to minimise the amount of junky self-signed keys you add to your certificate store for `localhost`.
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'localhost'
-```
-
-And then execute:
-
-	$ bundle
-
-Or install it yourself as:
-
-	$ gem install localhost
-
-## Usage
-
-This example shows how to generate a certificate for an SSL secured web server:
-
-```ruby
-require 'localhost/authority'
-require 'socket'
-
-authority = Localhost::Authority.fetch
-
-server_thread = Thread.new do
-	server = OpenSSL::SSL::SSLServer.new(TCPServer.new("localhost", 4050), authority.server_context)
-	
-	server.listen
-	
-	peer = server.accept
-	
-	puts "Writing..."
-	peer.flush
-	
-	peer.close
-end
-
-client = OpenSSL::SSL::SSLSocket.new(TCPSocket.new("localhost", 4050), authority.client_context)
-
-# Initialize SSL connection
-client.connect
-
-puts client.read
-
-client.close
-
-server_thread.join
-```
-
-If you use Safari to access such a server, it will allow you to add the certificate to your keychain without much work. Once you've done this, you won't need to do it again for any other site when running such a development environment from the same user account.
-
-### Safari
-
-If you use this with a web server, when you open the site in Safari:
-
-![Safari](media/safari.png)
-
-- Click "View the certificate" to check that it is the correct certificate.
-- Click "visit this website" which will prompt you to add the certificate to your keychain. Once you've done this, it should work for a long time.
-
-### Chrome
-
-If you use this with a web server, when you open the site in Safari:
-
-![Chrome](media/chrome.png)
-
-- Click "ADVANCED" to see additional details, including...
-- Click "Proceed to localhost (unsafe)" which will allow you to use the site for the current browser session.
-
-### Files
-
-The certificate and private key are stored in `~/.localhost/`. You can delete them and they will be regenerated. If you added the certificate to your keychain, you'll probably want to delete that too.
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
-
-## See Also
-
-- [falcon](https://github.com/socketry/falcon) — Uses this `Localhost::Authority` to provide HTTP/2 with minimal configuration for `localhost`.
-
-## License
-
-Released under the MIT license.
-
-Copyright, 2018, by [Samuel G. D. Williams](http://www.codeotaku.com/samuel-williams).
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

data/Rakefile

@@ -1,6 +0,0 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec

data/localhost.gemspec

@@ -1,22 +0,0 @@
-
-require_relative "lib/localhost/version"
-
-Gem::Specification.new do |spec|
-	spec.name          = "localhost"
-	spec.version       = Localhost::VERSION
-	spec.authors       = ["Samuel Williams"]
-	spec.email         = ["samuel.williams@oriontransfer.co.nz"]
-
-	spec.summary       = "Manage a local certificate authority for self-signed localhost development servers."
-	spec.homepage      = "https://github.com/socketry/localhost"
-
-	spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-		f.match(%r{^(test|spec|features)/})
-	end
-	spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-	spec.require_paths = ["lib"]
-	
-	spec.add_development_dependency "bundler", "~> 1.16"
-	spec.add_development_dependency "rake", "~> 10.0"
-	spec.add_development_dependency "rspec", "~> 3.0"
-end