Skip to content

Fix NPE in AppSecConfigServiceImpl #9165

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

Merged
merged 1 commit into from
Jul 15, 2025
Merged

Fix NPE in AppSecConfigServiceImpl #9165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 14 additions & 19 deletions dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/AppSecConfigServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,7 @@ public class AppSecConfigServiceImpl implements AppSecConfigService {
private final ConfigurationPoller configurationPoller;
private WafBuilder wafBuilder;

private MergedAsmFeatures mergedAsmFeatures;
private volatile boolean initialized;
private final MergedAsmFeatures mergedAsmFeatures = new MergedAsmFeatures();

private final ConcurrentHashMap<String, SubconfigListener> subconfigListeners =
new ConcurrentHashMap<>();
Expand Down Expand Up @@ -173,9 +172,7 @@ private class AppSecConfigChangesListener implements ProductListener {
@Override
public void accept(ConfigKey configKey, byte[] content, PollingRateHinter pollingRateHinter)
throws IOException {
if (!initialized) {
throw new IllegalStateException();
}
maybeInitializeDefaultConfig();

if (content == null) {
try {
Expand Down Expand Up @@ -219,8 +216,8 @@ public void accept(ConfigKey configKey, byte[] content, PollingRateHinter pollin
}
defaultConfigActivated = false;
}
super.accept(configKey, content, pollingRateHinter);
usedDDWafConfigKeys.add(configKey.toString());
super.accept(configKey, content, pollingRateHinter);
}

@Override
Expand Down Expand Up @@ -282,13 +279,7 @@ private void subscribeAsmFeatures() {
Product.ASM_FEATURES,
AppSecFeaturesDeserializer.INSTANCE,
(configKey, newConfig, hinter) -> {
if (!hasUserWafConfig && !defaultConfigActivated) {
// features activated in runtime
init();
}
if (!initialized) {
throw new IllegalStateException();
}
maybeInitializeDefaultConfig();
if (newConfig == null) {
mergedAsmFeatures.removeConfig(configKey);
} else {
Expand All @@ -305,10 +296,7 @@ private void subscribeAsmFeatures() {

private void distributeSubConfigurations(
String key, AppSecModuleConfigurer.Reconfiguration reconfiguration) {
if (usedDDWafConfigKeys.isEmpty() && !defaultConfigActivated && !hasUserWafConfig) {
// no config left in the WAF builder, add the default config
init();
}
maybeInitializeDefaultConfig();
for (Map.Entry<String, SubconfigListener> entry : subconfigListeners.entrySet()) {
SubconfigListener listener = entry.getValue();
try {
Expand All @@ -320,6 +308,13 @@ private void distributeSubConfigurations(
}
}

private void maybeInitializeDefaultConfig() {
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggestion: Maybe initializeDefaultConfigIfNeeded() would be a better name here?

Copy link
Contributor

Choose a reason for hiding this comment

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

The maybe pattern looks to be used here and there among the code base.
Not sure where it comes from, but that seems to spread to both common parts (agent) and products.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yep, there are other examples even in the same class (e.g. maybeSubscribeConfigPolling), I think it's better to leave it as it is for consistency.

if (usedDDWafConfigKeys.isEmpty() && !hasUserWafConfig && !defaultConfigActivated) {
// no config left in the WAF builder, add the default config
init();
}
}

@Override
public void init() {
Map<String, Object> wafConfig;
Expand All @@ -341,8 +336,8 @@ public void init() {
} else {
hasUserWafConfig = true;
}
this.mergedAsmFeatures = new MergedAsmFeatures();
this.initialized = true;
this.mergedAsmFeatures.clear();
this.usedDDWafConfigKeys.clear();

if (wafConfig.isEmpty()) {
throw new IllegalStateException("Expected default waf config to be available");
Expand Down
5 changes: 5 additions & 0 deletions dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/MergedAsmFeatures.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,9 @@ private void mergeAutoUserInstrum(
}
target.autoUserInstrum = newValue;
}

public void clear() {
mergedData = null;
configs.clear();
}
}
61 changes: 61 additions & 0 deletions ...sec/src/test/groovy/com/datadog/appsec/config/AppSecConfigServiceImplSpecification.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,6 +759,67 @@ class AppSecConfigServiceImplSpecification extends DDSpecification {
p.toFile().delete()
}

// https://github.com/DataDog/dd-trace-java/issues/9159
void 'test initialization issues while applying remote config'() {
setup:
final key = new ParsedConfigKey('Test', '1234', 1, 'ASM_DD', 'ID')
final service = new AppSecConfigServiceImpl(config, poller, reconf)
config.getAppSecActivation() >> ProductActivation.ENABLED_INACTIVE

when:
service.maybeSubscribeConfigPolling()

then:
1 * poller.addListener(Product.ASM_DD, _) >> {
listeners.savedWafDataChangesListener = it[1]
}

when:
listeners.savedWafDataChangesListener.accept(key, '''{"rules_override": [{"rules_target": [{"rule_id": "foo"}], "enabled": false}]}'''.getBytes(), NOOP)

then:
noExceptionThrown()
}

void 'config keys are added and removed to the set when receiving ASM_DD payloads'() {
setup:
final key = new ParsedConfigKey('Test', '1234', 1, 'ASM_DD', 'ID')
final service = new AppSecConfigServiceImpl(config, poller, reconf)
config.getAppSecActivation() >> ProductActivation.ENABLED_INACTIVE

when:
service.maybeSubscribeConfigPolling()

then:
1 * poller.addListener(Product.ASM_DD, _) >> {
listeners.savedWafDataChangesListener = it[1]
}
1 * poller.addListener(Product.ASM_FEATURES, _, _) >> {
listeners.savedFeaturesDeserializer = it[1]
listeners.savedFeaturesListener = it[2]
}

when:
listeners.savedFeaturesListener.accept('asm_features conf',
listeners.savedFeaturesDeserializer.deserialize('{"asm":{"enabled": true}}'.bytes),
NOOP)

then:
service.usedDDWafConfigKeys.empty

when:
listeners.savedWafDataChangesListener.accept(key, '''{"rules_override": [{"rules_target": [{"rule_id": "foo"}], "enabled": false}]}'''.getBytes(), NOOP)

then:
service.usedDDWafConfigKeys.toList() == [key.toString()]

when:
listeners.savedWafDataChangesListener.remove(key, NOOP)

then:
service.usedDDWafConfigKeys.empty
}

private static AppSecFeatures autoUserInstrum(String mode) {
return new AppSecFeatures().tap { features ->
features.autoUserInstrum = new AppSecFeatures.AutoUserInstrum().tap { instrum ->
Expand Down