18 Commits

Author SHA1 Message Date
Norm MacLennan
a98319aebe version 2016-04-15 07:01:46 -04:00
Norm MacLennan
7c154f5bc8 Merge pull request #20 from Cimpress-MCP/get_fieldlabel_value
Get fieldlabel value
2016-04-14 13:46:32 -04:00
Calvin Leung Huang
9fc219d98a Remove extra newline 2016-04-14 13:37:38 -04:00
Calvin Leung Huang
561a523261 Set and use fieldlabel value in zanzibar_options instead 2016-04-14 13:29:43 -04:00
Calvin Leung Huang
ca55a4de57 Set fieldlabel default to Password 2016-04-14 11:30:55 -04:00
Calvin Leung Huang
0da43c9fd3 Uncomment spec test 2016-04-13 14:59:05 -04:00
Calvin Leung Huang
ddb2931f6c Fix case on download_secret_file 2016-04-13 14:55:43 -04:00
Calvin Leung Huang
7cec3f7461 Add spec test 2016-04-13 14:51:43 -04:00
Calvin Leung Huang
7f357ef60d Add get_fieldlabel_value 2016-04-13 14:38:21 -04:00
Norm MacLennan
64d2b7101a version bump 2015-12-02 08:49:05 -05:00
Norm MacLennan
01a1be8084 Merge pull request #18 from ballou88/bump-savon-for-rails-compat
Bumped savon gem version to fix depencency issue with rails 4.2+
2015-12-02 08:48:37 -05:00
Mike Ballou
378dd0e39d Bumped savon gem version to fix depencency issue with rails 4.2+ 2015-12-01 10:45:03 -08:00
Norm MacLennan
20c5d0e34d bump version 2015-11-20 08:55:43 -05:00
Norm MacLennan
b7558d64f5 Merge pull request #17 from ballou88/fix-for-broken-prompt-for-password
Fix for prompt_for_password
2015-11-20 08:54:56 -05:00
Mike Ballou
293abdacde this is a fix for commit 813b171d26 which
broke the prompt_for_password method and resulted a nil password.
2015-11-19 10:55:42 -08:00
Jason Davis-Cooke
804d044632 Merge pull request #16 from Cimpress-MCP/print-feedback
Print response to indicate when cli is no longer interactive
2015-10-12 08:48:30 -04:00
Theodore X. Pak
813b171d26 Print response to indicate when cli is no longer interactive 2015-10-07 16:04:56 -04:00
Norm MacLennan
7a0ce1c04d Build and test on more rubies
Build and test on 1.9.x, 2.0.x, 2.1.x, 2.2.x. I'd be comfortable-ish dropping 1.9.x and 2.0.x, but it's low effort/high value to just keep them there.

Also, build on containers for speed.
2015-09-18 12:42:39 -04:00
7 changed files with 37 additions and 14 deletions

View File

@@ -1,7 +1,10 @@
sudo: false
language: ruby
rvm:
- 1.9.3
- 2.0.0
- 2.1.7
- 2.2.3
addons:
code_climate:
repo_token:

View File

@@ -66,7 +66,9 @@ module Zanzibar
def prompt_for_password
puts "Please enter password for #{@@username}:"
STDIN.noecho(&:gets).chomp
STDIN.noecho(&:gets).chomp.tap do
puts "Using password to login..."
end
end
## Gets the wsdl document location if none is provided in the constructor
@@ -111,17 +113,25 @@ module Zanzibar
raise "There was an error getting the secret with id #{scrt_id}: #{err}"
end
## Retrieve a simple password from a secret
## Retrieve the value from a field label of a secret
# Will raise an error if there are any issues
# @param [Integer] the secret id
# @return [String] the password for the given secret
def get_password(scrt_id)
# @param [String] the field label to get, defaults to Password
# @return [String] the value for the given field label
def get_fieldlabel_value(scrt_id, fieldlabel = 'Password')
secret = get_secret(scrt_id)
secret_items = secret[:secret][:items][:secret_item]
return get_secret_item_by_field_name(secret_items, 'Password')[:value]
return get_secret_item_by_field_name(secret_items, fieldlabel)[:value]
rescue Savon::Error => err
raise "There was an error getting the password for secret #{scrt_id}: #{err}"
raise "There was an error getting '#{fieldlabel}' for secret #{scrt_id}: #{err}"
end
## Retrieve a simple password from a secret
# Calls get get_fieldlabel_value()
# @param [Integer] the secret id
# @return [String] the password for the given secret
def get_password(scrt_id)
return get_fieldlabel_value(scrt_id)
end
## Get the password, save it to a file, and return the path to the file.

View File

@@ -20,18 +20,19 @@ module Zanzibar
construct_options
ensure_options
fetch_secret(@scrt_id, options['filelabel'])
fetch_secret(@scrt_id)
end
def fetch_secret(scrt_id, label = nil)
def fetch_secret(scrt_id)
scrt = ::Zanzibar::Zanzibar.new(@zanzibar_options)
if label
if @zanzibar_options[:filelabel]
scrt.download_secret_file(scrt_id: scrt_id,
type: label)
type: @zanzibar_options[:filelabel])
else
scrt.get_password(scrt_id)
scrt.get_fieldlabel_value(scrt_id, @zanzibar_options[:fieldlabel])
end
end
def construct_options
@@ -40,6 +41,8 @@ module Zanzibar
@zanzibar_options[:domain] = options['domain']
@zanzibar_options[:username] = options['username'] unless options['username'].nil?
@zanzibar_options[:domain] = options['domain'] ? options['domain'] : 'local'
@zanzibar_options[:fieldlabel] = options['fieldlabel'] || 'Password'
@zanzibar_options[:filelabel] = options['filelabel'] if options['filelabel']
end
def construct_wsdl

View File

@@ -76,6 +76,8 @@ module Zanzibar
desc: 'Don\'t verify Secret Server\'s SSL certificate'
option 'filelabel', type: :string, aliases: :f,
desc: 'Specify a file (by label) to download'
option 'fieldlabel', type: :string, aliases: :l,
desc: 'Specify a field (by label) to get'
option 'username', type: :string, aliases: :u
option 'password', type: :string, aliases: :p
def get(scrt_id)

View File

@@ -1,4 +1,4 @@
# The version of the gem
module Zanzibar
VERSION = '0.1.21'
VERSION = '0.1.27'
end

View File

@@ -47,6 +47,11 @@ describe Zanzibar::Cli do
expect { subject.get(1234) }.to raise_error.with_message(/#{Zanzibar::NO_WSDL_ERROR}/)
end
it 'should be able to get a field value' do
subject.options = { 'domain' => 'zanzitest.net', 'wsdl' => 'scrt.wsdl', 'fieldlabel' => 'Username' }
expect { subject.get(1234) }.to output(/ZanziUser/).to_stdout
end
it 'should be able to download files' do
WebMock.reset!
stub_request(:any, 'https://www.zanzitest.net/webservices/sswebservice.asmx')

View File

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
spec.add_development_dependency 'fakefs', '~> 0.6.4'
spec.add_development_dependency 'simplecov', '~> 0.9.1'
spec.add_runtime_dependency 'savon', '~> 2.8.0'
spec.add_runtime_dependency 'savon', '~> 2.10.0'
spec.add_runtime_dependency 'rubyntlm', '~> 0.4.0'
spec.add_runtime_dependency 'thor', '~> 0.19.0'
end