conjur-cli 5.6.4 → 5.6.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 1f8b622320f010ccc24a307ded9146bd7856f7c0
4
- data.tar.gz: 4d4bc63522bff544432931780925a31e9e0b8e19
3
+ metadata.gz: d830fcde4d635f03a1d61e9e5b704a823bf22d6c
4
+ data.tar.gz: 40a9d5682c992ced7a4a6e1e1d6759079bffd8a5
5
5
  SHA512:
6
- metadata.gz: 4684b54823fa3b59154ad8bb76d96b89a721e60e8dcb32572475c77e6114887e1fdc8d8180cf664a637e54d59bb7f7bee6d4a01aaa2cbe08a7b8b9524abcfaee
7
- data.tar.gz: b70c5ba938ef59b5f08e174735fd4de3e7f3cc3eae52eee0e0026d15579a7d7aa9ce2e7d975451a50bb36392565ff6b71c07f5aba0b3467868a33b9140d40ae2
6
+ metadata.gz: deada212f945a318918bad614874f4ac5b851abde130626177541b4415318a4ab7fe0caaf73406bec1723d2283e49caf07322344311161194089a37866df2fa9
7
+ data.tar.gz: dbc670b14e09246918d64fc7481328e8ac47bc1cbbddb05acc634b16bb3d0969b684d806465b87486c6c396c4047b15757bccae508f184cb49dc18c6625d7101
data/CHANGELOG.md CHANGED
@@ -1,3 +1,7 @@
1
+ # 5.6.5
2
+
3
+ * Fix init cert check when Conjur behind a SNI
4
+
1
5
  # 5.6.4
2
6
 
3
7
  * Allow activesupport 5 as a dependency.
data/ci/package.sh CHANGED
@@ -9,9 +9,7 @@ rake build
9
9
 
10
10
  gem install --no-ri --no-rdoc --install-dir /tmp/gems pkg/*.gem
11
11
 
12
- ITERATION=$(date +%s)
13
-
14
12
  find /tmp/gems/cache -name '*.gem' | xargs -rn1 \
15
- fpm --prefix $(gem environment gemdir) --iteration $ITERATION -s gem -t deb
13
+ fpm --prefix $(gem environment gemdir) -s gem -t deb
16
14
 
17
15
  cp -a *.deb /share
data/ci/publish.sh CHANGED
@@ -26,10 +26,10 @@ for package in *.deb; do
26
26
  -v $PWD/tmp/deb:/src \
27
27
  conjur-cli-publish \
28
28
  upload \
29
- --url https://conjurinc.artifactoryonline.com/conjurinc \
29
+ --url https://conjurinc.jfrog.io/conjurinc \
30
30
  --user $ART_USERNAME \
31
31
  --password $ART_PASSWORD \
32
32
  --deb "$distribution"/"$component"/amd64 \
33
33
  $package \
34
- debian-local
34
+ debian-private/
35
35
  done
@@ -140,6 +140,7 @@ class Conjur::Command::Init < Conjur::Command
140
140
 
141
141
  sock = TCPSocket.new host, port.to_i
142
142
  ssock = SSLSocket.new sock
143
+ ssock.hostname = host
143
144
  ssock.connect
144
145
  chain = ssock.peer_cert_chain
145
146
  cert = chain.first
@@ -19,6 +19,6 @@
19
19
  # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
20
20
  #
21
21
  module Conjur
22
- VERSION = '5.6.4'.freeze
22
+ VERSION = '5.6.5'.freeze
23
23
  ::Version=VERSION
24
24
  end
@@ -5,9 +5,6 @@ describe Conjur::Command::Assets, logged_in: true do
5
5
  let(:asset) { double(attributes: asset_attributes ) }
6
6
  let(:asset_attributes) { {"some"=>"attributes" } }
7
7
  before(:each) { allow(api).to receive(KIND.to_sym).and_return(asset) }
8
- def invoke_silently
9
- expect { invoke }.to write
10
- end
11
8
 
12
9
  context "asset:create" do
13
10
  before(:each) {
@@ -13,10 +13,6 @@ describe Conjur::Command::Audit, logged_in: true do
13
13
  invoke
14
14
  end
15
15
 
16
- def invoke_silently
17
- silence_stderr { invoke }
18
- end
19
-
20
16
  def self.describe_command_success cmd, method, *expected_args, &block
21
17
  describe_command cmd do
22
18
  it "calls api.#{method}(#{expected_args.map(&:inspect).join(',')})" do
@@ -11,10 +11,6 @@ describe Conjur::Command::Resources, logged_in: true do
11
11
  allow(api).to receive(:resource).with(full_resource_id).and_return(resource_instance)
12
12
  end
13
13
 
14
- def invoke_silently
15
- expect { invoke }.to write
16
- end
17
-
18
14
  shared_examples 'it displays resource attributes' do
19
15
  it "as JSON to stdout" do
20
16
  expect(JSON::parse( expect { invoke }.to write )).to eq(resource_attributes)
@@ -2,16 +2,6 @@ require 'spec_helper'
2
2
  require 'conjur/command/variables'
3
3
 
4
4
  describe Conjur::Command::Variables, :logged_in => true do
5
- def invoke_silently
6
- real_stderr = $stderr
7
- $stderr = StringIO.new
8
- begin
9
- invoke
10
- ensure
11
- $stderr = real_stderr
12
- end
13
- end
14
-
15
5
  let (:variable) { double(:name => 'foo') }
16
6
  let (:incompatible_server_msg) { /not supported/ }
17
7
 
data/spec/spec_helper.rb CHANGED
@@ -47,6 +47,10 @@ shared_context "fresh config" do
47
47
  }
48
48
  end
49
49
 
50
+ def invoke_silently
51
+ STDERR.grab { return invoke }
52
+ end
53
+
50
54
  RSpec::Core::DSL.change_global_dsl do
51
55
  def describe_conjurize *argv, &block
52
56
  describe *argv do
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: conjur-cli
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.6.4
4
+ version: 5.6.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Rafal Rzepecki
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2017-10-23 00:00:00.000000000 Z
12
+ date: 2018-03-08 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: activesupport
@@ -534,7 +534,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
534
534
  version: '0'
535
535
  requirements: []
536
536
  rubyforge_project:
537
- rubygems_version: 2.6.14
537
+ rubygems_version: 2.5.2.1
538
538
  signing_key:
539
539
  specification_version: 4
540
540
  summary: Conjur command line interface