summaryrefslogtreecommitdiff
path: root/plugins/ingest-attachment
diff options
context:
space:
mode:
authorRyan Ernst <ryan@iernst.net>2016-03-10 11:17:25 -0800
committerRyan Ernst <ryan@iernst.net>2016-03-10 11:17:25 -0800
commit51d87d94dc5b565ae4ab964bf7f4bd64329e8331 (patch)
treeb08bee759960d2852f6d4a2e1824a1408145f5a4 /plugins/ingest-attachment
parent6deabac8e8549cc7f01584144f40001492baa7cf (diff)
Add getClassLoader perm for tika in ingest
Diffstat (limited to 'plugins/ingest-attachment')
-rw-r--r--plugins/ingest-attachment/src/main/java/org/elasticsearch/ingest/attachment/TikaImpl.java2
-rw-r--r--plugins/ingest-attachment/src/main/plugin-metadata/plugin-security.policy2
-rw-r--r--plugins/ingest-attachment/src/test/resources/rest-api-spec/test/ingest_attachment/30_files_supported.yaml2
3 files changed, 5 insertions, 1 deletions
diff --git a/plugins/ingest-attachment/src/main/java/org/elasticsearch/ingest/attachment/TikaImpl.java b/plugins/ingest-attachment/src/main/java/org/elasticsearch/ingest/attachment/TikaImpl.java
index 2ea977b4dd..27a4cfebbc 100644
--- a/plugins/ingest-attachment/src/main/java/org/elasticsearch/ingest/attachment/TikaImpl.java
+++ b/plugins/ingest-attachment/src/main/java/org/elasticsearch/ingest/attachment/TikaImpl.java
@@ -137,6 +137,8 @@ final class TikaImpl {
perms.add(new SecurityPermission("putProviderProperty.BC"));
perms.add(new SecurityPermission("insertProvider"));
perms.add(new ReflectPermission("suppressAccessChecks"));
+ // xmlbeans, use by POI, needs to get the context classloader
+ perms.add(new RuntimePermission("getClassLoader"));
perms.setReadOnly();
return perms;
}
diff --git a/plugins/ingest-attachment/src/main/plugin-metadata/plugin-security.policy b/plugins/ingest-attachment/src/main/plugin-metadata/plugin-security.policy
index e23e9f4d0c..adf76991b5 100644
--- a/plugins/ingest-attachment/src/main/plugin-metadata/plugin-security.policy
+++ b/plugins/ingest-attachment/src/main/plugin-metadata/plugin-security.policy
@@ -27,4 +27,6 @@ grant {
permission java.security.SecurityPermission "insertProvider";
// TODO: fix POI XWPF to not do this: https://bz.apache.org/bugzilla/show_bug.cgi?id=58597
permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
+ // needed by xmlbeans, as part of POI for MS xml docs
+ permission java.lang.RuntimePermission "getClassLoader";
};
diff --git a/plugins/ingest-attachment/src/test/resources/rest-api-spec/test/ingest_attachment/30_files_supported.yaml b/plugins/ingest-attachment/src/test/resources/rest-api-spec/test/ingest_attachment/30_files_supported.yaml
index 48fded555b..4f56603a67 100644
--- a/plugins/ingest-attachment/src/test/resources/rest-api-spec/test/ingest_attachment/30_files_supported.yaml
+++ b/plugins/ingest-attachment/src/test/resources/rest-api-spec/test/ingest_attachment/30_files_supported.yaml
@@ -73,7 +73,7 @@
- match: { _source.attachment.content: "Test elasticsearch" }
- match: { _source.attachment.language: "et" }
- match: { _source.attachment.author: "David Pilato" }
- - match: { _source.attachment.date: "2016-03-10T08:25:00Z" }
+ - match: { _source.attachment.date: "2016-03-10T08:24:00Z" }
- match: { _source.attachment.content_length: "19" }
- match: { _source.attachment.content_type: "application/vnd.openxmlformats-officedocument.wordprocessingml.document" }