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

129 Commits

Author SHA1 Message Date
TomPallister
c06b492b46 upgraded to netcoreapp2.0 2017-09-21 23:00:22 +01:00
Tom Gardham-Pallister
7ef26f5f4b fixes issue #117 2017-08-29 20:47:52 +01:00
TomPallister
58dc7c93bc moved json converters under authentication feature 2017-07-04 19:14:37 +01:00
Tom Pallister
50ee9e20d8 Merge pull request #110 from sharpn/develop 
Adding JWT authentication for use with auth0
 2017-06-30 09:32:55 +01:00
Tom Gardham-Pallister
e4e7fcc943 unit tests for cache clearing passing 2017-06-27 18:54:15 +01:00
Nick Sharp
ec0f3b32e4 Adding deserializer config for consul 2017-06-27 13:49:30 +01:00
Nick Sharp
a7eeadb4c6 fixing tests 2017-06-26 21:32:44 +01:00
nicksharp
20f6ebac2f Fixing tests 2017-06-26 21:08:47 +01:00
nicksharp
461ef6aa52 Merging upstream 2017-06-26 19:39:28 +01:00
Nick Sharp
6209681b2c Adding code ##BROKEN TESTS## 2017-06-26 11:50:58 +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
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
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
488aa97342 Removed unnecessary IdentityServer4 nuget package. 2017-05-19 11:41:38 +01: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
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
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
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
TomPallister
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 2017-04-16 19:35:59 +01:00
David Derman
a3b387aeb1 Renamed ScopeName to ApiName, ScopeSecret to ApiSecret, and 
AdditionalScopes to Allowed Scoped in order to be more consistent with
Identity Server naming conventions.
 2017-03-14 16:54:55 -04:00
TomPallister
d80b73a0d2 change to get appveyor to pick up all tests from http://stackoverflow.com/questions/42747868/vs-2017-not-discovering-tests-if-net-core 2017-03-12 22:35:32 +00:00
TomPallister
c49a1c9004 removed a bunch of orig files checked in by accident 2017-03-09 17:00:51 +00:00
TomPallister
6f65d9bab0 upgraded to vs2017 2017-03-09 17:00:15 +00:00
TomPallister
d33e0c6f3b merged develop and stolen binarymash dont publish unstable build script code 2017-02-25 18:27:20 +00:00
Tom Gardham-Pallister
112a9c303e hacky auth working 2017-02-24 19:52:48 +00:00
Tom Gardham-Pallister
bd07af6926 more work towards getting identity server and admin area set up 2017-02-22 22:13:35 +00:00
Tom Gardham-Pallister
bf90b12f2c acceptance tests passing after fixing registrations 2017-02-21 07:39:09 +00:00
Tom Gardham-Pallister
2dfdf0bb86 after much hacking unit tests passing 2017-02-21 07:34:47 +00:00
TomPallister
eb5dfc6975 removed test configuration nonsense 2017-02-19 15:43:58 +00:00
TomPallister
d548a86327 Added integration test project as acceptance style doesnt work when running the new admin area because identityserver needs to use proper networking 2017-02-19 15:29:32 +00:00
Philip Wood
3c9ad87b73 Fix cake on Mac. Also added compile-time support for OSX.10.12-x64. The acceptance tests still fail on this version of OS X, however, because of the funky stuff going on in TestConfiguration.cs. Fixing this is outside the scope of this issue. 2017-02-19 15:03:11 +00:00
TomPallister
d236ed3018 trying to get identity server authing 2017-02-19 13:59:17 +00:00
TomPallister
fa47663259 changed file config stuff to just use app base directory 2017-02-19 12:58:22 +00:00
Tom Gardham-Pallister
b98310c80d working ssl example 2017-02-17 18:24:32 +00:00
Tom Gardham-Pallister
4dac8cb4fb still hacking around 2017-02-17 07:27:49 +00:00
Tom Gardham-Pallister
219b45e7d0 updated acceptance test assertion 2017-02-15 07:51:19 +00:00
Tom Gardham-Pallister
8ae8e2d834 added acceptance test for calling reroutes controller 2017-02-15 07:48:49 +00:00
geffzhang
f302ee77bf remove bak file 2017-02-15 08:54:20 +08:00
geffzhang
0aad1f8fa0 Merge remote-tracking branch 'refs/remotes/origin/develop' into RateLimit 
# Conflicts:
#	src/Ocelot/Configuration/Builder/ReRouteBuilder.cs
#	src/Ocelot/Configuration/Creator/FileOcelotConfigurationCreator.cs
#	src/Ocelot/Configuration/QoSOptions.cs
#	src/Ocelot/Configuration/ReRoute.cs
#	test/Ocelot.AcceptanceTests/configuration.json
 2017-02-15 08:49:40 +08:00
Tom Gardham-Pallister
ef3deec8da more hacking 2017-02-13 19:14:49 +00:00
Tom Gardham-Pallister
159969483b hacking away 2017-02-13 18:51:47 +00:00
geffzhang
2fa6e66dd4 refactor code 2017-02-13 08:29:29 +08:00
geffzhang
e1f16c2be1 add ratelimit acceptance test 2017-02-12 15:49:21 +08:00
TomPallister
286c7f8488 Fixed issue where qos was being created for each request so circuit breaker was never stopping traffic going to downstream service. 2017-02-11 18:56:36 +00:00
TomPallister
820673dda8 added docs but qos acceptance test not working seems circuit never opens but not sure if it is meant to with timeouts..investigating 2017-02-11 15:11:10 +00:00
geffzhang
9b06afc781 refactor ratelimit config 2017-02-11 20:52:20 +08:00