Raft round 2 (#182)

* brought in rafty

* moved raft classes into Ocelot and deleted from int project

* started to set up rafty in Ocelot

* RAFTY INSIDE OCELOT...WOOT

* more work adding rafty...just need to get auth working now

* rudimentary authenticated raft requests working

* asyn await stuff

* hacked rafty into the fileconfigurationcontroller...everything seems to be working roughly but I have a lot of refactoring to do

* updated to latest rafty that doesnt need an id

* hacky but all tests passing

* changed admin area set up to use builder not configuration.json, changed admin area auth to use client credentials

* missing code coverage

* ignore raft sectionf for code coverage

* ignore raft sectionf for code coverage

* back to normal filters

* try exclude attr

* missed these

* moved client secret to builder for authentication and updated docs

* lock to try and fix error accessing identity server created temprsa file on build server

* updated postman scripts and changed Ocelot to not always use type handling as this looked crap when manually accessing the configuration endpoint

* added rafty docs

* changes I missed

* added serialisation code we need for rafty to process commands when they proxy to leader

* moved controllers into their feature slices

test/Ocelot.UnitTests/Configuration/FileConfigurationCreatorTests.cs

@@ -15,6 +15,7 @@ using Xunit;
 
 namespace Ocelot.UnitTests.Configuration
 {
+    using Ocelot.DependencyInjection;
     using Ocelot.Errors;
     using Ocelot.UnitTests.TestData;
 
@@ -36,6 +37,7 @@ namespace Ocelot.UnitTests.Configuration
         private Mock<IRateLimitOptionsCreator> _rateLimitOptions;
         private Mock<IRegionCreator> _regionCreator;
         private Mock<IHttpHandlerOptionsCreator> _httpHandlerOptionsCreator;
+        private Mock<IAdministrationPath> _adminPath;
 
         public FileConfigurationCreatorTests()
         {
@@ -52,13 +54,23 @@ namespace Ocelot.UnitTests.Configuration
             _rateLimitOptions = new Mock<IRateLimitOptionsCreator>();
             _regionCreator = new Mock<IRegionCreator>();
             _httpHandlerOptionsCreator = new Mock<IHttpHandlerOptionsCreator>();
+            _adminPath = new Mock<IAdministrationPath>();
 
             _ocelotConfigurationCreator = new FileOcelotConfigurationCreator( 
-                _fileConfig.Object, _validator.Object, _logger.Object,
+                _fileConfig.Object,
+                _validator.Object, 
+                _logger.Object,
                 _claimsToThingCreator.Object,
-                _authOptionsCreator.Object, _upstreamTemplatePatternCreator.Object, _requestIdKeyCreator.Object,
-                _serviceProviderConfigCreator.Object, _qosOptionsCreator.Object, _fileReRouteOptionsCreator.Object,
-                _rateLimitOptions.Object, _regionCreator.Object, _httpHandlerOptionsCreator.Object);
+                _authOptionsCreator.Object, 
+                _upstreamTemplatePatternCreator.Object,
+                _requestIdKeyCreator.Object,
+                _serviceProviderConfigCreator.Object,
+                _qosOptionsCreator.Object,
+                _fileReRouteOptionsCreator.Object,
+                _rateLimitOptions.Object,
+                _regionCreator.Object,
+                _httpHandlerOptionsCreator.Object,
+                _adminPath.Object);
         }
 
         [Fact]

test/Ocelot.UnitTests/Configuration/FileConfigurationRepositoryTests.cs

@@ -91,7 +91,6 @@ namespace Ocelot.UnitTests.Configuration
 
         private void ThenTheConfigurationIsStoredAs(FileConfiguration expected)
         {
-            _result.GlobalConfiguration.AdministrationPath.ShouldBe(expected.GlobalConfiguration.AdministrationPath);
             _result.GlobalConfiguration.RequestIdKey.ShouldBe(expected.GlobalConfiguration.RequestIdKey);
             _result.GlobalConfiguration.ServiceDiscoveryProvider.Host.ShouldBe(expected.GlobalConfiguration.ServiceDiscoveryProvider.Host);
             _result.GlobalConfiguration.ServiceDiscoveryProvider.Port.ShouldBe(expected.GlobalConfiguration.ServiceDiscoveryProvider.Port);
@@ -126,7 +125,6 @@ namespace Ocelot.UnitTests.Configuration
 
         private void ThenTheFollowingIsReturned(FileConfiguration expected)
         {
-            _result.GlobalConfiguration.AdministrationPath.ShouldBe(expected.GlobalConfiguration.AdministrationPath);
             _result.GlobalConfiguration.RequestIdKey.ShouldBe(expected.GlobalConfiguration.RequestIdKey);
             _result.GlobalConfiguration.ServiceDiscoveryProvider.Host.ShouldBe(expected.GlobalConfiguration.ServiceDiscoveryProvider.Host);
             _result.GlobalConfiguration.ServiceDiscoveryProvider.Port.ShouldBe(expected.GlobalConfiguration.ServiceDiscoveryProvider.Port);
@@ -155,7 +153,6 @@ namespace Ocelot.UnitTests.Configuration
 
             var globalConfiguration = new FileGlobalConfiguration
             {
-                AdministrationPath = "asdas",
                 ServiceDiscoveryProvider = new FileServiceDiscoveryProvider
                 {
                     Port = 198,
@@ -185,7 +182,6 @@ namespace Ocelot.UnitTests.Configuration
 
             var globalConfiguration = new FileGlobalConfiguration
             {
-                AdministrationPath = "testy",
                 ServiceDiscoveryProvider = new FileServiceDiscoveryProvider
                 {
                     Port = 198,

test/Ocelot.UnitTests/Configuration/IdentityServerConfigurationCreatorTests.cs

@@ -9,7 +9,7 @@ namespace Ocelot.UnitTests.Configuration
         [Fact]
         public void happy_path_only_exists_for_test_coverage_even_uncle_bob_probably_wouldnt_test_this()
         {
-            var result = IdentityServerConfigurationCreator.GetIdentityServerConfiguration();
+            var result = IdentityServerConfigurationCreator.GetIdentityServerConfiguration("secret");
             result.ApiName.ShouldBe("admin");
         }
     }

test/Ocelot.UnitTests/Configuration/OcelotResourceOwnerPasswordValidatorTests.cs

@@ -1,117 +0,0 @@
-using Ocelot.Configuration.Authentication;
-using Xunit;
-using Shouldly;
-using TestStack.BDDfy;
-using Moq;
-using IdentityServer4.Validation;
-using Ocelot.Configuration.Provider;
-using System.Collections.Generic;
-
-namespace Ocelot.UnitTests.Configuration
-{
-    public class OcelotResourceOwnerPasswordValidatorTests
-    {
-        private OcelotResourceOwnerPasswordValidator _validator;
-        private Mock<IHashMatcher> _matcher;
-        private string _userName;
-        private string _password;
-        private ResourceOwnerPasswordValidationContext _context;
-        private Mock<IIdentityServerConfiguration> _config;
-        private User _user;
-
-        public OcelotResourceOwnerPasswordValidatorTests()
-        {
-            _matcher = new Mock<IHashMatcher>();
-            _config = new Mock<IIdentityServerConfiguration>();
-            _validator = new OcelotResourceOwnerPasswordValidator(_matcher.Object, _config.Object);
-        }
-
-        [Fact]
-        public void should_return_success()
-        {
-            this.Given(x => GivenTheUserName("tom"))
-                .And(x => GivenThePassword("password"))
-                .And(x => GivenTheUserIs(new User("sub", "tom", "xxx", "xxx")))
-                .And(x => GivenTheMatcherReturns(true))
-                .When(x => WhenIValidate())
-                .Then(x => ThenTheUserIsValidated())
-                .And(x => ThenTheMatcherIsCalledCorrectly())
-                .BDDfy();
-        }
-
-        [Fact]
-        public void should_return_fail_when_no_user()
-        {
-            this.Given(x => GivenTheUserName("bob"))
-                .And(x => GivenTheUserIs(new User("sub", "tom", "xxx", "xxx")))
-                .And(x => GivenTheMatcherReturns(true))
-                .When(x => WhenIValidate())
-                .Then(x => ThenTheUserIsNotValidated())
-                .BDDfy();
-        }
-
-        [Fact]
-        public void should_return_fail_when_password_doesnt_match()
-        {
-            this.Given(x => GivenTheUserName("tom"))
-                .And(x => GivenThePassword("password"))
-                .And(x => GivenTheUserIs(new User("sub", "tom", "xxx", "xxx")))
-                .And(x => GivenTheMatcherReturns(false))
-                .When(x => WhenIValidate())
-                .Then(x => ThenTheUserIsNotValidated())
-                .And(x => ThenTheMatcherIsCalledCorrectly())
-                .BDDfy();
-        }
-
-        private void ThenTheMatcherIsCalledCorrectly()
-        {
-            _matcher
-                .Verify(x => x.Match(_password, _user.Salt, _user.Hash), Times.Once);
-        }
-
-        private void GivenThePassword(string password)
-        {
-            _password = password;
-        }
-
-        private void GivenTheUserIs(User user)
-        {
-            _user = user;
-            _config
-                .Setup(x => x.Users)
-                .Returns(new List<User>{_user});
-        }
-
-        private void GivenTheMatcherReturns(bool expected)
-        {
-            _matcher
-                .Setup(x => x.Match(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()))
-                .Returns(expected);
-        }
-
-        private void GivenTheUserName(string userName)
-        {
-            _userName = userName;
-        }
-
-        private void WhenIValidate()
-        {
-            _context = new ResourceOwnerPasswordValidationContext
-            {
-                UserName = _userName,
-                Password = _password
-            };
-            _validator.ValidateAsync(_context).Wait();
-        }
-
-        private void ThenTheUserIsValidated()
-        {
-            _context.Result.IsError.ShouldBe(false);
-        }
-
-         private void ThenTheUserIsNotValidated()
-        {
-            _context.Result.IsError.ShouldBe(true);
-        }
-    }
-}