Skip to content

ADH-8486: fix Spark Ranger stale policy cache bypass #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iamlapa wants to merge 5 commits into
base: develop/2.2.0/2.6.0.7
Choose a base branch
from
Open

ADH-8486: fix Spark Ranger stale policy cache bypass #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
917259f
ADH-8486: fix Spark Ranger stale policy cache bypass
iamlapa Jun 29, 2026
4b02345
Merge remote-tracking branch 'origin/develop/2.2.0/2.6.0.7' into feat…
iamlapa Jun 30, 2026
895dabc
ADH-8486: Rename Nestedstructure service-def patch to J10065
iamlapa Jun 30, 2026
c882597
ADH-8486: Remove unused cache directory permissions field
iamlapa Jul 1, 2026
4959972
ADH-8486: Handle concurrent audit directory creation
iamlapa Jul 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions agents-audit/src/main/java/org/apache/ranger/audit/queue/AuditFileCacheProviderSpool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,13 @@ public boolean init(Properties props, String basePropertyName) {
"755");
filePermissions = AuditFileUtil.parsePermissions(spoolFilePerms);
Set<PosixFilePermission> dirPermissions = AuditFileUtil.parsePermissions(spoolDirPerms);
AuditFileUtil.ResolvedDirectory resolvedLogDirectory = AuditFileUtil.resolveDirectory(logFolderProp,
MiscUtil.getStringProperty(props, propPrefix + ".subdir.mode"),
dirPermissions,
filePermissions);
logFolderProp = resolvedLogDirectory.getPath();
dirPermissions = resolvedLogDirectory.getDirPermissions();
filePermissions = resolvedLogDirectory.getFilePermissions();
logFileNameFormat = MiscUtil.getStringProperty(props,
basePropertyName + "." + PROP_FILE_SPOOL_LOCAL_FILE_NAME);
String archiveFolderProp = MiscUtil.getStringProperty(props,
Expand Down Expand Up @@ -180,12 +187,11 @@ public boolean init(Properties props, String basePropertyName) {
return false;
}
logFolder = new File(logFolderProp);
if (!logFolder.isDirectory()) {
AuditFileUtil.createDirectoryWithPermissions(logFolder, dirPermissions);
if (!logFolder.isDirectory()) {
logger.error("File Spool folder not found and can't be created. folder={}, queueName={}", logFolder.getAbsolutePath(), FILE_CACHE_PROVIDER_NAME);
return false;
}
try {
resolvedLogDirectory.ensureDirectory();
} catch (Exception excp) {
logger.error("File Spool folder not found, unsafe, or can't be created. folder={}, queueName={}", logFolder.getAbsolutePath(), FILE_CACHE_PROVIDER_NAME, excp);
return false;
}
logger.info("logFolder=" + logFolder + ", queueName="
+ FILE_CACHE_PROVIDER_NAME);
Expand Down
18 changes: 12 additions & 6 deletions agents-audit/src/main/java/org/apache/ranger/audit/queue/AuditFileQueueSpool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,13 @@ public boolean init(Properties props, String basePropertyName) {
"755");
filePermissions = AuditFileUtil.parsePermissions(spoolFilePerms);
Set<PosixFilePermission> dirPermissions = AuditFileUtil.parsePermissions(spoolDirPerms);
AuditFileUtil.ResolvedDirectory resolvedLogDirectory = AuditFileUtil.resolveDirectory(logFolderProp,
MiscUtil.getStringProperty(props, propPrefix + ".subdir.mode"),
dirPermissions,
filePermissions);
logFolderProp = resolvedLogDirectory.getPath();
dirPermissions = resolvedLogDirectory.getDirPermissions();
filePermissions = resolvedLogDirectory.getFilePermissions();
logFileNameFormat = MiscUtil.getStringProperty(props,
basePropertyName + "." + PROP_FILE_SPOOL_LOCAL_FILE_NAME);
String archiveFolderProp = MiscUtil.getStringProperty(props,
Expand Down Expand Up @@ -176,12 +183,11 @@ public boolean init(Properties props, String basePropertyName) {
return false;
}
logFolder = new File(logFolderProp);
if (!logFolder.isDirectory()) {
AuditFileUtil.createDirectoryWithPermissions(logFolder, dirPermissions);
if (!logFolder.isDirectory()) {
logger.error("File Spool folder not found and can't be created. folder={}, queueName={}", logFolder.getAbsolutePath(), FILE_QUEUE_PROVIDER_NAME);
return false;
}
try {
resolvedLogDirectory.ensureDirectory();
} catch (Exception excp) {
logger.error("File Spool folder not found, unsafe, or can't be created. folder={}, queueName={}", logFolder.getAbsolutePath(), FILE_QUEUE_PROVIDER_NAME, excp);
return false;
}
logger.info("logFolder=" + logFolder + ", queueName="
+ FILE_QUEUE_PROVIDER_NAME);
Expand Down
18 changes: 12 additions & 6 deletions agents-audit/src/main/java/org/apache/ranger/audit/queue/AuditFileSpool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,13 @@ public boolean init(Properties props, String basePropertyName) {
"755");
filePermissions = AuditFileUtil.parsePermissions(spoolFilePerms);
Set<PosixFilePermission> dirPermissions = AuditFileUtil.parsePermissions(spoolDirPerms);
AuditFileUtil.ResolvedDirectory resolvedLogDirectory = AuditFileUtil.resolveDirectory(logFolderProp,
MiscUtil.getStringProperty(props, propPrefix + ".subdir.mode"),
dirPermissions,
filePermissions);
logFolderProp = resolvedLogDirectory.getPath();
dirPermissions = resolvedLogDirectory.getDirPermissions();
filePermissions = resolvedLogDirectory.getFilePermissions();
logFileNameFormat = MiscUtil.getStringProperty(props,
basePropertyName + "." + PROP_FILE_SPOOL_LOCAL_FILE_NAME);
String archiveFolderProp = MiscUtil.getStringProperty(props,
Expand All @@ -161,12 +168,11 @@ public boolean init(Properties props, String basePropertyName) {
return false;
}
logFolder = new File(logFolderProp);
if (!logFolder.isDirectory()) {
AuditFileUtil.createDirectoryWithPermissions(logFolder, dirPermissions);
if (!logFolder.isDirectory()) {
logger.error("File Spool folder not found and can't be created. folder={}, queueName={}", logFolder.getAbsolutePath(), queueProvider.getName());
return false;
}
try {
resolvedLogDirectory.ensureDirectory();
} catch (Exception excp) {
logger.error("File Spool folder not found, unsafe, or can't be created. folder={}, queueName={}", logFolder.getAbsolutePath(), queueProvider.getName(), excp);
return false;
}
logger.info("logFolder={}, queueName={}", logFolder, queueProvider.getName());

Expand Down
31 changes: 31 additions & 0 deletions agents-audit/src/main/java/org/apache/ranger/audit/utils/AuditFileUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@
import java.util.Set;

public class AuditFileUtil {
public static final String SUBDIR_MODE_DISABLED = "disabled";
public static final String SUBDIR_MODE_PERUSER = "peruser";
public static final String SUBDIR_MODE_PERGROUP = "pergroup";

public static void setPermissions(File file, Set<PosixFilePermission> perms) throws IOException {
Path path = file.toPath();
Expand Down Expand Up @@ -56,4 +59,32 @@ public static void createDirectoryWithPermissions(File dir, Set<PosixFilePermiss
Files.setPosixFilePermissions(path, perms);
}

public static ResolvedDirectory resolveDirectory(String baseDir, String subdirMode, Set<PosixFilePermission> defaultDirPerms, Set<PosixFilePermission> defaultFilePerms) {
return new ResolvedDirectory(LocalDirectoryResolver.resolveAuditSpool(baseDir, subdirMode, defaultDirPerms, defaultFilePerms));
}

public static final class ResolvedDirectory {
private final LocalDirectoryResolver.ResolvedDirectory delegate;

private ResolvedDirectory(LocalDirectoryResolver.ResolvedDirectory delegate) {
this.delegate = delegate;
}

public String getPath() {
return delegate.getPath();
}

public Set<PosixFilePermission> getDirPermissions() {
return delegate.getDirPermissions();
}

public Set<PosixFilePermission> getFilePermissions() {
return delegate.getFilePermissions();
}

public void ensureDirectory() throws IOException {
delegate.ensureDirectory();
}
}

}
Loading
Loading