Merge branch '26-password-environment'

src/ScmBackup.Tests/ConfigTests/EnvironmentVariableConfigReaderTests.cs

@@ -0,0 +1,46 @@
+using ScmBackup.Configuration;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Xunit;
+
+namespace ScmBackup.Tests.ConfigTests
+{
+    public class EnvironmentVariableConfigReaderTests
+    {
+        private IConfigReader sut;
+        private FakeConfigReader reader;
+
+        public EnvironmentVariableConfigReaderTests()
+        {
+            reader = new FakeConfigReader();
+            reader.SetDefaultFakeConfig();
+            sut = new EnvironmentVariableConfigReader(reader);
+
+            Environment.SetEnvironmentVariable("scmbackup_test", "foo");
+        }
+
+        [Theory]
+        [InlineData("%scmbackup_test%bar", "foobar")]   // part of the password
+        [InlineData("%scmbackup_test%", "foo")]         // whole password
+        public void ReplacesInPassword(string originalPw, string changedPw)
+        {
+            reader.FakeConfig.Sources.First().Password = originalPw;
+
+            var result = sut.ReadConfig();
+
+            Assert.Equal(changedPw, result.Sources.First().Password);
+        }
+
+        [Fact]
+        public void DoesNothingWhenPasswordContainsNoVariable()
+        {
+            reader.FakeConfig.Sources.First().Password = "bar";
+
+            var result = sut.ReadConfig();
+
+            Assert.Equal("bar", result.Sources.First().Password);
+        }
+    }
+}

src/ScmBackup/CompositionRoot/Bootstrapper.cs

@@ -1,4 +1,5 @@
-using ScmBackup.Hosters;
+using ScmBackup.Configuration;
+using ScmBackup.Hosters;
 using ScmBackup.Http;
 using ScmBackup.Loggers;
 using ScmBackup.Scm;
@@ -34,6 +35,7 @@ public static Container BuildContainer()
             container.Register<IConfigBackupMaker, ConfigBackupMaker>();
 
             container.Register<IConfigReader, ConfigReader>(Lifestyle.Singleton);
+            container.RegisterDecorator<IConfigReader, EnvironmentVariableConfigReader>(Lifestyle.Singleton); 
             container.RegisterDecorator<IConfigReader, ValidatingConfigReader>(Lifestyle.Singleton);
 
             container.Register<IHttpRequest, HttpRequest>();

src/ScmBackup/Configuration/EnvironmentVariableConfigReader.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace ScmBackup.Configuration
+{
+    /// <summary>
+    /// decorator for ConfigReader, replaces %foo% values with the respective environment variables
+    /// </summary>
+    internal class EnvironmentVariableConfigReader : IConfigReader
+    {
+        private readonly IConfigReader configReader;
+        private Config config = null;
+
+        public EnvironmentVariableConfigReader(IConfigReader configReader)
+        {
+            this.configReader = configReader;
+        }
+
+        public Config ReadConfig()
+        {
+            if (this.config != null)
+            {
+                return this.config;
+            }
+
+            var config = this.configReader.ReadConfig();
+
+            foreach (var source in config.Sources)
+            {
+                if (!string.IsNullOrWhiteSpace(source.Password))
+                {
+                    source.Password = Environment.ExpandEnvironmentVariables(source.Password);    
+                }
+            }
+
+            this.config = config;
+            return config;
+        }
+    }
+}