HADOOP-10499. Remove unused parameter from ProxyUsers.authorize(). Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1588098 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
9a0dec60ff
commit
dd7d032457
|
@ -390,6 +390,9 @@ Release 2.5.0 - UNRELEASED
|
|||
HADOOP-10500. TestDoAsEffectiveUser fails on JDK7 due to failure to reset
|
||||
proxy user configuration. (cnauroth)
|
||||
|
||||
HADOOP-10499. Remove unused parameter from ProxyUsers.authorize().
|
||||
(Benoy Antony via cnauroth)
|
||||
|
||||
Release 2.4.1 - UNRELEASED
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
|
|
@ -1983,7 +1983,7 @@ public abstract class Server {
|
|||
// authentication
|
||||
if (user != null && user.getRealUser() != null
|
||||
&& (authMethod != AuthMethod.TOKEN)) {
|
||||
ProxyUsers.authorize(user, this.getHostAddress(), conf);
|
||||
ProxyUsers.authorize(user, this.getHostAddress());
|
||||
}
|
||||
authorize(user, protocolName, getHostInetAddress());
|
||||
if (LOG.isDebugEnabled()) {
|
||||
|
|
|
@ -134,11 +134,10 @@ public class ProxyUsers {
|
|||
*
|
||||
* @param user ugi of the effective or proxy user which contains a real user
|
||||
* @param remoteAddress the ip address of client
|
||||
* @param newConf configuration
|
||||
* @throws AuthorizationException
|
||||
*/
|
||||
public static synchronized void authorize(UserGroupInformation user,
|
||||
String remoteAddress, Configuration newConf) throws AuthorizationException {
|
||||
String remoteAddress) throws AuthorizationException {
|
||||
|
||||
if(!init) {
|
||||
refreshSuperUserGroupsConfiguration();
|
||||
|
|
|
@ -271,7 +271,7 @@ public class TestProxyUsers {
|
|||
|
||||
private void assertNotAuthorized(UserGroupInformation proxyUgi, String host) {
|
||||
try {
|
||||
ProxyUsers.authorize(proxyUgi, host, null);
|
||||
ProxyUsers.authorize(proxyUgi, host);
|
||||
fail("Allowed authorization of " + proxyUgi + " from " + host);
|
||||
} catch (AuthorizationException e) {
|
||||
// Expected
|
||||
|
@ -280,7 +280,7 @@ public class TestProxyUsers {
|
|||
|
||||
private void assertAuthorized(UserGroupInformation proxyUgi, String host) {
|
||||
try {
|
||||
ProxyUsers.authorize(proxyUgi, host, null);
|
||||
ProxyUsers.authorize(proxyUgi, host);
|
||||
} catch (AuthorizationException e) {
|
||||
fail("Did not allowed authorization of " + proxyUgi + " from " + host);
|
||||
}
|
||||
|
|
|
@ -647,7 +647,7 @@ public class JspHelper {
|
|||
if (doAsUserFromQuery != null) {
|
||||
// create and attempt to authorize a proxy user
|
||||
ugi = UserGroupInformation.createProxyUser(doAsUserFromQuery, ugi);
|
||||
ProxyUsers.authorize(ugi, getRemoteAddr(request), conf);
|
||||
ProxyUsers.authorize(ugi, getRemoteAddr(request));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -179,14 +179,14 @@ public class TestRefreshUserMappings {
|
|||
|
||||
// check before
|
||||
try {
|
||||
ProxyUsers.authorize(ugi1, "127.0.0.1", config);
|
||||
ProxyUsers.authorize(ugi1, "127.0.0.1");
|
||||
fail("first auth for " + ugi1.getShortUserName() + " should've failed ");
|
||||
} catch (AuthorizationException e) {
|
||||
// expected
|
||||
System.err.println("auth for " + ugi1.getUserName() + " failed");
|
||||
}
|
||||
try {
|
||||
ProxyUsers.authorize(ugi2, "127.0.0.1", config);
|
||||
ProxyUsers.authorize(ugi2, "127.0.0.1");
|
||||
System.err.println("auth for " + ugi2.getUserName() + " succeeded");
|
||||
// expected
|
||||
} catch (AuthorizationException e) {
|
||||
|
@ -204,14 +204,14 @@ public class TestRefreshUserMappings {
|
|||
admin.run(args);
|
||||
|
||||
try {
|
||||
ProxyUsers.authorize(ugi2, "127.0.0.1", config);
|
||||
ProxyUsers.authorize(ugi2, "127.0.0.1");
|
||||
fail("second auth for " + ugi2.getShortUserName() + " should've failed ");
|
||||
} catch (AuthorizationException e) {
|
||||
// expected
|
||||
System.err.println("auth for " + ugi2.getUserName() + " failed");
|
||||
}
|
||||
try {
|
||||
ProxyUsers.authorize(ugi1, "127.0.0.1", config);
|
||||
ProxyUsers.authorize(ugi1, "127.0.0.1");
|
||||
System.err.println("auth for " + ugi1.getUserName() + " succeeded");
|
||||
// expected
|
||||
} catch (AuthorizationException e) {
|
||||
|
|
|
@ -173,7 +173,7 @@ public class TestHSAdminServer {
|
|||
|
||||
Throwable th = null;
|
||||
try {
|
||||
ProxyUsers.authorize(ugi, "127.0.0.1", conf);
|
||||
ProxyUsers.authorize(ugi, "127.0.0.1");
|
||||
} catch (Exception e) {
|
||||
th = e;
|
||||
}
|
||||
|
@ -189,7 +189,7 @@ public class TestHSAdminServer {
|
|||
// resetting th
|
||||
th = null;
|
||||
try {
|
||||
ProxyUsers.authorize(ugi, "127.0.0.1", conf);
|
||||
ProxyUsers.authorize(ugi, "127.0.0.1");
|
||||
} catch (Exception e) {
|
||||
th = e;
|
||||
}
|
||||
|
@ -202,7 +202,7 @@ public class TestHSAdminServer {
|
|||
th = null;
|
||||
|
||||
try {
|
||||
ProxyUsers.authorize(ugi, "127.0.0.1", conf);
|
||||
ProxyUsers.authorize(ugi, "127.0.0.1");
|
||||
} catch (Exception e) {
|
||||
th = e;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue