From d866f81edbd70121a9e29e5d25be67e1c464397e Mon Sep 17 00:00:00 2001 From: Aaron Myers Date: Fri, 30 Nov 2012 19:19:01 +0000 Subject: [PATCH] Reverting initial commit of HDFS-3680 pending further comments. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1415797 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 - .../org/apache/hadoop/hdfs/DFSConfigKeys.java | 2 - .../hdfs/server/namenode/AuditLogger.java | 61 ------ .../hdfs/server/namenode/FSNamesystem.java | 194 +++++------------- .../src/main/resources/hdfs-default.xml | 13 -- .../hdfs/server/namenode/TestAuditLogger.java | 123 ----------- 6 files changed, 55 insertions(+), 341 deletions(-) delete mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/AuditLogger.java delete mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAuditLogger.java diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 8fa36b3ddfa..6303154c2cf 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -490,9 +490,6 @@ Release 2.0.3-alpha - Unreleased HDFS-4214. OfflineEditsViewer should print out the offset at which it encountered an error. (Colin Patrick McCabe via atm) - HDFS-3680. Allow customized audit logging in HDFS FSNamesystem. (Marcelo - Vanzin via atm) - OPTIMIZATIONS BUG FIXES diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java index 994390cf7ac..9ea1ec5b526 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java @@ -246,8 +246,6 @@ public class DFSConfigKeys extends CommonConfigurationKeys { public static final String DFS_HOSTS = "dfs.hosts"; public static final String DFS_HOSTS_EXCLUDE = "dfs.hosts.exclude"; public static final String DFS_CLIENT_LOCAL_INTERFACES = "dfs.client.local.interfaces"; - public static final String DFS_NAMENODE_AUDIT_LOGGERS_KEY = "dfs.namenode.audit.loggers"; - public static final String DFS_NAMENODE_DEFAULT_AUDIT_LOGGER_NAME = "default"; // Much code in hdfs is not yet updated to use these keys. public static final String DFS_CLIENT_BLOCK_WRITE_LOCATEFOLLOWINGBLOCK_RETRIES_KEY = "dfs.client.block.write.locateFollowingBlock.retries"; diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/AuditLogger.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/AuditLogger.java deleted file mode 100644 index 614eb63d055..00000000000 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/AuditLogger.java +++ /dev/null @@ -1,61 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.hadoop.hdfs.server.namenode; - -import java.net.InetAddress; -import java.security.Principal; - -import org.apache.hadoop.classification.InterfaceAudience; -import org.apache.hadoop.classification.InterfaceStability; -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.fs.FileStatus; - -/** - * Interface defining an audit logger. - */ -@InterfaceAudience.Public -@InterfaceStability.Evolving -public interface AuditLogger { - - /** - * Called during initialization of the logger. - * - * @param conf The configuration object. - */ - void initialize(Configuration conf); - - /** - * Called to log an audit event. - *

- * This method must return as quickly as possible, since it's called - * in a critical section of the NameNode's operation. - * - * @param succeeded Whether authorization succeeded. - * @param userName Name of the user executing the request. - * @param addr Remote address of the request. - * @param cmd The requested command. - * @param src Path of affected source file. - * @param dst Path of affected destination file (if any). - * @param stat File information for operations that change the file's - * metadata (permissions, owner, times, etc). - */ - void logAuditEvent(boolean succeeded, String userName, - InetAddress addr, String cmd, String src, String dst, - FileStatus stat); - -} diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java index 32977a84b59..5fe7bc062e7 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java @@ -34,8 +34,6 @@ import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_HA_STANDBY_CHECKPOINTS_DEFAULT; import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_HA_STANDBY_CHECKPOINTS_KEY; import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_ACCESSTIME_PRECISION_KEY; -import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_AUDIT_LOGGERS_KEY; -import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_DEFAULT_AUDIT_LOGGER_NAME; import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_DELEGATION_KEY_UPDATE_INTERVAL_DEFAULT; import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_DELEGATION_KEY_UPDATE_INTERVAL_KEY; import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_DELEGATION_TOKEN_ALWAYS_USE_DEFAULT; @@ -113,7 +111,6 @@ import org.apache.hadoop.fs.ContentSummary; import org.apache.hadoop.fs.CreateFlag; import org.apache.hadoop.fs.FileAlreadyExistsException; -import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FsServerDefaults; import org.apache.hadoop.fs.InvalidPathException; import org.apache.hadoop.fs.Options; @@ -249,32 +246,32 @@ protected StringBuilder initialValue() { } }; - private boolean isAuditEnabled() { - return !isDefaultAuditLogger || auditLog.isInfoEnabled(); - } - - private void logAuditEvent(UserGroupInformation ugi, + private static final void logAuditEvent(UserGroupInformation ugi, InetAddress addr, String cmd, String src, String dst, HdfsFileStatus stat) { logAuditEvent(true, ugi, addr, cmd, src, dst, stat); } - private void logAuditEvent(boolean succeeded, + private static final void logAuditEvent(boolean succeeded, UserGroupInformation ugi, InetAddress addr, String cmd, String src, String dst, HdfsFileStatus stat) { - FileStatus status = null; - if (stat != null) { - Path symlink = stat.isSymlink() ? new Path(stat.getSymlink()) : null; - Path path = dst != null ? new Path(dst) : new Path(src); - status = new FileStatus(stat.getLen(), stat.isDir(), - stat.getReplication(), stat.getBlockSize(), stat.getModificationTime(), - stat.getAccessTime(), stat.getPermission(), stat.getOwner(), - stat.getGroup(), symlink, path); - } - for (AuditLogger logger : auditLoggers) { - logger.logAuditEvent(succeeded, ugi.toString(), addr, - cmd, src, dst, status); + final StringBuilder sb = auditBuffer.get(); + sb.setLength(0); + sb.append("allowed=").append(succeeded).append("\t"); + sb.append("ugi=").append(ugi).append("\t"); + sb.append("ip=").append(addr).append("\t"); + sb.append("cmd=").append(cmd).append("\t"); + sb.append("src=").append(src).append("\t"); + sb.append("dst=").append(dst).append("\t"); + if (null == stat) { + sb.append("perm=null"); + } else { + sb.append("perm="); + sb.append(stat.getOwner()).append(":"); + sb.append(stat.getGroup()).append(":"); + sb.append(stat.getPermission()); } + auditLog.info(sb); } /** @@ -307,11 +304,6 @@ private void logAuditEvent(boolean succeeded, final DelegationTokenSecretManager dtSecretManager; private final boolean alwaysUseDelegationTokensForTests; - // Tracks whether the default audit logger is the only configured audit - // logger; this allows isAuditEnabled() to return false in case the - // underlying logger is disabled, and avoid some unnecessary work. - private final boolean isDefaultAuditLogger; - private final List auditLoggers; /** The namespace tree. */ FSDirectory dir; @@ -544,50 +536,14 @@ public static FSNamesystem loadFromDisk(Configuration conf, this.dtSecretManager = createDelegationTokenSecretManager(conf); this.dir = new FSDirectory(fsImage, this, conf); this.safeMode = new SafeModeInfo(conf); - this.auditLoggers = initAuditLoggers(conf); - this.isDefaultAuditLogger = auditLoggers.size() == 1 && - auditLoggers.get(0) instanceof DefaultAuditLogger; + } catch(IOException e) { LOG.error(getClass().getSimpleName() + " initialization failed.", e); close(); throw e; - } catch (RuntimeException re) { - LOG.error(getClass().getSimpleName() + " initialization failed.", re); - close(); - throw re; } } - private List initAuditLoggers(Configuration conf) { - // Initialize the custom access loggers if configured. - Collection alClasses = conf.getStringCollection(DFS_NAMENODE_AUDIT_LOGGERS_KEY); - List auditLoggers = Lists.newArrayList(); - if (alClasses != null && !alClasses.isEmpty()) { - for (String className : alClasses) { - try { - AuditLogger logger; - if (DFS_NAMENODE_DEFAULT_AUDIT_LOGGER_NAME.equals(className)) { - logger = new DefaultAuditLogger(); - } else { - logger = (AuditLogger) Class.forName(className).newInstance(); - } - logger.initialize(conf); - auditLoggers.add(logger); - } catch (RuntimeException re) { - throw re; - } catch (Exception e) { - throw new RuntimeException(e); - } - } - } - - // Make sure there is at least one logger installed. - if (auditLoggers.isEmpty()) { - auditLoggers.add(new DefaultAuditLogger()); - } - return auditLoggers; - } - void loadFSImage(StartupOption startOpt, FSImage fsImage, boolean haEnabled) throws IOException { // format before starting up if requested @@ -1120,7 +1076,7 @@ void setPermission(String src, FsPermission permission) try { setPermissionInt(src, permission); } catch (AccessControlException e) { - if (isAuditEnabled() && isExternalInvocation()) { + if (auditLog.isInfoEnabled() && isExternalInvocation()) { logAuditEvent(false, UserGroupInformation.getCurrentUser(), getRemoteIp(), "setPermission", src, null, null); @@ -1142,14 +1098,14 @@ private void setPermissionInt(String src, FsPermission permission) } checkOwner(src); dir.setPermission(src, permission); - if (isAuditEnabled() && isExternalInvocation()) { + if (auditLog.isInfoEnabled() && isExternalInvocation()) { resultingStat = dir.getFileInfo(src, false); } } finally { writeUnlock(); } getEditLog().logSync(); - if (isAuditEnabled() && isExternalInvocation()) { + if (auditLog.isInfoEnabled() && isExternalInvocation()) { logAuditEvent(UserGroupInformation.getCurrentUser(), getRemoteIp(), "setPermission", src, null, resultingStat); @@ -1166,7 +1122,7 @@ void setOwner(String src, String username, String group) try { setOwnerInt(src, username, group); } catch (AccessControlException e) { - if (isAuditEnabled() && isExternalInvocation()) { + if (auditLog.isInfoEnabled() && isExternalInvocation()) { logAuditEvent(false, UserGroupInformation.getCurrentUser(), getRemoteIp(), "setOwner", src, null, null); @@ -1197,14 +1153,14 @@ private void setOwnerInt(String src, String username, String group) } } dir.setOwner(src, username, group); - if (isAuditEnabled() && isExternalInvocation()) { + if (auditLog.isInfoEnabled() && isExternalInvocation()) { resultingStat = dir.getFileInfo(src, false); } } finally { writeUnlock(); } getEditLog().logSync(); - if (isAuditEnabled() && isExternalInvocation()) { + if (auditLog.isInfoEnabled() && isExternalInvocation()) { logAuditEvent(UserGroupInformation.getCurrentUser(), getRemoteIp(), "setOwner", src, null, resultingStat); @@ -1247,7 +1203,7 @@ LocatedBlocks getBlockLocations(String src, long offset, long length, return getBlockLocationsInt(src, offset, length, doAccessTime, needBlockToken, checkSafeMode); } catch (AccessControlException e) { - if (isAuditEnabled() && isExternalInvocation()) { + if (auditLog.isInfoEnabled() && isExternalInvocation()) { logAuditEvent(false, UserGroupInformation.getCurrentUser(), getRemoteIp(), "open", src, null, null); @@ -1273,7 +1229,7 @@ private LocatedBlocks getBlockLocationsInt(String src, long offset, long length, } final LocatedBlocks ret = getBlockLocationsUpdateTimes(src, offset, length, doAccessTime, needBlockToken); - if (isAuditEnabled() && isExternalInvocation()) { + if (auditLog.isInfoEnabled() && isExternalInvocation()) { logAuditEvent(UserGroupInformation.getCurrentUser(), getRemoteIp(), "open", src, null, null); @@ -1354,7 +1310,7 @@ void concat(String target, String [] srcs) try { concatInt(target, srcs); } catch (AccessControlException e) { - if (isAuditEnabled() && isExternalInvocation()) { + if (auditLog.isInfoEnabled() && isExternalInvocation()) { logAuditEvent(false, UserGroupInformation.getLoginUser(), getRemoteIp(), "concat", Arrays.toString(srcs), target, null); @@ -1397,14 +1353,14 @@ private void concatInt(String target, String [] srcs) throw new SafeModeException("Cannot concat " + target, safeMode); } concatInternal(target, srcs); - if (isAuditEnabled() && isExternalInvocation()) { + if (auditLog.isInfoEnabled() && isExternalInvocation()) { resultingStat = dir.getFileInfo(target, false); } } finally { writeUnlock(); } getEditLog().logSync(); - if (isAuditEnabled() && isExternalInvocation()) { + if (auditLog.isInfoEnabled() && isExternalInvocation()) { logAuditEvent(UserGroupInformation.getLoginUser(), getRemoteIp(), "concat", Arrays.toString(srcs), target, resultingStat); @@ -1525,7 +1481,7 @@ void setTimes(String src, long mtime, long atime) try { setTimesInt(src, mtime, atime); } catch (AccessControlException e) { - if (isAuditEnabled() && isExternalInvocation()) { + if (auditLog.isInfoEnabled() && isExternalInvocation()) { logAuditEvent(false, UserGroupInformation.getCurrentUser(), getRemoteIp(), "setTimes", src, null, null); @@ -1551,7 +1507,7 @@ private void setTimesInt(String src, long mtime, long atime) INode inode = dir.getINode(src); if (inode != null) { dir.setTimes(src, inode, mtime, atime, true); - if (isAuditEnabled() && isExternalInvocation()) { + if (auditLog.isInfoEnabled() && isExternalInvocation()) { final HdfsFileStatus stat = dir.getFileInfo(src, false); logAuditEvent(UserGroupInformation.getCurrentUser(), getRemoteIp(), @@ -1574,7 +1530,7 @@ void createSymlink(String target, String link, try { createSymlinkInt(target, link, dirPerms, createParent); } catch (AccessControlException e) { - if (isAuditEnabled() && isExternalInvocation()) { + if (auditLog.isInfoEnabled() && isExternalInvocation()) { logAuditEvent(false, UserGroupInformation.getCurrentUser(), getRemoteIp(), "createSymlink", link, target, null); @@ -1595,14 +1551,14 @@ private void createSymlinkInt(String target, String link, verifyParentDir(link); } createSymlinkInternal(target, link, dirPerms, createParent); - if (isAuditEnabled() && isExternalInvocation()) { + if (auditLog.isInfoEnabled() && isExternalInvocation()) { resultingStat = dir.getFileInfo(link, false); } } finally { writeUnlock(); } getEditLog().logSync(); - if (isAuditEnabled() && isExternalInvocation()) { + if (auditLog.isInfoEnabled() && isExternalInvocation()) { logAuditEvent(UserGroupInformation.getCurrentUser(), getRemoteIp(), "createSymlink", link, target, resultingStat); @@ -1658,7 +1614,7 @@ boolean setReplication(final String src, final short replication) try { return setReplicationInt(src, replication); } catch (AccessControlException e) { - if (isAuditEnabled() && isExternalInvocation()) { + if (auditLog.isInfoEnabled() && isExternalInvocation()) { logAuditEvent(false, UserGroupInformation.getCurrentUser(), getRemoteIp(), "setReplication", src, null, null); @@ -1694,7 +1650,7 @@ private boolean setReplicationInt(final String src, final short replication) } getEditLog().logSync(); - if (isFile && isAuditEnabled() && isExternalInvocation()) { + if (isFile && auditLog.isInfoEnabled() && isExternalInvocation()) { logAuditEvent(UserGroupInformation.getCurrentUser(), getRemoteIp(), "setReplication", src, null, null); @@ -1750,7 +1706,7 @@ void startFile(String src, PermissionStatus permissions, String holder, startFileInt(src, permissions, holder, clientMachine, flag, createParent, replication, blockSize); } catch (AccessControlException e) { - if (isAuditEnabled() && isExternalInvocation()) { + if (auditLog.isInfoEnabled() && isExternalInvocation()) { logAuditEvent(false, UserGroupInformation.getCurrentUser(), getRemoteIp(), "create", src, null, null); @@ -1783,7 +1739,7 @@ private void startFileInt(String src, PermissionStatus permissions, String holde } } - if (isAuditEnabled() && isExternalInvocation()) { + if (auditLog.isInfoEnabled() && isExternalInvocation()) { final HdfsFileStatus stat = dir.getFileInfo(src, false); logAuditEvent(UserGroupInformation.getCurrentUser(), getRemoteIp(), @@ -2084,7 +2040,7 @@ LocatedBlock appendFile(String src, String holder, String clientMachine) try { return appendFileInt(src, holder, clientMachine); } catch (AccessControlException e) { - if (isAuditEnabled() && isExternalInvocation()) { + if (auditLog.isInfoEnabled() && isExternalInvocation()) { logAuditEvent(false, UserGroupInformation.getCurrentUser(), getRemoteIp(), "append", src, null, null); @@ -2130,7 +2086,7 @@ private LocatedBlock appendFileInt(String src, String holder, String clientMachi +" block size " + lb.getBlock().getNumBytes()); } } - if (isAuditEnabled() && isExternalInvocation()) { + if (auditLog.isInfoEnabled() && isExternalInvocation()) { logAuditEvent(UserGroupInformation.getCurrentUser(), getRemoteIp(), "append", src, null, null); @@ -2576,7 +2532,7 @@ boolean renameTo(String src, String dst) try { return renameToInt(src, dst); } catch (AccessControlException e) { - if (isAuditEnabled() && isExternalInvocation()) { + if (auditLog.isInfoEnabled() && isExternalInvocation()) { logAuditEvent(false, UserGroupInformation.getCurrentUser(), getRemoteIp(), "rename", src, dst, null); @@ -2598,14 +2554,14 @@ private boolean renameToInt(String src, String dst) checkOperation(OperationCategory.WRITE); status = renameToInternal(src, dst); - if (status && isAuditEnabled() && isExternalInvocation()) { + if (status && auditLog.isInfoEnabled() && isExternalInvocation()) { resultingStat = dir.getFileInfo(dst, false); } } finally { writeUnlock(); } getEditLog().logSync(); - if (status && isAuditEnabled() && isExternalInvocation()) { + if (status && auditLog.isInfoEnabled() && isExternalInvocation()) { logAuditEvent(UserGroupInformation.getCurrentUser(), getRemoteIp(), "rename", src, dst, resultingStat); @@ -2655,14 +2611,14 @@ void renameTo(String src, String dst, Options.Rename... options) checkOperation(OperationCategory.WRITE); renameToInternal(src, dst, options); - if (isAuditEnabled() && isExternalInvocation()) { + if (auditLog.isInfoEnabled() && isExternalInvocation()) { resultingStat = dir.getFileInfo(dst, false); } } finally { writeUnlock(); } getEditLog().logSync(); - if (isAuditEnabled() && isExternalInvocation()) { + if (auditLog.isInfoEnabled() && isExternalInvocation()) { StringBuilder cmd = new StringBuilder("rename options="); for (Rename option : options) { cmd.append(option.value()).append(" "); @@ -2703,7 +2659,7 @@ boolean delete(String src, boolean recursive) try { return deleteInt(src, recursive); } catch (AccessControlException e) { - if (isAuditEnabled() && isExternalInvocation()) { + if (auditLog.isInfoEnabled() && isExternalInvocation()) { logAuditEvent(false, UserGroupInformation.getCurrentUser(), getRemoteIp(), "delete", src, null, null); @@ -2719,7 +2675,7 @@ private boolean deleteInt(String src, boolean recursive) NameNode.stateChangeLog.debug("DIR* NameSystem.delete: " + src); } boolean status = deleteInternal(src, recursive, true); - if (status && isAuditEnabled() && isExternalInvocation()) { + if (status && auditLog.isInfoEnabled() && isExternalInvocation()) { logAuditEvent(UserGroupInformation.getCurrentUser(), getRemoteIp(), "delete", src, null, null); @@ -2885,7 +2841,7 @@ HdfsFileStatus getFileInfo(String src, boolean resolveLink) } stat = dir.getFileInfo(src, resolveLink); } catch (AccessControlException e) { - if (isAuditEnabled() && isExternalInvocation()) { + if (auditLog.isInfoEnabled() && isExternalInvocation()) { logAuditEvent(false, UserGroupInformation.getCurrentUser(), getRemoteIp(), "getfileinfo", src, null, null); @@ -2894,7 +2850,7 @@ HdfsFileStatus getFileInfo(String src, boolean resolveLink) } finally { readUnlock(); } - if (isAuditEnabled() && isExternalInvocation()) { + if (auditLog.isInfoEnabled() && isExternalInvocation()) { logAuditEvent(UserGroupInformation.getCurrentUser(), getRemoteIp(), "getfileinfo", src, null, null); @@ -2910,7 +2866,7 @@ boolean mkdirs(String src, PermissionStatus permissions, try { return mkdirsInt(src, permissions, createParent); } catch (AccessControlException e) { - if (isAuditEnabled() && isExternalInvocation()) { + if (auditLog.isInfoEnabled() && isExternalInvocation()) { logAuditEvent(false, UserGroupInformation.getCurrentUser(), getRemoteIp(), "mkdirs", src, null, null); @@ -2934,7 +2890,7 @@ private boolean mkdirsInt(String src, PermissionStatus permissions, writeUnlock(); } getEditLog().logSync(); - if (status && isAuditEnabled() && isExternalInvocation()) { + if (status && auditLog.isInfoEnabled() && isExternalInvocation()) { final HdfsFileStatus stat = dir.getFileInfo(src, false); logAuditEvent(UserGroupInformation.getCurrentUser(), getRemoteIp(), @@ -3363,7 +3319,7 @@ DirectoryListing getListing(String src, byte[] startAfter, try { return getListingInt(src, startAfter, needLocation); } catch (AccessControlException e) { - if (isAuditEnabled() && isExternalInvocation()) { + if (auditLog.isInfoEnabled() && isExternalInvocation()) { logAuditEvent(false, UserGroupInformation.getCurrentUser(), getRemoteIp(), "listStatus", src, null, null); @@ -3387,7 +3343,7 @@ private DirectoryListing getListingInt(String src, byte[] startAfter, checkTraverse(src); } } - if (isAuditEnabled() && isExternalInvocation()) { + if (auditLog.isInfoEnabled() && isExternalInvocation()) { logAuditEvent(UserGroupInformation.getCurrentUser(), getRemoteIp(), "listStatus", src, null, null); @@ -5330,7 +5286,7 @@ private static InetAddress getRemoteIp() { * Log fsck event in the audit log */ void logFsckEvent(String src, InetAddress remoteAddress) throws IOException { - if (isAuditEnabled()) { + if (auditLog.isInfoEnabled()) { logAuditEvent(UserGroupInformation.getCurrentUser(), remoteAddress, "fsck", src, null, null); @@ -5585,44 +5541,4 @@ public boolean isAvoidingStaleDataNodesForWrite() { return this.blockManager.getDatanodeManager() .isAvoidingStaleDataNodesForWrite(); } - - /** - * Default AuditLogger implementation; used when no access logger is - * defined in the config file. It can also be explicitly listed in the - * config file. - */ - private static class DefaultAuditLogger implements AuditLogger { - - @Override - public void initialize(Configuration conf) { - // Nothing to do. - } - - @Override - public void logAuditEvent(boolean succeeded, String userName, - InetAddress addr, String cmd, String src, String dst, - FileStatus status) { - if (auditLog.isInfoEnabled()) { - final StringBuilder sb = auditBuffer.get(); - sb.setLength(0); - sb.append("allowed=").append(succeeded).append("\t"); - sb.append("ugi=").append(userName).append("\t"); - sb.append("ip=").append(addr).append("\t"); - sb.append("cmd=").append(cmd).append("\t"); - sb.append("src=").append(src).append("\t"); - sb.append("dst=").append(dst).append("\t"); - if (null == status) { - sb.append("perm=null"); - } else { - sb.append("perm="); - sb.append(status.getOwner()).append(":"); - sb.append(status.getGroup()).append(":"); - sb.append(status.getPermission()); - } - auditLog.info(sb); - } - } - - } - } diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml index 34cd8465fd7..13dad672a2c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml @@ -1184,17 +1184,4 @@ - - dfs.namenode.audit.loggers - default - - List of classes implementing audit loggers that will receive audit events. - These should be implementations of org.apache.hadoop.hdfs.server.namenode.AuditLogger. - The special value "default" can be used to reference the default audit - logger, which uses the configured log system. Installing custom audit loggers - may affect the performance and stability of the NameNode. Refer to the custom - logger's documentation for more details. - - - diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAuditLogger.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAuditLogger.java deleted file mode 100644 index 3de27cb2746..00000000000 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAuditLogger.java +++ /dev/null @@ -1,123 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.hadoop.hdfs.server.namenode; - -import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_AUDIT_LOGGERS_KEY; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import java.io.IOException; -import java.net.InetAddress; - -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.fs.FileStatus; -import org.apache.hadoop.fs.FileSystem; -import org.apache.hadoop.fs.Path; -import org.apache.hadoop.hdfs.HdfsConfiguration; -import org.apache.hadoop.hdfs.MiniDFSCluster; -import org.apache.hadoop.hdfs.protocol.HdfsFileStatus; -import org.apache.hadoop.ipc.RemoteException; -import org.apache.hadoop.security.UserGroupInformation; -import org.junit.Test; - -/** - * Tests for the {@link AuditLogger} custom audit logging interface. - */ -public class TestAuditLogger { - - /** - * Tests that AuditLogger works as expected. - */ - @Test - public void testAuditLogger() throws IOException { - Configuration conf = new HdfsConfiguration(); - conf.set(DFS_NAMENODE_AUDIT_LOGGERS_KEY, - DummyAuditLogger.class.getName()); - MiniDFSCluster cluster = new MiniDFSCluster.Builder(conf).build(); - - try { - cluster.waitClusterUp(); - assertTrue(DummyAuditLogger.initialized); - - FileSystem fs = cluster.getFileSystem(); - long time = System.currentTimeMillis(); - fs.setTimes(new Path("/"), time, time); - assertEquals(1, DummyAuditLogger.logCount); - } finally { - cluster.shutdown(); - } - } - - /** - * Tests that a broken audit logger causes requests to fail. - */ - @Test - public void testBrokenLogger() throws IOException { - Configuration conf = new HdfsConfiguration(); - conf.set(DFS_NAMENODE_AUDIT_LOGGERS_KEY, - BrokenAuditLogger.class.getName()); - MiniDFSCluster cluster = new MiniDFSCluster.Builder(conf).build(); - - try { - cluster.waitClusterUp(); - - FileSystem fs = cluster.getFileSystem(); - long time = System.currentTimeMillis(); - fs.setTimes(new Path("/"), time, time); - fail("Expected exception due to broken audit logger."); - } catch (RemoteException re) { - // Expected. - } finally { - cluster.shutdown(); - } - } - - public static class DummyAuditLogger implements AuditLogger { - - static boolean initialized; - static int logCount; - - public void initialize(Configuration conf) { - initialized = true; - } - - public void logAuditEvent(boolean succeeded, String userName, - InetAddress addr, String cmd, String src, String dst, - FileStatus stat) { - logCount++; - } - - } - - public static class BrokenAuditLogger implements AuditLogger { - - public void initialize(Configuration conf) { - // No op. - } - - public void logAuditEvent(boolean succeeded, String userName, - InetAddress addr, String cmd, String src, String dst, - FileStatus stat) { - throw new RuntimeException("uh oh"); - } - - } - -}