Removing product name in various places. (#22521)

Author: dennisoelkers

graylog2-server/src/main/java/org/graylog/plugins/sidecar/migrations/V20180323150000_AddSidecarUser.java

@@ -18,14 +18,13 @@
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
+import jakarta.inject.Inject;
 import org.graylog.plugins.sidecar.common.SidecarPluginConfiguration;
 import org.graylog.plugins.sidecar.permissions.SidecarRestPermissions;
 import org.graylog2.migrations.Migration;
 import org.graylog2.migrations.MigrationHelpers;
 import org.graylog2.users.RoleService;
 
-import jakarta.inject.Inject;
-
 import java.time.ZonedDateTime;
 import java.util.UUID;
 
@@ -62,7 +61,7 @@ public void upgrade() {
                 sidecarUser,
                 UUID.randomUUID().toString(),
                 "Sidecar", "System User (built-in)",
-                "[email protected]",
+                "<No Mail Address>",
                 Sets.newHashSet(
                         roleId,
                         roleService.getReaderRoleObjectId()),

graylog2-server/src/main/java/org/graylog/plugins/threatintel/adapters/otx/OTXDataAdapter.java

@@ -34,6 +34,11 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Multimap;
 import com.google.inject.assistedinject.Assisted;
+import jakarta.inject.Inject;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
 import okhttp3.Headers;
 import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
@@ -46,20 +51,12 @@
 import org.graylog2.plugin.lookup.LookupDataAdapter;
 import org.graylog2.plugin.lookup.LookupDataAdapterConfiguration;
 import org.graylog2.plugin.lookup.LookupResult;
+import org.graylog2.web.customization.CustomizationConfig;
 import org.joda.time.Duration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.annotation.Nullable;
-
-import jakarta.inject.Inject;
-
-import jakarta.validation.constraints.Min;
-import jakarta.validation.constraints.NotEmpty;
-
-import jakarta.ws.rs.core.HttpHeaders;
-import jakarta.ws.rs.core.MediaType;
-
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -290,8 +287,12 @@ OTXDataAdapter create(@Assisted("id") String id,
     }
 
     public static class Descriptor extends LookupDataAdapter.Descriptor<Config> {
-        public Descriptor() {
+        private final CustomizationConfig customizationConfig;
+
+        @Inject
+        public Descriptor(CustomizationConfig customizationConfig) {
             super(NAME, Config.class);
+            this.customizationConfig = customizationConfig;
         }
 
         @Override
@@ -300,7 +301,7 @@ public Config defaultConfiguration() {
                     .type(NAME)
                     .indicator(OTX_INDICATOR_IP_AUTO_DETECT)
                     .apiUrl("https://otx.alienvault.com")
-                    .httpUserAgent("Graylog Threat Intelligence Plugin - https://github.com/Graylog2/graylog-plugin-threatintel")
+                    .httpUserAgent("%1$s Threat Intelligence".formatted(customizationConfig.productName()))
                     .httpConnectTimeout(10000)
                     .httpWriteTimeout(10000)
                     .httpReadTimeout(60000)

graylog2-server/src/main/java/org/graylog2/lookup/adapters/HTTPJSONPathDataAdapter.java

@@ -56,6 +56,7 @@
 import org.graylog2.system.urlwhitelist.UrlNotWhitelistedException;
 import org.graylog2.system.urlwhitelist.UrlWhitelistNotificationService;
 import org.graylog2.system.urlwhitelist.UrlWhitelistService;
+import org.graylog2.web.customization.CustomizationConfig;
 import org.joda.time.Duration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -290,8 +291,12 @@ public interface Factory extends LookupDataAdapter.Factory2<HTTPJSONPathDataAdap
     }
 
     public static class Descriptor extends LookupDataAdapter.Descriptor<Config> {
-        public Descriptor() {
+        private final CustomizationConfig customizationConfig;
+
+        @Inject
+        public Descriptor(CustomizationConfig customizationConfig) {
             super(NAME, Config.class);
+            this.customizationConfig = customizationConfig;
         }
 
         @Override
@@ -300,7 +305,7 @@ public Config defaultConfiguration() {
                     .type(NAME)
                     .url("https://example.invalid/api/lookup?key=${key}")
                     .singleValueJSONPath("$.value")
-                    .userAgent("Graylog Lookup - https://www.graylog.org/")
+                    .userAgent("%1$s Lookup".formatted(customizationConfig.productName()))
                     .headers(Collections.emptyMap())
                     .build();
         }

graylog2-server/src/main/java/org/graylog2/users/RoleServiceImpl.java

@@ -79,9 +79,9 @@ public RoleServiceImpl(MongoCollections mongoCollections,
 
         // make sure the two built-in roles actually exist
         adminRoleObjectId = checkNotNull(ensureBuiltinRole(ADMIN_ROLENAME, Sets.newHashSet("*"), "Admin",
-                "Grants all permissions for Graylog administrators (built-in)"));
+                "Grants all permissions for administrators (built-in)"));
         readerRoleObjectId = checkNotNull(ensureBuiltinRole(READER_ROLENAME, permissions.readerBasePermissions(), "Reader",
-                "Grants basic permissions for every Graylog user (built-in)"));
+                "Grants basic permissions for every user (built-in)"));
 
     }
 

graylog2-server/src/test/java/org/graylog/plugins/threatintel/adapters/otx/OTXDataAdapterTest.java

@@ -21,6 +21,7 @@
 import okhttp3.OkHttpClient;
 import okhttp3.ResponseBody;
 import org.graylog2.plugin.lookup.LookupResult;
+import org.graylog2.web.customization.CustomizationConfig;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -40,7 +41,7 @@ public class OTXDataAdapterTest {
 
     @Before
     public void setUp() throws Exception {
-        final OTXDataAdapter.Config defaultConfiguration = new OTXDataAdapter.Descriptor().defaultConfiguration();
+        final OTXDataAdapter.Config defaultConfiguration = new OTXDataAdapter.Descriptor(CustomizationConfig.empty()).defaultConfiguration();
         final MetricRegistry metricRegistry = new MetricRegistry();
 
         this.otxDataAdapter = new OTXDataAdapter("1", "otx-test", defaultConfiguration, new OkHttpClient(), metricRegistry);
@@ -66,4 +67,4 @@ public void isPrivateIPAddress() throws Exception {
         assertThat(otxDataAdapter.isPrivateIPAddress("8.8.8.8")).isFalse();
         assertThat(otxDataAdapter.isPrivateIPAddress("137.254.56.25")).isFalse();
     }
-}
+}