tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2025-04-20 19:22:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
558 Commits 1 Branch 0 Tags
Commit Graph

558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TomPallister
4d3d3e1bc0 changes to get this going again 2017-06-25 21:46:59 +01:00
Tom Pallister
1f762601e5 Merge pull request #107 from TomPallister/feature/tokens-work-across-ocelots 
Feature/tokens work across ocelots
 2017-06-24 13:11:18 +01:00
Tom Gardham-Pallister
e96d66139f boost test coverage 2017-06-24 13:04:25 +01:00
Tom Gardham-Pallister
6cdf4e67df can now use tokens from ocelot a on ocelot b when using admin area 2017-06-23 15:17:40 +01:00
TomPallister
2d94884c6f trying to get cluster working 2017-06-23 11:25:23 +01:00
TomPallister
bc7bfc8917 Revert "Revert "removed release notes to get a build?"" 
This reverts commit 5aa1596db48eb824ae6760d5d787eac7cfb56c84.
 2017-06-17 14:42:05 +01:00
TomPallister
af9e31e2b1 Revert "Revert "Fixes to get build running again on macOS. Basically, re-applying changes from #41"" 
This reverts commit 6786b5b0afa4fc6b9ad1253e76f1e8ad02f19703.
 2017-06-17 14:41:55 +01:00
TomPallister
6786b5b0af Revert "Fixes to get build running again on macOS. Basically, re-applying changes from #41" 
This reverts commit f452e8ea86c893090d5a700fa109279891765171.
 2017-06-17 14:24:13 +01:00
TomPallister
5aa1596db4 Revert "removed release notes to get a build?" 
This reverts commit 518c0a9129e3aa37d5a74041c0292941a3479282.
 2017-06-17 14:23:54 +01:00
tom.pallister
518c0a9129 removed release notes to get a build? 2017-06-16 15:55:31 +01:00
TomPallister
6c1b95f95b fixed some broken tests due to recent merges! 2017-06-10 15:52:31 +01:00
TomPallister
190c967655 Merge branch 'master' into develop 2017-06-10 15:20:37 +01:00
Tom Pallister
6648263ef8 Merge pull request #105 from geffzhang/develop 
I've applied Ocelot to the product，bug fixed
 2017-06-10 15:19:47 +01:00
Tom Pallister
6ff976f964 Merge pull request #104 from juancash/checking-identity-server 
Identity Server - Check's issues with Audience and AllowedScopes
 2017-06-10 15:16:15 +01:00
Tom Pallister
47e56039de Merge pull request #99 from binarymash/feature/macBuild 
Fixes to get build running again on macOS.
 2017-06-10 15:07:43 +01:00
Tom Pallister
c8564d81e1 Merge pull request #97 from juancash/case-sensitive-routing-fix 
Updated CharactersDontMatch method
 2017-06-10 14:31:23 +01:00
geffzhang
4d8da86950 refactor: Refactor HttpClientHttpRequester Httpclient queue 2017-06-03 22:57:45 +08:00
geffzhang
0b09644d7e Fix Ratelimit every day, every minute, every hour logic bugs 2017-06-03 22:51:11 +08:00
geffzhang
02162dd7a6 RoundRobin loadblancer cause config error https://github.com/TomPallister/Ocelot/issues/103 2017-06-03 22:32:47 +08:00
Juan Carlos Santana Herrera
efa68e9949 Allowed scopes checking added to AuthorisationMiddleware. 
Acceptance tests added.
 2017-05-31 18:27:28 +01:00
Juan Carlos Santana Herrera
07671b8fdb Updated all IdentityServer packages. 2017-05-19 14:46:25 +01:00
Juan Carlos Santana Herrera
7748262ecf Updated IdentityServer4.AccessTokenValidation package from 1.0.2 to 1.2.0. 
The removed version had a known issue with the audience check.
 2017-05-19 11:49:35 +01:00
Juan Carlos Santana Herrera
488aa97342 Removed unnecessary IdentityServer4 nuget package. 2017-05-19 11:41:38 +01:00
geffzhang
54db27100d Merge pull request #25 from TomPallister/develop 
merge newest code
 2017-05-18 08:45:50 +08:00
Juan Carlos Santana Herrera
30a5227e1e Adds two acceptance tests that checks two scenarios: 
- Get 401 when we do a request to api with a token issued to other api
- Get 403 when we do a request to scope not allowed
 2017-05-17 15:06:21 +01:00
Philip Wood
f452e8ea86 Fixes to get build running again on macOS. Basically, re-applying changes from #41 2017-05-10 21:23:36 +01:00
Tom Pallister
89375111fc Merge pull request #94 from juancash/multipleUpstreamHttpMethod 
Set multiple verbs in the UpstreamHttpMethod property
 2017-05-09 21:59:12 +01:00
Philip Wood
64814358fa Merge pull request #96 from binarymash/feature/testCoverage 
Test coverage reporting
 2017-05-09 20:38:56 +01:00
Philip Wood
e9ab5d64ea Not sure how I missed the acceptance test xunit update on the last commit. And, improve logging around test coverage. 2017-05-09 20:33:21 +01:00
Philip Wood
944e96c4f8 update to latest xunit prerelease 2017-05-09 19:44:47 +01:00
Juan Carlos Santana Herrera
ac49022274 Updated CharactersDontMatch method. 
At this point the comparer must ignore case sensitive.
 2017-05-09 19:02:26 +01:00
Tom Pallister
e34317a539 Update README.md 2017-05-09 17:43:15 +01:00
Philip Wood
28de6f2fbf Oops. Forgot to do this switcheroo after testing locally. 2017-05-09 13:06:54 +01:00
Philip Wood
0507806aae Rough first go at test coverage. Might need tidying up. 2017-05-06 17:53:44 +01:00
Juan Carlos Santana Herrera
24f7b9a171 UpstreamHttpMethod property (of class FileReRoute) changes from string to List<string>. 2017-05-05 11:47:28 +01:00
Juan Carlos Santana Herrera
e91da1ac23 Add the possibility of set mutiple verbs in the UpstreamHttpMethod property. 
Add UnitTests and AcceptanceTests to try this feature.
 2017-05-04 10:56:16 +01:00
Tom Pallister
f0205758ba Update README.md 2017-04-29 12:08:32 +01:00
tom.pallister
be3a2fb6ed Change to fix issue not setting content type header 2017-04-28 13:04:40 +01:00
geffzhang
c76fa1e5fb Merge pull request #24 from TomPallister/develop 
mergeNewestcode
 2017-04-24 07:16:26 +08:00
TomPallister
1a76c9fbd9 Merge branch 'master' into develop 2017-04-23 15:40:50 +01:00
Tom Pallister
11f5aa08ee Merge pull request #89 from juancash/placeholder_for_final_url_path 
Use final paths in the reroutes of configuration.json file.
 2017-04-23 15:38:56 +01:00
Juan Carlos Santana Herrera
6510f173b9 Adds an acceptance test to check the use of placeholder for a final url path. 2017-04-22 22:06:00 +01:00
Tom Pallister
c7d45022af Merge pull request #88 from binarymash/feature/RequestMutation 
Feature/request mutation
 2017-04-21 16:22:08 +01:00
Juan Carlos Santana Herrera
b8ee43c737 Adds the posibility of use final paths in the reroutes of configuration.json file. 
Adds a unit test method to test the functionality.
 2017-04-20 11:05:46 +01:00
Philip Wood
80e728aa00 Made changes based on PR comments. Also added lots more tests! 2017-04-19 20:12:08 +01:00
Philip Wood
878eacf1db Remove obsolete code 2017-04-18 15:35:54 +01:00
Philip Wood
a1c6ab4ce4 Get rest of unit tests working 2017-04-18 15:16:27 +01:00
Philip Wood
7c1a277147 Fixed some unit tests 2017-04-18 14:05:15 +01:00
Philip Wood
8b93f44077 Fix request id middleware 2017-04-18 11:05:37 +01:00
Philip Wood
da922c0e04 Initial mapping of request 2017-04-18 10:13:10 +01:00