You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2019/09/05 20:55:42 UTC
[lucene-solr] branch jira/SOLR-13722 updated: make publickey get
overridable
This is an automated email from the ASF dual-hosted git repository.
noble pushed a commit to branch jira/SOLR-13722
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/jira/SOLR-13722 by this push:
new eb076a3 make publickey get overridable
eb076a3 is described below
commit eb076a3964ff39b9514250ae3743f22ad981dbeb
Author: noble <no...@apache.org>
AuthorDate: Fri Sep 6 06:55:26 2019 +1000
make publickey get overridable
---
solr/core/src/java/org/apache/solr/core/PackageManager.java | 6 ++++++
solr/core/src/java/org/apache/solr/core/RuntimeLib.java | 8 ++++++--
.../java/org/apache/solr/handler/admin/CollectionHandlerApi.java | 2 +-
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/core/PackageManager.java b/solr/core/src/java/org/apache/solr/core/PackageManager.java
index 30c1c08..cfbbe08 100644
--- a/solr/core/src/java/org/apache/solr/core/PackageManager.java
+++ b/solr/core/src/java/org/apache/solr/core/PackageManager.java
@@ -18,6 +18,7 @@
package org.apache.solr.core;
import java.io.IOException;
+import java.io.InputStream;
import java.lang.invoke.MethodHandles;
import java.util.Collection;
import java.util.Collections;
@@ -45,6 +46,7 @@ import org.apache.solr.schema.FieldType;
import org.apache.solr.security.AuthorizationContext;
import org.apache.solr.security.PermissionNameProvider;
import org.apache.solr.util.plugin.PluginInfoInitialized;
+import org.apache.zookeeper.server.ByteBufferInputStream;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -92,6 +94,10 @@ public class PackageManager implements ClusterPropertiesListener {
return name;
}
+ public InputStream getBytes() {
+ return new ByteBufferInputStream(lib.buffer);
+ }
+
public boolean isModified(Map map) {
return (!Objects.equals(lib.getSha256(), (map).get(SHA256)) ||
diff --git a/solr/core/src/java/org/apache/solr/core/RuntimeLib.java b/solr/core/src/java/org/apache/solr/core/RuntimeLib.java
index bf370a5..e3edcd6 100644
--- a/solr/core/src/java/org/apache/solr/core/RuntimeLib.java
+++ b/solr/core/src/java/org/apache/solr/core/RuntimeLib.java
@@ -49,7 +49,7 @@ public class RuntimeLib implements PluginInfoInitialized, AutoCloseable, MapWrit
private final CoreContainer coreContainer;
private String name, version, sig, sha256;
private BlobRepository.BlobContentRef<ByteBuffer> blobContentRef;
- private ByteBuffer buffer;
+ ByteBuffer buffer;
private boolean verified = false;
int znodeVersion = -1;
@@ -210,7 +210,7 @@ public class RuntimeLib implements PluginInfoInitialized, AutoCloseable, MapWrit
}
void verifyJarSignature(ByteBuffer buf) {
- Map<String, byte[]> keys = CloudUtil.getTrustedKeys(coreContainer.getZkController().getZkClient(), "exe");
+ Map<String, byte[]> keys = getPublicKeys();
if (keys.isEmpty()) {
if (sig == null) {
verified = true;
@@ -233,4 +233,8 @@ public class RuntimeLib implements PluginInfoInitialized, AutoCloseable, MapWrit
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Error verifying key ", e);
}
}
+
+ protected Map<String, byte[]> getPublicKeys() {
+ return CloudUtil.getTrustedKeys(coreContainer.getZkController().getZkClient(), "exe");
+ }
}
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CollectionHandlerApi.java b/solr/core/src/java/org/apache/solr/handler/admin/CollectionHandlerApi.java
index 940353e..b31aa51 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/CollectionHandlerApi.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/CollectionHandlerApi.java
@@ -292,7 +292,7 @@ public class CollectionHandlerApi extends BaseHandlerApiSupport {
}
}
try {
- lib.init(new PluginInfo(SolrRequestHandler.TYPE, dataMap));
+ lib.init(new PluginInfo(RuntimeLib.TYPE, dataMap));
} catch (SolrException e) {
log.error("Error loading runtimelib ", e);
op.addError(e.getMessage());