net-ssh 4.0.0.rc2 → 4.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1956d73c8269053e9a74ba3a9f35fbf3b74b30b
-  data.tar.gz: 787bec5bdcd306b76fb46df94f58117409302355
+  metadata.gz: 0070d7f98af428299d967d5cd906b45d026f1d02
+  data.tar.gz: 264a809d4f1f0c2ef7325ca490932976ce939e30
 SHA512:
-  metadata.gz: a0061edadf67e981245ecc5ba288edc601b93a581429920532329a41e866df8ce5f497dee81bdc90581997f25ee2763e11547dab8ae11e437ef33badc913639d
-  data.tar.gz: ac13a2b972abc5295374cde51df3413d38534b08cbd5acb636d7b16974c24db277c409ab5e8c38512b58fb630c92d0911f0f7d6fe9e82424113ac4c2cf624c1a
+  metadata.gz: bfd3b8af45d03f984512d544101a3c07193e45caf6d343f65795ad3b889641144a72c3ef25a2760ffb043d13bc5462943043bc0082657bac3a731e8c399aaab3
+  data.tar.gz: 68c6ad1b2aa8b0a483cd47c988d7add452cded1d2a901f8304d5b7fe39a7bb297be0d8d96ca7a066fc890123fc5f9442f8a8baf9725da1bdb2bdee4757830e64

data/CHANGES.txt

@@ -1,3 +1,7 @@
+=== 4.0.0.rc3
+
+ * parse `+` character in config files [Christoph Lupprich, #470, #314]
+
 === 4.0.0.rc2
 
  * Fixed OpenSSL 2.0/Ruby 2.4.0 warnings [Miklós Fazekas, #468]

data/lib/net/ssh/transport/algorithms.rb

@@ -211,24 +211,8 @@ module Net; module SSH; module Transport
       def prepare_preferred_algorithms!
         options[:compression] = %w(zlib@openssh.com zlib) if options[:compression] == true
 
-        ALGORITHMS.each do |algorithm, list|
-          algorithms[algorithm] = list.dup
-
-          # apply the preferred algorithm order, if any
-          if options[algorithm]
-            algorithms[algorithm] = Array(options[algorithm]).compact.uniq
-            unsupported = []
-            algorithms[algorithm].select! do |name|
-              supported = ALGORITHMS[algorithm].include?(name)
-              unsupported << name unless supported
-              supported
-            end
-            lwarn { "unsupported #{algorithm} algorithm: `#{unsupported}'" } unless unsupported.empty?
-
-            if options[:append_all_supported_algorithms]
-              list.each { |name| algorithms[algorithm] << name unless algorithms[algorithm].include?(name) }
-            end
-          end
+        ALGORITHMS.each do |algorithm, supported|
+          algorithms[algorithm] = compose_algorithm_list(supported, options[algorithm], options[:append_all_supported_algorithms])
         end
 
         # for convention, make sure our list has the same keys as the server
@@ -252,6 +236,38 @@ module Net; module SSH; module Transport
         end
       end
 
+      # Composes the list of algorithms by taking supported algorithms and matching with supplied options.
+      def compose_algorithm_list(supported, option, append_all_supported_algorithms = false)
+        return supported.dup unless option
+
+        list = []
+        option = Array(option).compact.uniq
+
+        if option.first && option.first.start_with?('+')
+          list = supported.dup
+          list << option.first[1..-1]
+          list.concat(option[1..-1])
+          list.uniq!
+        else
+          list = option
+
+          if append_all_supported_algorithms
+            supported.each { |name| list << name unless list.include?(name) }
+          end
+        end
+
+        unsupported = []
+        list.select! do |name|
+          is_supported = supported.include?(name)
+          unsupported << name unless is_supported
+          is_supported
+        end
+
+        lwarn { "unsupported #{algorithm} algorithm: `#{unsupported}'" } unless unsupported.empty?
+
+        list
+      end
+
       # Parses a KEXINIT packet from the server.
       def parse_server_algorithm_packet(packet)
         data = { raw: packet.content }

data/lib/net/ssh/version.rb

@@ -55,7 +55,7 @@ module Net; module SSH
 
     # The prerelease component of this version of the Net::SSH library
     # nil allowed
-    PRE   = "rc2"
+    PRE   = "rc3"
 
     # The current version of the Net::SSH library as a Version instance
     CURRENT = new(*[MAJOR, MINOR, TINY, PRE].compact)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: net-ssh
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc2
+  version: 4.0.0.rc3
 platform: ruby
 authors:
 - Jamis Buck
 - Delano Mandelbaum
 - Miklós Fazekas
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain:
 - |
@@ -32,115 +32,101 @@ cert_chain:
   L4d54WIy4HkZCqQXoTSiK5HZMIdXkPk3F1bZdJ8Dy1sMRru0rUkkM5mW7TQ75mfW
   Zp0QrZyNZhtitrXFbZneGRrIA/8G2Krft5Ly/A==
   -----END CERTIFICATE-----
-date: 2016-12-15 00:00:00.000000000 Z
+date: 2016-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rbnacl-libsodium
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.10
-  type: :development
+  name: rbnacl-libsodium
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.10
 - !ruby/object:Gem::Dependency
-  name: rbnacl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.4.0
-  type: :development
+  name: rbnacl
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.4.0
-- !ruby/object:Gem::Dependency
-  name: bcrypt_pbkdf
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
-  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
-  type: :development
+  name: bundler
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.0'
-  type: :development
+  name: rake
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.10'
-  type: :development
+  name: minitest
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.10'
 - !ruby/object:Gem::Dependency
-  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.46.0
-  type: :development
+  name: rubocop
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.46.0
 - !ruby/object:Gem::Dependency
-  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.1
-  type: :development
+  name: mocha
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -262,7 +248,7 @@ homepage: https://github.com/net-ssh/net-ssh
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -277,9 +263,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.6.8
+signing_key:
 specification_version: 4
 summary: 'Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.'
 test_files: []