Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions agents-audit/dest-auditserver/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,12 @@
</dependency>

<!-- Test -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.apache.ranger.audit.model.AuthzAuditEvent;
import org.apache.ranger.audit.provider.MiscUtil;
import org.apache.ranger.plugin.authn.DefaultJwtProvider;
import org.apache.ranger.plugin.util.PluginHeaderAuthConfig;
import org.apache.ranger.plugin.util.RangerRESTClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -98,6 +99,12 @@ public void init(Properties props, String propPrefix) {
this.restClient.setMaxRetryAttempts(maxRetryAttempts);
this.restClient.setRetryIntervalMs(retryIntervalMs);

Map<String, String> spiffeHeaders = PluginHeaderAuthConfig.buildSpiffeAuthHeaders(props, propPrefix);
if (!spiffeHeaders.isEmpty()) {
this.restClient.setTrustedAuthHeaders(spiffeHeaders);
LOG.debug("SPIFFE header authentication enabled for audit-server destination");
}
Comment on lines +102 to +106

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Worth a README note (or at least a code comment) on whether SPIFFE header auth is meant to be combined with the existing authn.type (JWT/Basic) config, since this is wired in unconditionally alongside whatever authType was configured above. If combining is intentional (defense-in-depth), a one-line comment would save the next reader from wondering; if it's meant to be mutually exclusive, might be worth validating/warning on conflicting config.


LOG.info("<== RangerAuditServerDestination:init()");
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
/*
* 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.ranger.audit.destination;

import org.apache.ranger.plugin.util.PluginHeaderAuthConfig;
import org.junit.jupiter.api.Test;

import java.util.Map;
import java.util.Properties;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;

public class RangerAuditServerDestinationTest {
private static final String AUDIT_DEST_PREFIX = "xasecure.audit.destination.auditserver";

@Test
public void buildSpiffeAuthHeadersUsesAuditDestinationPrefix() {
Properties props = new Properties();
props.setProperty(AUDIT_DEST_PREFIX + ".authn.header.enabled", "true");
props.setProperty(AUDIT_DEST_PREFIX + ".authn.header.spiffe", "X-Spiffe-Id");
props.setProperty(AUDIT_DEST_PREFIX + ".authn.spiffe.value",
"spiffe://example.com/ns/default/sa/hive");

Map<String, String> headers = PluginHeaderAuthConfig.buildSpiffeAuthHeaders(props, AUDIT_DEST_PREFIX);

assertEquals(1, headers.size());
assertEquals("spiffe://example.com/ns/default/sa/hive", headers.get("X-Spiffe-Id"));
}

@Test
public void buildSpiffeAuthHeadersEmptyWhenAuditDestinationDisabled() {
Properties props = new Properties();
props.setProperty(AUDIT_DEST_PREFIX + ".authn.header.enabled", "false");
props.setProperty(AUDIT_DEST_PREFIX + ".authn.spiffe.value",
"spiffe://example.com/ns/default/sa/hive");

Map<String, String> headers = PluginHeaderAuthConfig.buildSpiffeAuthHeaders(props, AUDIT_DEST_PREFIX);

assertTrue(headers.isEmpty());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@
import java.security.SecureRandom;
import java.security.UnrecoverableKeyException;
import java.security.cert.CertificateException;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;
Expand Down Expand Up @@ -143,6 +145,7 @@ public String getMethod() {
private volatile Client cookieAuthClient;
private JwtProvider jwtProvider;
private volatile String authHeader;
private volatile Map<String, String> trustedAuthHeaders = Collections.emptyMap();

public RangerRESTClient(String url, String sslConfigFileName, Configuration config) {
this(url, sslConfigFileName, config, getPropertyPrefix(config));
Expand Down Expand Up @@ -215,6 +218,19 @@ public void setRetryIntervalMs(int retryIntervalMs) {
this.retryIntervalMs = retryIntervalMs;
}

/**
* Trusted HTTP headers for SPIFFE or other header-based auth.
* Applied to every REST request from this client.
*/
public void setTrustedAuthHeaders(Map<String, String> headers) {
if (headers == null || headers.isEmpty()) {
trustedAuthHeaders = Collections.emptyMap();
} else {
trustedAuthHeaders = Collections.unmodifiableMap(new LinkedHashMap<>(headers));
}
resetClient();
}

public void setBasicAuthInfo(String username, String password) {
setBasicAuthFilter(username, password);
}
Expand Down Expand Up @@ -494,9 +510,17 @@ private Invocation.Builder createInvocationBuilder(int currentIndex, String rela
builder = builder.cookie(sessionId);
}

applyTrustedAuthHeaders(builder);

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's no test in the REST client test suite asserting the header actually lands on the outbound Invocation.Builder/request, current tests only validate header construction in PluginHeaderAuthConfig, not application. Worth one test verifying setTrustedAuthHeaders(...) results in the header being present on a built request


return builder;
}

private void applyTrustedAuthHeaders(Invocation.Builder builder) {
for (Map.Entry<String, String> entry : trustedAuthHeaders.entrySet()) {
builder.header(entry.getKey(), entry.getValue());
}
}

private Response performRequest(HttpMethod method, String relativeUrl, Map<String, String> params, Object requestBody, Cookie sessionId) throws Exception {
Response finalResponse = null;
int startIndex = this.lastKnownActiveUrlIndex;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
/*
* 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
* 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.ranger.plugin.util;

import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;

/**
* Outbound trusted-header auth for audit-server and other REST clients.
*
* <p>Properties are read under a caller-supplied prefix (audit destination example):
* <pre>
* xasecure.audit.destination.auditserver.authn.header.enabled=true
* xasecure.audit.destination.auditserver.authn.header.spiffe=X-Spiffe-Id
* </pre>
* SPIFFE ID value is resolved via {@link SpiffeIdentityResolver} under the same
* prefix (explicit value, identity file, or {@code SPIFFE_ID} environment variable).
*/
public final class PluginHeaderAuthConfig {
public static final String PROP_HEADER_AUTH_ENABLED = "authn.header.enabled";
public static final String PROP_HEADER_SPIFFE = "authn.header.spiffe";
public static final String DEFAULT_SPIFFE_HEADER_NAME = "X-Spiffe-Id";

private static final Logger LOG =
LoggerFactory.getLogger(PluginHeaderAuthConfig.class);

private PluginHeaderAuthConfig() {
// to block instantiation
}

/**
* Returns whether trusted header auth is enabled for the given config prefix.
*
* @param props plugin or site configuration properties
* @param configPrefix property prefix for header-auth settings
* @return {@code true} when header auth is enabled
*/
public static boolean isHeaderAuthEnabled(final Properties props,
final String configPrefix) {
if (props == null || StringUtils.isBlank(configPrefix)) {
return false;
}

return Boolean.parseBoolean(
props.getProperty(configPrefix + "." + PROP_HEADER_AUTH_ENABLED,
"false"));
}

/**
* Builds SPIFFE header(s) for outbound REST calls when header auth is enabled.
*
* @param props plugin or site configuration properties
* @param configPrefix prefix such as {@code xasecure.audit.destination.auditserver}
* @return immutable header map; empty when auth is disabled or misconfigured
*/
public static Map<String, String> buildSpiffeAuthHeaders(final Properties props,
final String configPrefix) {
if (!isHeaderAuthEnabled(props, configPrefix)) {
return Collections.emptyMap();
}

List<String> headerNames = SpiffeIdUtil.parseHeaderNames(
resolveSpiffeHeaderName(props, configPrefix));
String spiffeId = SpiffeIdentityResolver.resolve(props, configPrefix);

if (headerNames.isEmpty()) {
LOG.warn("Plugin header auth enabled for {} but no SPIFFE header "
+ "name is configured", configPrefix);
return Collections.emptyMap();
}

if (StringUtils.isBlank(spiffeId)) {
LOG.warn("Plugin header auth enabled for {} but no SPIFFE ID could "

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

at 91, 97 and 103 LOG.warn misconfiguration branches (missing header name, unresolved SPIFFE ID, malformed SPIFFE ID) aren't covered by PluginHeaderAuthConfigTest.

+ "be resolved", configPrefix);
return Collections.emptyMap();
}

if (!SpiffeIdUtil.isValidSpiffeId(spiffeId)) {
LOG.warn("Resolved SPIFFE ID for {} is not well-formed", configPrefix);
return Collections.emptyMap();
}

Map<String, String> headers = new LinkedHashMap<>();

for (String headerName : headerNames) {
headers.put(headerName, spiffeId.trim());

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

spiffeId is already guaranteed trimmed by every path in SpiffeIdentityResolver.resolve() (value/file/env all go through StringUtils.trimToNull). The extra .trim() is dead code

}

return Collections.unmodifiableMap(headers);
}

private static String resolveSpiffeHeaderName(final Properties props,
final String configPrefix) {
String headerName = props != null
? StringUtils.trimToNull(
props.getProperty(configPrefix + "." + PROP_HEADER_SPIFFE))
: null;

return headerName != null ? headerName : DEFAULT_SPIFFE_HEADER_NAME;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
/*
* 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.ranger.plugin.util;

import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.List;
import java.util.Properties;

/**
* Resolves a workload SPIFFE ID from plugin/site configuration.
*
* <p>Resolution order: explicit {@code authn.spiffe.value}, identity file
* ({@code authn.spiffe.file} or the default SPIRE path), then {@code SPIFFE_ID}
* environment variable.
*/
public final class SpiffeIdentityResolver {
public static final String PROP_SPIFFE_VALUE = "authn.spiffe.value";
public static final String PROP_SPIFFE_FILE = "authn.spiffe.file";
public static final String ENV_SPIFFE_ID = "SPIFFE_ID";
public static final String DEFAULT_SPIFFE_IDENTITY_FILE =
"/var/run/secrets/spiffe.io/identity/spiffe";

private static final Logger LOG =
LoggerFactory.getLogger(SpiffeIdentityResolver.class);

private SpiffeIdentityResolver() {
// to block instantiation
}

/**
* Resolves the SPIFFE ID for the given config prefix.
*
* @param props plugin or site configuration properties
* @param configPrefix prefix such as {@code ranger.hive}
* @return the resolved SPIFFE ID, or {@code null} when unavailable
*/
public static String resolve(final Properties props, final String configPrefix) {
if (props == null || StringUtils.isBlank(configPrefix)) {
return null;
}

String value = StringUtils.trimToNull(
props.getProperty(configPrefix + "." + PROP_SPIFFE_VALUE));

if (value != null) {
return value;
}

String filePath = StringUtils.trimToNull(
props.getProperty(configPrefix + "." + PROP_SPIFFE_FILE));

if (filePath == null) {
filePath = DEFAULT_SPIFFE_IDENTITY_FILE;
}

value = readFirstLine(filePath);

if (value != null) {
return value;
}

return StringUtils.trimToNull(System.getenv(ENV_SPIFFE_ID));
}

private static String readFirstLine(final String filePath) {
if (StringUtils.isBlank(filePath)) {
return null;
}

try {
Path path = Paths.get(filePath.trim());

if (!Files.isRegularFile(path)) {
return null;
}

List<String> lines = Files.readAllLines(path, StandardCharsets.UTF_8);

for (String line : lines) {
String trimmed = StringUtils.trimToNull(line);

if (trimmed != null) {
return trimmed;
}
}
} catch (IOException ex) {
LOG.debug("Unable to read SPIFFE identity from file {}", filePath, ex);
}

return null;
}
}
Loading
Loading