From 355964a53b3f4f71e3a04d664b82da96a1a9994b Mon Sep 17 00:00:00 2001 From: jaymode Date: Tue, 23 Jan 2018 12:38:56 -0700 Subject: [PATCH 1/6] Update Netty to 4.1.18.Final This commit updates netty to 4.1.18.Final. This is the latest version that we can have work with the security manager. This updated version of netty fixes issues seen with Java 9 and some data not being sent, which results in timeouts. --- modules/transport-netty4/build.gradle | 32 +++++++++---------- .../netty-buffer-4.1.13.Final.jar.sha1 | 1 - .../netty-buffer-4.1.18.Final.jar.sha1 | 1 + .../netty-codec-4.1.13.Final.jar.sha1 | 1 - .../netty-codec-4.1.18.Final.jar.sha1 | 1 + .../netty-codec-http-4.1.13.Final.jar.sha1 | 1 - .../netty-codec-http-4.1.18.Final.jar.sha1 | 1 + .../netty-common-4.1.13.Final.jar.sha1 | 1 - .../netty-common-4.1.18.Final.jar.sha1 | 1 + .../netty-handler-4.1.13.Final.jar.sha1 | 1 - .../netty-handler-4.1.18.Final.jar.sha1 | 1 + .../netty-resolver-4.1.13.Final.jar.sha1 | 1 - .../netty-resolver-4.1.18.Final.jar.sha1 | 1 + .../netty-transport-4.1.13.Final.jar.sha1 | 1 - .../netty-transport-4.1.18.Final.jar.sha1 | 1 + .../transport/netty4/Netty4Utils.java | 9 +++++- .../plugin-metadata/plugin-security.policy | 5 +++ 17 files changed, 36 insertions(+), 24 deletions(-) delete mode 100644 modules/transport-netty4/licenses/netty-buffer-4.1.13.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-buffer-4.1.18.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-codec-4.1.13.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-codec-4.1.18.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-codec-http-4.1.13.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-codec-http-4.1.18.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-common-4.1.13.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-common-4.1.18.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-handler-4.1.13.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-handler-4.1.18.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-resolver-4.1.13.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-resolver-4.1.18.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-transport-4.1.13.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-transport-4.1.18.Final.jar.sha1 diff --git a/modules/transport-netty4/build.gradle b/modules/transport-netty4/build.gradle index 222cbca07ae55..82ccb59eab022 100644 --- a/modules/transport-netty4/build.gradle +++ b/modules/transport-netty4/build.gradle @@ -34,13 +34,13 @@ compileTestJava.options.compilerArgs << "-Xlint:-cast,-deprecation,-rawtypes,-tr dependencies { // network stack - compile "io.netty:netty-buffer:4.1.13.Final" - compile "io.netty:netty-codec:4.1.13.Final" - compile "io.netty:netty-codec-http:4.1.13.Final" - compile "io.netty:netty-common:4.1.13.Final" - compile "io.netty:netty-handler:4.1.13.Final" - compile "io.netty:netty-resolver:4.1.13.Final" - compile "io.netty:netty-transport:4.1.13.Final" + compile "io.netty:netty-buffer:4.1.18.Final" + compile "io.netty:netty-codec:4.1.18.Final" + compile "io.netty:netty-codec-http:4.1.18.Final" + compile "io.netty:netty-common:4.1.18.Final" + compile "io.netty:netty-handler:4.1.18.Final" + compile "io.netty:netty-resolver:4.1.18.Final" + compile "io.netty:netty-transport:4.1.18.Final" } dependencyLicenses { @@ -149,18 +149,18 @@ thirdPartyAudit.excludes = [ 'io.netty.util.internal.PlatformDependent0$3', 'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueConsumerNodeRef', 'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueProducerNodeRef', - 'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueue', - 'io.netty.util.internal.shaded.org.jctools.queues.ConcurrentSequencedCircularArrayQueue', + 'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueColdProducerFields', + 'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueConsumerFields', + 'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueProducerFields', + 'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueConsumerIndexField', + 'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerIndexField', + 'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerLimitField', 'io.netty.util.internal.shaded.org.jctools.queues.LinkedQueueNode', - 'io.netty.util.internal.shaded.org.jctools.queues.MpmcArrayQueueConsumerField', - 'io.netty.util.internal.shaded.org.jctools.queues.MpmcArrayQueueProducerField', - 'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueConsumerField', - 'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueHeadLimitField', - 'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueTailField', - 'io.netty.util.internal.shaded.org.jctools.util.JvmInfo', 'io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess', 'io.netty.util.internal.shaded.org.jctools.util.UnsafeRefArrayAccess', - 'org.conscrypt.Conscrypt$Engines', + 'org.conscrypt.AllocatedBuffer', + 'org.conscrypt.BufferAllocator', + 'org.conscrypt.Conscrypt', 'org.conscrypt.HandshakeListener' ] diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.13.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.13.Final.jar.sha1 deleted file mode 100644 index 31f015e158af4..0000000000000 --- a/modules/transport-netty4/licenses/netty-buffer-4.1.13.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0e3f583ea8a2618a7563b1ee2aa696c23edcc3d8 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.18.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.18.Final.jar.sha1 new file mode 100644 index 0000000000000..02d21aa4f2a23 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-buffer-4.1.18.Final.jar.sha1 @@ -0,0 +1 @@ +76b4eecbf7eeef749019f15295014e0106aced3c \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.13.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.13.Final.jar.sha1 deleted file mode 100644 index 6e7f1bdc14ced..0000000000000 --- a/modules/transport-netty4/licenses/netty-codec-4.1.13.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -370eeb6e9d92495a2a3be096ab6102755af76730 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.18.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.18.Final.jar.sha1 new file mode 100644 index 0000000000000..b266d24bc6d85 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-codec-4.1.18.Final.jar.sha1 @@ -0,0 +1 @@ +7e22fb8829a02b7b3f71bfbfcd4a69f4792c7dd1 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.13.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.13.Final.jar.sha1 deleted file mode 100644 index 80d18918e1d3f..0000000000000 --- a/modules/transport-netty4/licenses/netty-codec-http-4.1.13.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0ee87368766e6b900cf6be8ac9cdce27156e9411 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.18.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.18.Final.jar.sha1 new file mode 100644 index 0000000000000..81e277242ce9f --- /dev/null +++ b/modules/transport-netty4/licenses/netty-codec-http-4.1.18.Final.jar.sha1 @@ -0,0 +1 @@ +cd855bcfe88581efb465f1f87cb73bf9270c549a \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-common-4.1.13.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.13.Final.jar.sha1 deleted file mode 100644 index 044ec3ef4ed2c..0000000000000 --- a/modules/transport-netty4/licenses/netty-common-4.1.13.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f640e8cd8866527150784f8986152d3bba45b712 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-common-4.1.18.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.18.Final.jar.sha1 new file mode 100644 index 0000000000000..9d74b0ba86116 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-common-4.1.18.Final.jar.sha1 @@ -0,0 +1 @@ +cdc68be57df51293d08ee5792a4bc0628f33f67c \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.13.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.13.Final.jar.sha1 deleted file mode 100644 index 862f16a32a3ec..0000000000000 --- a/modules/transport-netty4/licenses/netty-handler-4.1.13.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -85847aa81a98d29948731befb4784d141046fa0e \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.18.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.18.Final.jar.sha1 new file mode 100644 index 0000000000000..71f3099cc6a05 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-handler-4.1.18.Final.jar.sha1 @@ -0,0 +1 @@ +b7b9aab26acf72ee376fb1fbbee6e35675a7b8d6 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.13.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.13.Final.jar.sha1 deleted file mode 100644 index 7857ddac89cb9..0000000000000 --- a/modules/transport-netty4/licenses/netty-resolver-4.1.13.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d33ce420bd22c8a53246296ceb6e1ff08d31f8e1 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.18.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.18.Final.jar.sha1 new file mode 100644 index 0000000000000..40f82e97e120a --- /dev/null +++ b/modules/transport-netty4/licenses/netty-resolver-4.1.18.Final.jar.sha1 @@ -0,0 +1 @@ +41cb6fa04ed3ccc0c83f5b8e3a11454bca0dc053 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.13.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.13.Final.jar.sha1 deleted file mode 100644 index dc86ce66f4357..0000000000000 --- a/modules/transport-netty4/licenses/netty-transport-4.1.13.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5008406221a849a350ad2a8885f14ac330e038f3 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.18.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.18.Final.jar.sha1 new file mode 100644 index 0000000000000..bb97175cd3c9c --- /dev/null +++ b/modules/transport-netty4/licenses/netty-transport-4.1.18.Final.jar.sha1 @@ -0,0 +1 @@ +2985accbe0c3ab5de6ebcb1574986230467ed652 \ No newline at end of file diff --git a/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4Utils.java b/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4Utils.java index 05295c1d4da4e..97607157a3989 100644 --- a/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4Utils.java +++ b/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4Utils.java @@ -25,6 +25,7 @@ import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; import io.netty.util.NettyRuntime; +import io.netty.util.internal.ThrowableUtil; import io.netty.util.internal.logging.InternalLogger; import io.netty.util.internal.logging.InternalLoggerFactory; import org.apache.logging.log4j.Logger; @@ -35,6 +36,8 @@ import org.elasticsearch.common.logging.ESLoggerFactory; import java.io.IOException; +import java.security.AccessController; +import java.security.PrivilegedAction; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -61,7 +64,11 @@ public InternalLogger newInstance(final String name) { } public static void setup() { - + // TODO remove this once we get a fix into Netty so we don't have to do this + AccessController.doPrivileged((PrivilegedAction) () -> { + ThrowableUtil.haveSuppressed(); + return null; + }); } private static AtomicBoolean isAvailableProcessorsSet = new AtomicBoolean(); diff --git a/modules/transport-netty4/src/main/plugin-metadata/plugin-security.policy b/modules/transport-netty4/src/main/plugin-metadata/plugin-security.policy index 32b2dc9bd1540..3c6e91fd5894c 100644 --- a/modules/transport-netty4/src/main/plugin-metadata/plugin-security.policy +++ b/modules/transport-netty4/src/main/plugin-metadata/plugin-security.policy @@ -17,6 +17,11 @@ * under the License. */ +grant { + // needed for Netty since they use reflection in ThrowableUtil :( + permission java.lang.RuntimePermission "accessDeclaredMembers"; +}; + grant codeBase "${codebase.netty-common}" { // for reading the system-wide configuration for the backlog of established sockets permission java.io.FilePermission "/proc/sys/net/core/somaxconn", "read"; From 8ef74475ba47c1d69a6e6a82d4f403a7fe5f05f5 Mon Sep 17 00:00:00 2001 From: jaymode Date: Tue, 23 Jan 2018 13:11:12 -0700 Subject: [PATCH 2/6] add netty issue --- .../src/main/plugin-metadata/plugin-security.policy | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/transport-netty4/src/main/plugin-metadata/plugin-security.policy b/modules/transport-netty4/src/main/plugin-metadata/plugin-security.policy index 3c6e91fd5894c..16731d9701312 100644 --- a/modules/transport-netty4/src/main/plugin-metadata/plugin-security.policy +++ b/modules/transport-netty4/src/main/plugin-metadata/plugin-security.policy @@ -19,6 +19,7 @@ grant { // needed for Netty since they use reflection in ThrowableUtil :( + // https://github.com/netty/netty/issues/7614 permission java.lang.RuntimePermission "accessDeclaredMembers"; }; From b073780c0121483af5df1c785fa8d3ef81a30dad Mon Sep 17 00:00:00 2001 From: jaymode Date: Tue, 23 Jan 2018 14:54:42 -0700 Subject: [PATCH 3/6] add comment about class init --- .../java/org/elasticsearch/transport/netty4/Netty4Utils.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4Utils.java b/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4Utils.java index 97607157a3989..f77d9b64e4698 100644 --- a/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4Utils.java +++ b/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4Utils.java @@ -66,6 +66,10 @@ public InternalLogger newInstance(final String name) { public static void setup() { // TODO remove this once we get a fix into Netty so we don't have to do this AccessController.doPrivileged((PrivilegedAction) () -> { + // this is triggering class initialization which triggers the reflective retrieval of + // the Throwable#addSuppressed method. We need to do this to avoid + // AccessControlExceptions that this code would otherwise trigger without us wrapping + // it in a doPrivileged block ThrowableUtil.haveSuppressed(); return null; }); From c157fd60fe72866a27149c3dd72b47caec64e8ab Mon Sep 17 00:00:00 2001 From: jaymode Date: Thu, 25 Jan 2018 09:33:17 -0700 Subject: [PATCH 4/6] Go back to Netty 4.1.16 so we don't need more permissions or the hack --- modules/transport-netty4/build.gradle | 16 ++++++++-------- .../licenses/netty-buffer-4.1.16.Final.jar.sha1 | 1 + .../licenses/netty-buffer-4.1.18.Final.jar.sha1 | 1 - .../licenses/netty-codec-4.1.16.Final.jar.sha1 | 1 + .../licenses/netty-codec-4.1.18.Final.jar.sha1 | 1 - .../netty-codec-http-4.1.16.Final.jar.sha1 | 1 + .../netty-codec-http-4.1.18.Final.jar.sha1 | 1 - .../licenses/netty-common-4.1.16.Final.jar.sha1 | 1 + .../licenses/netty-common-4.1.18.Final.jar.sha1 | 1 - .../licenses/netty-handler-4.1.16.Final.jar.sha1 | 1 + .../licenses/netty-handler-4.1.18.Final.jar.sha1 | 1 - .../netty-resolver-4.1.16.Final.jar.sha1 | 1 + .../netty-resolver-4.1.18.Final.jar.sha1 | 1 - .../netty-transport-4.1.16.Final.jar.sha1 | 1 + .../netty-transport-4.1.18.Final.jar.sha1 | 1 - .../transport/netty4/Netty4Utils.java | 12 ------------ .../main/plugin-metadata/plugin-security.policy | 6 ------ 17 files changed, 15 insertions(+), 33 deletions(-) create mode 100644 modules/transport-netty4/licenses/netty-buffer-4.1.16.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-buffer-4.1.18.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-codec-4.1.16.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-codec-4.1.18.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-codec-http-4.1.16.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-codec-http-4.1.18.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-common-4.1.16.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-common-4.1.18.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-handler-4.1.16.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-handler-4.1.18.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-resolver-4.1.16.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-resolver-4.1.18.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-transport-4.1.16.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-transport-4.1.18.Final.jar.sha1 diff --git a/modules/transport-netty4/build.gradle b/modules/transport-netty4/build.gradle index 82ccb59eab022..860dce94b044f 100644 --- a/modules/transport-netty4/build.gradle +++ b/modules/transport-netty4/build.gradle @@ -34,13 +34,13 @@ compileTestJava.options.compilerArgs << "-Xlint:-cast,-deprecation,-rawtypes,-tr dependencies { // network stack - compile "io.netty:netty-buffer:4.1.18.Final" - compile "io.netty:netty-codec:4.1.18.Final" - compile "io.netty:netty-codec-http:4.1.18.Final" - compile "io.netty:netty-common:4.1.18.Final" - compile "io.netty:netty-handler:4.1.18.Final" - compile "io.netty:netty-resolver:4.1.18.Final" - compile "io.netty:netty-transport:4.1.18.Final" + compile "io.netty:netty-buffer:4.1.16.Final" + compile "io.netty:netty-codec:4.1.16.Final" + compile "io.netty:netty-codec-http:4.1.16.Final" + compile "io.netty:netty-common:4.1.16.Final" + compile "io.netty:netty-handler:4.1.16.Final" + compile "io.netty:netty-resolver:4.1.16.Final" + compile "io.netty:netty-transport:4.1.16.Final" } dependencyLicenses { @@ -159,8 +159,8 @@ thirdPartyAudit.excludes = [ 'io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess', 'io.netty.util.internal.shaded.org.jctools.util.UnsafeRefArrayAccess', + 'org.conscrypt.Conscrypt$Engines', 'org.conscrypt.AllocatedBuffer', 'org.conscrypt.BufferAllocator', - 'org.conscrypt.Conscrypt', 'org.conscrypt.HandshakeListener' ] diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.16.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.16.Final.jar.sha1 new file mode 100644 index 0000000000000..c546222971985 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-buffer-4.1.16.Final.jar.sha1 @@ -0,0 +1 @@ +63b5fa95c74785e16f2c30ce268bc222e35c8cb5 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.18.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.18.Final.jar.sha1 deleted file mode 100644 index 02d21aa4f2a23..0000000000000 --- a/modules/transport-netty4/licenses/netty-buffer-4.1.18.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -76b4eecbf7eeef749019f15295014e0106aced3c \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.16.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.16.Final.jar.sha1 new file mode 100644 index 0000000000000..1e6c241ea0b17 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-codec-4.1.16.Final.jar.sha1 @@ -0,0 +1 @@ +d84a1f21768b7309c2954521cf5a1f46c2309eb1 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.18.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.18.Final.jar.sha1 deleted file mode 100644 index b266d24bc6d85..0000000000000 --- a/modules/transport-netty4/licenses/netty-codec-4.1.18.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7e22fb8829a02b7b3f71bfbfcd4a69f4792c7dd1 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.16.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.16.Final.jar.sha1 new file mode 100644 index 0000000000000..71c33af1c5fc2 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-codec-http-4.1.16.Final.jar.sha1 @@ -0,0 +1 @@ +d64312378b438dfdad84267c599a053327c6f02a \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.18.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.18.Final.jar.sha1 deleted file mode 100644 index 81e277242ce9f..0000000000000 --- a/modules/transport-netty4/licenses/netty-codec-http-4.1.18.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -cd855bcfe88581efb465f1f87cb73bf9270c549a \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-common-4.1.16.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.16.Final.jar.sha1 new file mode 100644 index 0000000000000..3edf5fcea59b3 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-common-4.1.16.Final.jar.sha1 @@ -0,0 +1 @@ +177a6b30cca92f6f5f9873c9befd681377a4c328 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-common-4.1.18.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.18.Final.jar.sha1 deleted file mode 100644 index 9d74b0ba86116..0000000000000 --- a/modules/transport-netty4/licenses/netty-common-4.1.18.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -cdc68be57df51293d08ee5792a4bc0628f33f67c \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.16.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.16.Final.jar.sha1 new file mode 100644 index 0000000000000..cba27387268d1 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-handler-4.1.16.Final.jar.sha1 @@ -0,0 +1 @@ +fec0e63e7dd7f4eeef7ea8dc47a1ff32dfc7ebc2 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.18.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.18.Final.jar.sha1 deleted file mode 100644 index 71f3099cc6a05..0000000000000 --- a/modules/transport-netty4/licenses/netty-handler-4.1.18.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b7b9aab26acf72ee376fb1fbbee6e35675a7b8d6 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.16.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.16.Final.jar.sha1 new file mode 100644 index 0000000000000..3571d2ecfdc48 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-resolver-4.1.16.Final.jar.sha1 @@ -0,0 +1 @@ +f6eb553b53fb3a90a8ac1170697093fed82eae28 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.18.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.18.Final.jar.sha1 deleted file mode 100644 index 40f82e97e120a..0000000000000 --- a/modules/transport-netty4/licenses/netty-resolver-4.1.18.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -41cb6fa04ed3ccc0c83f5b8e3a11454bca0dc053 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.16.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.16.Final.jar.sha1 new file mode 100644 index 0000000000000..e502d4c77084c --- /dev/null +++ b/modules/transport-netty4/licenses/netty-transport-4.1.16.Final.jar.sha1 @@ -0,0 +1 @@ +3c8ee2c4d4a1cbb947a5c184c7aeb2204260958b \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.18.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.18.Final.jar.sha1 deleted file mode 100644 index bb97175cd3c9c..0000000000000 --- a/modules/transport-netty4/licenses/netty-transport-4.1.18.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2985accbe0c3ab5de6ebcb1574986230467ed652 \ No newline at end of file diff --git a/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4Utils.java b/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4Utils.java index f77d9b64e4698..82bf258a2a295 100644 --- a/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4Utils.java +++ b/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4Utils.java @@ -25,7 +25,6 @@ import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; import io.netty.util.NettyRuntime; -import io.netty.util.internal.ThrowableUtil; import io.netty.util.internal.logging.InternalLogger; import io.netty.util.internal.logging.InternalLoggerFactory; import org.apache.logging.log4j.Logger; @@ -36,8 +35,6 @@ import org.elasticsearch.common.logging.ESLoggerFactory; import java.io.IOException; -import java.security.AccessController; -import java.security.PrivilegedAction; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -64,15 +61,6 @@ public InternalLogger newInstance(final String name) { } public static void setup() { - // TODO remove this once we get a fix into Netty so we don't have to do this - AccessController.doPrivileged((PrivilegedAction) () -> { - // this is triggering class initialization which triggers the reflective retrieval of - // the Throwable#addSuppressed method. We need to do this to avoid - // AccessControlExceptions that this code would otherwise trigger without us wrapping - // it in a doPrivileged block - ThrowableUtil.haveSuppressed(); - return null; - }); } private static AtomicBoolean isAvailableProcessorsSet = new AtomicBoolean(); diff --git a/modules/transport-netty4/src/main/plugin-metadata/plugin-security.policy b/modules/transport-netty4/src/main/plugin-metadata/plugin-security.policy index 16731d9701312..32b2dc9bd1540 100644 --- a/modules/transport-netty4/src/main/plugin-metadata/plugin-security.policy +++ b/modules/transport-netty4/src/main/plugin-metadata/plugin-security.policy @@ -17,12 +17,6 @@ * under the License. */ -grant { - // needed for Netty since they use reflection in ThrowableUtil :( - // https://github.com/netty/netty/issues/7614 - permission java.lang.RuntimePermission "accessDeclaredMembers"; -}; - grant codeBase "${codebase.netty-common}" { // for reading the system-wide configuration for the backlog of established sockets permission java.io.FilePermission "/proc/sys/net/core/somaxconn", "read"; From 3b5a83865dc8359419ffe098d8e9e0efef2c55b3 Mon Sep 17 00:00:00 2001 From: jaymode Date: Thu, 25 Jan 2018 09:38:07 -0700 Subject: [PATCH 5/6] unnecessary change --- .../java/org/elasticsearch/transport/netty4/Netty4Utils.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4Utils.java b/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4Utils.java index 82bf258a2a295..05295c1d4da4e 100644 --- a/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4Utils.java +++ b/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4Utils.java @@ -61,6 +61,7 @@ public InternalLogger newInstance(final String name) { } public static void setup() { + } private static AtomicBoolean isAvailableProcessorsSet = new AtomicBoolean(); From d81c998c203203f1a84f6fda744e5b6753456a7f Mon Sep 17 00:00:00 2001 From: jaymode Date: Thu, 25 Jan 2018 12:19:44 -0700 Subject: [PATCH 6/6] alphabetical order --- modules/transport-netty4/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/transport-netty4/build.gradle b/modules/transport-netty4/build.gradle index 860dce94b044f..5d4bcd7c10a84 100644 --- a/modules/transport-netty4/build.gradle +++ b/modules/transport-netty4/build.gradle @@ -152,15 +152,15 @@ thirdPartyAudit.excludes = [ 'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueColdProducerFields', 'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueConsumerFields', 'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueProducerFields', + 'io.netty.util.internal.shaded.org.jctools.queues.LinkedQueueNode', 'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueConsumerIndexField', 'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerIndexField', 'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerLimitField', - 'io.netty.util.internal.shaded.org.jctools.queues.LinkedQueueNode', 'io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess', 'io.netty.util.internal.shaded.org.jctools.util.UnsafeRefArrayAccess', - 'org.conscrypt.Conscrypt$Engines', 'org.conscrypt.AllocatedBuffer', 'org.conscrypt.BufferAllocator', + 'org.conscrypt.Conscrypt$Engines', 'org.conscrypt.HandshakeListener' ]