hrr_rb_ssh 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10374bce9a4138bfa640400ced86d6579e368db9caa58db8303676620a8cde4b
-  data.tar.gz: 0f42005a94c125d8a403ab07e011bc3398f92604a497091855d5fd4cecc8256d
+  metadata.gz: 7c9084a6fa67c8c215d0fa795eef327f6f7b8c52c7a6bda4a33ab0e97b65560b
+  data.tar.gz: 655a99379cf97086e9d29f1fcb3ffcabeec8058c7c4cbede3ce5c06ddaa8c7a2
 SHA512:
-  metadata.gz: c9bef9312be2875e17869c401fad888aaadd16936d90c069fd0a61313225b1f12b4ca7f0ea6307adff77520d63797a11de45e0569e48c3df987a1fa503138c7b
-  data.tar.gz: 1dd06737f9600c521fecfc158150cb766038b7afe160e16e9b6bc2e57ec1dd277fbbf659a4faa8990dbb292df2f49ea5e76b8714449ba28cf8f10dad346b6d69
+  metadata.gz: 240f03f04c51b1cb0671d15d7a0a89fdc9b64113cf0a5ba26ae2aa315dd77c107ec19213744065b7dd601e11937ad36a63085c5474bd4669e5e7b7f19499a2f5
+  data.tar.gz: ade3eac97ff8a9734a68336329c6cae56d5f427e73cdf96e65d3f8808b7128ac6a791c945fae975879a65e73b0565c56a6fd3c10ba5aa7c2dd89a3264db5f6e5

data/README.md

@@ -121,18 +121,10 @@ To define a public key authentication, the `HrrRbSsh::Authentication::Authentica
 
 ```ruby
 auth_publickey = HrrRbSsh::Authentication::Authenticator.new { |context|
-  username = 'user1'
-  ecdsa_sha2_nistp256_public_key_algorithm_name = 'ecdsa-sha2-nistp256'
-  ecdsa_sha2_nistp256_public_key = <<-'EOB'
------BEGIN PUBLIC KEY-----
-MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE9DPmu6CIA5VCBaN9wpUP2UUZQ+dw
-77mTZ7lD+z5cjzF7OL/cPL1/zklAsYaH7z7OcPYRbe24QCG5YfJQZjevJQ==
------END PUBLIC KEY-----
-  EOB
-  [
-    [username, ecdsa_sha2_nistp256_public_key_algorithm_name, ecdsa_sha2_nistp256_public_key],
-  ].any? { |username, public_key_algorithm_name, public_key|
-    context.verify username, public_key_algorithm_name, public_key
+  username = ENV['USER']
+  authorized_keys = HrrRbSsh::Compat::OpenSSH::AuthorizedKeys.new(File.read(File.join(Dir.home, '.ssh', 'authorized_keys')))
+  authorized_keys.any?{ |public_key|
+    context.verify username, public_key.algorithm_name, public_key.to_pem
   }
 }
 options['authentication_publickey_authenticator'] = auth_publickey
@@ -140,6 +132,8 @@ options['authentication_publickey_authenticator'] = auth_publickey
 
 The `context` variable in public key authentication context provides the `#verify` method. The `#verify` method takes three arguments; username, public key algorithm name and PEM or DER formed public key.
 
+And public keys that is in OpenSSH public key format is now available. To use OpenSSH public keys, it is easy to use $USER_HOME/.ssh/authorized_keys file.
+
 ##### None authentication (NOT recomended)
 
 The third one is none authentication. None authentication is usually NOT used.

data/demo/server.rb

@@ -27,47 +27,10 @@ auth_none = HrrRbSsh::Authentication::Authenticator.new { |context|
   false
 }
 auth_publickey = HrrRbSsh::Authentication::Authenticator.new { |context|
-  username = 'user1'
-  dss_public_key_algorithm_name = 'ssh-dss'
-  dss_public_key = <<-'EOB'
------BEGIN PUBLIC KEY-----
-  MIIBtzCCASwGByqGSM44BAEwggEfAoGBAKh2ZJp4ao8Xaexa0sk68VqMCaOaTi19
-YIqo2+t2t8ve4QSHvk/NbFIDTGq90lHziakTqwKaaswWLB7cSRPTcXjLv16Zmazg
-JRvh1jZ3ikuBME2G/B+EptlQ00dMa+5W/Acp2P6Cv5NRgA/tx0AyCJaItSpLXG+k
-B+HMp9LQ8WotAhUAk/yyvpsY9sVSyeN3lHvg5Nsl568CgYEAj4rqF241ROP2olNh
-VJUF0K5N4dSBCfcPnSPYuGPCi7qV229RISET3LOwrCXEUwSwlKoe/lLb2mcaeC84
-NIeN6pQnRTE6zajJ9UUeGErOFRm1x6E+FMtlVp/fwUE1Ra+AscHVKwMUehz7sA6A
-ZxJK7UvLs+R6s1eYhrES0bcorLIDgYQAAoGAd6XKzevlwzt6aCYdBRdN+BT4BQUw
-/L3MVYG0kDV9WqPcyAFvLO54xAUf9LxYM0e8X8J5ECp4oEGOcK1ilXEw3LPMJGmY
-IB56R9izS1t636kxnJTYNGQY+XvjAeuP7nC2WVNHNz7vXprT4Sq+hQaNkaKPu/3/
-48xJs2mYbxfyHCQ=
------END PUBLIC KEY-----
-  EOB
-  rsa_public_key_algorithm_name = 'ssh-rsa'
-  rsa_public_key = <<-'EOB'
------BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3OnIQcRTdeTZFjhGcx8f
-ssCgeqzY47p5KhT/gKMz2nOANNLCBr9e6IGaRePew03St3Cn0ApikuGzPnWxSlBT
-H6OpR/EnUmBttlvcL28CGOsZIwYJtAdVsGXpIXtiPLl2eEzaM9aBsS/LGWKgQNo3
-86UGa5j20yGJfsL9WIMCVoGvsA06+4VX1/zlWXwVJSNep674bmSWPcVtXWWZIk19
-T6b+xuqhfiUpbc/stfdmgDc3B/ZgpFsQh5oWBoAfkL6kAEa4oQBFhqF0QM5ej6h5
-wqbQt4paM0aEuypWE+CaizA0I+El7f0y+59sUqTAN/7F9UlXaOBdd9SZkhACBrAR
-nQIDAQAB
------END PUBLIC KEY-----
-  EOB
-  ecdsa_sha2_nistp256_public_key_algorithm_name = 'ecdsa-sha2-nistp256'
-  ecdsa_sha2_nistp256_public_key = <<-'EOB'
------BEGIN PUBLIC KEY-----
-MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE9DPmu6CIA5VCBaN9wpUP2UUZQ+dw
-77mTZ7lD+z5cjzF7OL/cPL1/zklAsYaH7z7OcPYRbe24QCG5YfJQZjevJQ==
------END PUBLIC KEY-----
-  EOB
-  [
-    [dss_public_key_algorithm_name, dss_public_key],
-    [rsa_public_key_algorithm_name, rsa_public_key],
-    [ecdsa_sha2_nistp256_public_key_algorithm_name, ecdsa_sha2_nistp256_public_key],
-  ].any? { |public_key_algorithm_name, public_key|
-    context.verify username, public_key_algorithm_name, public_key
+  username = ENV['USER']
+  authorized_keys = HrrRbSsh::Compat::OpenSSH::AuthorizedKeys.new(File.read(File.join(Dir.home, '.ssh', 'authorized_keys')))
+  authorized_keys.any?{ |public_key|
+    context.verify username, public_key.algorithm_name, public_key.to_pem
   }
 }
 auth_password = HrrRbSsh::Authentication::Authenticator.new { |context|

data/lib/hrr_rb_ssh/compat/openssh/authorized_keys.rb

@@ -0,0 +1,24 @@
+# coding: utf-8
+# vim: et ts=2 sw=2
+
+module HrrRbSsh
+  module Compat
+    module OpenSSH
+      class AuthorizedKeys
+        def initialize data_str
+          @public_keys = data_str.each_line.map{ |line|
+            PublicKey.new line
+          }
+        end
+
+        def each
+          @public_keys.each{ |public_key|
+            yield public_key
+          }
+        end
+
+        include Enumerable
+      end
+    end
+  end
+end

data/lib/hrr_rb_ssh/compat/openssh/public_key.rb

@@ -0,0 +1,65 @@
+# coding: utf-8
+# vim: et ts=2 sw=2
+
+require 'base64'
+require 'openssl'
+
+module HrrRbSsh
+  module Compat
+    module OpenSSH
+      class PublicKey
+        def initialize data_line
+          splitted = data_line.split(' ')
+          @algorithm_name = splitted[0]
+          public_key_blob = Authentication::Method::Publickey::Algorithm[@algorithm_name]::PublicKeyBlob.decode Base64.decode64(splitted[1])
+          case @algorithm_name
+          when 'ssh-dss'
+            @algorithm = OpenSSL::PKey::DSA.new
+            if @algorithm.respond_to?(:set_pqg)
+              @algorithm.set_pqg public_key_blob[:'p'], public_key_blob[:'q'], public_key_blob[:'g']
+            else
+              @algorithm.p = public_key_blob[:'p']
+              @algorithm.q = public_key_blob[:'q']
+              @algorithm.g = public_key_blob[:'g']
+            end
+            if @algorithm.respond_to?(:set_key)
+              @algorithm.set_key public_key_blob[:'y'], nil
+            else
+              @algorithm.pub_key = public_key_blob[:'y']
+            end
+            @pem = @algorithm.public_key.to_pem
+          when 'ssh-rsa'
+            @algorithm = OpenSSL::PKey::RSA.new
+            if @algorithm.respond_to?(:set_key)
+              @algorithm.set_key public_key_blob[:'n'], public_key_blob[:'e'], nil
+            else
+              @algorithm.e = public_key_blob[:'e']
+              @algorithm.n = public_key_blob[:'n']
+            end
+            @pem = @algorithm.public_key.to_pem
+          when 'ecdsa-sha2-nistp256'
+            @algorithm = OpenSSL::PKey::EC.new('prime256v1')
+            @algorithm.public_key = OpenSSL::PKey::EC::Point.new(@algorithm.group, OpenSSL::BN.new(public_key_blob[:'Q'], 2))
+            @pem = @algorithm.to_pem
+          when 'ecdsa-sha2-nistp384'
+            @algorithm = OpenSSL::PKey::EC.new('secp384r1')
+            @algorithm.public_key = OpenSSL::PKey::EC::Point.new(@algorithm.group, OpenSSL::BN.new(public_key_blob[:'Q'], 2))
+            @pem = @algorithm.to_pem
+          when 'ecdsa-sha2-nistp521'
+            @algorithm = OpenSSL::PKey::EC.new('secp521r1')
+            @algorithm.public_key = OpenSSL::PKey::EC::Point.new(@algorithm.group, OpenSSL::BN.new(public_key_blob[:'Q'], 2))
+            @pem = @algorithm.to_pem
+          end
+        end
+
+        def algorithm_name
+          @algorithm_name
+        end
+
+        def to_pem
+          @pem
+        end
+      end
+    end
+  end
+end

data/lib/hrr_rb_ssh/compat/openssh.rb

@@ -0,0 +1,12 @@
+# coding: utf-8
+# vim: et ts=2 sw=2
+
+module HrrRbSsh
+  module Compat
+    module OpenSSH
+    end
+  end
+end
+
+require 'hrr_rb_ssh/compat/openssh/public_key'
+require 'hrr_rb_ssh/compat/openssh/authorized_keys'

data/lib/hrr_rb_ssh/compat.rb

@@ -1,6 +1,8 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
+require 'hrr_rb_ssh/compat/openssh'
+
 if RUBY_VERSION < "2.1"
   class Array
     def to_h

data/lib/hrr_rb_ssh/version.rb

@@ -2,5 +2,5 @@
 # vim: et ts=2 sw=2
 
 module HrrRbSsh
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hrr_rb_ssh
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - hirura
@@ -124,6 +124,9 @@ files:
 - lib/hrr_rb_ssh/closed_transport_error.rb
 - lib/hrr_rb_ssh/codable.rb
 - lib/hrr_rb_ssh/compat.rb
+- lib/hrr_rb_ssh/compat/openssh.rb
+- lib/hrr_rb_ssh/compat/openssh/authorized_keys.rb
+- lib/hrr_rb_ssh/compat/openssh/public_key.rb
 - lib/hrr_rb_ssh/connection.rb
 - lib/hrr_rb_ssh/connection/channel.rb
 - lib/hrr_rb_ssh/connection/channel/channel_type.rb