tunnelss 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3adfce3ac04bd3a78819c48b8280cd87c1d23830
-  data.tar.gz: eb024a7f72d075a06d878b1514db8f5dc78f2055
+  metadata.gz: ad55614a31f005b914c96e7be44379152e2307e1
+  data.tar.gz: 5aa6d70d4ec2d399b208938bd4c80497eaba0835
 SHA512:
-  metadata.gz: 266c106b430d4777050ff1ae29c56969a033365a3b3e307cd4b8554afe803ac49ff084a5e49056ed1b30839be4c5f47861ab170b21fbfb5f60a5a3662fd0decf
-  data.tar.gz: 12e01834662932fdd9ba7712d72a39b0f5e89f0ff3b556080f2bd49f3e990e02acad389e9bf21a41552422f6851ed6e9289255f3465d2750dd3b85723a408051
+  metadata.gz: 42bfa166a8ba25a83583b1bdd63ab71af631ac626a92e55779bf238ce0ae63b80a68cc073395750d60ab034787994b42149c6a9a084216a0ff4d491f398adb6f
+  data.tar.gz: 9b2270a1e5e061833f3b56c39f016330e36abd5d6d124e0c8604fb0a72b90d8eabc9b85c6549782a39c4ede7361dbb906e3afca7136c7e63e713c68766bad91d

data/README.md

@@ -59,8 +59,23 @@ or
 
     $ sudo tunnelss 127.0.0.1:443 127.0.0.1:3000
 
+## Contributing
+
+Run from the local source code:
+
+    $ sudo script/run
+
+Feel free to submit pull requests. Please document your changes in the description.
+
 ## History
 
+### 0.1.3
+
+- Updated README
+- Added script/run to run from local source
+- Support multiple POW suffixes (https://github.com/rchampourlier/tunnelss/pull/2)
+- Using SHA256 (https://github.com/rchampourlier/tunnelss/pull/3)
+
 ### 0.1.2
 
 - Fix in README

data/generators/openssl.cnf

@@ -16,7 +16,7 @@ private_key      = $dir/key.pem
 RANDFILE         = $dir/.rand
 default_days     = 365     # how long to certify for
 default_crl_days = 30      # how long before next CRL
-default_md       = sha1      # which md to use.
+default_md       = sha256  # which md to use.
 x509_extensions  = usr_cert
 
 [ policy_anything ]

data/lib/tunnelss.rb

@@ -1,6 +1,7 @@
 require "tunnelss/version"
 require "tunnelss/configure_with_pow"
 require "eventmachine"
+require 'fileutils'
 
 # [Tunnels](http://github.com/rchampourlier/tunnelss)
 #

data/lib/tunnelss/configure_with_pow.rb

@@ -30,15 +30,16 @@ module Tunnelss::ConfigureWithPow
   end
 
   def ca_exists?
-    File.exists?(ca_dir) and File.exists?("#{ca_dir}/key.pem") and File.exists?("#{ca_dir}/cert.pem")
+    File.exists?(ca_dir) && File.exists?("#{ca_dir}/key.pem") && File.exists?("#{ca_dir}/cert.pem")
   end
 
   def build_ca
     FileUtils.rm_rf(ca_dir) if File.exists?(ca_dir)
     Dir.mkdir(ca_dir)
 
-    puts "Creating SSL keypair for signing *.dev certificate"
-    system "openssl req -newkey rsa:2048 -batch -x509 -nodes -subj \"/C=US/O=Developer Certificate/CN=*.dev Domain CA\" -keyout #{ca_dir}/key.pem -out #{ca_dir}/cert.pem -days 9999 &> /dev/null"
+    puts "Creating SSL keypair for signing #{pow_domain_extensions.join(',')}certificate"
+    multi_domain_certificate_param = pow_domain_extensions.map { |e| "CN=*.#{e} Domain CA" }.join('/')
+    system "openssl req -newkey rsa:2048 -batch -x509 -sha256 -nodes -subj \"/C=US/O=Developer Certificate/#{multi_domain_certificate_param}\" -keyout #{ca_dir}/key.pem -out #{ca_dir}/cert.pem -days 9999 &> /dev/null"
     puts "Adding certificate to login keychain as trusted."
     system "security add-trusted-cert -d -r trustRoot -k #{ENV['HOME']}/Library/Keychains/login.keychain #{ca_dir}/cert.pem"
     puts "================================================================================"
@@ -49,9 +50,10 @@ module Tunnelss::ConfigureWithPow
   def build_certificate
     prepare_openssl_config
 
-    puts "Generating new *.dev certificate"
-    system "openssl req -newkey rsa:2048 -batch -nodes -subj \"/C=US/O=Developer Certificate/CN=*.dev\" -keyout #{dir}/key.pem -out #{dir}/csr.pem -days 9999 &> /dev/null"
-    puts "Signing *.dev certificate"
+    puts "Generating new *.#{pow_domain_extensions.join(',')} certificate"
+    multi_domain_certificate_param = pow_domain_extensions.map { |e| "CN=*.#{e}" }.join('/')
+    system "openssl req -newkey rsa:2048 -sha256 -batch -nodes -subj \"/C=US/O=Developer Certificate/#{multi_domain_certificate_param}\" -keyout #{dir}/key.pem -out #{dir}/csr.pem -days 9999 &> /dev/null"
+    puts "Signing *.#{pow_domain_extensions.join(',')} certificate"
     system "openssl ca -config #{ca_dir}/openssl.cnf -policy policy_anything -batch -days 9999 -out #{dir}/cert.pem -infiles #{dir}/csr.pem &> /dev/null"
 
     # Build cert chain
@@ -60,7 +62,7 @@ module Tunnelss::ConfigureWithPow
 
     write_pow_domains_to_cache
 
-    puts "Generated certificate for your Pow .dev domains."
+    puts "Generated certificate for your Pow #{pow_domain_extensions.join(',')} domains."
     true
   end
 
@@ -107,8 +109,20 @@ module Tunnelss::ConfigureWithPow
     @pow_domains ||= Dir["#{pow_dir}/*"].collect {|f| File.basename(f)}
   end
 
+  def pow_domain_extensions
+    @pow_domain_extensions ||= begin
+      domains = `source #{ENV['HOME']}/.powconfig 2> /dev/null && echo $POW_DOMAINS`.chomp.split(',')
+      domains = ['dev'] if domains.empty?
+      domains
+    end
+  end
+
   def pow_domains_str
-    pow_domains.map {|d| "DNS:#{d}.dev,DNS:*.#{d}.dev"}.join(',')
+    pow_domains.map do |d|
+      pow_domain_extensions.map do |e|
+        "DNS:#{d}.#{e},DNS:*.#{d}.#{e}"
+      end
+    end.flatten.join(',')
   end
 
   def pow_dir

data/lib/tunnelss/version.rb

@@ -1,3 +1,3 @@
 module Tunnelss
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/script/run

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+
+project_dir = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+$LOAD_PATH.unshift File.join(project_dir, 'lib')
+
+require 'tunnelss'
+
+unless ARGV.size == 0 || ARGV.size == 2
+  puts <<-D
+Usage:
+    tunnelss [from to]
+
+Examples:
+    tunnelss 443 3000
+    tunnelss localhost:443 localhost:3000
+
+  D
+  exit!
+end
+
+Tunnelss.run!(*ARGV)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tunnelss
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - rchampourlier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-14 00:00:00.000000000 Z
+date: 2015-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -113,6 +113,7 @@ files:
 - lib/tunnelss/version.rb
 - readme-screenshot.png
 - script/console
+- script/run
 - spec/spec_helper.rb
 - spec/tunnelss_spec.rb
 - tunnelss.gemspec
@@ -135,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: tunnelss
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Pow + SSL, automated