github/ghidra
1
1
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-01-09 22:17:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-6146_ElasticSearch_8_19_7' into

Browse Source 
Ghidra_12.0 (Closes #8611)
This commit is contained in:
ghidra1
2025-12-02 15:41:12 -05:00
parent 1bed05d673 ad4b450f31
commit c35cbcb984
5 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Ghidra/Extensions/BSimElasticPlugin/README.md
View File

@@ -77,8 +77,8 @@ details.
## Version ## Version
The current BSim plug-in was tested with Elasticsearch version `8.8.1`. A change to the The current BSim plug-in was tested with Elasticsearch version `8.19.7`. A change to the
Elasticsearch scripting interface, starting with version `7.15`, makes the BSim plug-in incompatible Elasticsearch scripting interface, starting with version `8.16`, makes the BSim plug-in incompatible
with previous versions, but the lsh plug-in jars may work without change across later Elasticsearch with previous versions, but the lsh plug-in jars may work without change across later Elasticsearch
versions. versions.
@@ -93,7 +93,7 @@ elasticsearch/plugin-descriptor.properties
The file format is fairly simple: edit the line The file format is fairly simple: edit the line
``` ```
elasticsearch.version=8.8.1 elasticsearch.version=8.19.7
``` ```
The plugin may work with other nearby versions, but proceed at your own risk. The plugin may work with other nearby versions, but proceed at your own risk.

4
Ghidra/Extensions/BSimElasticPlugin/build.gradle
View File

@@ -92,8 +92,8 @@ task elasticPluginZip(type: Zip) {
destinationDirectory = file("build/data") destinationDirectory = file("build/data")
} }
// Currently targeting elasticsearch-8.8.1 which by default runs with java 20 // Currently targeting elasticsearch-8.19.7 which by default runs with java 25
compileElasticPluginJava.options.release = 20 compileElasticPluginJava.options.release = 21
compileElasticPluginJava.dependsOn copyGenericTask compileElasticPluginJava.dependsOn copyGenericTask
compileElasticPluginJava.dependsOn copyUtilityTask compileElasticPluginJava.dependsOn copyUtilityTask

4
Ghidra/Extensions/BSimElasticPlugin/contribZipExclude/plugin-descriptor.properties
View File

@@ -2,5 +2,5 @@ description=Feature Vector Plugin
version=1.0 version=1.0
name=lsh name=lsh
classname=org.elasticsearch.plugin.analysis.lsh.AnalysisLSHPlugin classname=org.elasticsearch.plugin.analysis.lsh.AnalysisLSHPlugin
java.version=1.11 java.version=1.21
elasticsearch.version=8.8.1 elasticsearch.version=8.19.7

9
Ghidra/Extensions/BSimElasticPlugin/src/org/elasticsearch/plugin/analysis/lsh/VectorCompareScriptFactory.java
View File

@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -73,6 +73,11 @@ public class VectorCompareScriptFactory implements ScoreScript.Factory {
return false; return false;
} }
@Override
public boolean needs_termStats() {
return false;
}
private static int scanForFeatures(byte[] buffer, int offset) throws IOException { private static int scanForFeatures(byte[] buffer, int offset) throws IOException {
int i = 0; int i = 0;
while (i < FEATURES_NAME.length()) { while (i < FEATURES_NAME.length()) {

6
Ghidra/Extensions/BSimElasticPlugin/srcdummy/org/elasticsearch/script/ScoreScript.java
View File

@@ -5,9 +5,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -39,6 +39,8 @@ public abstract class ScoreScript {
public interface LeafFactory { public interface LeafFactory {
boolean needs_score(); boolean needs_score();
boolean needs_termStats();
ScoreScript newInstance(DocReader reader) throws IOException; ScoreScript newInstance(DocReader reader) throws IOException;
} }