cul_hydra 1.6.4 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dab1003e11e34d701dde1eb46e18f31e34c72f2aedaadb6c56c95de80ce21f9a
-  data.tar.gz: '090c961afa5d3dd183c32ffeb3362fd712dca7321f42c4b9c8b3abe89f8d7ef0'
+  metadata.gz: 9cfae057e0eb17a94cd5c1d9428e9198d9b5e23917bb61f30ee53e961325d2b6
+  data.tar.gz: f7c3fd3150d8e7f68f83b94cbdb3b6b8c15e51965aacdd99904275acf7b811eb
 SHA512:
-  metadata.gz: 56f4da8b82090c0d603655d69707ea82dbb09137614e973e8b08c29101339c816655b88d340f61f96fa1e79f96cc3c154b1426128ada17eeb3edb68f9868eb8f
-  data.tar.gz: 3a8a85793196a278cab4c74a8ba3e38659de18866caed38ee9eb078b3edb8e9c0fe69a093ec35f2bdf5dc46dfccccee6cc48883923c759cbc4597fca69bdc68c
+  metadata.gz: b59e0f3115c18aa023fc89d32c3052087f0e4038ff9d3f21547536e7c742c22a83d23960abf1291eadef58b1618be99e466555061d46ab917f0b812ed2464e5d
+  data.tar.gz: f3898ca39cc7af64c33744f60d32fe6c72c6f1302775031264fbfbba34f17dc0d0830a9126b88812a5d97e12fd5bb00b0f38a26d5b528ea6c910901f912a5576

data/app/models/cul/hydra/datastreams/access_control_metadata.rb

@@ -0,0 +1,10 @@
+module Cul
+module Hydra
+module Datastreams
+class AccessControlMetadata < ::ActiveFedora::Datastream
+  include ::ActiveFedora::Datastreams::NokogiriDatastreams
+  include Cul::Hydra::Solrizer::AccessControlMetadataFields
+end
+end
+end
+end

data/app/models/generic_resource.rb

@@ -21,6 +21,7 @@ class GenericResource < ::ActiveFedora::Base
   LENGTH = RDF::URI(ActiveFedora::Predicates.find_graph_predicate(:image_length))
 
   has_datastream :name => "content", :type=>::ActiveFedora::Datastream, :versionable => true
+  has_datastream :name => "accessControlMetadata", :type=>Cul::Hydra::Datastreams::AccessControlMetadata, :versionable => false
   has_metadata :name=>"RELS-INT", :type=>ActiveFedora::RelsInt::Datastream
 
   rdf_types(RDF::CUL.Resource)

data/fixtures/spec/CUL_ACCESS/access-closed.xml

@@ -0,0 +1,20 @@
+<Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        PolicyId="policy:89dcca6c-87b3-46d5-a1fd-1264ae7488c2"
+        RuleCombiningAlgId="urn:oasis:names:tc:xacml:3.0:rule-combining-algorithm:deny-unless-permit"> 
+  <Description>Sample policy for unpublishable content</Description>
+  <Target>
+    <AnyOf>
+      <AllOf>
+        <Match MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+          <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">GET</AttributeValue>
+          <AttributeDesignator MustBePresent="false" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:action"
+                               AttributeId="urn:oasis:names:tc:xacml:1.0:action:action-id" DataType="http://www.w3.org/2001/XMLSchema#string"/>
+        </Match>
+      </AllOf>
+    </AnyOf>
+  </Target>
+  <Rule RuleId="1" Effect="Deny">
+    <Description>Closed</Description>
+  </Rule>
+</Policy>

data/fixtures/spec/CUL_ACCESS/access-conditions.xml

@@ -0,0 +1,43 @@
+
+<?xml version="1.0"?>
+<xacml:Policy xmlns:xacml="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" PolicyId="policy:c2bb973a-b21d-4a5f-b75d-c0374cc820d7" RuleCombiningAlgId="urn:oasis:names:tc:xacml:3.0:rule-combining-algorithm:deny-unless-permit">
+  <xacml:Target>
+    <xacml:AnyOf>
+      <xacml:AllOf>
+        <xacml:Match MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+          <xacml:AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">GET</xacml:AttributeValue>
+          <xacml:AttributeDesignator MustBePresent="false" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:action" AttributeId="urn:oasis:names:tc:xacml:1.0:action:action-id" DataType="http://www.w3.org/2001/XMLSchema#string"/>
+        </xacml:Match>
+      </xacml:AllOf>
+    </xacml:AnyOf>
+  </xacml:Target>
+  <xacml:Rule RuleId="1" Effect="Permit">
+    <xacml:Description>On-site Access</xacml:Description>
+    <xacml:Condition FunctionId="urn:oasis:names:tc:xacml:1.0:function:anyURI-at-least-one-member-of">
+      <xacml:AttributeDesignator MustBePresent="false" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:environment" AttributeId="urn:library.columbia.edu:names:reading-room-location" DataType="http://www.w3.org/2001/XMLSchema#anyURI"/>
+      <xacml:Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:anyURI-bag">
+        <xacml:AttributeValue DataType="http://www.w3.org/2001/XMLSchema#anyURI" FriendlyName="Reading Room, Rare Book &amp; Manuscript Library, Columbia University">http://id.library.columbia.edu/term/45487bbd-97ef-44b4-9468-dda47594bc60</xacml:AttributeValue>
+      </xacml:Apply>
+    </xacml:Condition>
+  </xacml:Rule>
+  <xacml:Rule RuleId="2" Effect="Permit">
+    <xacml:Description>Specified Group/UNI Access</xacml:Description>
+    <xacml:Condition FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-at-least-one-member-of">
+      <xacml:AttributeDesignator MustBePresent="false" Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="http://www.ja-sig.org/products/cas/affiliation" DataType="http://www.w3.org/2001/XMLSchema#string"/>
+      <xacml:Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-bag">
+        <xacml:AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">LIB_role-ext-UnivSemArchives</xacml:AttributeValue>
+      </xacml:Apply>
+    </xacml:Condition>
+  </xacml:Rule>
+  <xacml:Rule RuleId="3" Effect="Permit">
+    <!-- Each restriction_on_access field group results in a Rule element defining a permit condition -->
+    <xacml:Description>Embargoed</xacml:Description> 
+    <xacml:Condition FunctionId="urn:oasis:names:tc:xacml:1.0:function:date-greater-than-or-equal">
+      <xacml:Apply FunctionId="urn:oasis:names:tc:xacml:1.0:function:date-one-and-only">
+        <xacml:AttributeDesignator MustBePresent="false" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:environment"
+                           AttributeId="urn:oasis:names:tc:xacml:1.0:environment:current-date" DataType="http://www.w3.org/2001/XMLSchema#date"/>
+      </xacml:Apply>
+      <xacml:AttributeValue DataType="http://www.w3.org/2001/XMLSchema#date">2099-01-01</xacml:AttributeValue>
+    </xacml:Condition>
+  </xacml:Rule>
+</xacml:Policy>

data/fixtures/spec/CUL_ACCESS/access-open.xml

@@ -0,0 +1,20 @@
+<Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        PolicyId="policy:89dcca6c-87b3-46d5-a1fd-1264ae7488c2"
+        RuleCombiningAlgId="urn:oasis:names:tc:xacml:3.0:rule-combining-algorithm:deny-unless-permit"> 
+  <Description>Sample policy for unpublishable content</Description>
+  <Target>
+    <AnyOf>
+      <AllOf>
+        <Match MatchId="urn:oasis:names:tc:xacml:1.0:function:string-equal">
+          <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">GET</AttributeValue>
+          <AttributeDesignator MustBePresent="false" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:action"
+                               AttributeId="urn:oasis:names:tc:xacml:1.0:action:action-id" DataType="http://www.w3.org/2001/XMLSchema#string"/>
+        </Match>
+      </AllOf>
+    </AnyOf>
+  </Target>
+  <Rule RuleId="1" Effect="Permit">
+    <Description>Public Access</Description>
+  </Rule>
+</Policy>

data/lib/cul_hydra/access_levels.rb

@@ -0,0 +1,9 @@
+module Cul::Hydra::AccessLevels
+  ACCESS_LEVEL_PUBLIC      = "Public Access".freeze
+  ACCESS_LEVEL_ONSITE      = "On-site Access".freeze
+  ACCESS_LEVEL_REQUEST     = "On-site Access By Request".freeze
+  ACCESS_LEVEL_EMBARGO     = "Embargoed".freeze
+  ACCESS_LEVEL_CLOSED      = "Closed".freeze
+  ACCESS_LEVEL_AFFILIATION = "Specified Group/UNI Access".freeze
+  ACCESS_LEVEL_CLASSROOM   = "Columbia Classroom Access".freeze
+end

data/lib/cul_hydra/solrizer/access_control_metadata_fields.rb

@@ -0,0 +1,76 @@
+module Cul::Hydra::Solrizer
+  module AccessControlMetadataFields
+    extend ActiveSupport::Concern
+    include Cul::Hydra::AccessLevels # useful constants
+
+    XACML_NS = {'xacml'=>'urn:oasis:names:tc:xacml:3.0:core:schema:wd-17'}
+
+    FUNCTION_EMBARGO = "urn:oasis:names:tc:xacml:1.0:function:date-greater-than-or-equal".freeze
+    FUNCTION_ONE_STRING_MATCH = "urn:oasis:names:tc:xacml:1.0:function:string-at-least-one-member-of".freeze
+    FUNCTION_ONE_URI_MATCH = "urn:oasis:names:tc:xacml:1.0:function:anyURI-at-least-one-member-of".freeze
+
+    TYPE_DATE = "http://www.w3.org/2001/XMLSchema#date".freeze
+    TYPE_STRING = "http://www.w3.org/2001/XMLSchema#string".freeze
+    TYPE_URI = "http://www.w3.org/2001/XMLSchema#anyURI".freeze
+
+    ATTRIBUTE_AFFILIATION = "http://www.ja-sig.org/products/cas/affiliation".freeze
+
+    def to_solr(solr_doc={})
+      solr_doc = (defined? super) ? super : solr_doc
+
+      return solr_doc if policy.nil?  # Return because there is nothing to process
+      solr_doc['access_control_levels_ssim'] = access_levels
+      solr_doc['access_control_permissions_bsi'] = permissions_indicated?
+      solr_doc['access_control_embargo_dtsi'] = permit_after_date
+      solr_doc['access_control_affiliations_ssim'] = permit_affiliations
+      solr_doc['access_control_locations_ssim'] = permit_locations
+      solr_doc
+    end
+
+    def policy
+      ng_xml.xpath('/xacml:Policy', XACML_NS).first
+    end
+
+    def access_levels
+      policy&.xpath('./xacml:Rule/xacml:Description', XACML_NS).map(&:text)
+    end
+
+    def permissions_indicated?
+      permissions&.length > 0
+    end
+
+    def permissions
+      policy&.xpath('./xacml:Rule[@Effect=\'Permit\']/xacml:Condition', XACML_NS)
+    end
+
+    def permit_affiliations
+      permissions&.map do |condition|
+        if condition.xpath("../xacml:Description", XACML_NS).text.eql?(ACCESS_LEVEL_AFFILIATION)
+          if condition['FunctionId'].eql?(FUNCTION_ONE_STRING_MATCH)
+            condition.xpath(".//xacml:AttributeValue[@DataType='#{TYPE_STRING}']", XACML_NS).text
+          end
+        end
+      end.compact
+    end
+
+    def permit_locations
+      permissions&.map do |condition|
+        if condition.xpath("../xacml:Description", XACML_NS).text.eql?(ACCESS_LEVEL_ONSITE)
+          if condition['FunctionId'].eql?(FUNCTION_ONE_URI_MATCH)
+            condition.xpath(".//xacml:AttributeValue[@DataType='#{TYPE_URI}']", XACML_NS).text
+          end
+        end
+      end.compact
+    end
+
+    def permit_after_date
+      permissions&.map do |condition|
+        if condition.xpath("../xacml:Description", XACML_NS).text.eql?(ACCESS_LEVEL_EMBARGO)
+          if condition['FunctionId'].eql?(FUNCTION_EMBARGO)
+            condition.xpath("./xacml:AttributeValue[@DataType='#{TYPE_DATE}']", XACML_NS).text
+          end
+        end
+      end.compact.first
+    end
+  end
+end

data/lib/cul_hydra/solrizer/mods_fieldable.rb

@@ -525,6 +525,7 @@ module Cul::Hydra::Solrizer
 
       repo_marc_code = repository_code
       unless repo_marc_code.nil?
+        solr_doc["lib_repo_code_ssim"] = [repo_marc_code]
         solr_doc["lib_repo_short_ssim"] = [translate_repo_marc_code(repo_marc_code, 'short')]
         solr_doc["lib_repo_long_sim"] = [translate_repo_marc_code(repo_marc_code, 'long')]
         solr_doc["lib_repo_full_ssim"] = [translate_repo_marc_code(repo_marc_code, 'full')]

data/lib/cul_hydra/solrizer.rb

@@ -5,6 +5,7 @@ module Cul
       autoload :TerminologyBasedSolrizer, "cul_hydra/solrizer/terminology_based_solrizer"
       autoload :ValueMapper, "cul_hydra/solrizer/value_mapper"
       autoload :ModsFieldable, "cul_hydra/solrizer/mods_fieldable"
+      autoload :AccessControlMetadataFields, "cul_hydra/solrizer/access_control_metadata_fields"
     end
   end
 end

data/lib/cul_hydra/version.rb

@@ -1,6 +1,6 @@
 module Cul
   module Hydra
-    VERSION = '1.6.4'
+    VERSION = '1.7.0'
     def self.version
       VERSION
     end

data/lib/cul_hydra.rb

@@ -8,6 +8,7 @@ module Cul
     autoload :Fedora, 'cul_hydra/fedora'
     autoload :Om, 'cul_hydra/om'
     autoload :Solrizer, 'cul_hydra/solrizer'
+    autoload :AccessLevels, 'cul_hydra/access_levels'
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cul_hydra
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.7.0
 platform: ruby
 authors:
 - Benjamin Armintor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-29 00:00:00.000000000 Z
+date: 2019-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
@@ -385,6 +385,7 @@ files:
 - app/models/concerns/sc/canvas.rb
 - app/models/concerns/sc/sequence.rb
 - app/models/content_aggregator.rb
+- app/models/cul/hydra/datastreams/access_control_metadata.rb
 - app/models/cul/hydra/datastreams/dc_metadata.rb
 - app/models/cul/hydra/datastreams/mods_document.rb
 - app/models/cul/hydra/datastreams/struct_metadata.rb
@@ -399,14 +400,11 @@ files:
 - app/models/static_audio_aggregator.rb
 - app/models/static_image_aggregator.rb
 - bin/rails
-- config/fedora.yml
 - config/jetty.yml
 - config/locales/ldpd_hydra.en.yml
 - config/predicate_mappings.yml
-- config/solr.yml
 - config/solr_mappings.yml
 - config/solr_value_maps.yml
-- config/subs.yml
 - fixtures/cmodels/ldpd_ADLMetadata.xml
 - fixtures/cmodels/ldpd_AESMetadata.xml
 - fixtures/cmodels/ldpd_BagAggregator.xml
@@ -452,6 +450,9 @@ files:
 - fixtures/cmodels/pcdm_Collection.xml
 - fixtures/spec/BLOB/dlc.md
 - fixtures/spec/BLOB/test001.jpg
+- fixtures/spec/CUL_ACCESS/access-closed.xml
+- fixtures/spec/CUL_ACCESS/access-conditions.xml
+- fixtures/spec/CUL_ACCESS/access-open.xml
 - fixtures/spec/CUL_DC/dc.xml
 - fixtures/spec/CUL_MODS/mods-001.xml
 - fixtures/spec/CUL_MODS/mods-all.xml
@@ -508,6 +509,7 @@ files:
 - fixtures/spec/STRUCTMAP/structmap-unordered-seq.xml
 - lib/cul_hydra.rb
 - lib/cul_hydra/access_controls_enforcement.rb
+- lib/cul_hydra/access_levels.rb
 - lib/cul_hydra/controllers.rb
 - lib/cul_hydra/controllers/aggregates.rb
 - lib/cul_hydra/controllers/aggregator_controller_helper.rb
@@ -538,6 +540,7 @@ files:
 - lib/cul_hydra/om/standard_mods.rb
 - lib/cul_hydra/risearch_members.rb
 - lib/cul_hydra/solrizer.rb
+- lib/cul_hydra/solrizer/access_control_metadata_fields.rb
 - lib/cul_hydra/solrizer/extractor.rb
 - lib/cul_hydra/solrizer/mods_fieldable.rb
 - lib/cul_hydra/solrizer/terminology_based_solrizer.rb

data/config/fedora.yml

@@ -1,26 +0,0 @@
-development:
-  user: fedoraAdmin
-  password: f+BULUS*^
-  url: http://repository.cul.columbia.edu:8080/fedora
-  datastreams_root: /ifs/cul/repo/archive/repo-datastreams
-  time_zone: "America/New_York"
-test: &TEST  
-  user: fedoraAdmin
-  password: fedoraAdmin
-  url: <%= "http://127.0.0.1:#{ENV['TEST_JETTY_PORT'] || 8983}/fedora-test" %>
-  datastreams_root: /ifs/cul/repo/archive/repo-datastreams
-  time_zone: "America/New_York"
-production:
-  user: fedoraAdmin
-  password: f+BULUS*^
-  url: http://repository.cul.columbia.edu:8080/fedora
-  datastreams_root: /ifs/cul/repo/archive/repo-datastreams
-  time_zone: "America/New_York"
-dcv_test:
-  user: fedoraAdmin
-  password: f+BULUS*^
-  url: http://repository.cul.columbia.edu:8080/fedora
-  datastreams_root: /ifs/cul/repo/archive/repo-datastreams
-  time_zone: "America/New_York"
-cucumber:
-  <<: *TEST

data/config/solr.yml

@@ -1,17 +0,0 @@
-# This is a sample config file that does not have multiple solr instances. You will also need to be sure to
-# edit the fedora.yml file to match the solr URL for active-fedora. 
-#  url: http://katana.cul.columbia.edu:8080/solr-4.7/dcv_private_dev
-test: &TEST
-  url: <%= "http://127.0.0.1:#{ENV['TEST_JETTY_PORT'] || 8983}/solr/test" %>
-dcv_dev: &DEV
-  url: http://spatha.cul.columbia.edu:8080/solr-4.7/dcv_private_test
-  dcv_core: 'dcv_private_dev'
-dcv_test: &IFP
-  url: http://spatha.cul.columbia.edu:8080/solr-4.7/dcv_private_test
-  dcv_core: 'dcv_private_test'
-cucumber:
-  <<: *TEST
-production: &PROD
-  url: http://spatha.cul.columbia.edu:8080/solr-4.7/dcv_prod
-development:
-  <<: *PROD

data/config/subs.yml

@@ -1,10 +0,0 @@
-old:
-  fedora_server: http://sayers.cul.columbia.edu:8080
-  php_server: http://bach.cul.columbia.edu/dev
-  djatoka_server: http://iris.cul.columbia.edu:8080
-development:
-  fedora_server: http://repository.cul.columbia.edu:8080
-  php_server: http://fedora-svc.cul.columbia.edu/dev
-test:
-  fedora_server: http://repository.cul.columbia.edu:8080
-  php_server: http://fedora-svc.cul.columbia.edu/dev