Merge pull request #7482 from eugene7646/solr_8_11_1

Solr 8.11.1 and Log4J 2.16.0 (8248)

CoreLibs/ivy.xml

@@ -14,7 +14,7 @@
 
         <!-- for viewers -->
         <dependency conf="autopsy_core->*" org="org.freedesktop.gstreamer" name="gst1-java-core" rev="1.0.0"/>
-        <dependency conf="autopsy_core->*" org="net.java.dev.jna" name="jna-platform" rev="5.9.0"/>
+        <dependency conf="autopsy_core->*" org="net.java.dev.jna" name="jna-platform" rev="5.10.0"/>
 
         <!-- for file search -->
         <dependency conf="autopsy_core->*" org="com.github.lgooddatepicker" name="LGoodDatePicker" rev="10.3.1"/>

CoreLibs/nbproject/project.properties

@@ -42,8 +42,8 @@ file.reference.javassist-3.12.1.GA.jar=release/modules/ext/javassist-3.12.1.GA.j
 file.reference.jfxtras-common-8.0-r4.jar=release/modules/ext/jfxtras-common-8.0-r4.jar
 file.reference.jfxtras-controls-8.0-r4.jar=release/modules/ext/jfxtras-controls-8.0-r4.jar
 file.reference.jfxtras-fxml-8.0-r4.jar=release/modules/ext/jfxtras-fxml-8.0-r4.jar
-file.reference.jna-5.9.0.jar=release/modules/ext/jna-5.9.0.jar
-file.reference.jna-platform-5.9.0.jar=release/modules/ext/jna-platform-5.9.0.jar
+file.reference.jna-5.10.0.jar=release/modules/ext/jna-5.10.0.jar
+file.reference.jna-platform-5.10.0.jar=release/modules/ext/jna-platform-5.10.0.jar
 file.reference.joda-time-2.4.jar=release/modules/ext/joda-time-2.4.jar
 file.reference.jsr305-1.3.9.jar=release/modules/ext/jsr305-1.3.9.jar
 file.reference.LGoodDatePicker-10.3.1.jar=release/modules/ext/LGoodDatePicker-10.3.1.jar

CoreLibs/nbproject/project.xml

@@ -923,8 +923,8 @@
                 <binary-origin>release/modules/ext/commons-compress-1.18.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jna-platform-5.9.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\jna-platform-5.9.0.jar</binary-origin>
+                <runtime-relative-path>ext/jna-platform-5.10.0.jar</runtime-relative-path>
+                <binary-origin>release\modules\ext\jna-platform-5.10.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/opencv-248.jar</runtime-relative-path>
@@ -951,8 +951,8 @@
                 <binary-origin>release/modules/ext/imageio-bmp-3.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jna-5.9.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\jna-5.9.0.jar</binary-origin>
+                <runtime-relative-path>ext/jna-5.10.0.jar</runtime-relative-path>
+                <binary-origin>release\modules\ext\jna-5.10.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/commons-lang-2.6.jar</runtime-relative-path>

KeywordSearch/ivy.xml

@@ -16,10 +16,10 @@
     <dependencies>
         <!-- Solr -->
 	<dependency conf="solr-war->default" org="org.apache.solr" name="solr" rev="4.9.1" transitive="false" /> <!-- the war file for embedded Solr 4 -->
-        <dependency name="solr-cell" rev="8.6.3" org="org.apache.solr" conf="solr-libs->default"/>
+        <dependency name="solr-cell" rev="8.11.0" org="org.apache.solr" conf="solr-libs->default"/>
 
         <!-- Autopsy -->
-        <dependency conf="autopsy->*" org="org.apache.solr" name="solr-solrj" rev="8.6.3"/>
+        <dependency conf="autopsy->*" org="org.apache.solr" name="solr-solrj" rev="8.11.0"/>
         <dependency conf="autopsy->*" org="commons-lang" name="commons-lang" rev="2.4"/>
         <dependency conf="autopsy->*" org="commons-validator" name="commons-validator" rev="1.5.1"/>
         <dependency conf="autopsy->*" org="com.optimaize.languagedetector" name="language-detector" rev="0.6"/>

KeywordSearch/nbproject/project.properties

@@ -44,8 +44,7 @@ file.reference.poi-scratchpad-4.0.1.jar=release/modules/ext/poi-scratchpad-4.0.1
 file.reference.protobuf-java-2.5.0.jar=release/modules/ext/protobuf-java-2.5.0.jar
 file.reference.quartz-2.2.0.jar=release/modules/ext/quartz-2.2.0.jar
 file.reference.slf4j-api-1.7.25.jar=release/modules/ext/slf4j-api-1.7.25.jar
-file.reference.solr-solrj-8.6.2.jar=release/modules/ext/solr-solrj-8.6.2.jar
-file.reference.solr-solrj-8.6.3.jar=release/modules/ext/solr-solrj-8.6.3.jar
+file.reference.solr-solrj-8.11.0.jar=release/modules/ext/solr-solrj-8.11.0.jar
 file.reference.sqlwrapper-0.0.1.jar=release/modules/ext/sqlwrapper-0.0.1.jar
 file.reference.stax2-api-3.1.4.jar=release/modules/ext/stax2-api-3.1.4.jar
 file.reference.tagsoup-1.2.1.jar=release/modules/ext/tagsoup-1.2.1.jar
@@ -66,5 +65,5 @@ license.file=../LICENSE-2.0.txt
 nbm.homepage=http://www.sleuthkit.org/autopsy/
 nbm.needs.restart=true
 source.reference.commons-validator-1.5.1.jar=release/modules/ext/commons-validator-1.5.1-sources.jar 
-source.reference.solr-solrj-8.6.2.jar=release/modules/ext/solr-solrj-8.6.2-sources.jar
+source.reference.solr-solrj-8.11.0.jar=release/modules/ext/solr-solrj-8.11.0-sources.jar
 spec.version.base=6.6

KeywordSearch/nbproject/project.xml

@@ -385,8 +385,8 @@
                 <binary-origin>release/modules/ext/httpclient-4.5.10.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/solr-solrj-8.6.3.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/solr-solrj-8.6.3.jar</binary-origin>
+                <runtime-relative-path>ext/solr-solrj-8.11.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/solr-solrj-8.11.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/vorbis-java-tika-0.8.jar</runtime-relative-path>

KeywordSearch/solr/server/README.txt

@@ -93,8 +93,8 @@ statements in the solrconfig.xml file to reference plugin jars outside of
 this directory for loading "contrib" plugins via relative paths.  
 
 If you make a copy of this example server and wish to use the 
-ExtractingRequestHandler (SolrCell), DataImportHandler (DIH), the 
-clustering component, or any other modules in "contrib", you will need to 
+ExtractingRequestHandler (SolrCell), DataImportHandler (DIH), 
+or any other modules in "contrib", you will need to 
 copy the required jars or update the paths to those jars in your 
 solrconfig.xml.
 

KeywordSearch/solr/server/etc/jetty-gzip.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
+
+<!-- =============================================================== -->
+<!-- Mixin the GZIP Handler                                          -->
+<!-- This applies the GZIP Handler to the entire server              -->
+<!-- If a GZIP handler is required for an individual context, then   -->
+<!-- use a context XML (see test.xml example in distribution)        -->
+<!-- =============================================================== -->
+
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+ <Call name="insertHandler">
+   <Arg>
+     <New id="GzipHandler" class="org.eclipse.jetty.server.handler.gzip.GzipHandler">
+       <Set name="minGzipSize"><Property name="jetty.gzip.minGzipSize" deprecated="gzip.minGzipSize" default="2048"/></Set>
+       <Set name="checkGzExists"><Property name="jetty.gzip.checkGzExists" deprecated="gzip.checkGzExists" default="false"/></Set>
+       <Set name="compressionLevel"><Property name="jetty.gzip.compressionLevel" deprecated="gzip.compressionLevel" default="-1"/></Set>
+       <Set name="inflateBufferSize"><Property name="jetty.gzip.inflateBufferSize" default="0"/></Set>
+       <Set name="deflaterPoolCapacity"><Property name="jetty.gzip.deflaterPoolCapacity" default="-1"/></Set>
+       <Set name="syncFlush"><Property name="jetty.gzip.syncFlush" default="false" /></Set>
+
+       <Set name="excludedAgentPatterns">
+         <Array type="String">
+           <Item><Property name="jetty.gzip.excludedUserAgent" deprecated="gzip.excludedUserAgent" default=".*MSIE.6\.0.*"/></Item>
+         </Array>
+       </Set>
+
+       <Set name="includedMethodList"><Property name="jetty.gzip.includedMethodList" default="GET,POST" /></Set>
+       <Set name="excludedMethodList"><Property name="jetty.gzip.excludedMethodList" default="" /></Set>
+     </New>
+   </Arg>
+ </Call>
+</Configure>

KeywordSearch/solr/server/etc/jetty.xml

@@ -93,7 +93,7 @@
       <Call name="addRule">
         <Arg>
           <New class="org.eclipse.jetty.rewrite.handler.HeaderPatternRule">
-            <Set name="pattern">*</Set>
+            <Set name="pattern">/solr/*</Set>
             <Set name="name">Content-Security-Policy</Set>
             <Set name="value">default-src 'none'; base-uri 'none'; connect-src 'self'; form-action 'self'; font-src 'self'; frame-ancestors 'none'; img-src 'self'; media-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self'; worker-src 'self';</Set>
           </New>
@@ -102,7 +102,7 @@
       <Call name="addRule">
         <Arg>
           <New class="org.eclipse.jetty.rewrite.handler.HeaderPatternRule">
-            <Set name="pattern">*</Set>
+            <Set name="pattern">/solr/*</Set>
             <Set name="name">X-Content-Type-Options</Set>
             <Set name="value">nosniff</Set>
           </New>
@@ -111,7 +111,7 @@
       <Call name="addRule">
         <Arg>
           <New class="org.eclipse.jetty.rewrite.handler.HeaderPatternRule">
-            <Set name="pattern">*</Set>
+            <Set name="pattern">/solr/*</Set>
             <Set name="name">X-Frame-Options</Set>
             <Set name="value">SAMEORIGIN</Set>
           </New>
@@ -120,7 +120,7 @@
       <Call name="addRule">
         <Arg>
           <New class="org.eclipse.jetty.rewrite.handler.HeaderPatternRule">
-            <Set name="pattern">*</Set>
+            <Set name="pattern">/solr/*</Set>
             <Set name="name">X-XSS-Protection</Set>
             <Set name="value">1; mode=block</Set>
           </New>

KeywordSearch/solr/server/etc/security.policy

@@ -103,6 +103,9 @@ grant {
   permission java.lang.RuntimePermission "writeFileDescriptor";
   // needed by hadoop http
   permission java.lang.RuntimePermission "getProtectionDomain";
+  // needed by aws s3 sdk (Apache HTTP Client)
+  permission java.lang.RuntimePermission "setFactory";
+  permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.reflect";
 
   // These two *have* to be spelled out a separate
   permission java.lang.management.ManagementPermission "control";
@@ -198,6 +201,11 @@ grant {
 
   permission java.io.FilePermission "${log4j.configurationFile}", "read,write,delete,readlink";
 
+  // Credentials for S3 Repository
+  permission java.io.FilePermission "${aws.sharedCredentialsFile}", "read,readlink";
+  permission java.io.FilePermission "${aws.configFile}", "read,readlink";
+  permission java.io.FilePermission "${user.home}${/}.aws${/}-", "read,readlink";
+
   // expanded to a wildcard if set, allows all networking everywhere
   permission java.net.SocketPermission "${solr.internal.network.permission}", "accept,listen,connect,resolve";
 };

KeywordSearch/solr/server/modules/gzip.mod

@@ -0,0 +1,12 @@
+[description]
+Enable GzipHandler for dynamic gzip compression
+for the entire server.
+
+[tags]
+handler
+
+[depend]
+server
+
+[xml]
+etc/jetty-gzip.xml

KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/web.xml

@@ -47,25 +47,11 @@
     <servlet-class>org.apache.solr.servlet.LoadAdminUiServlet</servlet-class>
   </servlet>
 
-  <servlet>
-    <servlet-name>SolrRestApi</servlet-name>
-    <servlet-class>org.restlet.ext.servlet.ServerServlet</servlet-class>
-    <init-param>
-      <param-name>org.restlet.application</param-name>
-      <param-value>org.apache.solr.rest.SolrSchemaRestApi</param-value>
-    </init-param>
-  </servlet>
-
   <servlet-mapping>
     <servlet-name>LoadAdminUI</servlet-name>
     <url-pattern>/index.html</url-pattern>
   </servlet-mapping>
 
-  <servlet-mapping>
-    <servlet-name>SolrRestApi</servlet-name>
-    <url-pattern>/schema/*</url-pattern>
-  </servlet-mapping>
-
   <mime-mapping>
     <extension>.xsl</extension>
     <!-- per http://www.w3.org/TR/2006/PR-xslt20-20061121/ -->

KeywordSearch/solr/server/solr-webapp/webapp/css/angular/angular-csp.css

@@ -18,8 +18,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 /*
- AngularJS v1.7.9
- (c) 2010-2018 Google, Inc. http://angularjs.org
+ AngularJS v1.8.0
+ (c) 2010-2020 Google, Inc. http://angularjs.org
  License: MIT
 */
 /* Include this file in your html if you are using the CSP mode. */

KeywordSearch/solr/server/solr-webapp/webapp/css/angular/collections.css

@@ -123,6 +123,11 @@ limitations under the License.
   padding-right: 3px;
 }
 
+#content #collections  .chosen-container.chosen-container-single
+{
+  width: 100% !important;
+}
+
 #content #collections .actions form .buttons
 {
   padding-top: 10px;
@@ -228,7 +233,7 @@ limitations under the License.
 #content #collections #data #alias-data h2 { background-image: url( ../../img/ico/box.png ); }
 #content #collections #data #collection-data h2 { background-image: url( ../../img/ico/box.png ); }
 #content #collections #data #shard-data h2 { background-image: url( ../../img/ico/sitemap.png ); }
-#content #collections #data #shard-data .replica h2 { background-image: url( ../../img/ico/node-slave.png ); }
+#content #collections #data #shard-data .replica h2 { background-image: url( ../../img/ico/node-follower.png ); }
 
 #content #collections #data #index-data
 {

KeywordSearch/solr/server/solr-webapp/webapp/css/angular/dashboard.css

@@ -144,8 +144,8 @@ limitations under the License.
 #content #dashboard #system h2 { background-image: url( ../../img/ico/server.png ); }
 #content #dashboard #statistics h2 { background-image: url( ../../img/ico/chart.png ); }
 #content #dashboard #replication h2 { background-image: url( ../../img/ico/node.png ); }
-#content #dashboard #replication.master h2 { background-image: url( ../../img/ico/node-master.png ); }
-#content #dashboard #replication.slave h2 { background-image: url( ../../img/ico/node-slave.png ); }
+#content #dashboard #replication.leader h2 { background-image: url( ../../img/ico/node-leader.png ); }
+#content #dashboard #replication.follower h2 { background-image: url( ../../img/ico/node-follower.png ); }
 #content #dashboard #instance h2 { background-image: url( ../../img/ico/server.png ); }
 #content #dashboard #collection h2 { background-image: url( ../../img/ico/book-open-text.png ); }
 #content #dashboard #shards h2 { background-image: url( ../../img/ico/documents-stack.png ); }

KeywordSearch/solr/server/solr-webapp/webapp/css/angular/menu.css

@@ -253,7 +253,7 @@ limitations under the License.
 
 #menu #index.global p a { background-image: url( ../../img/ico/dashboard.png ); }
 
-#menu #login.global p a { background-image: url( ../../img/ico/users.png ); }
+#menu #login.global p a { background-image: url( ../../img/ico/logout.png ); }
 
 #menu #logging.global p a { background-image: url( ../../img/ico/inbox-document-text.png ); }
 #menu #logging.global .level a { background-image: url( ../../img/ico/gear.png ); }
@@ -269,9 +269,12 @@ limitations under the License.
 #menu #cloud.global p a { background-image: url( ../../img/ico/network-cloud.png ); }
 #menu #cloud.global .tree a { background-image: url( ../../img/ico/folder-tree.png ); }
 #menu #cloud.global .nodes a { background-image: url( ../../img/solr-ico.png ); }
-#menu #cloud.global .zkstatus a { background-image: url( ../../img/ico/node-master.png ); }
+#menu #cloud.global .zkstatus a { background-image: url( ../../img/ico/node-leader.png ); }
 #menu #cloud.global .graph a { background-image: url( ../../img/ico/molecule.png ); }
 
+#menu #schema-designer.global p a { background-image: url( ../../img/ico/book-open-text.png ); }
+#menu #security.global p a { background-image: url( ../../img/ico/users.png ); }
+
 .sub-menu .ping.error a
 {
 

KeywordSearch/solr/server/solr-webapp/webapp/css/angular/query.css

@@ -128,16 +128,21 @@ limitations under the License.
   margin-top: 0;
 }
 
-#content #query #form fieldset .fieldset
+#content #query #form fieldset:not(.optional) .fieldset
 {
   border-bottom: 1px solid #f0f0f0;
   margin-bottom: 5px;
   padding-bottom: 10px;
 }
+#content #query #form fieldset.optional .fieldset{
+  margin-bottom: 5px;
+  padding-bottom: 10px;
+}
 
 #content #query #form .optional
 {
-  border: 0;
+  border-top-width: 0;
+  border-bottom: 1px solid #f0f0f0;
 }
 
 #content #query #form .optional legend

KeywordSearch/solr/server/solr-webapp/webapp/css/angular/replication.css

@@ -61,17 +61,17 @@ limitations under the License.
   border-bottom: 0;
 }
 
-#content #replication .masterOnly,
-#content #replication .slaveOnly
+#content #replication .leaderOnly,
+#content #replication .followerOnly
 {
 }
 
-#content #replication.master .masterOnly
+#content #replication.leader .leaderOnly
 {
   display: block;
 }
 
-#content #replication.slave .slaveOnly
+#content #replication.follower .followerOnly
 {
   display: block;
 }
@@ -114,8 +114,8 @@ limitations under the License.
 #content #replication #progress #bar #eta
 {
   position: absolute;
-  right: -100px;
-  width: 100px;
+  right: -160px;
+  width: 160px;
 }
 
 #content #replication #progress #bar #bar-info
@@ -300,7 +300,7 @@ limitations under the License.
   text-align: left;
 }
 
-#content #replication.slave #details table .slaveOnly
+#content #replication.follower #details table .followerOnly
 {
   display: table-row;
 }