hydra-access-controls 5.0.0.pre12 → 5.0.0.pre13

data/lib/hydra/access_controls_enforcement.rb

@@ -72,7 +72,7 @@ module Hydra::AccessControlsEnforcement
     end
   end
   
-  private
+  protected
 
   # If someone hits the show action while their session's viewing_context is in edit mode, 
   # this will redirect them to the edit action.
@@ -106,7 +106,7 @@ module Hydra::AccessControlsEnforcement
       if @permissions_solr_document["embargo_release_date_dt"] 
         embargo_date = Date.parse(@permissions_solr_document["embargo_release_date_dt"].split(/T/)[0])
         if embargo_date > Date.parse(Time.now.to_s)
-          unless current_user && can?(:edit, params[:id])
+          unless current_or_guest_user && can?(:edit, params[:id])
             raise Hydra::AccessDenied.new("This item is under embargo.  You do not have sufficient access privileges to read this document.", :edit, params[:id])
           end
         end
@@ -201,7 +201,7 @@ module Hydra::AccessControlsEnforcement
     end
     
     # Grant access based on user id & role
-    unless current_user.nil?
+    unless current_or_guest_user.nil?
       user_access_filters += apply_role_permissions(permission_types)
       user_access_filters += apply_individual_permissions(permission_types)
       user_access_filters += apply_superuser_permissions(permission_types)
@@ -224,8 +224,10 @@ module Hydra::AccessControlsEnforcement
   def apply_individual_permissions(permission_types)
       # for individual person access
       user_access_filters = []
-      permission_types.each do |type|
-        user_access_filters << "#{type}_access_person_t:#{user_key}"        
+      if user_key
+        permission_types.each do |type|
+          user_access_filters << "#{type}_access_person_t:#{user_key}"        
+        end
       end
       user_access_filters
   end

data/lib/hydra/policy_aware_access_controls_enforcement.rb

@@ -12,7 +12,7 @@ module Hydra::PolicyAwareAccessControlsEnforcement
     end
   end
   
-  # returns solr query for finding all objects whose policies grant discover access to current_user
+  # returns solr query for finding all objects whose policies grant discover access to current_or_guest_user
   def policy_clauses 
     policy_pids = policies_with_access
     return nil if policy_pids.empty?
@@ -23,10 +23,10 @@ module Hydra::PolicyAwareAccessControlsEnforcement
   # find all the policies that grant discover/read/edit permissions to this user or any of it's groups
   def policies_with_access
     #### TODO -- Memoize this and put it in the session?
-    return [] unless current_user
+    return [] unless current_or_guest_user
     user_access_filters = []
     # Grant access based on user id & role
-    unless current_user.nil?
+    unless current_or_guest_user.nil?
       user_access_filters += apply_policy_role_permissions(discovery_permissions)
       user_access_filters += apply_policy_individual_permissions(discovery_permissions)
     end

data/spec/unit/access_controls_enforcement_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-# Need way to find way to stub current_user and RoleMapper in order to run these tests
+# Need way to find way to stub current_or_guest_user and RoleMapper in order to run these tests
 
 describe Hydra::AccessControlsEnforcement do
   before(:all) do
@@ -8,7 +8,7 @@ describe Hydra::AccessControlsEnforcement do
       attr_accessor :params
       
       def user_key
-        current_user.user_key
+        current_or_guest_user.user_key
       end
 
       def session
@@ -24,7 +24,7 @@ describe Hydra::AccessControlsEnforcement do
     end
     context "Given I am not logged in" do
       before do
-        subject.stub(:current_user).and_return(User.new)
+        subject.stub(:current_or_guest_user).and_return(User.new)
         subject.send(:apply_gated_discovery, @solr_parameters, @user_parameters)
       end
       it "Then I should be treated as a member of the 'public' group" do
@@ -44,7 +44,7 @@ describe Hydra::AccessControlsEnforcement do
         User.stub(:find_by_user_key).and_return(@user)
         # This is a pretty fragile way to stub it...
         RoleMapper.stub(:byname).and_return(@user.user_key=>["faculty", "africana-faculty"])
-        subject.stub(:current_user).and_return(@user)
+        subject.stub(:current_or_guest_user).and_return(@user)
         subject.send(:apply_gated_discovery, @solr_parameters, @user_parameters)
       end
       it "Then I should be treated as a member of the 'public' and 'registered' groups" do
@@ -86,7 +86,7 @@ describe Hydra::AccessControlsEnforcement do
     it "should allow a user w/ edit permissions to view an embargoed object" do
       user = User.new :uid=>'testuser@example.com'
       RoleMapper.stub(:roles).with(user.user_key).and_return(["archivist"])
-      subject.stub(:current_user).and_return(user)
+      subject.stub(:current_or_guest_user).and_return(user)
       subject.should_receive(:can?).with(:edit, nil).and_return(true)
       subject.stub(:can?).with(:read, nil).and_return(true)
       subject.instance_variable_set :@permissions_solr_document, SolrDocument.new({"edit_access_person_t"=>["testuser@example.com"], "embargo_release_date_dt"=>(Date.parse(Time.now.to_s)+2).to_s})
@@ -98,7 +98,7 @@ describe Hydra::AccessControlsEnforcement do
     it "should prevent a user w/o edit permissions from viewing an embargoed object" do
       user = User.new :uid=>'testuser@example.com'
       RoleMapper.stub(:roles).with(user.user_key).and_return([])
-      subject.stub(:current_user).and_return(user)
+      subject.stub(:current_or_guest_user).and_return(user)
       subject.should_receive(:can?).with(:edit, nil).and_return(false)
       subject.stub(:can?).with(:read, nil).and_return(true)
       subject.params = {}
@@ -111,7 +111,7 @@ describe Hydra::AccessControlsEnforcement do
     before(:each) do
       @stub_user = User.new :uid=>'archivist1@example.com'
       RoleMapper.stub(:roles).with(@stub_user.user_key).and_return(["archivist","researcher"])
-      subject.stub(:current_user).and_return(@stub_user)
+      subject.stub(:current_or_guest_user).and_return(@stub_user)
       @solr_parameters = {}
       @user_parameters = {}
     end
@@ -133,7 +133,7 @@ describe Hydra::AccessControlsEnforcement do
   describe "exclude_unwanted_models" do
     before(:each) do
       stub_user = User.new :uid=>'archivist1@example.com'
-      subject.stub(:current_user).and_return(stub_user)
+      subject.stub(:current_or_guest_user).and_return(stub_user)
       @solr_parameters = {}
       @user_parameters = {}
     end
@@ -142,6 +142,18 @@ describe Hydra::AccessControlsEnforcement do
       @solr_parameters[:fq].should include("-has_model_s:\"info:fedora/afmodel:FileAsset\"")  
     end
   end
+
+  describe "apply_individual_permissions" do
+    describe "when the user is a guest user (user key nil)" do
+      before do
+        stub_user = User.new
+        subject.stub(:current_or_guest_user).and_return(stub_user)
+      end
+      it "should not create filters" do
+        subject.send(:apply_individual_permissions, ["edit","discover","read"]).should == []
+      end
+    end
+  end
 end
 
 

data/spec/unit/policy_aware_access_controls_enforcement_spec.rb

@@ -8,7 +8,7 @@ describe Hydra::PolicyAwareAccessControlsEnforcement do
       attr_accessor :params
       
       def user_key
-        current_user.user_key
+        current_or_guest_user.user_key
       end
 
       def session
@@ -71,7 +71,7 @@ describe Hydra::PolicyAwareAccessControlsEnforcement do
     @user_parameters = {}
     @user = FactoryGirl.build(:sara_student)
     RoleMapper.stub(:roles).with(@user.user_key).and_return(@user.roles)
-    subject.stub(:current_user).and_return(@user)
+    subject.stub(:current_or_guest_user).and_return(@user)
   end
   
   describe "policies_with_access" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 5.0.0.pre12
+  version: 5.0.0.pre13
   prerelease: 6
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2012-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport