(NuGet#9) Return null for configuration elements

This prevents any configuration from nuget.config files being returned to prevent NuGet configuration from tainting Chocolatey
TheCakeIsNaOH · Jan 10, 2023 · 9bca314 · 9bca314
1 parent a0210f0
commit 9bca314
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 0 deletions.
diff --git a/src/NuGet.Core/NuGet.Configuration/Settings/Settings.cs b/src/NuGet.Core/NuGet.Configuration/Settings/Settings.cs
@@ -45,6 +45,17 @@ public class Settings : ISettings
 
         public SettingSection GetSection(string sectionName)
         {
+            //////////////////////////////////////////////////////////
+            // Start - Chocolatey Specific Modification
+            //////////////////////////////////////////////////////////
+            if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("CHOCOLATEY_VERSION")))
+            {
+                return null;
+            }
+            //////////////////////////////////////////////////////////
+            // End - Chocolatey Specific Modification
+            //////////////////////////////////////////////////////////
+
             if (_computedSections.TryGetValue(sectionName, out var section))
             {
                 return section.Clone() as SettingSection;

diff --git a/src/NuGet.Core/NuGet.Configuration/Settings/SettingsFile.cs b/src/NuGet.Core/NuGet.Configuration/Settings/SettingsFile.cs
@@ -143,6 +143,17 @@ public SettingsFile(string directoryPath, string fileName, bool isMachineWide, b
         /// <returns>null if no section with the given name was found</returns>
         public SettingSection GetSection(string sectionName)
         {
+            //////////////////////////////////////////////////////////
+            // Start - Chocolatey Specific Modification
+            //////////////////////////////////////////////////////////
+            if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("CHOCOLATEY_VERSION")))
+            {
+                return null;
+            }
+            //////////////////////////////////////////////////////////
+            // End - Chocolatey Specific Modification
+            //////////////////////////////////////////////////////////
+
             return _rootElement.GetSection(sectionName);
         }
 
@@ -194,6 +205,18 @@ internal void SaveToDisk()
         /// </remarks>
         internal bool TryGetSection(string sectionName, out SettingSection section)
         {
+            //////////////////////////////////////////////////////////
+            // Start - Chocolatey Specific Modification
+            //////////////////////////////////////////////////////////
+            if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("CHOCOLATEY_VERSION")))
+            {
+                section = null;
+                return false;
+            }
+            //////////////////////////////////////////////////////////
+            // End - Chocolatey Specific Modification
+            //////////////////////////////////////////////////////////
+
             return _rootElement.Sections.TryGetValue(sectionName, out section);
         }