Skip to content

Auto Detect SE/Validator URL to connect based on host #378

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
lovesh-ap wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Auto Detect SE/Validator URL to connect based on host #378

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
21 changes: 19 additions & 2 deletions ...in/java/com/newrelic/agent/security/instrumentator/utils/CollectorConfigurationUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ public static CollectorConfigurationUtils getInstance() {
*/
public static CollectorConfig populateCollectorConfig() {
CollectorConfig collectorConfig = new CollectorConfig();
String validatorServiceEndpointUrl = NewRelic.getAgent().getConfig()
.getValue("security.validator_service_url", "wss://csec.nr-data.net");
String validatorServiceEndpointUrl = getValidatorServiceEndpointUrl(NewRelic.getAgent().getConfig().getValue("host", "collector.newrelic.com"));
K2ServiceInfo serviceInfo = new K2ServiceInfo();

serviceInfo.setValidatorServiceEndpointURL(validatorServiceEndpointUrl);
Expand All @@ -76,6 +75,24 @@ public static CollectorConfig populateCollectorConfig() {
return collectorConfig;
}

private static String getValidatorServiceEndpointUrl(String host) {
String validatorServiceEndpointUrl = NewRelic.getAgent().getConfig()
.getValue("security.validator_service_url");
if(StringUtils.isNotBlank(validatorServiceEndpointUrl)){
return validatorServiceEndpointUrl;
}
switch (host) {
case "collector.eu.newrelic.com":
return "wss://csec.eu01.nr-data.net";
case "gov-collector.newrelic.com":
return "wss://csec-gov.nr-data.net";
case "staging-collector.newrelic.com":
return "wss://csec-staging.nr-data.net";
default:
return "wss://csec.nr-data.net";
}
}

private static String parseLicenseKey(Object license_key) {
if(license_key instanceof String){
return StringUtils.strip((String) license_key, "'\"");
Expand Down
Loading