Skip to content

Commit 1939a03

Browse files
committed
Remove unneeded code
Signed-off-by: Craig Perkins <cwperx@amazon.com>
1 parent c4e49b2 commit 1939a03

File tree

4 files changed

+0
-27
lines changed

4 files changed

+0
-27
lines changed

src/main/java/org/opensearch/security/auth/BackendRegistry.java

-15
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@
6666
import org.opensearch.security.user.User;
6767
import org.opensearch.threadpool.ThreadPool;
6868

69-
import com.amazon.dlic.auth.http.jwt.HTTPJwtAuthenticator;
7069
import org.greenrobot.eventbus.Subscribe;
7170

7271
import static org.apache.http.HttpStatus.SC_FORBIDDEN;
@@ -78,7 +77,6 @@ public class BackendRegistry {
7877
protected final Logger log = LogManager.getLogger(this.getClass());
7978
private SortedSet<AuthDomain> restAuthDomains;
8079
private Set<AuthorizationBackend> restAuthorizers;
81-
private Set<String> urlParamsToConsume = new HashSet<>();
8280
private List<AuthFailureListener> ipAuthFailureListeners;
8381
private Multimap<String, AuthFailureListener> authBackendFailureListeners;
8482
private List<ClientBlockRegistry<InetAddress>> ipClientBlockRegistries;
@@ -157,10 +155,6 @@ public BackendRegistry(
157155
createCaches();
158156
}
159157

160-
public Set<String> getUrlParamsToConsume() {
161-
return urlParamsToConsume;
162-
}
163-
164158
public boolean isInitialized() {
165159
return initialized;
166160
}
@@ -187,15 +181,6 @@ public void onDynamicConfigModelChanged(DynamicConfigModel dcm) {
187181
authBackendClientBlockRegistries = dcm.getAuthBackendClientBlockRegistries();
188182

189183
SortedSet<AuthDomain> authDomains = Collections.unmodifiableSortedSet(dcm.getRestAuthDomains());
190-
urlParamsToConsume.clear();
191-
for (AuthDomain authDomain : authDomains) {
192-
if ("jwt".equals(authDomain.getHttpAuthenticator().getType())) {
193-
HTTPJwtAuthenticator jwtAuthenticator = (HTTPJwtAuthenticator) authDomain.getHttpAuthenticator();
194-
if (jwtAuthenticator.getJwtUrlParameter() != null) {
195-
urlParamsToConsume.add(jwtAuthenticator.getJwtUrlParameter());
196-
}
197-
}
198-
}
199184

200185
// OpenSearch Security no default authc
201186
initialized = !restAuthDomains.isEmpty() || anonymousAuthEnabled || injectedUserEnabled;

src/main/java/org/opensearch/security/filter/NettyRequest.java

-6
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ public class NettyRequest implements SecurityRequest {
4141
protected final Netty4HttpChannel underlyingChannel;
4242
protected final Supplier<CheckedAccessMap> parameters = Suppliers.memoize(() -> new CheckedAccessMap(params(uri())));
4343

44-
private final Set<String> consumedParams = new HashSet<>();
45-
4644
NettyRequest(final HttpRequest request, final Netty4HttpChannel channel) {
4745
this.underlyingRequest = request;
4846
this.underlyingChannel = channel;
@@ -98,10 +96,6 @@ public Set<String> getUnconsumedParams() {
9896
return parameters.get().accessedKeys();
9997
}
10098

101-
public Set<String> getConsumedParams() {
102-
return consumedParams;
103-
}
104-
10599
private static Map<String, String> params(String uri) {
106100
// Sourced from
107101
// https://github.com/opensearch-project/OpenSearch/blob/main/server/src/main/java/org/opensearch/http/AbstractHttpServerTransport.java#L419-L422

src/main/java/org/opensearch/security/support/ConfigConstants.java

-2
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,6 @@ public class ConfigConstants {
170170
public static final boolean OPENDISTRO_SECURITY_AUDIT_SSL_VERIFY_HOSTNAMES_DEFAULT = true;
171171
public static final boolean OPENDISTRO_SECURITY_AUDIT_SSL_ENABLE_SSL_CLIENT_AUTH_DEFAULT = false;
172172
public static final String OPENDISTRO_SECURITY_AUDIT_EXCLUDE_SENSITIVE_HEADERS = "opendistro_security.audit.exclude_sensitive_headers";
173-
public static final String OPENDISTRO_SECURITY_AUDIT_EXCLUDE_SENSITIVE_URL_PARAMETERS =
174-
"opendistro_security.audit.exclude_sensitive_url_params";
175173

176174
public static final String SECURITY_AUDIT_CONFIG_DEFAULT_PREFIX = "plugins.security.audit.config.";
177175

src/test/java/org/opensearch/security/auditlog/config/AuditConfigSerializeTest.java

-4
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ public void testDefaultSerialize() throws IOException {
7070
.field("log_request_body", true)
7171
.field("resolve_indices", true)
7272
.field("exclude_sensitive_headers", true)
73-
.field("exclude_sensitive_url_params", true)
7473
.field("ignore_users", Collections.singletonList("kibanaserver"))
7574
.field("ignore_requests", Collections.emptyList())
7675
.field("ignore_headers", Collections.emptyList())
@@ -135,7 +134,6 @@ public void testDeserialize() throws IOException {
135134
.field("log_request_body", true)
136135
.field("resolve_indices", true)
137136
.field("exclude_sensitive_headers", true)
138-
.field("exclude_sensitive_url_params", true)
139137
.field("ignore_users", Collections.singletonList("test-user-1"))
140138
.field("ignore_requests", Collections.singletonList("test-request"))
141139
.field("ignore_headers", Collections.singletonList("test-headers"))
@@ -235,7 +233,6 @@ public void testSerialize() throws IOException {
235233
.field("log_request_body", true)
236234
.field("resolve_indices", true)
237235
.field("exclude_sensitive_headers", true)
238-
.field("exclude_sensitive_url_params", true)
239236
.field("ignore_users", ImmutableList.of("ignore-user-1", "ignore-user-2"))
240237
.field("ignore_requests", Collections.singletonList("ignore-request-1"))
241238
.field("ignore_headers", Collections.singletonList("test-header"))
@@ -280,7 +277,6 @@ public void testNullSerialize() throws IOException {
280277
.field("log_request_body", true)
281278
.field("resolve_indices", true)
282279
.field("exclude_sensitive_headers", true)
283-
.field("exclude_sensitive_url_params", true)
284280
.field("ignore_users", ImmutableList.of("kibanaserver"))
285281
.field("ignore_requests", Collections.emptyList())
286282
.field("ignore_headers", Collections.emptyList())

0 commit comments

Comments
 (0)