more cleanup

Signed-off-by: Peter Nied <[email protected]>
peternied · Oct 3, 2023 · e749a8e · e749a8e
1 parent 9a915e7
commit e749a8e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/src/main/java/com/amazon/dlic/auth/http/kerberos/HTTPSpnegoAuthenticator.java b/src/main/java/com/amazon/dlic/auth/http/kerberos/HTTPSpnegoAuthenticator.java
@@ -282,13 +282,14 @@ public GSSCredential run() throws GSSException {
 
     @Override
     public boolean reRequestAuthentication(final SecurityRequestChannel request, AuthCredentials creds) {
+        final Map<String, String> headers = new HashMap<>();
         String responseBody = "";
         final String negotiateResponseBody = getNegotiateResponseBody();
         if (negotiateResponseBody != null) {
             responseBody = negotiateResponseBody;
+            headers.put("Content-Type", "application/json");
         }
 
-        final Map<String, String> headers = new HashMap<>();
         if (creds == null || creds.getNativeCredentials() == null) {
             headers.put("WWW-Authenticate", "Negotiate");
         } else {

diff --git a/src/main/java/org/opensearch/security/http/proxy/HTTPExtendedProxyAuthenticator.java b/src/main/java/org/opensearch/security/http/proxy/HTTPExtendedProxyAuthenticator.java
@@ -84,11 +84,6 @@ public AuthCredentials extractCredentials(final SecurityRequest request, final T
         return credentials.markComplete();
     }
 
-    @Override
-    public boolean reRequestAuthentication(final SecurityRequestChannel response, AuthCredentials creds) {
-        return false;
-    }
-
     @Override
     public String getType() {
         return "extended-proxy";

diff --git a/src/main/java/org/opensearch/security/ssl/rest/SecuritySSLInfoAction.java b/src/main/java/org/opensearch/security/ssl/rest/SecuritySSLInfoAction.java
@@ -87,7 +87,6 @@ public void accept(RestChannel channel) throws Exception {
 
                 try {
                     final SecurityRequestChannel securityRequest = SecurityRequestFactory.from(request, channel);
-                    ;
                     SSLInfo sslInfo = SSLRequestHelper.getSSLInfo(settings, configPath, securityRequest, principalExtractor);
                     X509Certificate[] certs = sslInfo == null ? null : sslInfo.getX509Certs();
                     X509Certificate[] localCerts = sslInfo == null ? null : sslInfo.getLocalCertificates();

diff --git a/src/main/java/org/opensearch/security/support/HTTPHelper.java b/src/main/java/org/opensearch/security/support/HTTPHelper.java
@@ -32,8 +32,7 @@
 import java.util.Map;
 
 import org.apache.logging.log4j.Logger;
-
-import org.opensearch.security.filter.SecurityRequestChannel;
+import org.opensearch.security.filter.SecurityRequest;
 import org.opensearch.security.user.AuthCredentials;
 
 public class HTTPHelper {
@@ -86,7 +85,7 @@ public static AuthCredentials extractCredentials(String authorizationHeader, Log
         }
     }
 
-    public static boolean containsBadHeader(final SecurityRequestChannel request) {
+    public static boolean containsBadHeader(final SecurityRequest request) {
 
         final Map<String, List<String>> headers;