cf-uaac 2.0.3 → 3.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ac80747a5648fea9abc3e07787564eeadff44248
+  data.tar.gz: cc69ad42a01ec016cd07509772bf770155d844b0
+SHA512:
+  metadata.gz: b1b30fb6191e498d26d8a8db083ec244f72b4529360b6179b7f988e5d02484ac9fa7f89d393603df16940a6ba7fe5e0a83fecc4fb6311cffe7b652e1a4769a40
+  data.tar.gz: a55e1a8ca96dbfb6a750ae90717d0178071547604a9afbd63160dcf0ce5033e7eb6b5ab6816c6b756095cbc174daa6456ed0b6f578c6e1d80b42b9a1dc4c915f

data/cf-uaac.gemspec

@@ -34,16 +34,16 @@ Gem::Specification.new do |s|
 
   # dependencies
   s.add_development_dependency "bundler"
-  s.add_development_dependency "rake"
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "simplecov"
-  s.add_development_dependency "simplecov-rcov"
+  s.add_development_dependency "rake", "~> 10.3.1"
+  s.add_development_dependency "rspec", "~> 2.14.1"
+  s.add_development_dependency "simplecov", "~> 0.8.2"
+  s.add_development_dependency "simplecov-rcov", "~> 0.2.3"
   s.add_development_dependency "ci_reporter", "~> 1.9.2"
-  s.add_runtime_dependency "cf-uaa-lib", "~> 2.0.0"
-  s.add_runtime_dependency "highline"
-  s.add_runtime_dependency "eventmachine"
-  s.add_runtime_dependency "launchy"
-  s.add_runtime_dependency "em-http-request", ">= 1.0.0.beta.3"
-  s.add_runtime_dependency "json_pure"
-  s.add_runtime_dependency "rack"
+  s.add_runtime_dependency "cf-uaa-lib", "~> 3.0.0"
+  s.add_runtime_dependency "highline", "~> 1.6.21"
+  s.add_runtime_dependency "eventmachine", "~> 1.0.3"
+  s.add_runtime_dependency "launchy", "~> 2.4.2"
+  s.add_runtime_dependency "em-http-request", "~> 1.1.2"
+  s.add_runtime_dependency "json_pure", "~> 1.8.1"
+  s.add_runtime_dependency "rack", "~> 1.5.2"
 end

data/lib/cli/common.rb

@@ -67,7 +67,7 @@ class CommonCli < Topic
   end
 
   def scim_request
-    yield Scim.new(Config.target, auth_header)
+    yield Scim.new(Config.target, auth_header, { skip_ssl_validation: Config.target_value(:skip_ssl_validation) })
   rescue Exception => e
     complain e
   end
@@ -135,30 +135,32 @@ class MiscCli < CommonCli
     url.to_s.to_sym
   end
 
-  def bad_uaa_url(url, info)
-    info.replace(@cli_class.uaa_info_client(url.to_s).server)
+  def bad_uaa_url(url, info, skip_ssl_validation = false)
+    info.replace(@cli_class.uaa_info_client(url.to_s, skip_ssl_validation).server)
     nil
   rescue Exception => e
     "failed to access #{url}: #{e.message}"
   end
 
+  define_option :skip_ssl_validation, "--skip-ssl-validation", "do not attempt to validate ssl certificate"
   define_option :force, "--[no-]force", "-f", "set even if target does not respond"
-  desc "target [uaa_url]", "Display current or set new target", :force do |uaa_url|
+  desc "target [uaa_url]", "Display current or set new target", :force, :skip_ssl_validation do |uaa_url|
     msg, info = nil, {}
     if uaa_url
       if uaa_url.to_i.to_s == uaa_url
         return gripe "invalid target index" unless url = Config.target?(uaa_url.to_i)
       elsif url = normalize_url(uaa_url)
-        return gripe msg if (msg = bad_uaa_url(url, info)) unless opts[:force] || Config.target?(url)
+        return gripe msg if (msg = bad_uaa_url(url, info, opts[:skip_ssl_validation])) unless opts[:force] || Config.target?(url)
       elsif !Config.target?(url = normalize_url(uaa_url, "https")) &&
             !Config.target?(url = normalize_url(uaa_url, "http"))
         if opts[:force]
           url = normalize_url(uaa_url, "https")
-        elsif bad_uaa_url((url = normalize_url(uaa_url, "https")), info)
-          return gripe msg if msg = bad_uaa_url((url = normalize_url(uaa_url, "http")), info)
+        else
+          return gripe msg if msg = bad_uaa_url((url = normalize_url(uaa_url, "https")), info, opts[:skip_ssl_validation])
         end
       end
       Config.target = url # we now have a canonical url set to https if possible
+      Config.target_opts(skip_ssl_validation: true) if opts[:skip_ssl_validation]
       update_target_info(info) if info[:prompts]
     end
     return say "no target set" unless Config.target

data/lib/cli/runner.rb

@@ -50,8 +50,9 @@ class Cli < BaseCli
     @uaa_logger = Util.default_logger(opts[:trace]? :trace: opts[:debug]? :debug: :warn, @output)
   end
 
-  def self.uaa_info_client(url = Config.target)
-    client = Info.new(url)
+  def self.uaa_info_client(url = Config.target, skip_ssl_validation = false)
+    skip_ssl_validation = Config.config[url][:skip_ssl_validation] if Config.config[url]
+    client = Info.new(url, { skip_ssl_validation: skip_ssl_validation })
     client.logger = @uaa_logger
     client
   end

data/lib/cli/token.rb

@@ -24,7 +24,8 @@ class TokenCatcher < Stub::Base
     server.logger.debug "processing grant for path #{request.path}"
     secret = server.info.delete(:client_secret)
     ti = TokenIssuer.new(Config.target, server.info.delete(:client_id), secret,
-        token_target: Config.target_value(:token_target))
+        { token_target: Config.target_value(:token_target),
+          skip_ssl_validation: Config.target_value(:skip_ssl_validation) })
     tkn = secret ? ti.authcode_grant(server.info.delete(:uri), data) :
         ti.implicit_grant(server.info.delete(:uri), data)
     server.info.update(token_info: tkn.info)
@@ -86,7 +87,8 @@ class TokenCli < CommonCli
   def issuer_request(client_id, secret = nil)
     update_target_info
     yield TokenIssuer.new(Config.target.to_s, client_id, secret,
-        token_target: Config.target_value(:token_endpoint))
+        { token_target: Config.target_value(:token_endpoint),
+          skip_ssl_validation: Config.target_value(:skip_ssl_validation) })
   rescue Exception => e
     complain e
   end

data/lib/cli/version.rb

@@ -14,6 +14,6 @@
 # Cloud Foundry namespace
 module CF
   module UAA
-    CLI_VERSION = "2.0.3"
+    CLI_VERSION = "3.0.0"
   end
 end

data/spec/common_spec.rb

@@ -21,9 +21,9 @@ describe CommonCli do
 
   include SpecHelper
 
-  before :each do 
-    Util.default_logger(:trace)
-    Cli.configure("", nil, StringIO.new, true) 
+  before :each do
+    # Util.default_logger(:trace)
+    Cli.configure("", nil, StringIO.new, true)
   end
 
   ["-v", "version", "--version"].each do |opt|
@@ -83,7 +83,18 @@ describe CommonCli do
     Config.yaml.should_not include "foo\.bar"
   end
 
-end
+  it "does not attempt to validate ssl certificate" do
+    Cli.run("target --force --skip-ssl-validation https://example.com")
+    Cli.output.string.should include "https://example.com"
+    Config.yaml.should include "skip_ssl_validation: true"
+  end
 
+  it "only attempts http if scheme is http" do
+    Cli.run("target http://example.com")
+    puts Cli.output.string
+    Cli.output.string.should_not include "https"
+  end
+
+end
 end
 

data/spec/info_spec.rb

@@ -61,13 +61,13 @@ describe InfoCli do
 
   it "sets multiple targets to be fully qualified in config and targets output" do
     Config.load("")
-    Cli.run("target example.com --force")
+    Cli.run("target example1.com --force")
     Cli.run("target example2.com --force")
-    uri = URI.parse(@target)
-    Cli.run("target #{uri.host}:#{uri.port}#{uri.path}")
+    Cli.run("target example.com")
+    Cli.output.string.should_not include "http://example.com"
     Cli.run("targets").should be
-    Config.yaml.should include "https://example.com", "https://example2.com", @target
-    Cli.output.string.should include "https://example.com", "https://example2.com", @target
+    Config.yaml.should include "https://example1.com", "https://example2.com"
+    Cli.output.string.should include "https://example1.com", "https://example2.com"
   end
 
 end

data/spec/ssl_integration_spec.rb

@@ -0,0 +1,69 @@
+# Cloud Foundry
+# Copyright (c) [2009-2014] Pivotal Software, Inc. All Rights Reserved.
+#
+# This product is licensed to you under the Apache License, Version 2.0 (the "License").
+# You may not use this product except in compliance with the License.
+#
+# This product includes a number of subcomponents with
+# separate copyright notices and license terms. Your use of these
+# subcomponents is subject to the terms and conditions of the
+# subcomponent's license, as noted in the LICENSE file.
+
+require 'spec_helper'
+require 'fiber'
+require 'em-http'
+require 'cli'
+require 'stub/server'
+
+module CF::UAA
+
+  if ENV["UAA_CLIENT_TARGET"] && ENV["UAA_CLIENT_TARGET"].start_with?("https")
+
+    class StubHttp < Stub::Base
+      route(:get, '/') { reply_in_kind "welcome to stub http, version #{CLI_VERSION}" }
+    end
+
+    describe "cf-uaa-lib integration" do
+
+      include SpecHelper
+
+      before :all do
+        @url = URI.parse(ENV["UAA_CLIENT_TARGET"])
+        Cli.configure("", nil, StringIO.new, true)
+      end
+
+      before :each do
+        Config.load("")
+      end
+
+      describe 'targetting a https URL' do
+        it "fails ssl validation without a certificate via HTTPS unless skipped" do
+          Cli.run("target #{ENV["UAA_CLIENT_TARGET"]}")
+          Cli.output.string.should include "Invalid SSL Cert"
+        end
+
+        it "skips ssl validation with a flag" do
+          Cli.run("target #{ENV["UAA_CLIENT_TARGET"]} --skip-ssl-validation")
+          Cli.output.string.should_not include "Invalid SSL Cert"
+        end
+      end
+
+      describe 'targeting a URL without specifying the scheme' do
+        it "uses HTTPS if --skip-ssl-validation is true" do
+          Cli.run("target #{@url.host}:#{@url.port}/#{@url.path} --skip-ssl-validation")
+          Cli.output.string.should include "https"
+          Cli.output.string.should_not include "Invalid SSL Cert"
+        end
+      end
+
+      describe 'using other commands after skipping ssl validation' do
+        it "does not raise SSLException for the same target" do
+          Cli.run("target #{ENV["UAA_CLIENT_TARGET"]} --skip-ssl-validation")
+          Cli.run("token client get foo -s bar")
+          Cli.output.string.should_not include "Invalid SSL Cert"
+        end
+      end
+    end
+
+  end
+end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf-uaac
 version: !ruby/object:Gem::Version
-  version: 2.0.3
-  prerelease: 
+  version: 3.0.0
 platform: ruby
 authors:
 - Dave Syer
@@ -13,216 +12,190 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
+date: 2014-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.3.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.2
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.9.2
 - !ruby/object:Gem::Dependency
   name: cf-uaa-lib
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.21
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.2
 - !ruby/object:Gem::Dependency
   name: em-http-request
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.3
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.3
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.2
 description: Client command line tools for interacting with the CloudFoundry User
   Account and Authorization (UAA) server.  The UAA is an OAuth2 Authorization Server
   so it can be used by webapps and command line apps to obtain access tokens to act
@@ -243,9 +216,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".travis.yml"
+- ".yardopts"
 - Gemfile
 - LICENSE.TXT
 - NOTICE.TXT
@@ -280,32 +253,32 @@ files:
 - spec/info_spec.rb
 - spec/setup_helper.rb
 - spec/spec_helper.rb
+- spec/ssl_integration_spec.rb
 - spec/token_spec.rb
 - spec/user_spec.rb
 homepage: https://github.com/cloudfoundry/cf-uaac
 licenses:
 - Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: cf-uaac
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Command line interface for CloudFoundry UAA
 test_files:
 - spec/client_reg_spec.rb
@@ -316,5 +289,6 @@ test_files:
 - spec/info_spec.rb
 - spec/setup_helper.rb
 - spec/spec_helper.rb
+- spec/ssl_integration_spec.rb
 - spec/token_spec.rb
 - spec/user_spec.rb