Skip to content

Commit 5e20fde

Browse files
committed
[Security Manager Replacement] Native Java Agent (dynamic code rewriting, must be low overhead)
Signed-off-by: Andriy Redko <[email protected]>
1 parent 6b1861a commit 5e20fde

File tree

31 files changed

+4353
-39
lines changed

31 files changed

+4353
-39
lines changed

buildSrc/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,8 @@ if (project != rootProject) {
171171

172172
allprojects {
173173
java {
174-
targetCompatibility = JavaVersion.VERSION_11
175-
sourceCompatibility = JavaVersion.VERSION_11
174+
targetCompatibility = JavaVersion.VERSION_17
175+
sourceCompatibility = JavaVersion.VERSION_17
176176
}
177177
}
178178

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
11
1+
17

distribution/src/config/jvm.options

+3-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
11-:-XX:InitiatingHeapOccupancyPercent=30
4949

5050
## JVM temporary directory
51-
-Djava.io.tmpdir=${OPENSEARCH_TMPDIR}
51+
-Djava.io.tmpdir=_TMPDIR}
5252

5353
## heap dumps
5454

@@ -89,3 +89,5 @@ ${error.file}
8989
# See please https://bugs.openjdk.org/browse/JDK-8341127 (openjdk/jdk#21283)
9090
23:-XX:CompileCommand=dontinline,java/lang/invoke/MethodHandle.setAsTypeCache
9191
23:-XX:CompileCommand=dontinline,java/lang/invoke/MethodHandle.asTypeUncached
92+
93+
24:-javaagent:${OPENSEARCH_HOME}/lib/opensearch-agent-3.0.0-SNAPSHOT.jar

libs/agent-sm/agent/build.gradle

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
2+
apply plugin: 'opensearch.build'
3+
apply plugin: 'opensearch.publish'
4+
5+
base {
6+
archivesName = 'opensearch-agent'
7+
}
8+
9+
configurations {
10+
bootstrapConfiguration.extendsFrom(implementation)
11+
}
12+
13+
dependencies {
14+
implementation project(":libs:agent-sm:bootstrap")
15+
implementation "net.bytebuddy:byte-buddy:1.15.10"
16+
compileOnly "com.google.code.findbugs:jsr305:3.0.2"
17+
}
18+
19+
jar {
20+
manifest {
21+
attributes(
22+
"Can-Redefine-Classes": "true",
23+
"Can-Retransform-Classes": "true",
24+
"Agent-Class": "org.opensearch.javaagent.Agent",
25+
"Premain-Class": "org.opensearch.javaagent.Agent",
26+
"Boot-Class-Path": 'byte-buddy-1.15.10.jar opensearch-agent-bootstrap-3.0.0-SNAPSHOT.jar'
27+
)
28+
}
29+
}
30+
31+
compileJava {
32+
options.compilerArgs -= '-Werror'
33+
}
34+
35+
test.enabled = false
36+
37+
tasks.named('forbiddenApisMain').configure {
38+
replaceSignatureFiles 'jdk-signatures'
39+
}
40+
41+
copy {
42+
from configurations.runtimeClasspath
43+
into "$buildDir/distributions"
44+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
635c873fadd853c084f84fdc3cbd58c5dd8537f9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,180 @@
1+
This product bundles ASM 9.7.1, which is available under a "3-clause BSD"
2+
license. For details, see licenses/ASM. For more information visit ${asm.url}.
3+
4+
Apache License
5+
Version 2.0, January 2004
6+
http://www.apache.org/licenses/
7+
8+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
9+
10+
1. Definitions.
11+
12+
"License" shall mean the terms and conditions for use, reproduction,
13+
and distribution as defined by Sections 1 through 9 of this document.
14+
15+
"Licensor" shall mean the copyright owner or entity authorized by
16+
the copyright owner that is granting the License.
17+
18+
"Legal Entity" shall mean the union of the acting entity and all
19+
other entities that control, are controlled by, or are under common
20+
control with that entity. For the purposes of this definition,
21+
"control" means (i) the power, direct or indirect, to cause the
22+
direction or management of such entity, whether by contract or
23+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
24+
outstanding shares, or (iii) beneficial ownership of such entity.
25+
26+
"You" (or "Your") shall mean an individual or Legal Entity
27+
exercising permissions granted by this License.
28+
29+
"Source" form shall mean the preferred form for making modifications,
30+
including but not limited to software source code, documentation
31+
source, and configuration files.
32+
33+
"Object" form shall mean any form resulting from mechanical
34+
transformation or translation of a Source form, including but
35+
not limited to compiled object code, generated documentation,
36+
and conversions to other media types.
37+
38+
"Work" shall mean the work of authorship, whether in Source or
39+
Object form, made available under the License, as indicated by a
40+
copyright notice that is included in or attached to the work
41+
(an example is provided in the Appendix below).
42+
43+
"Derivative Works" shall mean any work, whether in Source or Object
44+
form, that is based on (or derived from) the Work and for which the
45+
editorial revisions, annotations, elaborations, or other modifications
46+
represent, as a whole, an original work of authorship. For the purposes
47+
of this License, Derivative Works shall not include works that remain
48+
separable from, or merely link (or bind by name) to the interfaces of,
49+
the Work and Derivative Works thereof.
50+
51+
"Contribution" shall mean any work of authorship, including
52+
the original version of the Work and any modifications or additions
53+
to that Work or Derivative Works thereof, that is intentionally
54+
submitted to Licensor for inclusion in the Work by the copyright owner
55+
or by an individual or Legal Entity authorized to submit on behalf of
56+
the copyright owner. For the purposes of this definition, "submitted"
57+
means any form of electronic, verbal, or written communication sent
58+
to the Licensor or its representatives, including but not limited to
59+
communication on electronic mailing lists, source code control systems,
60+
and issue tracking systems that are managed by, or on behalf of, the
61+
Licensor for the purpose of discussing and improving the Work, but
62+
excluding communication that is conspicuously marked or otherwise
63+
designated in writing by the copyright owner as "Not a Contribution."
64+
65+
"Contributor" shall mean Licensor and any individual or Legal Entity
66+
on behalf of whom a Contribution has been received by Licensor and
67+
subsequently incorporated within the Work.
68+
69+
2. Grant of Copyright License. Subject to the terms and conditions of
70+
this License, each Contributor hereby grants to You a perpetual,
71+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
72+
copyright license to reproduce, prepare Derivative Works of,
73+
publicly display, publicly perform, sublicense, and distribute the
74+
Work and such Derivative Works in Source or Object form.
75+
76+
3. Grant of Patent License. Subject to the terms and conditions of
77+
this License, each Contributor hereby grants to You a perpetual,
78+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
79+
(except as stated in this section) patent license to make, have made,
80+
use, offer to sell, sell, import, and otherwise transfer the Work,
81+
where such license applies only to those patent claims licensable
82+
by such Contributor that are necessarily infringed by their
83+
Contribution(s) alone or by combination of their Contribution(s)
84+
with the Work to which such Contribution(s) was submitted. If You
85+
institute patent litigation against any entity (including a
86+
cross-claim or counterclaim in a lawsuit) alleging that the Work
87+
or a Contribution incorporated within the Work constitutes direct
88+
or contributory patent infringement, then any patent licenses
89+
granted to You under this License for that Work shall terminate
90+
as of the date such litigation is filed.
91+
92+
4. Redistribution. You may reproduce and distribute copies of the
93+
Work or Derivative Works thereof in any medium, with or without
94+
modifications, and in Source or Object form, provided that You
95+
meet the following conditions:
96+
97+
(a) You must give any other recipients of the Work or
98+
Derivative Works a copy of this License; and
99+
100+
(b) You must cause any modified files to carry prominent notices
101+
stating that You changed the files; and
102+
103+
(c) You must retain, in the Source form of any Derivative Works
104+
that You distribute, all copyright, patent, trademark, and
105+
attribution notices from the Source form of the Work,
106+
excluding those notices that do not pertain to any part of
107+
the Derivative Works; and
108+
109+
(d) If the Work includes a "NOTICE" text file as part of its
110+
distribution, then any Derivative Works that You distribute must
111+
include a readable copy of the attribution notices contained
112+
within such NOTICE file, excluding those notices that do not
113+
pertain to any part of the Derivative Works, in at least one
114+
of the following places: within a NOTICE text file distributed
115+
as part of the Derivative Works; within the Source form or
116+
documentation, if provided along with the Derivative Works; or,
117+
within a display generated by the Derivative Works, if and
118+
wherever such third-party notices normally appear. The contents
119+
of the NOTICE file are for informational purposes only and
120+
do not modify the License. You may add Your own attribution
121+
notices within Derivative Works that You distribute, alongside
122+
or as an addendum to the NOTICE text from the Work, provided
123+
that such additional attribution notices cannot be construed
124+
as modifying the License.
125+
126+
You may add Your own copyright statement to Your modifications and
127+
may provide additional or different license terms and conditions
128+
for use, reproduction, or distribution of Your modifications, or
129+
for any such Derivative Works as a whole, provided Your use,
130+
reproduction, and distribution of the Work otherwise complies with
131+
the conditions stated in this License.
132+
133+
5. Submission of Contributions. Unless You explicitly state otherwise,
134+
any Contribution intentionally submitted for inclusion in the Work
135+
by You to the Licensor shall be under the terms and conditions of
136+
this License, without any additional terms or conditions.
137+
Notwithstanding the above, nothing herein shall supersede or modify
138+
the terms of any separate license agreement you may have executed
139+
with Licensor regarding such Contributions.
140+
141+
6. Trademarks. This License does not grant permission to use the trade
142+
names, trademarks, service marks, or product names of the Licensor,
143+
except as required for reasonable and customary use in describing the
144+
origin of the Work and reproducing the content of the NOTICE file.
145+
146+
7. Disclaimer of Warranty. Unless required by applicable law or
147+
agreed to in writing, Licensor provides the Work (and each
148+
Contributor provides its Contributions) on an "AS IS" BASIS,
149+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
150+
implied, including, without limitation, any warranties or conditions
151+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
152+
PARTICULAR PURPOSE. You are solely responsible for determining the
153+
appropriateness of using or redistributing the Work and assume any
154+
risks associated with Your exercise of permissions under this License.
155+
156+
8. Limitation of Liability. In no event and under no legal theory,
157+
whether in tort (including negligence), contract, or otherwise,
158+
unless required by applicable law (such as deliberate and grossly
159+
negligent acts) or agreed to in writing, shall any Contributor be
160+
liable to You for damages, including any direct, indirect, special,
161+
incidental, or consequential damages of any character arising as a
162+
result of this License or out of the use or inability to use the
163+
Work (including but not limited to damages for loss of goodwill,
164+
work stoppage, computer failure or malfunction, or any and all
165+
other commercial damages or losses), even if such Contributor
166+
has been advised of the possibility of such damages.
167+
168+
9. Accepting Warranty or Additional Liability. While redistributing
169+
the Work or Derivative Works thereof, You may choose to offer,
170+
and charge a fee for, acceptance of support, warranty, indemnity,
171+
or other liability obligations and/or rights consistent with this
172+
License. However, in accepting such obligations, You may act only
173+
on Your own behalf and on Your sole responsibility, not on behalf
174+
of any other Contributor, and only if You agree to indemnify,
175+
defend, and hold each Contributor harmless for any liability
176+
incurred by, or claims asserted against, such Contributor by reason
177+
of your accepting any such warranty or additional liability.
178+
179+
END OF TERMS AND CONDITIONS
180+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Copyright 2014 - Present Rafael Winterhalter
2+
3+
Licensed under the Apache License, Version 2.0 (the "License");
4+
you may not use this file except in compliance with the License.
5+
You may obtain a copy of the License at
6+
7+
http://www.apache.org/licenses/LICENSE-2.0
8+
9+
Unless required by applicable law or agreed to in writing, software
10+
distributed under the License is distributed on an "AS IS" BASIS,
11+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
See the License for the specific language governing permissions and
13+
limitations under the License.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
/*
2+
* SPDX-License-Identifier: Apache-2.0
3+
*
4+
* The OpenSearch Contributors require contributions made to
5+
* this file be licensed under the Apache-2.0 license or a
6+
* compatible open source license.
7+
*/
8+
9+
package org.opensearch.javaagent;
10+
11+
import org.opensearch.javaagent.bootstrap.AgentPolicy;
12+
13+
import java.lang.instrument.Instrumentation;
14+
import java.nio.channels.SocketChannel;
15+
import java.util.Map;
16+
17+
import net.bytebuddy.ByteBuddy;
18+
import net.bytebuddy.agent.builder.AgentBuilder;
19+
import net.bytebuddy.asm.Advice;
20+
import net.bytebuddy.description.type.TypeDescription;
21+
import net.bytebuddy.dynamic.ClassFileLocator;
22+
import net.bytebuddy.dynamic.loading.ClassInjector;
23+
import net.bytebuddy.implementation.Implementation;
24+
import net.bytebuddy.matcher.ElementMatcher.Junction;
25+
import net.bytebuddy.matcher.ElementMatchers;
26+
27+
/**
28+
* Java Agent
29+
*/
30+
public class Agent {
31+
/**
32+
* Constructor
33+
*/
34+
private Agent() {}
35+
36+
/**
37+
* Premain
38+
* @param agentArguments agent arguments
39+
* @param instrumentation instrumentation
40+
* @throws Exception Exception
41+
*/
42+
public static void premain(String agentArguments, Instrumentation instrumentation) throws Exception {
43+
initAgent(instrumentation);
44+
}
45+
46+
/**
47+
* Agent Main
48+
* @param agentArguments agent arguments
49+
* @param instrumentation instrumentation
50+
* @throws Exception Exception
51+
*/
52+
public static void agentmain(String agentArguments, Instrumentation instrumentation) throws Exception {
53+
initAgent(instrumentation);
54+
}
55+
56+
private static AgentBuilder createAgentBuilder(Instrumentation inst) throws Exception {
57+
final Junction<TypeDescription> systemType = ElementMatchers.isSubTypeOf(SocketChannel.class);
58+
59+
final AgentBuilder.Transformer transformer = (b, typeDescription, classLoader, module, pd) -> b.visit(
60+
Advice.to(SocketChannelInterceptor.class)
61+
.on(ElementMatchers.named("connect").and(ElementMatchers.not(ElementMatchers.isAbstract())))
62+
);
63+
64+
ClassInjector.UsingUnsafe.ofBootLoader()
65+
.inject(
66+
Map.of(
67+
new TypeDescription.ForLoadedType(StackCallerChainExtractor.class),
68+
ClassFileLocator.ForClassLoader.read(StackCallerChainExtractor.class),
69+
new TypeDescription.ForLoadedType(AgentPolicy.class),
70+
ClassFileLocator.ForClassLoader.read(AgentPolicy.class)
71+
)
72+
);
73+
74+
final ByteBuddy byteBuddy = new ByteBuddy().with(Implementation.Context.Disabled.Factory.INSTANCE);
75+
final AgentBuilder agentBuilder = new AgentBuilder.Default(byteBuddy).with(AgentBuilder.InitializationStrategy.NoOp.INSTANCE)
76+
.with(AgentBuilder.RedefinitionStrategy.REDEFINITION)
77+
.with(AgentBuilder.RedefinitionStrategy.Listener.StreamWriting.toSystemError())
78+
.with(AgentBuilder.TypeStrategy.Default.REDEFINE)
79+
.ignore(ElementMatchers.none())
80+
.type(systemType)
81+
.transform(transformer);
82+
83+
return agentBuilder;
84+
}
85+
86+
private static void initAgent(Instrumentation instrumentation) throws Exception {
87+
AgentBuilder agentBuilder = createAgentBuilder(instrumentation);
88+
agentBuilder.installOn(instrumentation);
89+
}
90+
}

0 commit comments

Comments
 (0)