tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2026-05-05 19:19:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Commit Graph

  • 58dc7c93bc moved json converters under authentication feature TomPallister 2017-07-04 19:14:37 +01:00
  • 50ee9e20d8 Merge pull request #110 from sharpn/develop Tom Pallister 2017-06-30 09:32:55 +01:00
  • 1168eb3110 Reenabling some tests Nick Sharp 2017-06-29 08:58:41 +01:00
  • 0139452fbf Merge pull request #109 from TomPallister/feature/clear-cache Tom Pallister 2017-06-29 06:54:01 +01:00
  • 9532d940f1 Implementing jwt and adding tests Nick Sharp 2017-06-28 21:43:37 +01:00
  • 9a4a670e79 sorted int tests Tom Gardham-Pallister 2017-06-28 19:05:06 +01:00
  • 0f60a353ef now set region in config...or it defaults to something Tom Gardham-Pallister 2017-06-28 19:02:08 +01:00
  • ab953f28fd realised the user can just set the region..delete time Tom Gardham-Pallister 2017-06-28 08:17:48 +01:00
  • 0fa759c76c first acceptance test failing.. Tom Gardham-Pallister 2017-06-27 19:07:55 +01:00
  • e4e7fcc943 unit tests for cache clearing passing Tom Gardham-Pallister 2017-06-27 18:54:15 +01:00
  • ec0f3b32e4 Adding deserializer config for consul Nick Sharp 2017-06-27 13:49:30 +01:00
  • a7eeadb4c6 fixing tests Nick Sharp 2017-06-26 21:32:44 +01:00
  • 20f6ebac2f Fixing tests nicksharp 2017-06-26 21:08:47 +01:00
  • 461ef6aa52 Merging upstream nicksharp 2017-06-26 19:39:28 +01:00
  • 239dcfb6bd working on region clearing cache, if using cachemanager back plance this would clear all servers in cluster Tom Gardham-Pallister 2017-06-26 19:10:20 +01:00
  • 6209681b2c Adding code ##BROKEN TESTS## Nick Sharp 2017-06-26 11:50:58 +01:00
  • 26e7621798 fixed stupid double request bug from bad merge TomPallister 2017-06-25 22:07:19 +01:00
  • b85474b393 Merge branch 'MarcDenman-feature/logging' into develop TomPallister 2017-06-25 21:47:03 +01:00
  • 4d3d3e1bc0 changes to get this going again TomPallister 2017-06-25 21:46:59 +01:00
  • 1f762601e5 Merge pull request #107 from TomPallister/feature/tokens-work-across-ocelots Tom Pallister 2017-06-24 13:11:18 +01:00
  • e96d66139f boost test coverage Tom Gardham-Pallister 2017-06-24 13:04:25 +01:00
  • 6cdf4e67df can now use tokens from ocelot a on ocelot b when using admin area Tom Gardham-Pallister 2017-06-23 15:17:40 +01:00
  • 2d94884c6f trying to get cluster working TomPallister 2017-06-23 11:25:23 +01:00
  • bc7bfc8917 Revert "Revert "removed release notes to get a build?"" TomPallister 2017-06-17 14:42:05 +01:00
  • af9e31e2b1 Revert "Revert "Fixes to get build running again on macOS. Basically, re-applying changes from #41"" TomPallister 2017-06-17 14:41:55 +01:00
  • 6786b5b0af Revert "Fixes to get build running again on macOS. Basically, re-applying changes from #41" TomPallister 2017-06-17 14:24:13 +01:00
  • 5aa1596db4 Revert "removed release notes to get a build?" TomPallister 2017-06-17 14:23:54 +01:00
  • 518c0a9129 removed release notes to get a build? tom.pallister 2017-06-16 15:55:31 +01:00
  • 88698d487f Merge pull request #26 from TomPallister/develop geffzhang 2017-06-12 09:09:25 +08:00
  • 6c1b95f95b fixed some broken tests due to recent merges! TomPallister 2017-06-10 15:52:31 +01:00
  • 190c967655 Merge branch 'master' into develop TomPallister 2017-06-10 15:20:37 +01:00
  • 6648263ef8 Merge pull request #105 from geffzhang/develop Tom Pallister 2017-06-10 15:19:47 +01:00
  • 6ff976f964 Merge pull request #104 from juancash/checking-identity-server Tom Pallister 2017-06-10 15:16:15 +01:00
  • 47e56039de Merge pull request #99 from binarymash/feature/macBuild Tom Pallister 2017-06-10 15:07:43 +01:00
  • c8564d81e1 Merge pull request #97 from juancash/case-sensitive-routing-fix Tom Pallister 2017-06-10 14:31:23 +01:00
  • 4d8da86950 refactor: Refactor HttpClientHttpRequester Httpclient queue geffzhang 2017-06-03 22:57:45 +08:00
  • 0b09644d7e Fix Ratelimit every day, every minute, every hour logic bugs geffzhang 2017-06-03 22:51:11 +08:00
  • 02162dd7a6 RoundRobin loadblancer cause config error https://github.com/TomPallister/Ocelot/issues/103 geffzhang 2017-06-03 22:32:47 +08:00
  • efa68e9949 Allowed scopes checking added to AuthorisationMiddleware. Juan Carlos Santana Herrera 2017-05-31 18:27:28 +01:00
  • 07671b8fdb Updated all IdentityServer packages. Juan Carlos Santana Herrera 2017-05-19 14:46:25 +01:00
  • 7748262ecf Updated IdentityServer4.AccessTokenValidation package from 1.0.2 to 1.2.0. Juan Carlos Santana Herrera 2017-05-19 11:49:35 +01:00
  • 488aa97342 Removed unnecessary IdentityServer4 nuget package. Juan Carlos Santana Herrera 2017-05-19 11:41:38 +01:00
  • 54db27100d Merge pull request #25 from TomPallister/develop geffzhang 2017-05-18 08:45:50 +08:00
  • 30a5227e1e Adds two acceptance tests that checks two scenarios: Juan Carlos Santana Herrera 2017-05-17 15:06:21 +01:00
  • f452e8ea86 Fixes to get build running again on macOS. Basically, re-applying changes from #41 Philip Wood 2017-05-10 21:23:36 +01:00
  • 89375111fc Merge pull request #94 from juancash/multipleUpstreamHttpMethod Tom Pallister 2017-05-09 21:59:12 +01:00
  • 64814358fa Merge pull request #96 from binarymash/feature/testCoverage Philip Wood 2017-05-09 20:38:56 +01:00
  • e9ab5d64ea Not sure how I missed the acceptance test xunit update on the last commit. And, improve logging around test coverage. Philip Wood 2017-05-09 20:33:21 +01:00
  • 944e96c4f8 update to latest xunit prerelease Philip Wood 2017-05-09 19:44:47 +01:00
  • ac49022274 Updated CharactersDontMatch method. Juan Carlos Santana Herrera 2017-05-09 19:02:26 +01:00
  • e34317a539 Update README.md Tom Pallister 2017-05-09 17:43:15 +01:00
  • 28de6f2fbf Oops. Forgot to do this switcheroo after testing locally. Philip Wood 2017-05-09 13:06:54 +01:00
  • 0507806aae Rough first go at test coverage. Might need tidying up. Philip Wood 2017-05-06 17:53:44 +01:00
  • 24f7b9a171 UpstreamHttpMethod property (of class FileReRoute) changes from string to List<string>. Juan Carlos Santana Herrera 2017-05-05 11:47:28 +01:00
  • e91da1ac23 Add the possibility of set mutiple verbs in the UpstreamHttpMethod property. Juan Carlos Santana Herrera 2017-05-04 10:56:16 +01:00
  • f0205758ba Update README.md Tom Pallister 2017-04-29 12:08:32 +01:00
  • be3a2fb6ed Change to fix issue not setting content type header tom.pallister 2017-04-28 13:04:40 +01:00
  • c76fa1e5fb Merge pull request #24 from TomPallister/develop geffzhang 2017-04-24 07:16:26 +08:00
  • 1a76c9fbd9 Merge branch 'master' into develop TomPallister 2017-04-23 15:40:50 +01:00
  • 11f5aa08ee Merge pull request #89 from juancash/placeholder_for_final_url_path Tom Pallister 2017-04-23 15:38:56 +01:00
  • 6510f173b9 Adds an acceptance test to check the use of placeholder for a final url path. Juan Carlos Santana Herrera 2017-04-22 22:06:00 +01:00
  • c7d45022af Merge pull request #88 from binarymash/feature/RequestMutation Tom Pallister 2017-04-21 16:22:08 +01:00
  • b8ee43c737 Adds the posibility of use final paths in the reroutes of configuration.json file. Juan Carlos Santana Herrera 2017-04-20 11:05:46 +01:00
  • 80e728aa00 Made changes based on PR comments. Also added lots more tests! Philip Wood 2017-04-19 20:12:08 +01:00
  • 878eacf1db Remove obsolete code Philip Wood 2017-04-18 15:35:54 +01:00
  • a1c6ab4ce4 Get rest of unit tests working Philip Wood 2017-04-18 15:16:27 +01:00
  • 7c1a277147 Fixed some unit tests Philip Wood 2017-04-18 14:05:15 +01:00
  • 8b93f44077 Fix request id middleware Philip Wood 2017-04-18 11:05:37 +01:00
  • da922c0e04 Initial mapping of request Philip Wood 2017-04-18 10:13:10 +01:00
  • eeb8f691c7 Very hacky proof of concept Philip Wood 2017-04-17 21:25:04 +01:00
  • 637d93dc4b Use DiagnosticListner for middleware logging Marc Denman 2017-04-17 11:23:34 +01:00
  • 8533186cf0 Merge pull request #23 from TomPallister/develop geffzhang 2017-04-17 11:24:00 +08:00
  • 8d31b40c21 Merge pull request #85 from TomPallister/feature/config-in-consul Tom Pallister 2017-04-16 19:45:54 +01:00
  • c3cd181b90 added a new implementation that stores the ocelot config in consul kv store, had to change some major things and add cache settings as default TomPallister 2017-04-16 19:35:59 +01:00
  • 34070021ce Merge pull request #21 from TomPallister/develop geffzhang 2017-04-06 07:46:11 +08:00
  • ab9c8e30b2 Merge pull request #82 from geffzhang/HttpClientPerformance Tom Pallister 2017-04-05 06:48:54 +01:00
  • 81e2e8a5be refactor : ConcurrentDictionary and ConcurrentQueue replace MemoryCache for cache HttpClient geffzhang 2017-04-04 16:06:27 +08:00
  • 34325d7969 Merge pull request #20 from geffzhang/develop geffzhang 2017-04-03 21:06:00 +08:00
  • 9e5faa268f Merge pull request #19 from TomPallister/develop geffzhang 2017-03-20 13:06:49 +08:00
  • f58da434ba Merge pull request #70 from MarcDenman/feature/updateLogging Tom Pallister 2017-03-19 15:57:28 +00:00
  • be0918879c Change to not log loads of rubbish when running integration tests TomPallister 2017-03-19 12:46:42 +00:00
  • 77a16b4175 Merge pull request #72 from geffzhang/develop Tom Pallister 2017-03-19 12:42:26 +00:00
  • 34be5a2955 Update middelware to use logging extension methods Marc Denman 2017-03-18 18:33:51 +00:00
  • ad81b7a305 Update OcelotLogger to accept name of class Marc Denman 2017-03-18 18:30:09 +00:00
  • aa66fdddd3 Merge branch 'develop' of https://github.com/geffzhang/Ocelot into develop geffzhang 2017-03-18 19:58:04 +08:00
  • faf6d40d73 refactor: TryAddSingleton replace AddSingleton geffzhang 2017-03-18 19:56:08 +08:00
  • 4ac8e98029 Merge pull request #71 from geffzhang/develop Tom Pallister 2017-03-18 08:06:15 +00:00
  • 18d4013e61 Fix: This string.Equals Method Windows is normal, but running under Centos, due to a case of the string problem, seems to be. NET core implementation issues on a Linux system is case sensitive. Modifications are as follows var applicableReRoutes = configuration.Data.ReRoutes.Where(r => string.Equals(r.UpstreamHttpMethod.Method.ToLower(), upstreamHttpMethod.ToLower(), StringComparison.CurrentCultureIgnoreCase)); geffzhang 2017-03-16 20:13:27 +08:00
  • 01fc26fb68 Merge pull request #18 from TomPallister/develop geffzhang 2017-03-16 14:31:19 +08:00
  • d0296bc020 Merge pull request #69 from FryDerm/develop Tom Pallister 2017-03-15 18:37:03 +00:00
  • 82ecd667e0 Merged in develop Marc Denman 2017-03-14 21:50:03 +00:00
  • a3b387aeb1 Renamed ScopeName to ApiName, ScopeSecret to ApiSecret, and AdditionalScopes to Allowed Scoped in order to be more consistent with Identity Server naming conventions. David Derman 2017-03-14 16:54:55 -04:00
  • 3e8a296631 Merge pull request #67 from MarcDenman/feature/updateResponder Tom Pallister 2017-03-14 18:54:49 +00:00
  • 9774580c4e Change logging for various middleware Marc Denman 2017-03-14 17:43:24 +00:00
  • 0ad41aa3fa Add LogError(string) to logger Marc Denman 2017-03-14 11:52:44 +00:00
  • c01f778bf9 Add LogTrace to IOcelotLogger Marc Denman 2017-03-14 10:06:53 +00:00
  • a007887461 Add MiddelwareName into base OcelotMiddleware Marc Denman 2017-03-14 09:45:07 +00:00
  • 0c33323352 Change HttpStatusCodeMapper not to wrap responses Marc Denman 2017-03-14 09:15:19 +00:00
  • 3fb83077fb Changed log messages to be a bit more descriptive Marc Denman 2017-03-13 17:23:09 +00:00
  • 0ec7fc44ad Change all ctor's to use IOcelotLoggerFactory Marc Denman 2017-03-13 11:44:02 +00:00