openid_connect 0.0.13 → 0.0.14

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    openid_connect (0.0.12)
+    openid_connect (0.0.13)
       activemodel (>= 3)
       attr_required (>= 0.0.3)
       json (>= 1.4.3)
@@ -70,7 +70,7 @@ GEM
     validate_url (0.2.0)
       activemodel (>= 3.0.0)
     webmock (1.7.4)
-      addressable (~> 2.2, > 2.2.5)
+      addressable (> 2.2.5, ~> 2.2)
       crack (>= 0.1.7)
 
 PLATFORMS

data/VERSION

@@ -1 +1 @@
-0.0.13
+0.0.14

data/lib/openid_connect/discovery/principal.rb

@@ -5,8 +5,8 @@ module OpenIDConnect
     class Principal
       attr_reader :identifier, :host
 
-      def initialize(identifier)
-        raise InvalidIdentifier if identifier.blank?
+      def self.parse(identifier)
+        raise InvalidIdentifier.new('Identifier Required') if identifier.blank?
         type = case identifier
         when /^(=|@|!)/
           XRI
@@ -15,15 +15,13 @@ module OpenIDConnect
         else
           URI
         end
-        principal = type.new identifier
-        @identifier = principal.identifier
-        @host = principal.host
+        type.new identifier
       end
 
       def discover!
         SWD.discover!(
           :principal => identifier,
-          :service => 'http://openid.net/specs/connect/1.0/issuer',
+          :service => Provider::SERVICE_URI,
           :host => host
         )
       rescue SWD::Exception => e

data/lib/openid_connect/discovery/principal/uri.rb

@@ -11,13 +11,12 @@ module OpenIDConnect
         private
 
         def normalize(identifier)
+          identifier = "https://#{identifier}" unless identifier.include?('://')
           uri = ::URI.parse(identifier)
-          if uri.host.blank?
-            uri.host, uri.path = uri.path.split('/', 2)
-            uri.path = File.join('/', uri.path)
-          end
-          uri.scheme ||= 'https'
+          uri.fragment = nil
           uri
+        rescue ::URI::Error => e
+          raise InvalidIdentifier.new('Invalid URI')
         end
       end
     end

data/lib/openid_connect/discovery/principal/xri.rb

@@ -5,6 +5,10 @@ module OpenIDConnect
         def initialize(identifier)
           @identifier = identifier
         end
+
+        def discover!
+          raise NotImplementedError.new('XRI is not supported yet')
+        end
       end
     end
   end

data/lib/openid_connect/discovery/provider.rb

@@ -1,8 +1,10 @@
 module OpenIDConnect
   module Discovery
     module Provider
+      SERVICE_URI = 'http://openid.net/specs/connect/1.0/issuer'
+
       def self.discover!(identifier)
-        Principal.new(identifier).discover!
+        Principal.parse(identifier).discover!
       end
     end
   end

data/spec/mock_response/discovery/swd.json

@@ -0,0 +1,3 @@
+{
+  "locations": ["https://server.example.com/authorize"]
+}

data/spec/openid_connect/discovery/principal/uri_spec.rb

@@ -1,5 +1,43 @@
 require 'spec_helper'
 
 describe OpenIDConnect::Discovery::Principal::URI do
-  it :TODO
+  subject { uri }
+  let(:uri) { OpenIDConnect::Discovery::Principal::URI.new identifier }
+
+  {
+    'server.example.com' => 'https://server.example.com',
+    'server.example.com/' => 'https://server.example.com/',
+    'server.example.com/nov' => 'https://server.example.com/nov',
+    'server.example.com/nov/' => 'https://server.example.com/nov/',
+    'server.example.com/nov#id' => 'https://server.example.com/nov',
+    'server.example.com/nov?k=v' => 'https://server.example.com/nov?k=v',
+    'server.example.com/nov?k=v#id' => 'https://server.example.com/nov?k=v',
+    'http://server.example.com' => 'http://server.example.com',
+    'http://server.example.com/' => 'http://server.example.com/',
+    'http://server.example.com/nov' => 'http://server.example.com/nov',
+    'http://server.example.com/nov/' => 'http://server.example.com/nov/',
+    'http://server.example.com/nov#id' => 'http://server.example.com/nov',
+    'http://server.example.com/nov?k=v' => 'http://server.example.com/nov?k=v',
+    'http://server.example.com/nov?k=v#id' => 'http://server.example.com/nov?k=v',
+    'https://server.example.com' => 'https://server.example.com',
+    'https://server.example.com/' => 'https://server.example.com/',
+    'https://server.example.com/nov' => 'https://server.example.com/nov',
+    'https://server.example.com/nov/' => 'https://server.example.com/nov/',
+    'https://server.example.com/nov#id' => 'https://server.example.com/nov',
+    'https://server.example.com/nov?k=v' => 'https://server.example.com/nov?k=v',
+    'https://server.example.com/nov?k=v#id' => 'https://server.example.com/nov?k=v',
+  }.each do |input, output|
+    context "when '#{input}' is given" do
+      let(:identifier) { input }
+      its(:identifier) { should == output }
+      its(:host) { should == 'server.example.com' }
+    end
+  end
+
+  describe 'error handling' do
+    let(:identifier) { '**' }
+    it do
+      expect { uri }.should raise_error OpenIDConnect::Discovery::InvalidIdentifier
+    end
+  end
 end

data/spec/openid_connect/discovery/principal_spec.rb

@@ -1,5 +1,35 @@
 require 'spec_helper'
 
 describe OpenIDConnect::Discovery::Principal do
-  it :TODO
+  describe '.parse' do
+    {
+      'server.example.com' => OpenIDConnect::Discovery::Principal::URI,
+      'http://server.example.com' => OpenIDConnect::Discovery::Principal::URI,
+      'nov@server.example.com' => OpenIDConnect::Discovery::Principal::Email,
+      '=nov' => OpenIDConnect::Discovery::Principal::XRI,
+      '@nov' => OpenIDConnect::Discovery::Principal::XRI
+    }.each do |input, klass|
+      describe input do
+        it do
+          OpenIDConnect::Discovery::Principal.parse(input).should be_a klass
+        end
+      end
+    end
+  end
+
+  describe '#discover!' do
+    let(:request) { OpenIDConnect::Discovery::Principal.new.discover! }
+
+    it 'should do SWD discovery' do
+      SWD.should_receive(:discover!)
+      request
+    end
+
+    context 'when discovery failed' do
+      it do
+        SWD.should_receive(:discover!).and_raise(SWD::Exception)
+        expect { request }.should raise_error OpenIDConnect::Discovery::DiscoveryFailed
+      end
+    end
+  end
 end

data/spec/openid_connect/discovery/provider_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+describe OpenIDConnect::Discovery::Provider do
+  let(:provider) { 'https://server.example.com/authorize' }
+  let(:discover) { OpenIDConnect::Discovery::Provider.discover! identifier }
+  let(:endpoint) { "https://#{host}/.well-known/simple-web-discovery" }
+  let(:query) do
+    {
+      :service => OpenIDConnect::Discovery::Provider::SERVICE_URI,
+      :principal => principal
+    }
+  end
+
+  shared_examples_for :discover_provider do
+    it "should succeed" do
+      mock_json :get, endpoint, 'discovery/swd', :params => query do
+        res = discover
+        res.should be_a SWD::Response
+        res.location.should == provider
+      end
+    end
+  end
+
+  describe '#discover!' do
+
+    context 'when URI is given' do
+      let(:principal) { identifier }
+
+      context 'when scheme included' do
+        let(:host) { URI.parse(identifier).host }
+
+        context 'when HTTPS' do
+          let(:identifier) { 'https://server.example.com' }
+          it_behaves_like :discover_provider
+        end
+
+        context 'otherwise' do
+          let(:identifier) { 'http://server.example.com' }
+          it_behaves_like :discover_provider
+          it 'should access to https://**' do
+            endpoint.should match /^https:\/\//
+          end
+        end
+      end
+
+      context 'when only host is given' do
+        let(:identifier) { 'server.example.com' }
+        let(:host)       { identifier }
+        let(:principal)  { "https://#{identifier}" }
+        it_behaves_like :discover_provider
+      end
+    end
+
+    context 'when Email is given' do
+      it :TODO
+    end
+
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: openid_connect
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors: 
 - nov matake
@@ -198,6 +198,7 @@ files:
 - spec/mock_response/access_token/bearer.json
 - spec/mock_response/access_token/bearer_with_id_token.json
 - spec/mock_response/access_token/mac.json
+- spec/mock_response/discovery/swd.json
 - spec/mock_response/errors/insufficient_scope.json
 - spec/mock_response/errors/invalid_access_token.json
 - spec/mock_response/errors/invalid_request.json
@@ -210,7 +211,7 @@ files:
 - spec/openid_connect/discovery/principal/uri_spec.rb
 - spec/openid_connect/discovery/principal/xri_spec.rb
 - spec/openid_connect/discovery/principal_spec.rb
-- spec/openid_connect/discovery_spec.rb
+- spec/openid_connect/discovery/provider_spec.rb
 - spec/openid_connect/exception_spec.rb
 - spec/openid_connect/response_object/id_token_spec.rb
 - spec/openid_connect/response_object/user_info/open_id/address_spec.rb
@@ -254,6 +255,7 @@ test_files:
 - spec/mock_response/access_token/bearer.json
 - spec/mock_response/access_token/bearer_with_id_token.json
 - spec/mock_response/access_token/mac.json
+- spec/mock_response/discovery/swd.json
 - spec/mock_response/errors/insufficient_scope.json
 - spec/mock_response/errors/invalid_access_token.json
 - spec/mock_response/errors/invalid_request.json
@@ -266,7 +268,7 @@ test_files:
 - spec/openid_connect/discovery/principal/uri_spec.rb
 - spec/openid_connect/discovery/principal/xri_spec.rb
 - spec/openid_connect/discovery/principal_spec.rb
-- spec/openid_connect/discovery_spec.rb
+- spec/openid_connect/discovery/provider_spec.rb
 - spec/openid_connect/exception_spec.rb
 - spec/openid_connect/response_object/id_token_spec.rb
 - spec/openid_connect/response_object/user_info/open_id/address_spec.rb

data/spec/openid_connect/discovery_spec.rb

@@ -1,5 +0,0 @@
-require 'spec_helper'
-
-describe OpenIDConnect::Discovery do
-  it :TODO
-end