ncs_navigator_authority 1.1.1 → 1.2.0

data/.rvmrc

@@ -1,3 +1,3 @@
-rvm ree-1.8.7-2011.03 
+rvm ruby-1.9.3-p194
 rvm_gemset_create_on_use_flag=1
 rvm gemset use ncs_navigator_authority

data/buildfile

@@ -2,6 +2,6 @@ require 'buildr/bnd'
 require 'buildr-gemjar'
 
 define 'ncs_navigator_authority_gems' do
-  project.version = '1.0.0'
-  package(:gemjar).with_gem(:file => _('ncs_navigator_authority-1.0.0.gem')).with_gem('jruby-openssl', '0.7.5')
+  project.version = '1.1.3'
+  package(:gemjar).with_gem(:file => _('ncs_navigator_authority-1.2.0.gem')).with_gem('jruby-openssl', '0.7.5')
 end

data/lib/ncs_navigator/authorization/core/authority.rb

@@ -1,16 +1,21 @@
 require 'ncs_navigator/configuration'
 module NcsNavigator::Authorization::Core
   class Authority
-    def initialize(config=nil)
-      @logger = config.try(:logger) || Logger.new(STDERR)
+    attr_reader :logger
+    attr_reader :staff_portal_uri
+    attr_reader :staff_portal_user
+    attr_reader :staff_portal_password
+
+    def initialize(options = {})
+      @logger = options[:logger] || Logger.new($stderr)
+      @staff_portal_uri = options[:staff_portal_uri] || NcsNavigator.configuration.staff_portal_uri
+      @staff_portal_user = options[:staff_portal_user] || "psc_application"
+      @staff_portal_password = options[:staff_portal_password] || NcsNavigator.configuration.staff_portal['psc_user_password']
+
       @groups = {}
       @portal = :NCSNavigator
     end
 
-    def logger
-      @logger
-    end
-
     def amplify!(user)
       base = user(user)
       return user unless base
@@ -61,10 +66,6 @@ module NcsNavigator::Authorization::Core
 
     private
 
-    def staff_portal_uri
-      NcsNavigator.configuration.staff_portal_uri
-    end
-
     def get_connection(user)
       connection = staff_portal_client(create_authenticator(user)).connection
     end
@@ -78,7 +79,7 @@ module NcsNavigator::Authorization::Core
     end
 
     def machine_authenticator
-      { :basic => ["psc_application", NcsNavigator.configuration.staff_portal['psc_user_password']] }
+      { :basic => [staff_portal_user, staff_portal_password] }
     end
 
     def load_group_memberships(portal, group_data)

data/lib/ncs_navigator/authorization/psc/authority.rb

@@ -3,7 +3,14 @@ require 'logger'
 module NcsNavigator::Authorization::Psc
   class Authority
     def initialize(ignored_config=nil)
-      @logger = Logger.new("#{Java::JavaLang::System.getProperty('catalina.base')}/logs/ncs_navigator_authority.log")
+      @logdir = Java::JavaLang::System.getProperty('catalina.base')
+
+      @logger = if !@logdir
+                  Logger.new($stderr).tap { |l| l.warn("catalina.base property not set; logging to standard error") }
+                else
+                  Logger.new("#{@logdir}/logs/ncs_navigator_authority.log")
+                end
+
       @staff_portal_connection ||= staff_portal_client.connection
     end
     

data/lib/ncs_navigator/authorization/staff_portal/connection.rb

@@ -1,12 +1,13 @@
 require 'faraday'
-require 'faraday_stack'
+require 'faraday_middleware'
+
 module NcsNavigator::Authorization::StaffPortal
   class Connection < ::Faraday::Connection
       def initialize(url, options)
         super do |builder|
           builder.use *authentication_middleware(options[:authenticator])
           builder.request :json
-          builder.use FaradayStack::ResponseJSON, :content_type => 'application/json'
+          builder.use FaradayMiddleware::ParseJson, :content_type => 'application/json'
           builder.adapter :net_http
         end
       end
@@ -30,4 +31,4 @@ module NcsNavigator::Authorization::StaffPortal
         end
       end
     end
-end
+end

data/lib/ncs_navigator/authorization/staff_portal/http_basic.rb

@@ -4,7 +4,7 @@ module NcsNavigator::Authorization::StaffPortal
   class HttpBasic
     def initialize(app, username, password)
       @app = app
-      @header_value = "Basic #{Base64.encode64([username, password].join(':')).strip}"
+      @header_value = "Basic #{Base64.strict_encode64([username, password].join(':')).strip}"
     end
 
     def call(env)

data/lib/ncs_navigator/authorization/version.rb

@@ -1,5 +1,5 @@
 module NcsNavigator
   module Authorization
-    VERSION = '1.1.1'
+    VERSION = '1.2.0'
   end
 end

data/ncs_navigator_authority.gemspec

@@ -21,12 +21,13 @@ Gem::Specification.new do |s|
   s.add_dependency 'ncs_navigator_configuration', '~> 0.2'
   s.add_dependency 'aker', '~> 3.0'
   s.add_dependency 'faraday', '~> 0.7.5'
-  s.add_dependency 'faraday-stack', '~> 0.1.3'
+  s.add_dependency 'faraday_middleware'
   
   s.add_development_dependency 'rspec', '~> 2.6'
   s.add_development_dependency 'rake', '~> 0.9.2'
-  s.add_development_dependency 'vcr'
+  s.add_development_dependency 'vcr', '~> 1.0'
   s.add_development_dependency 'fakeweb'
+  s.add_development_dependency 'ci_reporter'
 
   # specify any dependencies here; for example:
   # s.add_development_dependency "rspec"

data/spec/ncs_navigator/authorization/core/authority_spec.rb

@@ -1,15 +1,29 @@
 require 'spec_helper'
 require 'aker'
 require 'vcr'
-require 'faraday'
-require 'faraday_stack'
-describe NcsNavigator::Authorization::Core::Authority do
 
+describe NcsNavigator::Authorization::Core::Authority do
   before do
     @ncs_navigator_authority = NcsNavigator::Authorization::Core::Authority.new
     @user = mock(:username => "lee", :cas_proxy_ticket => "PT-cas-ticket")
   end
 
+  describe '.initialize' do
+    it 'accepts a Staff Portal URI' do
+      a = NcsNavigator::Authorization::Core::Authority.new(:staff_portal_uri => URI('https://navops.example.edu'))
+
+      a.staff_portal_uri.should == URI('https://navops.example.edu')
+    end
+
+    it 'accepts Staff Portal credentials' do
+      a = NcsNavigator::Authorization::Core::Authority.new(:staff_portal_user => 'user',
+                                                           :staff_portal_password => 'foobar')
+
+      a.staff_portal_user.should == 'user'
+      a.staff_portal_password.should == 'foobar'
+    end
+  end
+
   describe "user" do
     before do
       VCR.use_cassette('staff_portal/core/user') do
@@ -63,8 +77,7 @@ describe NcsNavigator::Authorization::Core::Authority do
 
     it "should use the configured logger if given" do
       logger = Logger.new("dummyfile.log")
-      auth = NcsNavigator::Authorization::Core::Authority.new(
-        mock(Aker::Configuration, :logger => logger))
+      auth = NcsNavigator::Authorization::Core::Authority.new(:logger => logger)
       auth.logger.should == logger
     end
 

data/spec/ncs_navigator/authorization/psc/authority_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 require 'aker'
 require 'vcr'
-require 'faraday'
-require 'faraday_stack'
 
 describe NcsNavigator::Authorization::Psc::Authority do
   before do
+    pending "These must be run in a Java Ruby environment" unless RUBY_PLATFORM =~ /java/
+
     @psc_authority = NcsNavigator::Authorization::Psc::Authority.new
   end
 
@@ -296,4 +296,4 @@ describe NcsNavigator::Authorization::Psc::Authority do
     end
 
   end
-end
+end

data/spec/ncs_navigator/authorization/staff_portal/http_basic_spec.rb

@@ -7,11 +7,20 @@ describe NcsNavigator::Authorization::StaffPortal::HttpBasic do
   
   before { app.stub!(:call) }
   describe "token" do
-    subject { NcsNavigator::Authorization::StaffPortal::HttpBasic.new(app, 'user', 'pwd') }
-    
-    it 'adds the appropriate Authorization header' do
-      subject.call(env)
-      headers['Authorization'].should == 'Basic dXNlcjpwd2Q='
+    describe "for shoter passwrod" do
+      subject { NcsNavigator::Authorization::StaffPortal::HttpBasic.new(app, 'user', 'pwd') }
+      it 'adds the appropriate Authorization header' do
+        subject.call(env)
+        headers['Authorization'].should == 'Basic dXNlcjpwd2Q='
+      end
+    end
+
+    describe "for longer passwrod" do
+      subject { NcsNavigator::Authorization::StaffPortal::HttpBasic.new(app, 'user', 'a' * 46) }
+      it 'adds the appropriate Authorization header' do
+        subject.call(env)
+        headers['Authorization'].should == 'Basic dXNlcjphYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFh'
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -12,7 +12,8 @@ require 'ncs_navigator/authorization/staff_portal/client'
 require 'ncs_navigator/authorization/staff_portal/connection'
 require 'ncs_navigator/authorization/staff_portal/http_basic'
 
-require 'spec/support/vcr_setup.rb'
+require File.expand_path('../support/vcr_setup', __FILE__)
+
 RSpec.configure do |config|
 # config.fixture_path = "/spec/fixtures"
-end
+end

metadata

@@ -1,154 +1,169 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ncs_navigator_authority
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 1.2.0
   prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 1
-  version: 1.1.1
 platform: ruby
-authors: 
+authors:
 - Jalpa Patel
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-11-26 00:00:00 -06:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-04-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ncs_navigator_configuration
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 2
-        version: "0.2"
+      - !ruby/object:Gem::Version
+        version: '0.2'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: aker
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: aker
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: faraday
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 0
-        - 7
-        - 5
+      - !ruby/object:Gem::Version
         version: 0.7.5
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: faraday-stack
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 0
-        - 1
-        - 3
-        version: 0.1.3
+      - !ruby/object:Gem::Version
+        version: 0.7.5
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 6
-        version: "2.6"
+      - !ruby/object:Gem::Version
+        version: '2.6'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: vcr
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
   name: fakeweb
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ci_reporter
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-description: This is a shared library which consume Staff Portal's authorization API and provides group membership information for the NcsNavigator portal and role authorization mapping for PSC.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: This is a shared library which consume Staff Portal's authorization API
+  and provides group membership information for the NcsNavigator portal and role authorization
+  mapping for PSC.
+email:
 - jalpa-patel@northwestern.edu
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rvmrc
 - Gemfile
@@ -195,41 +210,31 @@ files:
 - spec/ncs_navigator/authorization/staff_portal/http_basic_spec.rb
 - spec/spec_helper.rb
 - spec/support/vcr_setup.rb
-has_rdoc: true
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: ncs_navigator_authority
-rubygems_version: 1.5.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Authorization module for NCS Navigator
-test_files: 
+test_files:
 - spec/fixtures/.DS_Store
 - spec/fixtures/vcr_cassettes/staff_portal/core/unknown_user.yml
 - spec/fixtures/vcr_cassettes/staff_portal/core/user.yml