Merge pull request #59 from mlibrary/this_time

Authorize group member by identity/username

lauth/app/repositories/grant_repo.rb

@@ -15,6 +15,7 @@ def for_user_and_uri(username, uri)
           .join(locations.name.dataset, coll: :uniqueIdentifier)
           .left_join(users.name.dataset, userid: grants[:userid])
           .left_join(institution_memberships.name.dataset, inst: grants[:inst])
+          .left_join(group_memberships.name.dataset, user_grp: grants[:user_grp])
           .where(Sequel.ilike(uri, locations[:dlpsPath]))
           .where(
             Sequel.|(
@@ -25,6 +26,10 @@ def for_user_and_uri(username, uri)
               Sequel.&(
                 Sequel.~(institution_memberships[:userid] => nil),
                 {institution_memberships[:userid] => username}
+              ),
+              Sequel.&(
+                Sequel.~(group_memberships[:userid] => nil),
+                {group_memberships[:userid] => username}
               )
             )
           )

lauth/lib/lauth/group.rb

@@ -0,0 +1,4 @@
+module Lauth
+  class Group < ROM::Struct
+  end
+end

lauth/lib/lauth/persistence/relations/grants.rb

@@ -17,6 +17,7 @@ class Grants < ROM::Relation[:sql]
             belongs_to :user, foreign_key: :userid
             belongs_to :collection, foreign_key: :coll
             belongs_to :institution, foreign_key: :inst
+            belongs_to :group, foreign_key: :user_grp
           end
         end
 

lauth/lib/lauth/persistence/relations/group_memberships.rb

@@ -0,0 +1,21 @@
+module Lauth
+  module Persistence
+    module Relations
+      class GroupMemberships < ROM::Relation[:sql]
+        schema(:aa_is_member_of_grp, infer: true, as: :group_memberships) do
+          # attribute :lastModifiedTime, Types::Time.default { Time.now }
+          attribute :lastModifiedBy, Types::String.default("root".freeze)
+          attribute :dlpsDeleted, Types::String.default("f".freeze)
+
+          associations do
+            belongs_to :user, foreign_key: :userid
+            belongs_to :group, foreign_key: :user_grp
+          end
+        end
+
+        struct_namespace Lauth
+        auto_struct true
+      end
+    end
+  end
+end

lauth/lib/lauth/persistence/relations/groups.rb

@@ -0,0 +1,22 @@
+module Lauth
+  module Persistence
+    module Relations
+      class Groups < ROM::Relation[:sql]
+        schema(:aa_user_grp, infer: true, as: :groups) do
+          # attribute :lastModifiedTime, Types::Time.default { Time.now }
+          # attribute :manager, Types::Integer.default(0)
+          attribute :lastModifiedBy, Types::String.default("root".freeze)
+          attribute :dlpsDeleted, Types::String.default("f".freeze)
+
+          associations do
+            has_many :grants, foreign_key: :user_grp
+            has_many :group_memberships, foreign_key: :user_grp
+          end
+        end
+
+        struct_namespace Lauth
+        auto_struct true
+      end
+    end
+  end
+end

lauth/lib/lauth/persistence/relations/institutions.rb

@@ -5,7 +5,6 @@ class Institutions < ROM::Relation[:sql]
         schema(:aa_inst, infer: true, as: :institutions) do
           # attribute :lastModifiedTime, Types::Time.default { Time.now }
           attribute :lastModifiedBy, Types::String.default("root".freeze)
-          # attribute :dlpsExpiryTime, Types::Time.default { Time.now }
           attribute :dlpsDeleted, Types::String.default("f".freeze)
 
           associations do

lauth/spec/repositories/grant_repo_spec.rb

@@ -70,5 +70,41 @@
         expect(grants).to be_empty
       end
     end
+
+    context "with a member of an authorized group" do
+      let!(:collection) { Factory[:collection, :restricted_by_username] }
+      let!(:user) { Factory[:user, userid: "lauth-group-member"] }
+      let!(:group) {
+        Factory[:group]
+        relations.groups.last
+      }
+      let!(:membership) { Factory[:group_membership, user: user, group: group] }
+      let!(:grant) { Factory[:grant, :for_group, group: group, collection: collection] }
+
+      it "finds that member's grant" do
+        grant_ids = repo.for_user_and_uri("lauth-group-member", "/restricted-by-username/")
+          .map(&:uniqueIdentifier)
+
+        expect(grant_ids).to contain_exactly(grant.uniqueIdentifier)
+      end
+
+      it "finds nothing for a nonmember" do
+        grants = repo.for_user_and_uri("lauth-denied", "/restricted-by-username/")
+
+        expect(grants).to be_empty
+      end
+
+      it "finds nothing for an empty user" do
+        grants = repo.for_user_and_uri("", "/restricted-by-username/")
+
+        expect(grants).to be_empty
+      end
+
+      it "finds nothing for a nil user" do
+        grants = repo.for_user_and_uri(nil, "/restricted-by-username/")
+
+        expect(grants).to be_empty
+      end
+    end
   end
 end

lauth/spec/requests/authorized_spec.rb

@@ -21,4 +21,22 @@
       expect(body).to eq({determination: "allowed"})
     end
   end
+
+  context "with an authorized group" do
+    let!(:user) { Factory[:user, userid: "lauth-group-member"] }
+    let!(:collection) { Factory[:collection, :restricted_by_username] }
+    let!(:group) {
+      Factory[:group]
+      relations.groups.last
+    }
+    let!(:group_membership) { Factory[:group_membership, group: group, user: user] }
+    let!(:grant) { Factory[:grant, :for_group, group: group, collection: collection] }
+
+    it do
+      get "/authorized", {user: "lauth-group-member", uri: "/restricted-by-username/"}
+
+      body = JSON.parse(last_response.body, symbolize_names: true)
+      expect(body).to eq({determination: "allowed"})
+    end
+  end
 end

lauth/spec/support/factories/grant.rb

@@ -13,4 +13,8 @@
   f.trait(:for_institution) do |t|
     t.association(:institution)
   end
+
+  f.trait(:for_group) do |t|
+    t.association(:group)
+  end
 end

lauth/spec/support/factories/group.rb

@@ -0,0 +1,8 @@
+Factory.define(:group, struct_namespace: Lauth) do |f|
+  f.sequence(:uniqueIdentifier) { |n| n }
+  f.sequence(:commonName) { |n| "Group #{n}" }
+  f.manager 0
+  f.lastModifiedTime Time.now
+  f.lastModifiedBy "root"
+  f.dlpsDeleted "f"
+end

lauth/spec/support/factories/group_membership.rb

@@ -0,0 +1,7 @@
+Factory.define(:group_membership, struct_namespace: Lauth) do |f|
+  f.association(:user)
+  f.association(:group)
+  f.lastModifiedTime Time.now
+  f.lastModifiedBy "root"
+  f.dlpsDeleted "f"
+end

lauth/spec/support/requests.rb

@@ -6,7 +6,13 @@
   let(:app) { Hanami.app }
 end
 
+RSpec.shared_context "Lauth::Persistence" do
+  let(:rom) { Hanami.app["persistence.rom"] }
+  let(:relations) { rom.relations }
+end
+
 RSpec.configure do |config|
   config.include Rack::Test::Methods, type: :request
   config.include_context "Rack::Test", type: :request
+  config.include_context "Lauth::Persistence", type: :database
 end