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

567 Commits

Author SHA1 Message Date
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
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
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
944e96c4f8 update to latest xunit prerelease 2017-05-09 19:44:47 +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
be3a2fb6ed Change to fix issue not setting content type header 2017-04-28 13:04:40 +01:00
TomPallister
1a76c9fbd9 Merge branch 'master' into develop 2017-04-23 15:40:50 +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
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
eeb8f691c7 Very hacky proof of concept 2017-04-17 21:25:04 +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
Tom Pallister
f58da434ba Merge pull request #70 from MarcDenman/feature/updateLogging 
Update logging
 2017-03-19 15:57:28 +00:00
TomPallister
be0918879c Change to not log loads of rubbish when running integration tests 2017-03-19 12:46:42 +00:00
Marc Denman
34be5a2955 Update middelware to use logging extension methods 2017-03-18 18:33:51 +00:00
Marc Denman
82ecd667e0 Merged in develop 2017-03-14 21:50:03 +00: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
Marc Denman
0ad41aa3fa Add LogError(string) to logger 
Added LogError(string) to interface as sometimes there isn't an exception
to be logged. Additionally, split Logger and LoggerFactory implementations
into seperate files just for tidiness.

Additonally added some very basic unit tests to the HttpDataRepository as
a bit of regression safety and to prove that Get never returns a null.

Slightly refactored the logic within AspDotNetLogger under
GetMessageWithOcelotRequestId so that the if statement is a little easier
to read. Attempted to remove the requestId == null, however this broke
numerous tests as the mocks don't set the behviour for dataReposioty
getting the requestId
 2017-03-14 11:52:44 +00:00
Marc Denman
0c33323352 Change HttpStatusCodeMapper not to wrap responses 
As part of #66 we realised that the implementation of
IErrorToHttpStatusCodeMapper would always return a wrapped StatusCode
within an OK response, in turn meaning that ResponderMiddleware would
never fall into the else branch for returning a 500.

This commit removes the wrapping of the status code and removes the unused
logic for generating the 500 status code, giving the mapper full
responsbility for generating the correct status code.
 2017-03-14 09:15:19 +00:00
Marc Denman
0ec7fc44ad Change all ctor's to use IOcelotLoggerFactory 
As part of #35 we are we are standardising on using IOcelotLoggerFactory
over the default ILogger for DI purposes. Following a sln search, the use
of ILogger was only found in one place (FileOcelotConfigurationCreator)
and it's corresponding tests.

This commit changes them and ensures the unit tests still pass.
 2017-03-13 11:44:02 +00:00
TomPallister
c09cec67c6 didnt need to add this 2017-03-12 22:39:36 +00: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
tom.pallister
f443575185 thread safe test passing on windows 2017-03-06 13:24:36 +00:00
Tom Gardham-Pallister
f0dcefff38 test fails on my mac.. 2017-03-06 07:34:07 +00:00
Tom Gardham-Pallister
fac2346161 added thread safe test 2017-03-06 07:33:55 +00:00
TomPallister
c787202374 I realised we can get rid of the cookie container as cookies are just sent as a header called cookie... 2017-03-05 18:05:20 +00:00
TomPallister
558a0dfdab finished refactoring config cretor 2017-03-05 16:56:41 +00:00
Tom Gardham-Pallister
8bbd781820 updated file options 2017-03-02 09:18:53 +00:00
Tom Gardham-Pallister
b44c02510a unit test for qos 2017-03-01 23:34:56 +00:00
Tom Gardham-Pallister
0a2d7a6922 qos options creator in own class 2017-03-01 23:28:32 +00:00
Tom Gardham-Pallister
6661cb5f32 use config tests 2017-03-01 23:15:30 +00:00
Tom Gardham-Pallister
034732ce90 added lame test for service config creator 2017-03-01 23:12:00 +00:00
Tom Gardham-Pallister
fff743ccf8 pulling out service config cretor 2017-03-01 12:42:37 +00:00
Tom Gardham-Pallister
d4119ab33d extracted thing that creates request id key 2017-03-01 08:11:39 +00:00
Tom Gardham-Pallister
c85ea41951 refactoring ocelot config creation process 2017-03-01 07:54:07 +00:00
TomPallister
d33e0c6f3b merged develop and stolen binarymash dont publish unstable build script code 2017-02-25 18:27:20 +00:00
TomPallister
be24f9a9ca Added base url finder for when nothing set in Program.cs 2017-02-25 17:02:36 +00:00