blacklight-access_controls 6.0.0 → 6.1.0

data/solr_conf/conf/scripts.conf

@@ -0,0 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+user=
+solr_hostname=localhost
+solr_port=8983
+rsyncd_port=18983
+data_dir=
+webapp_name=solr
+master_host=
+master_data_dir=
+master_status_dir=

data/solr_conf/conf/solrconfig.xml

@@ -1,86 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!--
- This is a stripped down config file used for a simple example...  
- It is *not* a good example to work from. 
--->
 <config>
-  
-  <!-- Controls what version of Lucene various components of Solr
-       adhere to.  Generally, you want to use the latest version to
-       get all bug fixes and improvements. It is highly recommended
-       that you fully re-index after changing this setting as it can
-       affect both how text is indexed and queried.
-  -->
-  <luceneMatchVersion>5.0.0</luceneMatchVersion>
-  
-  <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" />
-  <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />
-  <lib dir="${solr.install.dir:../../../..}/contrib/extraction/lib" regex=".*\.jar" />
-  <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-cell-\d.*\.jar" />
-
-  <directoryFactory name="DirectoryFactory" 
-                    class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}">
-  </directoryFactory> 
+  <!-- NOTE: various comments and unused configuration possibilities have been purged
+     from this file.  Please refer to http://wiki.apache.org/solr/SolrConfigXml,
+     as well as the default solrconfig file included with Solr -->
 
-  <codecFactory class="solr.SchemaCodecFactory"/>
+  <abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
 
-  <schemaFactory class="ClassicIndexSchemaFactory"/>
-
-
-  <dataDir>${solr.blacklight-core.data.dir:}</dataDir>
-  
-  <requestDispatcher handleSelect="true" >
-    <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048000" />
-  </requestDispatcher>
-  
-  <requestHandler name="/analysis/field" startup="lazy" class="solr.FieldAnalysisRequestHandler" />
+  <luceneMatchVersion>6.1.0</luceneMatchVersion>
 
-  <!-- config for the admin interface --> 
-  <admin>
-    <defaultQuery>*:*</defaultQuery>
-  </admin>
+  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
 
   <updateHandler class="solr.DirectUpdateHandler2">
     <updateLog>
-      <str name="dir">${solr.ulog.dir:}</str>
+      <str name="dir">${solr.core0.data.dir:}</str>
     </updateLog>
-
-    <autoCommit>
-      <maxTime>${solr.autoCommit.maxTime:15000}</maxTime>
-      <openSearcher>false</openSearcher>
-    </autoCommit>
-
-    <autoSoftCommit>
-      <maxTime>${solr.autoSoftCommit.maxTime:-1}</maxTime>
-    </autoSoftCommit>
   </updateHandler>
 
-  <!-- SearchHandler
+  <!-- solr lib dirs, which are needed for Solr 8 compatibility but ignored in solr 9.8 and above -->
+  <lib dir="${solr.install.dir:../../../..}/modules/analysis-extras/lib" />
+  <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" />
+  <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />
 
-       http://wiki.apache.org/solr/SearchHandler
+  <dataDir>${solr.data.dir:}</dataDir>
 
-       For processing Search Queries, the primary Request Handler
-       provided with Solr is "SearchHandler" It delegates to a sequent
-       of SearchComponents (see below) and supports distributed
-       queries across multiple shards
-    -->
   <requestHandler name="search" class="solr.SearchHandler" default="true">
     <!-- default values for query parameters can be specified, these
          will be overridden by parameters in the request
@@ -102,27 +44,33 @@
        -->
         <str name="qf">
           id
-          active_fedora_model_ssi
-          title_tesim
-          author_tesim
-          subject_tesim
+          full_title_tsim
+          short_title_tsim
+          alternative_title_tsim
+          title_tsim
+          author_tsim
+          subject_tsim
+          all_text_timv
         </str>
         <str name="pf">
           all_text_timv^10
         </str>
 
        <str name="author_qf">
-          author_tesim
+          author_tsim
        </str>
        <str name="author_pf">
        </str>
        <str name="title_qf">
-          title_tesim
+          title_tsim
+          full_title_tsim
+          short_title_tsim
+          alternative_title_tsim
        </str>
        <str name="title_pf">
        </str>
        <str name="subject_qf">
-          subject_tesim
+          subject_tsim
        </str>
        <str name="subject_pf">
        </str>
@@ -134,6 +82,75 @@
 
        <str name="facet">true</str>
        <str name="facet.mincount">1</str>
+       <str name="facet.limit">10</str>
+       <str name="facet.field">subject_ssim</str>
+
+       <str name="spellcheck">true</str>
+       <str name="spellcheck.dictionary">default</str>
+       <str name="spellcheck.onlyMorePopular">true</str>
+       <str name="spellcheck.extendedResults">true</str>
+       <str name="spellcheck.collate">false</str>
+       <str name="spellcheck.count">5</str>
+
+     </lst>
+    <arr name="last-components">
+      <str>spellcheck</str>
+    </arr>
+  </requestHandler>
+
+  <requestHandler name="/advanced" class="solr.SearchHandler">
+    <!-- a lucene request handler for using the JSON Query DSL,
+         specifically for advanced search.
+         Using a separate requestHandler is a workaround to
+         https://issues.apache.org/jira/browse/SOLR-16916, although
+         it could be desirable for other reasons as well.
+      -->
+     <lst name="defaults">
+       <str name="defType">lucene</str>
+       <str name="echoParams">explicit</str>
+        <str name="df">title_tsim</str>
+        <str name="qf">
+          id
+          full_title_tsim
+          short_title_tsim
+          alternative_title_tsim
+          title_tsim
+          author_tsim
+          subject_tsim
+          all_text_timv
+        </str>
+        <str name="pf">
+          all_text_timv^10
+        </str>
+
+       <str name="author_qf">
+          author_tsim
+       </str>
+       <str name="author_pf">
+       </str>
+       <str name="title_qf">
+          title_tsim
+          full_title_tsim
+          short_title_tsim
+          alternative_title_tsim
+       </str>
+       <str name="title_pf">
+       </str>
+       <str name="subject_qf">
+          subject_tsim
+       </str>
+       <str name="subject_pf">
+       </str>
+
+       <str name="fl">
+         *,
+         score
+       </str>
+
+       <str name="facet">true</str>
+       <str name="facet.mincount">1</str>
+       <str name="facet.limit">10</str>
+       <str name="facet.field">subject_ssim</str>
 
        <str name="spellcheck">true</str>
        <str name="spellcheck.dictionary">default</str>
@@ -167,6 +184,7 @@
         inheritable_discover_access_group_ssim,inheritable_discover_access_person_ssim,
         inheritable_read_access_group_ssim,inheritable_read_access_person_ssim,
         inheritable_edit_access_group_ssim,inheritable_edit_access_person_ssim,
+        inheritable_download_access_group_ssim,inheritable_download_access_person_ssim,
         inheritable_embargo_release_date_dtsi
       </str>
     </lst>
@@ -179,33 +197,11 @@
      </lst>
   </requestHandler>
 
-  <!-- for requests to get a single document; use id=666 instead of q=id:666 -->
-  <requestHandler name="document" class="solr.SearchHandler" >
-    <lst name="defaults">
-      <str name="echoParams">all</str>
-      <str name="fl">*</str>
-      <str name="rows">1</str>
-      <str name="q">{!term f=id v=$id}</str> <!-- use id=666 instead of q=id:666 -->
-    </lst>
-  </requestHandler>
-
-<!-- Spell Check
 
-        The spell check component can return a list of alternative spelling
-        suggestions.  
-
-        http://wiki.apache.org/solr/SpellCheckComponent
-     -->
   <searchComponent name="spellcheck" class="solr.SpellCheckComponent">
-
     <str name="queryAnalyzerFieldType">textSpell</str>
-
-    <!-- Multiple "Spell Checkers" can be declared and used by this
-         component
-      -->
-
-    <!-- a spellchecker built from a field of the main index, and
-         written to disk
+    <!-- Multiple "Spell Checkers" can be declared and used by this component
+      (e.g. for title_spell field)
       -->
     <lst name="spellchecker">
       <str name="name">default</str>
@@ -234,45 +230,6 @@
       <str name="accuracy">0.7</str>
       <str name="buildOnOptimize">true</str>
     </lst>
-
-    <!-- a spellchecker that uses a different distance measure -->
-    <!--
-       <lst name="spellchecker">
-         <str name="name">jarowinkler</str>
-         <str name="field">spell</str>
-         <str name="distanceMeasure">
-           org.apache.lucene.search.spell.JaroWinklerDistance
-         </str>
-         <str name="spellcheckIndexDir">spellcheckerJaro</str>
-       </lst>
-     -->
-
-    <!-- a spellchecker that use an alternate comparator 
-
-         comparatorClass be one of:
-          1. score (default)
-          2. freq (Frequency first, then score)
-          3. A fully qualified class name
-      -->
-    <!--
-       <lst name="spellchecker">
-         <str name="name">freq</str>
-         <str name="field">lowerfilt</str>
-         <str name="spellcheckIndexDir">spellcheckerFreq</str>
-         <str name="comparatorClass">freq</str>
-         <str name="buildOnCommit">true</str>
-      -->
-
-    <!-- A spellchecker that reads the list of words from a file -->
-    <!--
-       <lst name="spellchecker">
-         <str name="classname">solr.FileBasedSpellChecker</str>
-         <str name="name">file</str>
-         <str name="sourceLocation">spellings.txt</str>
-         <str name="characterEncoding">UTF-8</str>
-         <str name="spellcheckIndexDir">spellcheckerFile</str>
-       </lst>
-      -->
   </searchComponent>
 
   <searchComponent name="suggest" class="solr.SuggestComponent">
@@ -296,18 +253,11 @@
     </arr>
   </requestHandler>
 
-  <requestHandler name="/update/extract" class="org.apache.solr.handler.extraction.ExtractingRequestHandler">
-    <lst name="defaults">
-      <str name="fmap.Last-Modified">last_modified</str>
-      <str name="uprefix">ignored_</str>
-    </lst>
-    <!--Optional.  Specify a path to a tika configuration file. See the Tika docs for details.-->
-    <!-- <str name="tika.config">/my/path/to/tika.config</str> -->
-    <!-- Optional. Specify one or more date formats to parse. See DateUtil.DEFAULT_DATE_FORMATS
-         for default date formats -->
-    <!-- <lst name="date.formats"> -->
-    <!--   <str>yyyy&#45;MM&#45;dd</str> -->
-    <!-- </lst> -->
-  </requestHandler>
-</config>
+  <requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" />
 
+  <requestDispatcher handleSelect="true" >
+    <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048" />
+  </requestDispatcher>
+
+  <requestHandler name="/analysis/field" startup="lazy" class="solr.FieldAnalysisRequestHandler" />
+</config>

data/solr_conf/conf/stopwords.txt

@@ -12,3 +12,47 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
+#-----------------------------------------------------------------------
+# a couple of test stopwords to test that the words are really being
+# configured from this file:
+stopworda
+stopwordb
+
+#Standard english stop words taken from Lucene's StopAnalyzer
+a
+an
+and
+are
+as
+at
+be
+but
+by
+for
+if
+in
+into
+is
+it
+no
+not
+of
+on
+or
+s
+such
+t
+that
+the
+their
+then
+there
+these
+they
+this
+to
+was
+will
+with
+

data/solr_conf/conf/{lang/stopwords_en.txt → stopwords_en.txt}

@@ -13,12 +13,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+#-----------------------------------------------------------------------
 # a couple of test stopwords to test that the words are really being
 # configured from this file:
 stopworda
 stopwordb
 
-# Standard english stop words taken from Lucene's StopAnalyzer
+#Standard english stop words taken from Lucene's StopAnalyzer
 a
 an
 and
@@ -39,7 +40,9 @@ not
 of
 on
 or
+s
 such
+t
 that
 the
 their
@@ -52,3 +55,4 @@ to
 was
 will
 with
+

data/solr_conf/conf/synonyms.txt

@@ -12,9 +12,11 @@
 
 #-----------------------------------------------------------------------
 #some test synonym mappings unlikely to appear in real input text
-aaafoo => aaabar
-bbbfoo => bbbfoo bbbbar
-cccfoo => cccbar cccbaz
+aaa => aaaa
+bbb => bbbb1 bbbb2
+ccc => cccc1,cccc2
+a\=>a => b\=>b
+a\,a => b\,b
 fooaaa,baraaa,bazaaa
 
 # Some synonym groups specific to this example

data/solr_conf/conf/xslt/example.xsl

@@ -24,7 +24,7 @@
     xmlns:xsl='http://www.w3.org/1999/XSL/Transform'
 >
 
-  <xsl:output media-type="text/html" encoding="UTF-8"/> 
+  <xsl:output media-type="text/html; charset=UTF-8" encoding="UTF-8"/> 
   
   <xsl:variable name="title" select="concat('Solr search results (',response/result/@numFound,' documents)')"/>
   

data/solr_conf/conf/xslt/example_atom.xsl

@@ -27,7 +27,7 @@
   <xsl:output
        method="xml"
        encoding="utf-8"
-       media-type="application/xml"
+       media-type="text/xml; charset=UTF-8"
   />
 
   <xsl:template match='/'>

data/solr_conf/conf/xslt/example_rss.xsl

@@ -27,7 +27,7 @@
   <xsl:output
        method="xml"
        encoding="utf-8"
-       media-type="application/xml"
+       media-type="text/xml; charset=UTF-8"
   />
   <xsl:template match='/'>
     <rss version="2.0">

data/solr_conf/conf/xslt/luke.xsl

@@ -28,7 +28,7 @@
     <xsl:output
         method="html"
         encoding="UTF-8"
-        media-type="text/html"
+        media-type="text/html; charset=UTF-8"
         doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
         doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
     />
@@ -39,8 +39,8 @@
         <html xmlns="http://www.w3.org/1999/xhtml">
             <head>
                 <link rel="stylesheet" type="text/css" href="solr-admin.css"/>
-                <link rel="icon" href="favicon.ico" type="image/x-icon"/>
-                <link rel="shortcut icon" href="favicon.ico" type="image/x-icon"/>
+                <link rel="icon" href="favicon.ico" type="image/ico"/>
+                <link rel="shortcut icon" href="favicon.ico" type="image/ico"/>
                 <title>
                     <xsl:value-of select="$title"/>
                 </title>

data/spec/factories/user.rb

@@ -3,6 +3,6 @@
 FactoryBot.define do
   factory :user do
     sequence(:email) { |n| "user_#{n}@example.com" }
-    password 'password'
+    password { 'password' }
   end
 end

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -11,7 +11,7 @@ class TestAppGenerator < Rails::Generators::Base
 
   def generate_blacklight
     say_status('status', 'GENERATING BLACKLIGHT', :yellow)
-    generate 'blacklight:install', '--devise'
+    generate 'blacklight:install', '--devise --skip-assets'
   end
 
   def configure_blacklight

data/spec/unit/blacklight/access_controls/search_builder_spec.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
 RSpec.describe Blacklight::AccessControls::SearchBuilder do
-  subject { search_builder }
+  subject(:search_builder) { described_class.new scope, ability: ability }
 
-  let(:search_builder) do
-    described_class.new(controller, ability: ability)
-  end
-  let(:controller) { double }
+  let(:blacklight_config) { Blacklight::Configuration.new }
+  let(:scope) { double blacklight_config: blacklight_config, search_state_class: nil }
   let(:user) { User.new }
   let(:ability) { Ability.new(user) }