openid_connect 0.4.1 → 0.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0a794ead00a4df88df6f42e75c8fbab30e8bc31a
+  data.tar.gz: 6d6a735d8d0fd25b23c3b77cbe847eedc46408fc
+SHA512:
+  metadata.gz: e163661d484cf04fb02660783affd6ffab261dade19166c9d22acc0a1ce69eb65f451653f93b313ce454360bbdf52864de09801ce79783ffc860cd19fba381fc
+  data.tar.gz: cda7908012fd20d5ffdb8e3e73afe149dae37741779d653264f0318c9931520189b5308cf51f22fc9fa6ffaaec1db99b28b232842435c3586d1a24d62cf64ff6

data/Gemfile

@@ -1,2 +1,2 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    openid_connect (0.4.1)
+    openid_connect (0.5.0)
       activemodel (>= 3)
       attr_required (>= 0.0.5)
       json (>= 1.4.3)
@@ -11,59 +11,60 @@ PATH
       tzinfo
       validate_email
       validate_url
+      webfinger (>= 0.0.2)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    activemodel (3.2.9)
-      activesupport (= 3.2.9)
+    activemodel (3.2.12)
+      activesupport (= 3.2.12)
       builder (~> 3.0.0)
-    activesupport (3.2.9)
+    activesupport (3.2.12)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    addressable (2.3.2)
+    addressable (2.3.3)
     attr_required (0.0.5)
     builder (3.0.4)
-    configatron (2.9.1)
+    configatron (2.10.0)
       yamler (>= 0.1.0)
     cover_me (1.2.0)
       configatron
       hashie
-    crack (0.3.1)
-    diff-lcs (1.1.3)
-    hashie (1.2.0)
-    httpclient (2.3.0.1)
-    i18n (0.6.1)
-    json (1.7.5)
-    json-jwt (0.4.0)
+    crack (0.3.2)
+    diff-lcs (1.2.1)
+    hashie (2.0.2)
+    httpclient (2.3.3)
+    i18n (0.6.4)
+    json (1.7.7)
+    json-jwt (0.4.2)
       activesupport (>= 2.3)
       i18n
-      json (>= 1.4.3)
+      multi_json (>= 1.3)
       url_safe_base64
     mail (2.5.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.19)
-    multi_json (1.5.0)
+    mime-types (1.21)
+    multi_json (1.6.1)
     polyglot (0.3.3)
-    rack (1.4.1)
-    rack-oauth2 (1.0.0)
+    rack (1.5.2)
+    rack-oauth2 (1.0.3)
       activesupport (>= 2.3)
       attr_required (>= 0.0.5)
       httpclient (>= 2.2.0.2)
       i18n
       multi_json (>= 1.3.6)
       rack (>= 1.1)
-    rake (10.0.2)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.1)
-    rspec-expectations (2.12.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.0)
+    rake (10.0.3)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.0)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
     swd (0.2.1)
       activesupport (>= 3)
       attr_required (>= 0.0.5)
@@ -80,9 +81,13 @@ GEM
       mail (>= 2.2.5)
     validate_url (0.2.0)
       activemodel (>= 3.0.0)
-    webmock (1.9.0)
+    webfinger (0.0.4)
+      activesupport (>= 3)
+      httpclient (>= 2.2.0.2)
+      multi_json
+    webmock (1.10.1)
       addressable (>= 2.2.7)
-      crack (>= 0.1.7)
+      crack (>= 0.3.2)
     yamler (0.1.0)
 
 PLATFORMS

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.5.0

data/lib/openid_connect.rb

@@ -1,6 +1,7 @@
 require 'json'
 require 'logger'
 require 'swd'
+require 'webfinger'
 require 'active_model'
 require 'tzinfo'
 require 'validate_url'

data/lib/openid_connect/client/registrar.rb

@@ -156,7 +156,8 @@ module OpenIDConnect
 
       def valid_uri?(uri, schemes = ['http', 'https'])
         # NOTE: specify nil for schemes to allow any schemes
-        URI::regexp(schemes).match(uri).present?
+        URI::regexp(schemes).match(uri).present? &&
+        URI.parse(uri).fragment.blank?
       end
 
       def validate_contacts

data/lib/openid_connect/debugger/request_filter.rb

@@ -5,7 +5,7 @@ module OpenIDConnect
       # request:: HTTP::Message
       def filter_request(request)
         started = "======= [OpenIDConnect] HTTP REQUEST STARTED ======="
-        OpenIDConnect.logger.info [started, request.dump].join("\n")
+        log started, request.dump
       end
 
       # Callback called in HTTPClient (after received a response)
@@ -13,7 +13,15 @@ module OpenIDConnect
       # response:: HTTP::Message
       def filter_response(request, response)
         finished = "======= [OpenIDConnect] HTTP REQUEST FINISHED ======="
-        OpenIDConnect.logger.info ['-' * 50, response.dump, finished].join("\n")
+        log '-' * 50, response.dump, finished
+      end
+
+      private
+
+      def log(*outputs)
+        outputs.each do |output|
+          OpenIDConnect.logger.info output
+        end
       end
     end
   end

data/lib/openid_connect/discovery.rb

@@ -1,9 +1,10 @@
 module OpenIDConnect
   module Discovery
+    REL_VALUE = 'http://openid.net/specs/connect/1.0/issuer'
+
     class InvalidIdentifier < Exception; end
     class DiscoveryFailed < Exception; end
   end
 end
 
-require 'openid_connect/discovery/principal'
 require 'openid_connect/discovery/provider'

data/lib/openid_connect/discovery/provider.rb

@@ -1,10 +1,27 @@
 module OpenIDConnect
   module Discovery
     module Provider
-      SERVICE_URI = 'http://openid.net/specs/connect/1.0/issuer'
+      module Issuer
+        def issuer
+          self.link_for(REL_VALUE)[:href]
+        end
+      end
 
-      def self.discover!(identifier, cache_options = {})
-        Principal.parse(identifier).discover!(cache_options)
+      def self.discover!(identifier)
+        resource = case identifier
+        when /^acct:/, /@/, /^https?:\/\//
+          identifier
+        else
+          "https://#{identifier}"
+        end
+        response = WebFinger.discover!(
+          resource,
+          rel: REL_VALUE
+        )
+        response.extend Issuer
+        response
+      rescue WebFinger::Exception => e
+        raise DiscoveryFailed.new(e.message)
       end
     end
   end

data/lib/openid_connect/discovery/provider/config.rb

@@ -3,8 +3,8 @@ module OpenIDConnect
     module Provider
       class Config
         def self.discover!(identifier, cache_options = {})
-          principal = Principal.parse(identifier)
-          Resource.new(principal).discover!(cache_options)
+          uri = URI.parse(identifier)
+          Resource.new(uri).discover!(cache_options)
         rescue SWD::Exception => e
           raise DiscoveryFailed.new(e.message)
         end

data/lib/openid_connect/discovery/provider/config/resource.rb

@@ -7,9 +7,9 @@ module OpenIDConnect
 
           class Expired < SWD::Resource::Expired; end
 
-          def initialize(principal)
-            @host = principal.host
-            @port = principal.port unless [80, 443].include?(principal.port)
+          def initialize(uri)
+            @host = uri.host
+            @port = uri.port unless [80, 443].include?(uri.port)
             @path ||= '/.well-known/openid-configuration'
             attr_missing!
           end

data/openid_connect.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "validate_email"
   s.add_runtime_dependency "json-jwt", ">= 0.3.3"
   s.add_runtime_dependency "swd", ">= 0.1.2"
+  s.add_runtime_dependency "webfinger", ">= 0.0.2"
   s.add_runtime_dependency "rack-oauth2", ">= 1.0.0"
   s.add_development_dependency "rake", ">= 0.8"
   s.add_development_dependency "rspec", ">= 2"

data/spec/mock_response/discovery/webfinger.json

@@ -0,0 +1,8 @@
+{
+  "expires": "2013-03-09T06:43:23Z",
+  "links": [{
+    "rel": "http://openid.net/specs/connect/1.0/issuer",
+    "href": "https://server.example.com"
+  }],
+  "subject": "acct:foo@server.example.com"
+}

data/spec/openid_connect/client/registrar_spec.rb

@@ -144,6 +144,22 @@ describe OpenIDConnect::Client::Registrar do
     end
   end
 
+  describe '#redirect_uris' do
+    let(:base_url) { 'http://client.example.com/callback' }
+    let(:attributes) { minimum_attributes.merge(redirect_uris: redirect_uri) }
+
+    context 'when query included' do
+      let(:redirect_uri) { [base_url, '?foo=bar'].join }
+      it { should be_valid }
+      its(:redirect_uris) { should == [redirect_uri] }
+    end
+
+    context 'when fragment included' do
+      let(:redirect_uri) { [base_url, '#foo=bar'].join }
+      it { should_not be_valid }
+    end
+  end
+
   describe '#contacts' do
     context 'when contacts given' do
       context 'when invalid email included' do

data/spec/openid_connect/debugger/request_filter_spec.rb

@@ -8,21 +8,25 @@ describe OpenIDConnect::Debugger::RequestFilter do
 
   describe '#filter_request' do
     it 'should log request' do
-      OpenIDConnect.logger.should_receive(:info).with(
-        "======= [OpenIDConnect] HTTP REQUEST STARTED =======\n" +
+      [
+        "======= [OpenIDConnect] HTTP REQUEST STARTED =======",
         request.dump
-      )
+      ].each do |output|
+        OpenIDConnect.logger.should_receive(:info).with output
+      end
       request_filter.filter_request(request)
     end
   end
 
   describe '#filter_response' do
     it 'should log response' do
-      OpenIDConnect.logger.should_receive(:info).with(
-        "--------------------------------------------------\n" +
-        response.dump +
-        "\n======= [OpenIDConnect] HTTP REQUEST FINISHED ======="
-      )
+      [
+        "--------------------------------------------------",
+        response.dump,
+        "======= [OpenIDConnect] HTTP REQUEST FINISHED ======="
+      ].each do |output|
+        OpenIDConnect.logger.should_receive(:info).with output
+      end
       request_filter.filter_response(request, response)
     end
   end

data/spec/openid_connect/discovery/provider_spec.rb

@@ -3,39 +3,38 @@ require 'spec_helper'
 describe OpenIDConnect::Discovery::Provider do
   let(:provider) { 'https://server.example.com' }
   let(:discover) { OpenIDConnect::Discovery::Provider.discover! identifier }
-  let(:endpoint) { "https://#{host}/.well-known/simple-web-discovery" }
+  let(:endpoint) { "https://#{host}/.well-known/webfinger" }
   let(:query) do
     {
-      service: OpenIDConnect::Discovery::Provider::SERVICE_URI,
-      principal: principal
+      rel: OpenIDConnect::Discovery::REL_VALUE,
+      resource: resource
     }
   end
 
   shared_examples_for :discover_provider do
     it "should succeed" do
-      mock_json :get, endpoint, 'discovery/swd', params: query do
+      mock_json :get, endpoint, 'discovery/webfinger', params: query do
         res = discover
-        res.should be_a SWD::Response
-        res.location.should == provider
+        res.should be_a WebFinger::Response
+        res.issuer.should == provider
       end
     end
   end
 
   describe '#discover!' do
+    let(:host) { 'server.example.com' }
 
     context 'when URI is given' do
-      let(:principal) { identifier }
+      let(:resource) { identifier }
 
       context 'when scheme included' do
-        let(:host) { URI.parse(identifier).host }
-
         context 'when HTTPS' do
-          let(:identifier) { 'https://server.example.com' }
+          let(:identifier) { "https://#{host}" }
           it_behaves_like :discover_provider
         end
 
         context 'otherwise' do
-          let(:identifier) { 'http://server.example.com' }
+          let(:identifier) { "http://#{host}" }
           it_behaves_like :discover_provider
           it 'should access to https://**' do
             endpoint.should match /^https:\/\//
@@ -44,19 +43,28 @@ describe OpenIDConnect::Discovery::Provider do
       end
 
       context 'when only host is given' do
-        let(:identifier) { 'server.example.com' }
-        let(:host)       { identifier }
-        let(:principal)  { "https://#{identifier}" }
+        let(:identifier) { host }
+        let(:resource)   { "https://#{host}" }
         it_behaves_like :discover_provider
       end
     end
 
     context 'when Email is given' do
       let(:identifier) { "nov@#{host}" }
-      let(:host)       { 'server.example.com' }
-      let(:principal)  { identifier }
+      let(:resource)   { identifier }
       it_behaves_like :discover_provider
     end
 
+    context 'when error occured' do
+      let(:identifier) { host }
+      let(:resource)   { "https://#{host}" }
+      it 'should raise OpenIDConnect::Discovery::DiscoveryFailed' do
+        mock_json :get, endpoint, 'discovery/webfinger', params: query, status: [404, 'Not Found'] do
+          expect do
+            discover
+          end.to raise_error OpenIDConnect::Discovery::DiscoveryFailed
+        end
+      end
+    end
   end
 end

metadata

@@ -1,222 +1,209 @@
 --- !ruby/object:Gem::Specification
 name: openid_connect
 version: !ruby/object:Gem::Version
-  version: 0.4.1
-  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-12 00:00:00.000000000 Z
+date: 2013-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.3
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: attr_required
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: validate_url
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: validate_email
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json-jwt
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.3
 - !ruby/object:Gem::Dependency
   name: swd
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.2
+- !ruby/object:Gem::Dependency
+  name: webfinger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: rack-oauth2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.6.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.6.2
 - !ruby/object:Gem::Dependency
   name: cover_me
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
 description: OpenID Connect Server & Client Library
@@ -243,9 +230,6 @@ files:
 - lib/openid_connect/debugger.rb
 - lib/openid_connect/debugger/request_filter.rb
 - lib/openid_connect/discovery.rb
-- lib/openid_connect/discovery/principal.rb
-- lib/openid_connect/discovery/principal/email.rb
-- lib/openid_connect/discovery/principal/uri.rb
 - lib/openid_connect/discovery/provider.rb
 - lib/openid_connect/discovery/provider/config.rb
 - lib/openid_connect/discovery/provider/config/resource.rb
@@ -281,6 +265,7 @@ files:
 - spec/mock_response/client/updated.json
 - spec/mock_response/discovery/config.json
 - spec/mock_response/discovery/swd.json
+- spec/mock_response/discovery/webfinger.json
 - spec/mock_response/errors/insufficient_scope.json
 - spec/mock_response/errors/invalid_access_token.json
 - spec/mock_response/errors/invalid_request.json
@@ -295,9 +280,6 @@ files:
 - spec/openid_connect/client_spec.rb
 - spec/openid_connect/connect_object_spec.rb
 - spec/openid_connect/debugger/request_filter_spec.rb
-- spec/openid_connect/discovery/principal/email_spec.rb
-- spec/openid_connect/discovery/principal/uri_spec.rb
-- spec/openid_connect/discovery/principal_spec.rb
 - spec/openid_connect/discovery/provider/config/resource_spec.rb
 - spec/openid_connect/discovery/provider/config/response_spec.rb
 - spec/openid_connect/discovery/provider/config_spec.rb
@@ -318,33 +300,26 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/nov/openid_connect
 licenses: []
+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'
-      segments:
-      - 0
-      hash: -3886993201268064457
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3886993201268064457
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: OpenID Connect Server & Client Library
 test_files:
 - spec/helpers/crypto_spec_helper.rb
@@ -358,6 +333,7 @@ test_files:
 - spec/mock_response/client/updated.json
 - spec/mock_response/discovery/config.json
 - spec/mock_response/discovery/swd.json
+- spec/mock_response/discovery/webfinger.json
 - spec/mock_response/errors/insufficient_scope.json
 - spec/mock_response/errors/invalid_access_token.json
 - spec/mock_response/errors/invalid_request.json
@@ -372,9 +348,6 @@ test_files:
 - spec/openid_connect/client_spec.rb
 - spec/openid_connect/connect_object_spec.rb
 - spec/openid_connect/debugger/request_filter_spec.rb
-- spec/openid_connect/discovery/principal/email_spec.rb
-- spec/openid_connect/discovery/principal/uri_spec.rb
-- spec/openid_connect/discovery/principal_spec.rb
 - spec/openid_connect/discovery/provider/config/resource_spec.rb
 - spec/openid_connect/discovery/provider/config/response_spec.rb
 - spec/openid_connect/discovery/provider/config_spec.rb

data/lib/openid_connect/discovery/principal.rb

@@ -1,33 +0,0 @@
-module OpenIDConnect
-  module Discovery
-    class Principal
-      attr_reader :identifier, :host, :port
-
-      def self.parse(identifier)
-        raise InvalidIdentifier.new('Identifier Required') if identifier.blank?
-        type = case identifier
-        when /@/
-          Email
-        else
-          URI
-        end
-        type.new identifier
-      end
-
-      def discover!(cache_options = {})
-        SWD.discover!(
-          principal: identifier,
-          service:   Provider::SERVICE_URI,
-          host:      host,
-          port:      port,
-          cache: cache_options
-        )
-      rescue SWD::Exception => e
-        raise DiscoveryFailed.new(e.message)
-      end
-    end
-  end
-end
-
-require 'openid_connect/discovery/principal/email'
-require 'openid_connect/discovery/principal/uri'

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

@@ -1,12 +0,0 @@
-module OpenIDConnect
-  module Discovery
-    class Principal
-      class Email < Principal
-        def initialize(identifier)
-          @identifier = identifier
-          @host = identifier.split('@').last
-        end
-      end
-    end
-  end
-end

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

@@ -1,25 +0,0 @@
-module OpenIDConnect
-  module Discovery
-    class Principal
-      class URI < Principal
-        def initialize(identifier)
-          uri = normalize(identifier)
-          @identifier = uri.to_s
-          @host = uri.host
-          @port = uri.port unless [80, 443].include?(uri.port)
-        end
-
-        private
-
-        def normalize(identifier)
-          identifier = "https://#{identifier}" unless identifier.include?('://')
-          uri = ::URI.parse(identifier)
-          uri.fragment = nil
-          uri
-        rescue ::URI::Error => e
-          raise InvalidIdentifier.new('Invalid URI')
-        end
-      end
-    end
-  end
-end

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

@@ -1,10 +0,0 @@
-require 'spec_helper'
-
-describe OpenIDConnect::Discovery::Principal::Email do
-  subject { email }
-  let(:email) { OpenIDConnect::Discovery::Principal::Email.new identifier }
-  let(:identifier) { 'nov@server.example.com' }
-
-  its(:identifier) { should == identifier }
-  its(:host) { should == 'server.example.com' }
-end

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

@@ -1,55 +0,0 @@
-require 'spec_helper'
-
-describe OpenIDConnect::Discovery::Principal::URI do
-  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' }
-      its(:port) { should be_nil }
-    end
-  end
-
-  {
-    'server.example.com:8080' => 'https://server.example.com:8080'
-  }.each do |input, output|
-    context "when '#{input}' is given" do
-      let(:identifier) { input }
-      its(:identifier) { should == output }
-      its(:host) { should == 'server.example.com' }
-      its(:port) { should == 8080 }
-    end
-  end
-
-  describe 'error handling' do
-    let(:identifier) { '**' }
-    it do
-      expect { uri }.to raise_error OpenIDConnect::Discovery::InvalidIdentifier
-    end
-  end
-end

data/spec/openid_connect/discovery/principal_spec.rb

@@ -1,46 +0,0 @@
-require 'spec_helper'
-
-describe OpenIDConnect::Discovery::Principal do
-  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
-    }.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 port specified' do
-      it do
-        SWD.should_receive(:discover!).with(
-          principal: "https://example.com:8080",
-          service: "http://openid.net/specs/connect/1.0/issuer",
-          host: "example.com",
-          port: 8080,
-          cache: {}
-        )
-        OpenIDConnect::Discovery::Principal.parse('example.com:8080').discover!
-      end
-    end
-
-    context 'when discovery failed' do
-      it do
-        SWD.should_receive(:discover!).and_raise(SWD::Exception)
-        expect { request }.to raise_error OpenIDConnect::Discovery::DiscoveryFailed
-      end
-    end
-  end
-end