gds-sso 0.7.7 → 0.7.8

data/app/views/authorisations/unauthorised.html.erb

@@ -0,0 +1,5 @@
+<h1><%= message %></h1>
+
+<p>Please contact your Delivery Manager or main GDS contact if you think you should be able to do what you tried to do.</p>
+
+<p>If you think something is wrong, try <%= link_to "signing out", gds_sign_out_path %> and then back in</p>

data/lib/gds-sso/controller_methods.rb

@@ -4,9 +4,18 @@ module GDS
       class PermissionDeniedException < StandardError
       end
 
+      def self.included(base)
+        base.rescue_from PermissionDeniedException do |e|
+          render "authorisations/unauthorised", layout: "unauthorised", status: :forbidden, locals: { message: e.message }
+        end
+        base.helper_method :user_signed_in?
+        base.helper_method :current_user
+      end
+
+
       def authorise_user!(scope, permission)
         if not current_user.has_permission?(scope, permission)
-          raise PermissionDeniedException
+          raise PermissionDeniedException, "Sorry, you don't seem to have the #{permission} permission for #{scope}."
         end
       end
 
@@ -36,11 +45,6 @@ module GDS
       def warden
         request.env['warden']
       end
-
-      def self.included(base)
-        base.helper_method :user_signed_in?
-        base.helper_method :current_user
-      end
     end
   end
 end

data/lib/gds-sso/version.rb

@@ -1,5 +1,5 @@
 module GDS
   module SSO
-    VERSION = "0.7.7"
+    VERSION = "0.7.8"
   end
 end

data/spec/internal/log/test.log

@@ -3637,3 +3637,271 @@ Started GET "/this_requires_signin_permission" for 127.0.0.1 at 2012-06-29 15:15
 Processing by ExampleController#this_requires_signin_permission as JSON
 Authenticating with gds_sso_api_access strategy
 Completed 200 OK in 1ms (Views: 0.6ms)
+
+
+Started GET "/" for 127.0.0.1 at 2012-07-05 09:53:38 +0000
+Processing by ExampleController#index as HTML
+  Rendered text template (0.0ms)
+Completed 200 OK in 61ms (Views: 60.5ms)
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-07-05 09:53:39 +0000
+Processing by ExampleController#restricted as HTML
+Authenticating with gds_sso strategy
+Completed   in 59ms
+
+
+Started GET "/auth/gds" for 127.0.0.1 at 2012-07-05 09:53:39 +0000
+
+
+Started GET "/auth/gds/callback?code=20e6ceb1882795bbe08e6c08449d259ae794876da286c3b5a87753b8c4210219" for 127.0.0.1 at 2012-07-05 09:53:40 +0000
+Processing by AuthenticationsController#callback as HTML
+  Parameters: {"code"=>"20e6ceb1882795bbe08e6c08449d259ae794876da286c3b5a87753b8c4210219"}
+Authenticating with gds_sso strategy
+Redirected to http://www.example-client.com/restricted
+Completed 302 Found in 1ms
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-07-05 09:53:40 +0000
+Processing by ExampleController#restricted as HTML
+Completed 200 OK in 1ms (Views: 0.5ms)
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-07-05 09:53:40 +0000
+Processing by ExampleController#restricted as HTML
+Authenticating with gds_sso strategy
+Completed   in 1ms
+
+
+Started GET "/auth/gds" for 127.0.0.1 at 2012-07-05 09:53:40 +0000
+
+
+Started GET "/auth/gds/callback?code=87dbc56e17acca533425d4a129c1613d4732ca43caad9217c47c458b56f13186" for 127.0.0.1 at 2012-07-05 09:53:40 +0000
+Processing by AuthenticationsController#callback as HTML
+  Parameters: {"code"=>"87dbc56e17acca533425d4a129c1613d4732ca43caad9217c47c458b56f13186"}
+Authenticating with gds_sso strategy
+Redirected to http://www.example-client.com/restricted
+Completed 302 Found in 1ms
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-07-05 09:53:40 +0000
+Processing by ExampleController#restricted as HTML
+Completed 200 OK in 1ms (Views: 0.5ms)
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-07-05 09:53:40 +0000
+Processing by ExampleController#restricted as HTML
+Authenticating with gds_sso strategy
+Completed   in 0ms
+
+
+Started GET "/auth/gds" for 127.0.0.1 at 2012-07-05 09:53:40 +0000
+
+
+Started GET "/auth/gds/callback?code=1933908f2f4bc31395d244ce85f683cb9b4e72448fee032f9be09799f312918f" for 127.0.0.1 at 2012-07-05 09:53:40 +0000
+Processing by AuthenticationsController#callback as HTML
+  Parameters: {"code"=>"1933908f2f4bc31395d244ce85f683cb9b4e72448fee032f9be09799f312918f"}
+Authenticating with gds_sso strategy
+Redirected to http://www.example-client.com/restricted
+Completed 302 Found in 1ms
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-07-05 09:53:40 +0000
+Processing by ExampleController#restricted as HTML
+Completed 200 OK in 1ms (Views: 0.3ms)
+
+
+Started GET "/this_requires_signin_permission" for 127.0.0.1 at 2012-07-05 09:53:41 +0000
+Processing by ExampleController#this_requires_signin_permission as HTML
+Authenticating with gds_sso strategy
+Completed   in 1ms
+
+
+Started GET "/auth/gds" for 127.0.0.1 at 2012-07-05 09:53:41 +0000
+
+
+Started GET "/auth/gds/callback?code=4cfd8778aa1427d2562f6e054e9ff8f553181176a948899497deb32257be50e2" for 127.0.0.1 at 2012-07-05 09:53:41 +0000
+Processing by AuthenticationsController#callback as HTML
+  Parameters: {"code"=>"4cfd8778aa1427d2562f6e054e9ff8f553181176a948899497deb32257be50e2"}
+Authenticating with gds_sso strategy
+Redirected to http://www.example-client.com/this_requires_signin_permission
+Completed 302 Found in 1ms
+
+
+Started GET "/this_requires_signin_permission" for 127.0.0.1 at 2012-07-05 09:53:41 +0000
+Processing by ExampleController#this_requires_signin_permission as HTML
+Completed 200 OK in 1ms (Views: 0.6ms)
+
+
+Started GET "/this_requires_signin_permission" for 127.0.0.1 at 2012-07-05 09:53:41 +0000
+Processing by ExampleController#this_requires_signin_permission as HTML
+Authenticating with gds_sso strategy
+Completed   in 0ms
+
+
+Started GET "/auth/gds" for 127.0.0.1 at 2012-07-05 09:53:41 +0000
+
+
+Started GET "/auth/gds/callback?code=ac200c24882d8ed4f9dab8b35890452378bf594aac2f01ef683f64af6571d9ea" for 127.0.0.1 at 2012-07-05 09:53:41 +0000
+Processing by AuthenticationsController#callback as HTML
+  Parameters: {"code"=>"ac200c24882d8ed4f9dab8b35890452378bf594aac2f01ef683f64af6571d9ea"}
+Authenticating with gds_sso strategy
+Redirected to http://www.example-client.com/this_requires_signin_permission
+Completed 302 Found in 1ms
+
+
+Started GET "/this_requires_signin_permission" for 127.0.0.1 at 2012-07-05 09:53:41 +0000
+Processing by ExampleController#this_requires_signin_permission as HTML
+Completed 200 OK in 1ms (Views: 0.3ms)
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-07-05 09:53:41 +0000
+Processing by ExampleController#restricted as JSON
+Authenticating with gds_sso_api_access strategy
+Completed   in 33ms
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-07-05 09:53:41 +0000
+Processing by ExampleController#restricted as JSON
+Authenticating with gds_sso_api_access strategy
+Completed 200 OK in 1ms (Views: 0.6ms)
+
+
+Started GET "/this_requires_signin_permission" for 127.0.0.1 at 2012-07-05 09:53:41 +0000
+Processing by ExampleController#this_requires_signin_permission as JSON
+Authenticating with gds_sso_api_access strategy
+Completed 200 OK in 2ms (Views: 0.6ms)
+
+
+Started GET "/" for 127.0.0.1 at 2012-07-06 09:41:47 +0000
+Processing by ExampleController#index as HTML
+  Rendered text template (0.0ms)
+Completed 200 OK in 49ms (Views: 48.3ms)
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-07-06 09:41:48 +0000
+Processing by ExampleController#restricted as HTML
+Authenticating with gds_sso strategy
+Completed   in 57ms
+
+
+Started GET "/auth/gds" for 127.0.0.1 at 2012-07-06 09:41:48 +0000
+
+
+Started GET "/auth/gds/callback?code=71ec92eee5953ce38a526a43a8647d47fcaeb2f5d2b0d82fecab58a3e0100eb6" for 127.0.0.1 at 2012-07-06 09:41:49 +0000
+Processing by AuthenticationsController#callback as HTML
+  Parameters: {"code"=>"71ec92eee5953ce38a526a43a8647d47fcaeb2f5d2b0d82fecab58a3e0100eb6"}
+Authenticating with gds_sso strategy
+Redirected to http://www.example-client.com/restricted
+Completed 302 Found in 1ms
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-07-06 09:41:49 +0000
+Processing by ExampleController#restricted as HTML
+Completed 200 OK in 1ms (Views: 0.5ms)
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-07-06 09:41:49 +0000
+Processing by ExampleController#restricted as HTML
+Authenticating with gds_sso strategy
+Completed   in 0ms
+
+
+Started GET "/auth/gds" for 127.0.0.1 at 2012-07-06 09:41:49 +0000
+
+
+Started GET "/auth/gds/callback?code=7bdf75481822f0a4d117ca60992afe3dc75b5d23cdf1e8cc9a00016d1de054b8" for 127.0.0.1 at 2012-07-06 09:41:49 +0000
+Processing by AuthenticationsController#callback as HTML
+  Parameters: {"code"=>"7bdf75481822f0a4d117ca60992afe3dc75b5d23cdf1e8cc9a00016d1de054b8"}
+Authenticating with gds_sso strategy
+Redirected to http://www.example-client.com/restricted
+Completed 302 Found in 1ms
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-07-06 09:41:49 +0000
+Processing by ExampleController#restricted as HTML
+Completed 200 OK in 1ms (Views: 0.5ms)
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-07-06 09:41:49 +0000
+Processing by ExampleController#restricted as HTML
+Authenticating with gds_sso strategy
+Completed   in 0ms
+
+
+Started GET "/auth/gds" for 127.0.0.1 at 2012-07-06 09:41:49 +0000
+
+
+Started GET "/auth/gds/callback?code=b89bf9999a2c2321c95bb750021185a06c95b24ff907e9e79da916d4b09dde2f" for 127.0.0.1 at 2012-07-06 09:41:50 +0000
+Processing by AuthenticationsController#callback as HTML
+  Parameters: {"code"=>"b89bf9999a2c2321c95bb750021185a06c95b24ff907e9e79da916d4b09dde2f"}
+Authenticating with gds_sso strategy
+Redirected to http://www.example-client.com/restricted
+Completed 302 Found in 1ms
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-07-06 09:41:50 +0000
+Processing by ExampleController#restricted as HTML
+Completed 200 OK in 1ms (Views: 0.4ms)
+
+
+Started GET "/this_requires_signin_permission" for 127.0.0.1 at 2012-07-06 09:41:50 +0000
+Processing by ExampleController#this_requires_signin_permission as HTML
+Authenticating with gds_sso strategy
+Completed   in 1ms
+
+
+Started GET "/auth/gds" for 127.0.0.1 at 2012-07-06 09:41:50 +0000
+
+
+Started GET "/auth/gds/callback?code=0032b4e775f3f4db74e631445714e8ed9824a92eab6f4386a37523344dcd4680" for 127.0.0.1 at 2012-07-06 09:41:50 +0000
+Processing by AuthenticationsController#callback as HTML
+  Parameters: {"code"=>"0032b4e775f3f4db74e631445714e8ed9824a92eab6f4386a37523344dcd4680"}
+Authenticating with gds_sso strategy
+Redirected to http://www.example-client.com/this_requires_signin_permission
+Completed 302 Found in 1ms
+
+
+Started GET "/this_requires_signin_permission" for 127.0.0.1 at 2012-07-06 09:41:50 +0000
+Processing by ExampleController#this_requires_signin_permission as HTML
+Completed 200 OK in 1ms (Views: 0.6ms)
+
+
+Started GET "/this_requires_signin_permission" for 127.0.0.1 at 2012-07-06 09:41:50 +0000
+Processing by ExampleController#this_requires_signin_permission as HTML
+Authenticating with gds_sso strategy
+Completed   in 0ms
+
+
+Started GET "/auth/gds" for 127.0.0.1 at 2012-07-06 09:41:50 +0000
+
+
+Started GET "/auth/gds/callback?code=8250970673248032ded4063ee0321b1e3c84173c7f17d9e19c193ded808962ff" for 127.0.0.1 at 2012-07-06 09:41:50 +0000
+Processing by AuthenticationsController#callback as HTML
+  Parameters: {"code"=>"8250970673248032ded4063ee0321b1e3c84173c7f17d9e19c193ded808962ff"}
+Authenticating with gds_sso strategy
+Redirected to http://www.example-client.com/this_requires_signin_permission
+Completed 302 Found in 1ms
+
+
+Started GET "/this_requires_signin_permission" for 127.0.0.1 at 2012-07-06 09:41:50 +0000
+Processing by ExampleController#this_requires_signin_permission as HTML
+Completed 200 OK in 1ms (Views: 0.4ms)
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-07-06 09:41:50 +0000
+Processing by ExampleController#restricted as JSON
+Authenticating with gds_sso_api_access strategy
+Completed   in 34ms
+
+
+Started GET "/restricted" for 127.0.0.1 at 2012-07-06 09:41:50 +0000
+Processing by ExampleController#restricted as JSON
+Authenticating with gds_sso_api_access strategy
+Completed 200 OK in 2ms (Views: 0.9ms)
+
+
+Started GET "/this_requires_signin_permission" for 127.0.0.1 at 2012-07-06 09:41:50 +0000
+Processing by ExampleController#this_requires_signin_permission as JSON
+Authenticating with gds_sso_api_access strategy
+Completed 200 OK in 2ms (Views: 0.6ms)

metadata

@@ -2,7 +2,7 @@
 name: gds-sso
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.7
+  version: 0.7.8
 platform: ruby
 authors: 
 - Matt Patterson
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-29 00:00:00 Z
+date: 2012-07-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -158,6 +158,7 @@ extra_rdoc_files: []
 files: 
 - app/views/layouts/unauthorised.html.erb
 - app/views/authentications/failure.html.erb
+- app/views/authorisations/unauthorised.html.erb
 - app/views/authorisations/cant_signin.html.erb
 - app/controllers/authentications_controller.rb
 - config/routes.rb
@@ -204,7 +205,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 414716890116187310
+      hash: 1809515685969194484
       segments: 
       - 0
       version: "0"
@@ -213,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 414716890116187310
+      hash: 1809515685969194484
       segments: 
       - 0
       version: "0"