Restrict connectionString to app service only (#3191)

microsoft · Jul 11, 2023 · 2b8a219 · 2b8a219
1 parent a66d51d
commit 2b8a219
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/...java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/DiagnosticsHelper.java b/...java/com/microsoft/applicationinsights/agent/bootstrap/diagnostics/DiagnosticsHelper.java
@@ -14,7 +14,7 @@ private DiagnosticsHelper() {}
       "APPLICATIONINSIGHTS_DIAGNOSTICS_OUTPUT_DIRECTORY";
 
   // visible for testing
-  static volatile boolean useAppSvcRpIntegrationLogging;
+  public static volatile boolean useAppSvcRpIntegrationLogging;
   private static volatile boolean useFunctionsRpIntegrationLogging;
 
   private static volatile char rpIntegrationChar;

diff --git a/.../com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java b/.../com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java
@@ -841,7 +841,9 @@ static Configuration getConfigurationFromEnvVar(String json) {
 
     Configuration configuration = getConfiguration(json, JsonOrigin.ENV_VAR);
 
-    if (configuration.connectionString != null) {
+    // restrict connection string in APPLICATIONINSIGHTS_CONFIGURATION_CONTENT for App Service only
+    if (configuration.connectionString != null
+        && DiagnosticsHelper.useAppSvcRpIntegrationLogging()) {
       throw new ConfigurationException(
           "\"connectionString\" attribute is not supported inside of "
               + APPLICATIONINSIGHTS_CONFIGURATION_CONTENT

diff --git a/...ava/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationTest.java b/...ava/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationTest.java
@@ -10,6 +10,7 @@
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException;
+import com.microsoft.applicationinsights.agent.bootstrap.diagnostics.DiagnosticsHelper;
 import com.microsoft.applicationinsights.agent.internal.configuration.Configuration.JmxMetric;
 import com.microsoft.applicationinsights.agent.internal.configuration.Configuration.MatchType;
 import com.microsoft.applicationinsights.agent.internal.configuration.Configuration.PreviewConfiguration;
@@ -104,6 +105,7 @@ void shouldParseFromEnvVar() throws IOException {
 
   @Test
   void shouldThrowFromEnvVarIfEmbeddedConnectionString() {
+    DiagnosticsHelper.useAppSvcRpIntegrationLogging = true;
     String contentJson =
         "{\"connectionString\":\"InstrumentationKey=55555555-5555-5555-5555-555555555555\","
             + "\"role\":{\"name\":\"testrole\"}}";