Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-17621. hadoop-auth to remove jetty-server dependency. (#2865) 

Reviewed-by: Akira Ajisaka <aajisaka@apache.org>
(cherry picked from commit dac60b8282)
This commit is contained in:
Wei-Chiu Chuang 2021-04-06 21:55:01 -07:00
parent 44365244e6
commit 1110b03752
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hadoop-common-project/hadoop-auth/pom.xml
View File

@ -193,11 +193,7 @@
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> </dependencies>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
</dependency>
</dependencies>
<build> <build>
<plugins> <plugins>

8
hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/AuthenticationFilter.java
View File

@ -19,7 +19,6 @@ import org.apache.hadoop.security.authentication.client.AuthenticatedURL;
import org.apache.hadoop.security.authentication.client.AuthenticationException; import org.apache.hadoop.security.authentication.client.AuthenticationException;
import org.apache.hadoop.security.authentication.client.KerberosAuthenticator; import org.apache.hadoop.security.authentication.client.KerberosAuthenticator;
import org.apache.hadoop.security.authentication.util.*; import org.apache.hadoop.security.authentication.util.*;
import org.eclipse.jetty.server.Response;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -621,7 +620,7 @@ public class AuthenticationFilter implements Filter {
errCode = HttpServletResponse.SC_FORBIDDEN; errCode = HttpServletResponse.SC_FORBIDDEN;
} }
// After Jetty 9.4.21, sendError() no longer allows a custom message. // After Jetty 9.4.21, sendError() no longer allows a custom message.
// use setStatusWithReason() to set a custom message. // use setStatus() to set a custom message.
String reason; String reason;
if (authenticationEx == null) { if (authenticationEx == null) {
reason = "Authentication required"; reason = "Authentication required";
@ -629,10 +628,7 @@ public class AuthenticationFilter implements Filter {
reason = authenticationEx.getMessage(); reason = authenticationEx.getMessage();
} }
if (httpResponse instanceof Response) { httpResponse.setStatus(errCode, reason);
((Response)httpResponse).setStatusWithReason(errCode, reason);
}
httpResponse.sendError(errCode, reason); httpResponse.sendError(errCode, reason);
} }
} }