From 498b4a613c750721f206a06d8e0529f09e9bd7a1 Mon Sep 17 00:00:00 2001 From: aeneasr Date: Sat, 26 Oct 2019 23:15:10 +0200 Subject: [PATCH 1/5] vendor: Update ory/x/viperx dependency This patch automatically binds environment variables to configuration keys. This patch resolves several issues: - closes #276 - closes #270 - closes #279 - closes #280 --- .schemas/config.schema.json | 131 +++++++++--------- cmd/root.go | 1 - go.mod | 15 +- go.sum | 23 +++ helper/bearer_test.go | 3 +- ...authenticator_oauth2_introspection_test.go | 7 +- 6 files changed, 104 insertions(+), 76 deletions(-) diff --git a/.schemas/config.schema.json b/.schemas/config.schema.json index cf0755af05..d05cea0062 100644 --- a/.schemas/config.schema.json +++ b/.schemas/config.schema.json @@ -154,10 +154,7 @@ }, "handlerSwitch": { "title": "Enabled", - "enum": [ - false, - true - ], + "type": "boolean", "default": false, "examples": [ true @@ -870,13 +867,6 @@ } }, "oneOf": [ - { - "properties": { - "enabled": { - "const": false - } - } - }, { "properties": { "enabled": { @@ -886,6 +876,13 @@ "required": [ "config" ] + }, + { + "properties": { + "enabled": { + "const": false + } + } } ] }, @@ -903,13 +900,6 @@ } }, "oneOf": [ - { - "properties": { - "enabled": { - "const": false - } - } - }, { "properties": { "enabled": { @@ -919,6 +909,13 @@ "required": [ "config" ] + }, + { + "properties": { + "enabled": { + "const": false + } + } } ] }, @@ -936,13 +933,6 @@ } }, "oneOf": [ - { - "properties": { - "enabled": { - "const": false - } - } - }, { "properties": { "enabled": { @@ -952,6 +942,13 @@ "required": [ "config" ] + }, + { + "properties": { + "enabled": { + "const": false + } + } } ] }, @@ -969,13 +966,6 @@ } }, "oneOf": [ - { - "properties": { - "enabled": { - "const": false - } - } - }, { "properties": { "enabled": { @@ -985,6 +975,13 @@ "required": [ "config" ] + }, + { + "properties": { + "enabled": { + "const": false + } + } } ] } @@ -1032,13 +1029,6 @@ } }, "oneOf": [ - { - "properties": { - "enabled": { - "const": false - } - } - }, { "properties": { "enabled": { @@ -1048,6 +1038,13 @@ "required": [ "config" ] + }, + { + "properties": { + "enabled": { + "const": false + } + } } ] } @@ -1084,13 +1081,6 @@ } }, "oneOf": [ - { - "properties": { - "enabled": { - "const": false - } - } - }, { "properties": { "enabled": { @@ -1100,6 +1090,13 @@ "required": [ "config" ] + }, + { + "properties": { + "enabled": { + "const": false + } + } } ] }, @@ -1117,13 +1114,6 @@ } }, "oneOf": [ - { - "properties": { - "enabled": { - "const": false - } - } - }, { "properties": { "enabled": { @@ -1133,6 +1123,13 @@ "required": [ "config" ] + }, + { + "properties": { + "enabled": { + "const": false + } + } } ] }, @@ -1150,13 +1147,6 @@ } }, "oneOf": [ - { - "properties": { - "enabled": { - "const": false - } - } - }, { "properties": { "enabled": { @@ -1166,6 +1156,13 @@ "required": [ "config" ] + }, + { + "properties": { + "enabled": { + "const": false + } + } } ] }, @@ -1183,13 +1180,6 @@ } }, "oneOf": [ - { - "properties": { - "enabled": { - "const": false - } - } - }, { "properties": { "enabled": { @@ -1199,6 +1189,13 @@ "required": [ "config" ] + }, + { + "properties": { + "enabled": { + "const": false + } + } } ] } diff --git a/cmd/root.go b/cmd/root.go index f16b23369e..554ae90e9e 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -66,7 +66,6 @@ func init() { viperx.InitializeConfig("oathkeeper", "", nil) logger = logrusx.New() - if err := viperx.Validate(gojsonschema.NewBytesLoader(schema)); err != nil { viperx.LoggerWithValidationErrorFields(logger, err). WithError(err). diff --git a/go.mod b/go.mod index 449cfbb31e..bfee764f56 100644 --- a/go.mod +++ b/go.mod @@ -12,6 +12,7 @@ require ( github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/fsnotify/fsnotify v1.4.7 github.com/ghodss/yaml v1.0.0 + github.com/go-bindata/go-bindata v3.1.2+incompatible // indirect github.com/go-openapi/analysis v0.19.0 // indirect github.com/go-openapi/errors v0.19.0 github.com/go-openapi/inflect v0.19.0 // indirect @@ -36,36 +37,42 @@ require ( github.com/julienschmidt/httprouter v1.2.0 github.com/lib/pq v1.0.0 github.com/luna-duclos/instrumentedsql v0.0.0-20190316074304-ecad98b20aec // indirect - github.com/mattn/goveralls v0.0.2 + github.com/mattn/goveralls v0.0.3 github.com/meatballhat/negroni-logrus v0.0.0-20170801195057-31067281800f github.com/opencontainers/runc v1.0.0-rc5 // indirect github.com/opentracing/opentracing-go v1.1.0 // indirect github.com/ory/fosite v0.29.2 github.com/ory/go-acc v0.0.0-20181118080137-ddc355013f90 github.com/ory/go-convenience v0.1.0 - github.com/ory/gojsonschema v1.1.1-0.20190919112458-f254ca73d5e9 + github.com/ory/gojsonschema v1.2.0 github.com/ory/graceful v0.1.1 github.com/ory/herodot v0.6.2 github.com/ory/ladon v1.0.1 github.com/ory/viper v1.5.6 - github.com/ory/x v0.0.76 + github.com/ory/x v0.0.77 github.com/pborman/uuid v1.2.0 + github.com/pelletier/go-toml v1.6.0 // indirect github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 github.com/pkg/errors v0.8.1 github.com/rs/cors v1.6.0 github.com/sirupsen/logrus v1.4.2 github.com/spf13/cobra v0.0.5 + github.com/spf13/pflag v1.0.5 // indirect + github.com/spf13/viper v1.4.0 // indirect github.com/sqs/goreturns v0.0.0-20181028201513-538ac6014518 github.com/square/go-jose v2.3.1+incompatible github.com/stretchr/testify v1.3.0 + github.com/subosito/gotenv v1.2.0 // indirect github.com/tidwall/gjson v1.3.2 github.com/tidwall/sjson v1.0.4 github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce github.com/toqueteos/webbrowser v1.1.0 // indirect github.com/urfave/negroni v1.0.0 + github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 - golang.org/x/tools v0.0.0-20190711191110-9a621aea19f8 + golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 // indirect + golang.org/x/tools v0.0.0-20191026034945-b2104f82a97d gopkg.in/square/go-jose.v2 v2.3.0 ) diff --git a/go.sum b/go.sum index d9b63efff6..e8258b8c2a 100644 --- a/go.sum +++ b/go.sum @@ -84,6 +84,8 @@ github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 h1:DujepqpGd1hyOd7a github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= github.com/go-bindata/go-bindata v3.1.1+incompatible h1:tR4f0e4VTO7LK6B2YWyAoVEzG9ByG1wrXB4TL9+jiYg= github.com/go-bindata/go-bindata v3.1.1+incompatible/go.mod h1:xK8Dsgwmeed+BBsSy2XTopBn/8uK2HWuGSnA11C3Joo= +github.com/go-bindata/go-bindata v3.1.2+incompatible h1:5vjJMVhowQdPzjE1LdxyFF7YFTXg5IgGVW4gBr5IbvE= +github.com/go-bindata/go-bindata v3.1.2+incompatible/go.mod h1:xK8Dsgwmeed+BBsSy2XTopBn/8uK2HWuGSnA11C3Joo= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= @@ -459,6 +461,8 @@ github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK86 github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/goveralls v0.0.2 h1:7eJB6EqsPhRVxvwEXGnqdO2sJI0PTsrWoTMXEk9/OQc= github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= +github.com/mattn/goveralls v0.0.3 h1:GnFhBAK0wJmxZBum88FqDzcDPLjAk9sL0HzhmW+9bo8= +github.com/mattn/goveralls v0.0.3/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/meatballhat/negroni-logrus v0.0.0-20170801195057-31067281800f h1:V6GHkMOIsnpGDasS1iYiNxEYTY8TmyjQXEF8PqYkKQ8= github.com/meatballhat/negroni-logrus v0.0.0-20170801195057-31067281800f/go.mod h1:Ylx55XGW4gjY7McWT0pgqU0aQquIOChDnYkOVbSuF/c= @@ -507,6 +511,8 @@ github.com/ory/gojsonreference v0.0.0-20190720135523-6b606c2d8ee8 h1:e2S2FmxqSbh github.com/ory/gojsonreference v0.0.0-20190720135523-6b606c2d8ee8/go.mod h1:wsH1C4nIeeQClDtD5AH7kF1uTS6zWyqfjVDTmB0Em7A= github.com/ory/gojsonschema v1.1.1-0.20190919112458-f254ca73d5e9 h1:LDIG2Mnha10nFZuVXv3GIBqhQ1+JLwRXPcP4Ykx5VOY= github.com/ory/gojsonschema v1.1.1-0.20190919112458-f254ca73d5e9/go.mod h1:BNZpdJgB74KOLSsWFvzw6roXg1I6O51WO8roMmW+T7Y= +github.com/ory/gojsonschema v1.2.0 h1:ePsM9vnsxVHrEHW9/bE2DyU4s34B/YdDtT4LoPnGNso= +github.com/ory/gojsonschema v1.2.0/go.mod h1:BNZpdJgB74KOLSsWFvzw6roXg1I6O51WO8roMmW+T7Y= github.com/ory/graceful v0.1.1 h1:zx+8tDObLPrG+7Tc8jKYlXsqWnLtOQA1IZ/FAAKHMXU= github.com/ory/graceful v0.1.1/go.mod h1:zqu70l95WrKHF4AZ6tXHvAqAvpY6M7g6ttaAVcMm7KU= github.com/ory/herodot v0.5.1/go.mod h1:3BOneqcyBsVybCPAJoi92KN2BpJHcmDqAMcAAaJiJow= @@ -519,12 +525,16 @@ github.com/ory/viper v1.5.6 h1:w4ceGgWwWLzAFYQ7bHaDZmwNsAto2JPVdyQjQnn7VWI= github.com/ory/viper v1.5.6/go.mod h1:TYmpFpKLxjQwvT4f0QPpkOn4sDXU1kDgAwJpgLYiQ28= github.com/ory/x v0.0.76 h1:pM9oK8szqYr/tAa0I/oGiCRVGppt4pJSm56oQUnjsvM= github.com/ory/x v0.0.76/go.mod h1:TH1ImNLBepjywXHy3fgEXDgOIxH+ZF95jkZuo4/lPEU= +github.com/ory/x v0.0.77 h1:juHvrvCuletCoNmflOWNLp0K/cV61D2rHc2HlVXAwFw= +github.com/ory/x v0.0.77/go.mod h1:WVlPrVNe4wtPfdXqE6B+x7a7xoTR2EFGIGxZTPdAuxw= github.com/parnurzeal/gorequest v0.2.15/go.mod h1:3Kh2QUMJoqw3icWAecsyzkpY7UzRfDhbRdTjtNwNiUE= github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.4.0 h1:u3Z1r+oOXJIkxqw34zVhyPgjBsm6X2wn21NWs/HfSeg= github.com/pelletier/go-toml v1.4.0/go.mod h1:PN7xzY2wHTK0K9p34ErDQMlFxa51Fk0OUruD3k1mMwo= +github.com/pelletier/go-toml v1.6.0 h1:aetoXYr0Tv7xRU/V4B4IZJ2QcbtMUFoNb3ORp7TzIK4= +github.com/pelletier/go-toml v1.6.0/go.mod h1:5N711Q9dKgbdkxHL+MEfF31hpT7l0S0s/t2kKREewys= github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 h1:JhzVVoYvbOACxoUmOs6V/G4D5nPVUW73rKvXxP4XUJc= github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2/go.mod h1:iIss55rKnNBTvrwdmkUpLnDpZoAHvWaiq5+iMmen4AE= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -597,6 +607,8 @@ github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0 github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.2.1/go.mod h1:P4AexN0a+C9tGAnUFNwDMYYZv3pjFuvmeiMyKRaNVlI= github.com/spf13/viper v1.3.1/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/spf13/viper v1.3.2 h1:VUFqw5KcqRf7i70GOzW7N+Q7+gxVBkSSqiXB12+JQ4M= @@ -614,6 +626,8 @@ github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/subosito/gotenv v1.1.1 h1:TWxckSF6WVKWbo2M3tMqCtWa9NFUgqM1SSynxmYONOI= github.com/subosito/gotenv v1.1.1/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= +github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tidwall/gjson v1.3.2 h1:+7p3qQFaH3fOMXAJSrdZwGKcOO/lYdGS0HqGhPqDdTI= github.com/tidwall/gjson v1.3.2/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJHhxOls= github.com/tidwall/match v1.0.1 h1:PnKP62LPNxHKTwvHHZZzdOAOCtsJTjo6dZLCwpKm5xc= @@ -638,6 +652,8 @@ github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc= github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= +github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo= +github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c h1:3lbZUMbMiGUW/LMkfsEABsc5zNT9+b1CvsJx47JzJ8g= @@ -753,6 +769,8 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7 h1:LepdCS8Gf/MVejFIt8lsiexZATdoGVyp5bcyS+rYoUI= golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 h1:YyJpGZS1sBuBCzLAR1VEpK193GlqGZbnPFnPV/5Rsb4= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2 h1:z99zHgr7hKfrUcX/KsoJk5FJfjTceCKIp96+biqP4To= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -797,6 +815,9 @@ golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190624190245-7f2218787638/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190711191110-9a621aea19f8 h1:VZick+NwcqlXXVsD1iFr4Wo6F1FgBbnM4AOMzhwKQ7w= golang.org/x/tools v0.0.0-20190711191110-9a621aea19f8/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= +golang.org/x/tools v0.0.0-20191026034945-b2104f82a97d h1:QFO0Wgcqcp8nI9hbisKDTBsmfwrvLswk2T73QDZZgVo= +golang.org/x/tools v0.0.0-20191026034945-b2104f82a97d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0 h1:9sdfJOzWlkqPltHAuzT2Cp+yrBeY1KRVYgms8soxMwM= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= @@ -846,6 +867,8 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/helper/bearer_test.go b/helper/bearer_test.go index 8bce12dd96..b8dff1bb89 100644 --- a/helper/bearer_test.go +++ b/helper/bearer_test.go @@ -4,8 +4,9 @@ import ( "net/http" "testing" - "github.com/ory/oathkeeper/helper" "github.com/stretchr/testify/assert" + + "github.com/ory/oathkeeper/helper" ) const ( diff --git a/pipeline/authn/authenticator_oauth2_introspection_test.go b/pipeline/authn/authenticator_oauth2_introspection_test.go index 8f078e478f..2256575ef7 100644 --- a/pipeline/authn/authenticator_oauth2_introspection_test.go +++ b/pipeline/authn/authenticator_oauth2_introspection_test.go @@ -28,13 +28,14 @@ import ( "testing" "github.com/julienschmidt/httprouter" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/tidwall/sjson" + "github.com/ory/oathkeeper/driver/configuration" "github.com/ory/oathkeeper/internal" . "github.com/ory/oathkeeper/pipeline/authn" "github.com/ory/viper" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - "github.com/tidwall/sjson" ) func TestAuthenticatorOAuth2Introspection(t *testing.T) { From ce3a25c93fe012e80f3a543a2d08037743f25de3 Mon Sep 17 00:00:00 2001 From: aeneasr Date: Sun, 27 Oct 2019 10:42:28 +0100 Subject: [PATCH 2/5] u --- .schemas/config.schema.json | 79 +- CHANGELOG.md | 860 +++++++++++++----- UPGRADE.md | 3 +- cmd/root.go | 2 +- driver/configuration/provider_viper.go | 31 - .../provider_viper_public_test.go | 1 - go.mod | 4 +- go.sum | 2 + 8 files changed, 674 insertions(+), 308 deletions(-) diff --git a/.schemas/config.schema.json b/.schemas/config.schema.json index d05cea0062..dbad4be5ac 100644 --- a/.schemas/config.schema.json +++ b/.schemas/config.schema.json @@ -520,12 +520,10 @@ ] }, "required_action": { - "type": "string", - "default": "unset" + "type": "string" }, "required_resource": { - "type": "string", - "default": "unset" + "type": "string" }, "subject": { "type": "string" @@ -801,6 +799,7 @@ "title": "Repositories", "description": "Locations (list of URLs) where access rules should be fetched from on boot. It is expected that the documents at those locations return a JSON or YAML Array containing ORY Oathkeeper Access Rules:\n\n- If the URL Scheme is `file://`, the access rules (an array of access rules is expected) will be fetched from the local file system.\n- If the URL Scheme is `inline://`, the access rules (an array of access rules is expected) are expected to be a base64 encoded (with padding!) JSON/YAML string (base64_encode(`[{\"id\":\"foo-rule\",\"authenticators\":[....]}]`)).\n- If the URL Scheme is `http://` or `https://`, the access rules (an array of access rules is expected) will be fetched from the provided HTTP(s) location.", "type": "array", + "default": [], "items": { "type": "string", "format": "uri" @@ -857,13 +856,9 @@ "title": "Cookie Session", "description": "The [`cookie_session` authenticator](https://www.ory.sh/docs/oathkeeper/pipeline/authn#cookie_session).", "type": "object", - "additionalProperties": false, "properties": { "enabled": { "$ref": "#/definitions/handlerSwitch" - }, - "config": { - "$ref": "#/definitions/configAuthenticatorsCookieSession" } }, "oneOf": [ @@ -871,6 +866,9 @@ "properties": { "enabled": { "const": true + }, + "config": { + "$ref": "#/definitions/configAuthenticatorsCookieSession" } }, "required": [ @@ -890,13 +888,9 @@ "title": "JSON Web Token (jwt)", "description": "The [`jwt` authenticator](https://www.ory.sh/docs/oathkeeper/pipeline/authn#jwt).", "type": "object", - "additionalProperties": false, "properties": { "enabled": { "$ref": "#/definitions/handlerSwitch" - }, - "config": { - "$ref": "#/definitions/configAuthenticatorsJwt" } }, "oneOf": [ @@ -904,6 +898,9 @@ "properties": { "enabled": { "const": true + }, + "config": { + "$ref": "#/definitions/configAuthenticatorsJwt" } }, "required": [ @@ -923,13 +920,10 @@ "title": "OAuth 2.0 Client Credentials", "description": "The [`oauth2_client_credentials` authenticator](https://www.ory.sh/docs/oathkeeper/pipeline/authn#oauth2_client_credentials).", "type": "object", - "additionalProperties": false, + "properties": { "enabled": { "$ref": "#/definitions/handlerSwitch" - }, - "config": { - "$ref": "#/definitions/configAuthenticatorsOauth2ClientCredentials" } }, "oneOf": [ @@ -937,6 +931,9 @@ "properties": { "enabled": { "const": true + }, + "config": { + "$ref": "#/definitions/configAuthenticatorsOauth2ClientCredentials" } }, "required": [ @@ -956,13 +953,10 @@ "title": "OAuth 2.0 Token Introspection", "description": "The [`oauth2_introspection` authenticator](https://www.ory.sh/docs/oathkeeper/pipeline/authn#oauth2_introspection).", "type": "object", - "additionalProperties": false, + "properties": { "enabled": { "$ref": "#/definitions/handlerSwitch" - }, - "config": { - "$ref": "#/definitions/configAuthenticatorsOauth2Introspection" } }, "oneOf": [ @@ -970,6 +964,9 @@ "properties": { "enabled": { "const": true + }, + "config": { + "$ref": "#/definitions/configAuthenticatorsOauth2Introspection" } }, "required": [ @@ -1019,13 +1016,9 @@ "title": "ORY Keto Access Control Policies Engine", "description": "The [`keto_engine_acp_ory` authorizer](https://www.ory.sh/docs/oathkeeper/pipeline/authz#keto_engine_acp_ory).", "type": "object", - "additionalProperties": false, "properties": { "enabled": { "$ref": "#/definitions/handlerSwitch" - }, - "config": { - "$ref": "#/definitions/configAuthorizersKetoEngineAcpOry" } }, "oneOf": [ @@ -1033,6 +1026,9 @@ "properties": { "enabled": { "const": true + }, + "config": { + "$ref": "#/definitions/configAuthorizersKetoEngineAcpOry" } }, "required": [ @@ -1071,13 +1067,10 @@ "title": "HTTP Cookie", "description": "The [`cookie` mutator](https://www.ory.sh/docs/oathkeeper/pipeline/mutator#cookie).", "type": "object", - "additionalProperties": false, + "properties": { "enabled": { "$ref": "#/definitions/handlerSwitch" - }, - "config": { - "$ref": "#/definitions/configMutatorsCookie" } }, "oneOf": [ @@ -1085,6 +1078,9 @@ "properties": { "enabled": { "const": true + }, + "config": { + "$ref": "#/definitions/configMutatorsCookie" } }, "required": [ @@ -1104,13 +1100,10 @@ "title": "HTTP Header", "description": "The [`header` mutator](https://www.ory.sh/docs/oathkeeper/pipeline/mutator#header).", "type": "object", - "additionalProperties": false, + "properties": { "enabled": { "$ref": "#/definitions/handlerSwitch" - }, - "config": { - "$ref": "#/definitions/configMutatorsHeader" } }, "oneOf": [ @@ -1118,6 +1111,9 @@ "properties": { "enabled": { "const": true + }, + "config": { + "$ref": "#/definitions/configMutatorsHeader" } }, "required": [ @@ -1137,13 +1133,10 @@ "title": "Hydrator", "description": "The [`hydrator` mutator](https://www.ory.sh/docs/oathkeeper/pipeline/mutator#hydrator).", "type": "object", - "additionalProperties": false, + "properties": { "enabled": { "$ref": "#/definitions/handlerSwitch" - }, - "config": { - "$ref": "#/definitions/configMutatorsHydrator" } }, "oneOf": [ @@ -1151,6 +1144,9 @@ "properties": { "enabled": { "const": true + }, + "config": { + "$ref": "#/definitions/configMutatorsHydrator" } }, "required": [ @@ -1170,13 +1166,10 @@ "title": "ID Token (JSON Web Token)", "description": "The [`id_token` mutator](https://www.ory.sh/docs/oathkeeper/pipeline/mutator#id_token).", "type": "object", - "additionalProperties": false, + "properties": { "enabled": { "$ref": "#/definitions/handlerSwitch" - }, - "config": { - "$ref": "#/definitions/configMutatorsIdToken" } }, "oneOf": [ @@ -1184,6 +1177,9 @@ "properties": { "enabled": { "const": true + }, + "config": { + "$ref": "#/definitions/configMutatorsIdToken" } }, "required": [ @@ -1239,7 +1235,8 @@ "type": "string", "enum": [ "cpu", - "mem" + "mem", + "" ] } }, diff --git a/CHANGELOG.md b/CHANGELOG.md index b3b2f5517e..325107dd35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ -**Table of Contents** *generated with [DocToc](https://github.com/thlorenz/doctoc)* + +**Table of Contents** _generated with +[DocToc](https://github.com/thlorenz/doctoc)_ - [Change Log](#change-log) - [Unreleased](#unreleased) @@ -72,200 +74,327 @@ **Implemented enhancements:** -- Remove the need for outbound internet connection from Oathkeeper [\#234](https://github.com/ory/oathkeeper/issues/234) +- Remove the need for outbound internet connection from Oathkeeper + [\#234](https://github.com/ory/oathkeeper/issues/234) **Closed issues:** -- \[Helm chart\] Quick changes [\#278](https://github.com/ory/oathkeeper/issues/278) -- missing release assets in release v0.19.2-beta.1+oryOS.12 [\#275](https://github.com/ory/oathkeeper/issues/275) +- \[Helm chart\] Quick changes + [\#278](https://github.com/ory/oathkeeper/issues/278) +- missing release assets in release v0.19.2-beta.1+oryOS.12 + [\#275](https://github.com/ory/oathkeeper/issues/275) **Merged pull requests:** -- Dereference config schema and resolve issues [\#282](https://github.com/ory/oathkeeper/pull/282) ([aeneasr](https://github.com/aeneasr)) +- Dereference config schema and resolve issues + [\#282](https://github.com/ory/oathkeeper/pull/282) + ([aeneasr](https://github.com/aeneasr)) ## [v0.32.0-beta.1](https://github.com/ory/oathkeeper/tree/v0.32.0-beta.1) (2019-10-20) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.31.0-beta.1...v0.32.0-beta.1) ## [v0.31.0-beta.1](https://github.com/ory/oathkeeper/tree/v0.31.0-beta.1) (2019-10-20) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.19.0-beta.1...v0.31.0-beta.1) **Implemented enhancements:** - Version access rules [\#266](https://github.com/ory/oathkeeper/issues/266) -- rule: Add migration capabilities [\#268](https://github.com/ory/oathkeeper/pull/268) ([aeneasr](https://github.com/aeneasr)) +- rule: Add migration capabilities + [\#268](https://github.com/ory/oathkeeper/pull/268) + ([aeneasr](https://github.com/aeneasr)) **Fixed bugs:** -- Client Credentials Authenticators not compatible with Hydra? [\#260](https://github.com/ory/oathkeeper/issues/260) -- "jwt" authenticator returns 403 instead of 401 [\#256](https://github.com/ory/oathkeeper/issues/256) +- Client Credentials Authenticators not compatible with Hydra? + [\#260](https://github.com/ory/oathkeeper/issues/260) +- "jwt" authenticator returns 403 instead of 401 + [\#256](https://github.com/ory/oathkeeper/issues/256) **Closed issues:** -- Access-rules conversion error. [\#274](https://github.com/ory/oathkeeper/issues/274) -- The configuration is invalid and could not be loaded. [\#273](https://github.com/ory/oathkeeper/issues/273) -- Update mutators in documentation [\#261](https://github.com/ory/oathkeeper/issues/261) -- Support fully both Oauth & JWT authenticator in access rule [\#257](https://github.com/ory/oathkeeper/issues/257) +- Access-rules conversion error. + [\#274](https://github.com/ory/oathkeeper/issues/274) +- The configuration is invalid and could not be loaded. + [\#273](https://github.com/ory/oathkeeper/issues/273) +- Update mutators in documentation + [\#261](https://github.com/ory/oathkeeper/issues/261) +- Support fully both Oauth & JWT authenticator in access rule + [\#257](https://github.com/ory/oathkeeper/issues/257) **Merged pull requests:** -- Support alternative token location [\#271](https://github.com/ory/oathkeeper/pull/271) ([kubadz](https://github.com/kubadz)) -- authn: Force auth style in oauth2 client credentials authn [\#267](https://github.com/ory/oathkeeper/pull/267) ([aeneasr](https://github.com/aeneasr)) -- fix \#256: change error code from 403 to 401 [\#259](https://github.com/ory/oathkeeper/pull/259) ([ngrigoriev](https://github.com/ngrigoriev)) +- Support alternative token location + [\#271](https://github.com/ory/oathkeeper/pull/271) + ([kubadz](https://github.com/kubadz)) +- authn: Force auth style in oauth2 client credentials authn + [\#267](https://github.com/ory/oathkeeper/pull/267) + ([aeneasr](https://github.com/aeneasr)) +- fix \#256: change error code from 403 to 401 + [\#259](https://github.com/ory/oathkeeper/pull/259) + ([ngrigoriev](https://github.com/ngrigoriev)) ## [v0.19.0-beta.1](https://github.com/ory/oathkeeper/tree/v0.19.0-beta.1) (2019-09-23) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.18.0-beta.1...v0.19.0-beta.1) **Closed issues:** -- Keto engine doesn't build correctly the payload to call keto for URL with query parameters [\#250](https://github.com/ory/oathkeeper/issues/250) -- Mutator: unrecognized by oathkeeper \(v0.17.5\) [\#248](https://github.com/ory/oathkeeper/issues/248) -- Mutator issuing JWT with custom claims [\#228](https://github.com/ory/oathkeeper/issues/228) +- Keto engine doesn't build correctly the payload to call keto for URL with + query parameters [\#250](https://github.com/ory/oathkeeper/issues/250) +- Mutator: unrecognized by oathkeeper \(v0.17.5\) + [\#248](https://github.com/ory/oathkeeper/issues/248) +- Mutator issuing JWT with custom claims + [\#228](https://github.com/ory/oathkeeper/issues/228) **Merged pull requests:** -- Resolve broken tests [\#262](https://github.com/ory/oathkeeper/pull/262) ([aeneasr](https://github.com/aeneasr)) -- Homogenize configuration management [\#258](https://github.com/ory/oathkeeper/pull/258) ([aeneasr](https://github.com/aeneasr)) -- Fix \#250: Ignore query parameters to build payload for Keto engine [\#251](https://github.com/ory/oathkeeper/pull/251) ([GuillaumeSmaha](https://github.com/GuillaumeSmaha)) +- Resolve broken tests [\#262](https://github.com/ory/oathkeeper/pull/262) + ([aeneasr](https://github.com/aeneasr)) +- Homogenize configuration management + [\#258](https://github.com/ory/oathkeeper/pull/258) + ([aeneasr](https://github.com/aeneasr)) +- Fix \#250: Ignore query parameters to build payload for Keto engine + [\#251](https://github.com/ory/oathkeeper/pull/251) + ([GuillaumeSmaha](https://github.com/GuillaumeSmaha)) ## [v0.18.0-beta.1](https://github.com/ory/oathkeeper/tree/v0.18.0-beta.1) (2019-08-22) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.17.4-beta.1...v0.18.0-beta.1) **Merged pull requests:** -- ID Token Custom Claims [\#246](https://github.com/ory/oathkeeper/pull/246) ([aeneasr](https://github.com/aeneasr)) -- docs: Updates issue and pull request templates [\#245](https://github.com/ory/oathkeeper/pull/245) ([aeneasr](https://github.com/aeneasr)) -- Add mutator for modifying authenticationSession with external API [\#240](https://github.com/ory/oathkeeper/pull/240) ([kubadz](https://github.com/kubadz)) -- docs: Updates issue and pull request templates [\#239](https://github.com/ory/oathkeeper/pull/239) ([aeneasr](https://github.com/aeneasr)) -- docs: Updates issue and pull request templates [\#238](https://github.com/ory/oathkeeper/pull/238) ([aeneasr](https://github.com/aeneasr)) -- docs: Updates issue and pull request templates [\#237](https://github.com/ory/oathkeeper/pull/237) ([aeneasr](https://github.com/aeneasr)) -- doc: Add adopters placeholder [\#236](https://github.com/ory/oathkeeper/pull/236) ([aeneasr](https://github.com/aeneasr)) -- support multiple mutators [\#233](https://github.com/ory/oathkeeper/pull/233) ([jakkab](https://github.com/jakkab)) +- ID Token Custom Claims [\#246](https://github.com/ory/oathkeeper/pull/246) + ([aeneasr](https://github.com/aeneasr)) +- docs: Updates issue and pull request templates + [\#245](https://github.com/ory/oathkeeper/pull/245) + ([aeneasr](https://github.com/aeneasr)) +- Add mutator for modifying authenticationSession with external API + [\#240](https://github.com/ory/oathkeeper/pull/240) + ([kubadz](https://github.com/kubadz)) +- docs: Updates issue and pull request templates + [\#239](https://github.com/ory/oathkeeper/pull/239) + ([aeneasr](https://github.com/aeneasr)) +- docs: Updates issue and pull request templates + [\#238](https://github.com/ory/oathkeeper/pull/238) + ([aeneasr](https://github.com/aeneasr)) +- docs: Updates issue and pull request templates + [\#237](https://github.com/ory/oathkeeper/pull/237) + ([aeneasr](https://github.com/aeneasr)) +- doc: Add adopters placeholder + [\#236](https://github.com/ory/oathkeeper/pull/236) + ([aeneasr](https://github.com/aeneasr)) +- support multiple mutators [\#233](https://github.com/ory/oathkeeper/pull/233) + ([jakkab](https://github.com/jakkab)) ## [v0.17.4-beta.1](https://github.com/ory/oathkeeper/tree/v0.17.4-beta.1) (2019-08-09) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.17.3-beta.1...v0.17.4-beta.1) **Merged pull requests:** -- Add sprig template library [\#235](https://github.com/ory/oathkeeper/pull/235) ([hypnoglow](https://github.com/hypnoglow)) -- docs: Updates issue and pull request templates [\#232](https://github.com/ory/oathkeeper/pull/232) ([aeneasr](https://github.com/aeneasr)) +- Add sprig template library [\#235](https://github.com/ory/oathkeeper/pull/235) + ([hypnoglow](https://github.com/hypnoglow)) +- docs: Updates issue and pull request templates + [\#232](https://github.com/ory/oathkeeper/pull/232) + ([aeneasr](https://github.com/aeneasr)) ## [v0.17.3-beta.1](https://github.com/ory/oathkeeper/tree/v0.17.3-beta.1) (2019-08-03) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.17.2-beta.1...v0.17.3-beta.1) **Fixed bugs:** -- rule: Resolve k8s configmap reload issue [\#231](https://github.com/ory/oathkeeper/pull/231) ([aeneasr](https://github.com/aeneasr)) +- rule: Resolve k8s configmap reload issue + [\#231](https://github.com/ory/oathkeeper/pull/231) + ([aeneasr](https://github.com/aeneasr)) ## [v0.17.2-beta.1](https://github.com/ory/oathkeeper/tree/v0.17.2-beta.1) (2019-08-02) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.17.1-beta.1...v0.17.2-beta.1) **Closed issues:** -- Panic on rolling update in Kubernetes [\#224](https://github.com/ory/oathkeeper/issues/224) -- Helm chart for oathkeeper [\#186](https://github.com/ory/oathkeeper/issues/186) +- Panic on rolling update in Kubernetes + [\#224](https://github.com/ory/oathkeeper/issues/224) +- Helm chart for oathkeeper + [\#186](https://github.com/ory/oathkeeper/issues/186) **Merged pull requests:** -- rules: Support kubernetes configmap reloading [\#230](https://github.com/ory/oathkeeper/pull/230) ([aeneasr](https://github.com/aeneasr)) -- docs: Updates issue and pull request templates [\#226](https://github.com/ory/oathkeeper/pull/226) ([aeneasr](https://github.com/aeneasr)) +- rules: Support kubernetes configmap reloading + [\#230](https://github.com/ory/oathkeeper/pull/230) + ([aeneasr](https://github.com/aeneasr)) +- docs: Updates issue and pull request templates + [\#226](https://github.com/ory/oathkeeper/pull/226) + ([aeneasr](https://github.com/aeneasr)) ## [v0.17.1-beta.1](https://github.com/ory/oathkeeper/tree/v0.17.1-beta.1) (2019-07-23) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.17.0-beta.1...v0.17.1-beta.1) **Merged pull requests:** -- Fix panic on send on closed channel [\#225](https://github.com/ory/oathkeeper/pull/225) ([hypnoglow](https://github.com/hypnoglow)) +- Fix panic on send on closed channel + [\#225](https://github.com/ory/oathkeeper/pull/225) + ([hypnoglow](https://github.com/hypnoglow)) ## [v0.17.0-beta.1](https://github.com/ory/oathkeeper/tree/v0.17.0-beta.1) (2019-07-18) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.16.0-beta.5...v0.17.0-beta.1) **Implemented enhancements:** -- Add file watcher for access rules [\#216](https://github.com/ory/oathkeeper/issues/216) -- Add file watcher for config file [\#215](https://github.com/ory/oathkeeper/issues/215) +- Add file watcher for access rules + [\#216](https://github.com/ory/oathkeeper/issues/216) +- Add file watcher for config file + [\#215](https://github.com/ory/oathkeeper/issues/215) **Merged pull requests:** -- ci: Automate schema confiugration sync [\#222](https://github.com/ory/oathkeeper/pull/222) ([aeneasr](https://github.com/aeneasr)) -- Validate Configuration with JSON Schema [\#220](https://github.com/ory/oathkeeper/pull/220) ([aeneasr](https://github.com/aeneasr)) -- cmd: Do not fatal when immutable value is changed [\#218](https://github.com/ory/oathkeeper/pull/218) ([aeneasr](https://github.com/aeneasr)) -- Watch configuration and access rule changes [\#217](https://github.com/ory/oathkeeper/pull/217) ([aeneasr](https://github.com/aeneasr)) -- Add support for rules in YAML format [\#213](https://github.com/ory/oathkeeper/pull/213) ([hypnoglow](https://github.com/hypnoglow)) +- ci: Automate schema confiugration sync + [\#222](https://github.com/ory/oathkeeper/pull/222) + ([aeneasr](https://github.com/aeneasr)) +- Validate Configuration with JSON Schema + [\#220](https://github.com/ory/oathkeeper/pull/220) + ([aeneasr](https://github.com/aeneasr)) +- cmd: Do not fatal when immutable value is changed + [\#218](https://github.com/ory/oathkeeper/pull/218) + ([aeneasr](https://github.com/aeneasr)) +- Watch configuration and access rule changes + [\#217](https://github.com/ory/oathkeeper/pull/217) + ([aeneasr](https://github.com/aeneasr)) +- Add support for rules in YAML format + [\#213](https://github.com/ory/oathkeeper/pull/213) + ([hypnoglow](https://github.com/hypnoglow)) ## [v0.16.0-beta.5](https://github.com/ory/oathkeeper/tree/v0.16.0-beta.5) (2019-06-28) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.16.0-beta.4...v0.16.0-beta.5) **Closed issues:** -- Unable to build docker image on linux [\#207](https://github.com/ory/oathkeeper/issues/207) -- Always return 404 when used with Ambassador Auth Service [\#199](https://github.com/ory/oathkeeper/issues/199) +- Unable to build docker image on linux + [\#207](https://github.com/ory/oathkeeper/issues/207) +- Always return 404 when used with Ambassador Auth Service + [\#199](https://github.com/ory/oathkeeper/issues/199) **Merged pull requests:** -- Add description into the name of subtest [\#212](https://github.com/ory/oathkeeper/pull/212) ([minchao](https://github.com/minchao)) -- Add cookie session authenticator [\#211](https://github.com/ory/oathkeeper/pull/211) ([alexdavid](https://github.com/alexdavid)) -- ci: Update golangci install script [\#210](https://github.com/ory/oathkeeper/pull/210) ([aeneasr](https://github.com/aeneasr)) -- docker: Use non-root user in image [\#209](https://github.com/ory/oathkeeper/pull/209) ([aeneasr](https://github.com/aeneasr)) -- Remove binary license [\#208](https://github.com/ory/oathkeeper/pull/208) ([aeneasr](https://github.com/aeneasr)) -- Update config.yaml [\#204](https://github.com/ory/oathkeeper/pull/204) ([haf](https://github.com/haf)) +- Add description into the name of subtest + [\#212](https://github.com/ory/oathkeeper/pull/212) + ([minchao](https://github.com/minchao)) +- Add cookie session authenticator + [\#211](https://github.com/ory/oathkeeper/pull/211) + ([alexdavid](https://github.com/alexdavid)) +- ci: Update golangci install script + [\#210](https://github.com/ory/oathkeeper/pull/210) + ([aeneasr](https://github.com/aeneasr)) +- docker: Use non-root user in image + [\#209](https://github.com/ory/oathkeeper/pull/209) + ([aeneasr](https://github.com/aeneasr)) +- Remove binary license [\#208](https://github.com/ory/oathkeeper/pull/208) + ([aeneasr](https://github.com/aeneasr)) +- Update config.yaml [\#204](https://github.com/ory/oathkeeper/pull/204) + ([haf](https://github.com/haf)) ## [v0.16.0-beta.4](https://github.com/ory/oathkeeper/tree/v0.16.0-beta.4) (2019-05-28) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.16.0-beta.3...v0.16.0-beta.4) **Merged pull requests:** -- server: Properly declare negroni middleware [\#200](https://github.com/ory/oathkeeper/pull/200) ([aeneasr](https://github.com/aeneasr)) -- docs: Updates issue and pull request templates [\#198](https://github.com/ory/oathkeeper/pull/198) ([aeneasr](https://github.com/aeneasr)) -- docs: Updates issue and pull request templates [\#197](https://github.com/ory/oathkeeper/pull/197) ([aeneasr](https://github.com/aeneasr)) -- docs: Updates issue and pull request templates [\#196](https://github.com/ory/oathkeeper/pull/196) ([aeneasr](https://github.com/aeneasr)) +- server: Properly declare negroni middleware + [\#200](https://github.com/ory/oathkeeper/pull/200) + ([aeneasr](https://github.com/aeneasr)) +- docs: Updates issue and pull request templates + [\#198](https://github.com/ory/oathkeeper/pull/198) + ([aeneasr](https://github.com/aeneasr)) +- docs: Updates issue and pull request templates + [\#197](https://github.com/ory/oathkeeper/pull/197) + ([aeneasr](https://github.com/aeneasr)) +- docs: Updates issue and pull request templates + [\#196](https://github.com/ory/oathkeeper/pull/196) + ([aeneasr](https://github.com/aeneasr)) ## [v0.16.0-beta.3](https://github.com/ory/oathkeeper/tree/v0.16.0-beta.3) (2019-05-19) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.15.2...v0.16.0-beta.3) **Implemented enhancements:** -- Clean up environment variables and throw errors on misconfiguration [\#140](https://github.com/ory/oathkeeper/issues/140) -- Missing serve all, both proxy/api using 4455 [\#122](https://github.com/ory/oathkeeper/issues/122) +- Clean up environment variables and throw errors on misconfiguration + [\#140](https://github.com/ory/oathkeeper/issues/140) +- Missing serve all, both proxy/api using 4455 + [\#122](https://github.com/ory/oathkeeper/issues/122) **Closed issues:** -- json: cannot unmarshal string into Go value [\#183](https://github.com/ory/oathkeeper/issues/183) -- Oathkeeper \(v0.14.2\_oryOS.10\) returning empty reply on slow/long distance database calls [\#178](https://github.com/ory/oathkeeper/issues/178) -- Moving forward with ORY Oathkeeper [\#177](https://github.com/ory/oathkeeper/issues/177) -- Replace ORY Hydra JWK fetcher with local strategy and storage [\#174](https://github.com/ory/oathkeeper/issues/174) -- Support multiple JWKS URL in oathkeeper config rather than environment variable [\#168](https://github.com/ory/oathkeeper/issues/168) -- Move to new configuration management [\#164](https://github.com/ory/oathkeeper/issues/164) -- Do not disable filters, instead show decent error messages on misconfiguration [\#141](https://github.com/ory/oathkeeper/issues/141) -- make id\_token credential issuer optional [\#136](https://github.com/ory/oathkeeper/issues/136) +- json: cannot unmarshal string into Go value + [\#183](https://github.com/ory/oathkeeper/issues/183) +- Oathkeeper \(v0.14.2_oryOS.10\) returning empty reply on slow/long distance + database calls [\#178](https://github.com/ory/oathkeeper/issues/178) +- Moving forward with ORY Oathkeeper + [\#177](https://github.com/ory/oathkeeper/issues/177) +- Replace ORY Hydra JWK fetcher with local strategy and storage + [\#174](https://github.com/ory/oathkeeper/issues/174) +- Support multiple JWKS URL in oathkeeper config rather than environment + variable [\#168](https://github.com/ory/oathkeeper/issues/168) +- Move to new configuration management + [\#164](https://github.com/ory/oathkeeper/issues/164) +- Do not disable filters, instead show decent error messages on misconfiguration + [\#141](https://github.com/ory/oathkeeper/issues/141) +- make id_token credential issuer optional + [\#136](https://github.com/ory/oathkeeper/issues/136) **Merged pull requests:** -- ci: Rename job release-docs to docs [\#193](https://github.com/ory/oathkeeper/pull/193) ([aeneasr](https://github.com/aeneasr)) -- ci: Resolve goreleaser issues [\#192](https://github.com/ory/oathkeeper/pull/192) ([aeneasr](https://github.com/aeneasr)) -- ci: Update release pipeline [\#191](https://github.com/ory/oathkeeper/pull/191) ([aeneasr](https://github.com/aeneasr)) -- docs: Updates issue and pull request templates [\#189](https://github.com/ory/oathkeeper/pull/189) ([aeneasr](https://github.com/aeneasr)) -- install.sh: fix install script [\#187](https://github.com/ory/oathkeeper/pull/187) ([mkontani](https://github.com/mkontani)) -- Reduce deployment complexity and refactor internals [\#185](https://github.com/ory/oathkeeper/pull/185) ([aeneasr](https://github.com/aeneasr)) +- ci: Rename job release-docs to docs + [\#193](https://github.com/ory/oathkeeper/pull/193) + ([aeneasr](https://github.com/aeneasr)) +- ci: Resolve goreleaser issues + [\#192](https://github.com/ory/oathkeeper/pull/192) + ([aeneasr](https://github.com/aeneasr)) +- ci: Update release pipeline + [\#191](https://github.com/ory/oathkeeper/pull/191) + ([aeneasr](https://github.com/aeneasr)) +- docs: Updates issue and pull request templates + [\#189](https://github.com/ory/oathkeeper/pull/189) + ([aeneasr](https://github.com/aeneasr)) +- install.sh: fix install script + [\#187](https://github.com/ory/oathkeeper/pull/187) + ([mkontani](https://github.com/mkontani)) +- Reduce deployment complexity and refactor internals + [\#185](https://github.com/ory/oathkeeper/pull/185) + ([aeneasr](https://github.com/aeneasr)) ## [v0.15.2](https://github.com/ory/oathkeeper/tree/v0.15.2) (2019-05-04) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.15.1...v0.15.2) **Fixed bugs:** -- Credential issuer config is base64 encoded [\#182](https://github.com/ory/oathkeeper/issues/182) +- Credential issuer config is base64 encoded + [\#182](https://github.com/ory/oathkeeper/issues/182) **Merged pull requests:** -- Fix json encode of config for "credentials\_issuer" and "authorizer" during import [\#184](https://github.com/ory/oathkeeper/pull/184) ([stszap](https://github.com/stszap)) +- Fix json encode of config for "credentials_issuer" and "authorizer" during + import [\#184](https://github.com/ory/oathkeeper/pull/184) + ([stszap](https://github.com/stszap)) ## [v0.15.1](https://github.com/ory/oathkeeper/tree/v0.15.1) (2019-04-29) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.15.0...v0.15.1) **Merged pull requests:** -- vendor: Add go.sum [\#180](https://github.com/ory/oathkeeper/pull/180) ([aeneasr](https://github.com/aeneasr)) +- vendor: Add go.sum [\#180](https://github.com/ory/oathkeeper/pull/180) + ([aeneasr](https://github.com/aeneasr)) ## [v0.15.0](https://github.com/ory/oathkeeper/tree/v0.15.0) (2019-04-29) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.14.2+oryOS.10...v0.15.0) **Implemented enhancements:** @@ -278,406 +407,673 @@ **Closed issues:** -- Forward all auth\* headers in judge mode [\#166](https://github.com/ory/oathkeeper/issues/166) -- Move to go-swagger client [\#165](https://github.com/ory/oathkeeper/issues/165) -- Unable to install oathkeeper CLI [\#161](https://github.com/ory/oathkeeper/issues/161) -- Using Oathkeeper - External Consumer App [\#158](https://github.com/ory/oathkeeper/issues/158) -- Allow multiple rules for one URL [\#157](https://github.com/ory/oathkeeper/issues/157) -- CORS Not working as expected [\#151](https://github.com/ory/oathkeeper/issues/151) -- keto\_engine\_acp\_ory not working with oryOS10 [\#150](https://github.com/ory/oathkeeper/issues/150) -- Update README building-from-source part with the gomodule way [\#149](https://github.com/ory/oathkeeper/issues/149) -- required\_scope of authenticator validate only scope claim and not scp claim [\#138](https://github.com/ory/oathkeeper/issues/138) - -**Merged pull requests:** - -- docker: Remove full tag from build pipeline [\#179](https://github.com/ory/oathkeeper/pull/179) ([aeneasr](https://github.com/aeneasr)) -- sdk: Remove sdk dependencies to keto/hydra [\#173](https://github.com/ory/oathkeeper/pull/173) ([aeneasr](https://github.com/aeneasr)) -- ci: Adopt new release pipeline [\#171](https://github.com/ory/oathkeeper/pull/171) ([aeneasr](https://github.com/aeneasr)) -- sdk: Move to go-swagger SDK code generation [\#170](https://github.com/ory/oathkeeper/pull/170) ([aeneasr](https://github.com/aeneasr)) -- judge: Set request headers for credential issuers [\#169](https://github.com/ory/oathkeeper/pull/169) ([aeneasr](https://github.com/aeneasr)) -- Update dependencies [\#163](https://github.com/ory/oathkeeper/pull/163) ([aeneasr](https://github.com/aeneasr)) -- proxy: Use scp,scope,scopes in jwt authenticator [\#162](https://github.com/ory/oathkeeper/pull/162) ([aeneasr](https://github.com/aeneasr)) -- ci: Resolve CI build issue [\#160](https://github.com/ory/oathkeeper/pull/160) ([aeneasr](https://github.com/aeneasr)) -- Ensure rule matcher is locked before updating [\#159](https://github.com/ory/oathkeeper/pull/159) ([jtescher](https://github.com/jtescher)) -- proxy: improve debugability of JWT authenticator [\#156](https://github.com/ory/oathkeeper/pull/156) ([aeneasr](https://github.com/aeneasr)) -- issue \#149 - Update README building-from-source part with the gomodul… [\#152](https://github.com/ory/oathkeeper/pull/152) ([pink-lucifer](https://github.com/pink-lucifer)) +- Forward all auth\* headers in judge mode + [\#166](https://github.com/ory/oathkeeper/issues/166) +- Move to go-swagger client + [\#165](https://github.com/ory/oathkeeper/issues/165) +- Unable to install oathkeeper CLI + [\#161](https://github.com/ory/oathkeeper/issues/161) +- Using Oathkeeper - External Consumer App + [\#158](https://github.com/ory/oathkeeper/issues/158) +- Allow multiple rules for one URL + [\#157](https://github.com/ory/oathkeeper/issues/157) +- CORS Not working as expected + [\#151](https://github.com/ory/oathkeeper/issues/151) +- keto_engine_acp_ory not working with oryOS10 + [\#150](https://github.com/ory/oathkeeper/issues/150) +- Update README building-from-source part with the gomodule way + [\#149](https://github.com/ory/oathkeeper/issues/149) +- required_scope of authenticator validate only scope claim and not scp claim + [\#138](https://github.com/ory/oathkeeper/issues/138) + +**Merged pull requests:** + +- docker: Remove full tag from build pipeline + [\#179](https://github.com/ory/oathkeeper/pull/179) + ([aeneasr](https://github.com/aeneasr)) +- sdk: Remove sdk dependencies to keto/hydra + [\#173](https://github.com/ory/oathkeeper/pull/173) + ([aeneasr](https://github.com/aeneasr)) +- ci: Adopt new release pipeline + [\#171](https://github.com/ory/oathkeeper/pull/171) + ([aeneasr](https://github.com/aeneasr)) +- sdk: Move to go-swagger SDK code generation + [\#170](https://github.com/ory/oathkeeper/pull/170) + ([aeneasr](https://github.com/aeneasr)) +- judge: Set request headers for credential issuers + [\#169](https://github.com/ory/oathkeeper/pull/169) + ([aeneasr](https://github.com/aeneasr)) +- Update dependencies [\#163](https://github.com/ory/oathkeeper/pull/163) + ([aeneasr](https://github.com/aeneasr)) +- proxy: Use scp,scope,scopes in jwt authenticator + [\#162](https://github.com/ory/oathkeeper/pull/162) + ([aeneasr](https://github.com/aeneasr)) +- ci: Resolve CI build issue [\#160](https://github.com/ory/oathkeeper/pull/160) + ([aeneasr](https://github.com/aeneasr)) +- Ensure rule matcher is locked before updating + [\#159](https://github.com/ory/oathkeeper/pull/159) + ([jtescher](https://github.com/jtescher)) +- proxy: improve debugability of JWT authenticator + [\#156](https://github.com/ory/oathkeeper/pull/156) + ([aeneasr](https://github.com/aeneasr)) +- issue \#149 - Update README building-from-source part with the gomodul… + [\#152](https://github.com/ory/oathkeeper/pull/152) + ([pink-lucifer](https://github.com/pink-lucifer)) ## [v0.14.2+oryOS.10](https://github.com/ory/oathkeeper/tree/v0.14.2+oryOS.10) (2018-12-13) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.14.1+oryOS.10...v0.14.2+oryOS.10) **Merged pull requests:** -- ci: Fix docker push arguments in publish task [\#148](https://github.com/ory/oathkeeper/pull/148) ([aeneasr](https://github.com/aeneasr)) -- Support "scope" claim as a string in jwt authenticator [\#137](https://github.com/ory/oathkeeper/pull/137) ([stszap](https://github.com/stszap)) +- ci: Fix docker push arguments in publish task + [\#148](https://github.com/ory/oathkeeper/pull/148) + ([aeneasr](https://github.com/aeneasr)) +- Support "scope" claim as a string in jwt authenticator + [\#137](https://github.com/ory/oathkeeper/pull/137) + ([stszap](https://github.com/stszap)) ## [v0.14.1+oryOS.10](https://github.com/ory/oathkeeper/tree/v0.14.1+oryOS.10) (2018-12-13) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.14.0+oryOS.10...v0.14.1+oryOS.10) **Merged pull requests:** -- ci: Fix docker release task [\#147](https://github.com/ory/oathkeeper/pull/147) ([aeneasr](https://github.com/aeneasr)) +- ci: Fix docker release task + [\#147](https://github.com/ory/oathkeeper/pull/147) + ([aeneasr](https://github.com/aeneasr)) ## [v0.14.0+oryOS.10](https://github.com/ory/oathkeeper/tree/v0.14.0+oryOS.10) (2018-12-13) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.13.9+oryOS.9...v0.14.0+oryOS.10) **Closed issues:** -- Moving forward with this project's versioning [\#130](https://github.com/ory/oathkeeper/issues/130) +- Moving forward with this project's versioning + [\#130](https://github.com/ory/oathkeeper/issues/130) - Add OPA authorizer [\#98](https://github.com/ory/oathkeeper/issues/98) **Merged pull requests:** -- vendor: Update keto to latest [\#146](https://github.com/ory/oathkeeper/pull/146) ([aeneasr](https://github.com/aeneasr)) -- proxy: Update to recent keto changes [\#145](https://github.com/ory/oathkeeper/pull/145) ([aeneasr](https://github.com/aeneasr)) -- docs: Update documentation links [\#144](https://github.com/ory/oathkeeper/pull/144) ([aeneasr](https://github.com/aeneasr)) -- docs: Align changelog, upgrade with new versions [\#143](https://github.com/ory/oathkeeper/pull/143) ([aeneasr](https://github.com/aeneasr)) -- docs: Fix proxy help command description [\#142](https://github.com/ory/oathkeeper/pull/142) ([aeneasr](https://github.com/aeneasr)) -- Ignore query parameters when matching url in rules. [\#139](https://github.com/ory/oathkeeper/pull/139) ([stszap](https://github.com/stszap)) +- vendor: Update keto to latest + [\#146](https://github.com/ory/oathkeeper/pull/146) + ([aeneasr](https://github.com/aeneasr)) +- proxy: Update to recent keto changes + [\#145](https://github.com/ory/oathkeeper/pull/145) + ([aeneasr](https://github.com/aeneasr)) +- docs: Update documentation links + [\#144](https://github.com/ory/oathkeeper/pull/144) + ([aeneasr](https://github.com/aeneasr)) +- docs: Align changelog, upgrade with new versions + [\#143](https://github.com/ory/oathkeeper/pull/143) + ([aeneasr](https://github.com/aeneasr)) +- docs: Fix proxy help command description + [\#142](https://github.com/ory/oathkeeper/pull/142) + ([aeneasr](https://github.com/aeneasr)) +- Ignore query parameters when matching url in rules. + [\#139](https://github.com/ory/oathkeeper/pull/139) + ([stszap](https://github.com/stszap)) ## [v0.13.9+oryOS.9](https://github.com/ory/oathkeeper/tree/v0.13.9+oryOS.9) (2018-11-14) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.13.8+oryOS.8...v0.13.9+oryOS.9) ## [v0.13.8+oryOS.8](https://github.com/ory/oathkeeper/tree/v0.13.8+oryOS.8) (2018-11-14) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.13.7+oryOS.7...v0.13.8+oryOS.8) ## [v0.13.7+oryOS.7](https://github.com/ory/oathkeeper/tree/v0.13.7+oryOS.7) (2018-11-14) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.13.6+oryOS.6...v0.13.7+oryOS.7) ## [v0.13.6+oryOS.6](https://github.com/ory/oathkeeper/tree/v0.13.6+oryOS.6) (2018-11-14) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.13.5+oryOS.5...v0.13.6+oryOS.6) ## [v0.13.5+oryOS.5](https://github.com/ory/oathkeeper/tree/v0.13.5+oryOS.5) (2018-11-14) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.13.4+oryOS.4...v0.13.5+oryOS.5) ## [v0.13.4+oryOS.4](https://github.com/ory/oathkeeper/tree/v0.13.4+oryOS.4) (2018-11-14) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.13.3+oryOS.3...v0.13.4+oryOS.4) ## [v0.13.3+oryOS.3](https://github.com/ory/oathkeeper/tree/v0.13.3+oryOS.3) (2018-11-14) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.13.2+oryOS.2...v0.13.3+oryOS.3) ## [v0.13.2+oryOS.2](https://github.com/ory/oathkeeper/tree/v0.13.2+oryOS.2) (2018-11-14) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.13.1+oryOS.1...v0.13.2+oryOS.2) ## [v0.13.1+oryOS.1](https://github.com/ory/oathkeeper/tree/v0.13.1+oryOS.1) (2018-11-14) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.11.12...v0.13.1+oryOS.1) **Implemented enhancements:** - Add JWT authenticator [\#112](https://github.com/ory/oathkeeper/issues/112) -- cmd: Should not fatal if ORY Hydra SDK is unable to start [\#71](https://github.com/ory/oathkeeper/issues/71) -- Slow POST through proxy causes timeout after 5 seconds [\#64](https://github.com/ory/oathkeeper/issues/64) -- proxy: Add JWT authenticator [\#109](https://github.com/ory/oathkeeper/pull/109) ([aeneasr](https://github.com/aeneasr)) -- cmd: Disable cors per default [\#107](https://github.com/ory/oathkeeper/pull/107) ([aeneasr](https://github.com/aeneasr)) -- Resolve various issues [\#93](https://github.com/ory/oathkeeper/pull/93) ([aeneasr](https://github.com/aeneasr)) -- rule: Adds validator for rules [\#77](https://github.com/ory/oathkeeper/pull/77) ([aeneasr](https://github.com/aeneasr)) +- cmd: Should not fatal if ORY Hydra SDK is unable to start + [\#71](https://github.com/ory/oathkeeper/issues/71) +- Slow POST through proxy causes timeout after 5 seconds + [\#64](https://github.com/ory/oathkeeper/issues/64) +- proxy: Add JWT authenticator + [\#109](https://github.com/ory/oathkeeper/pull/109) + ([aeneasr](https://github.com/aeneasr)) +- cmd: Disable cors per default + [\#107](https://github.com/ory/oathkeeper/pull/107) + ([aeneasr](https://github.com/aeneasr)) +- Resolve various issues [\#93](https://github.com/ory/oathkeeper/pull/93) + ([aeneasr](https://github.com/aeneasr)) +- rule: Adds validator for rules + [\#77](https://github.com/ory/oathkeeper/pull/77) + ([aeneasr](https://github.com/aeneasr)) **Fixed bugs:** -- oathkeeper beta8 builds on older hydra SDK [\#101](https://github.com/ory/oathkeeper/issues/101) +- oathkeeper beta8 builds on older hydra SDK + [\#101](https://github.com/ory/oathkeeper/issues/101) - Invalid Url Validator [\#92](https://github.com/ory/oathkeeper/issues/92) -- Resolve stack overflow in key & rule refresher [\#80](https://github.com/ory/oathkeeper/issues/80) -- Deletion of conflicting rule doesn't solve the route conflict [\#73](https://github.com/ory/oathkeeper/issues/73) -- proxy: Improve compatibility with ORY Hydra 1.0.0-beta.8 [\#108](https://github.com/ory/oathkeeper/pull/108) ([aeneasr](https://github.com/aeneasr)) -- cmd: Disable cors per default [\#107](https://github.com/ory/oathkeeper/pull/107) ([aeneasr](https://github.com/aeneasr)) -- Resolve various issues [\#93](https://github.com/ory/oathkeeper/pull/93) ([aeneasr](https://github.com/aeneasr)) -- rules: Properly handle conflicts on PUT and POST [\#76](https://github.com/ory/oathkeeper/pull/76) ([aeneasr](https://github.com/aeneasr)) -- rules: Resolves an issue with cached matchers [\#75](https://github.com/ory/oathkeeper/pull/75) ([aeneasr](https://github.com/aeneasr)) +- Resolve stack overflow in key & rule refresher + [\#80](https://github.com/ory/oathkeeper/issues/80) +- Deletion of conflicting rule doesn't solve the route conflict + [\#73](https://github.com/ory/oathkeeper/issues/73) +- proxy: Improve compatibility with ORY Hydra 1.0.0-beta.8 + [\#108](https://github.com/ory/oathkeeper/pull/108) + ([aeneasr](https://github.com/aeneasr)) +- cmd: Disable cors per default + [\#107](https://github.com/ory/oathkeeper/pull/107) + ([aeneasr](https://github.com/aeneasr)) +- Resolve various issues [\#93](https://github.com/ory/oathkeeper/pull/93) + ([aeneasr](https://github.com/aeneasr)) +- rules: Properly handle conflicts on PUT and POST + [\#76](https://github.com/ory/oathkeeper/pull/76) + ([aeneasr](https://github.com/aeneasr)) +- rules: Resolves an issue with cached matchers + [\#75](https://github.com/ory/oathkeeper/pull/75) + ([aeneasr](https://github.com/aeneasr)) **Closed issues:** -- Keto Warden Authorizer: Make Subject configurable. [\#128](https://github.com/ory/oathkeeper/issues/128) -- Inconsistent Environment Variable Docs [\#121](https://github.com/ory/oathkeeper/issues/121) -- --config flag doesn't work [\#110](https://github.com/ory/oathkeeper/issues/110) -- `noop` authenticator should not bypass allow/deny authorizers [\#97](https://github.com/ory/oathkeeper/issues/97) -- \[Proposal/Discussion\] New Credentials Issuers [\#96](https://github.com/ory/oathkeeper/issues/96) -- Build and upload binaries upon release [\#89](https://github.com/ory/oathkeeper/issues/89) -- Feature request: vault authenticator [\#88](https://github.com/ory/oathkeeper/issues/88) -- kid does not match .well-known/jwks.json [\#83](https://github.com/ory/oathkeeper/issues/83) +- Keto Warden Authorizer: Make Subject configurable. + [\#128](https://github.com/ory/oathkeeper/issues/128) +- Inconsistent Environment Variable Docs + [\#121](https://github.com/ory/oathkeeper/issues/121) +- --config flag doesn't work + [\#110](https://github.com/ory/oathkeeper/issues/110) +- `noop` authenticator should not bypass allow/deny authorizers + [\#97](https://github.com/ory/oathkeeper/issues/97) +- \[Proposal/Discussion\] New Credentials Issuers + [\#96](https://github.com/ory/oathkeeper/issues/96) +- Build and upload binaries upon release + [\#89](https://github.com/ory/oathkeeper/issues/89) +- Feature request: vault authenticator + [\#88](https://github.com/ory/oathkeeper/issues/88) +- kid does not match .well-known/jwks.json + [\#83](https://github.com/ory/oathkeeper/issues/83) - MySQL not supported [\#82](https://github.com/ory/oathkeeper/issues/82) -- Make Oathkeeper work without Hydra \(Fix JWK Manager\) [\#65](https://github.com/ory/oathkeeper/issues/65) -- Expected at least one private key [\#61](https://github.com/ory/oathkeeper/issues/61) -- Disallow unknown JSON fields [\#45](https://github.com/ory/oathkeeper/issues/45) -- Write AWS Lambda function for oathkeeper [\#44](https://github.com/ory/oathkeeper/issues/44) -- Add endpoint for answering access requests directly [\#42](https://github.com/ory/oathkeeper/issues/42) -- Add input validator to rules [\#41](https://github.com/ory/oathkeeper/issues/41) -- PUT rules/unknownId does not error [\#38](https://github.com/ory/oathkeeper/issues/38) - -**Merged pull requests:** - -- docs: Improve some docs and update SDK [\#135](https://github.com/ory/oathkeeper/pull/135) ([aeneasr](https://github.com/aeneasr)) -- Add environment parameters \(and description\) to configure proxy server timeout settings [\#132](https://github.com/ory/oathkeeper/pull/132) ([7phs](https://github.com/7phs)) -- Make subject configurable using go template [\#129](https://github.com/ory/oathkeeper/pull/129) ([lsjostro](https://github.com/lsjostro)) -- docs: Updates issue and pull request templates [\#127](https://github.com/ory/oathkeeper/pull/127) ([aeneasr](https://github.com/aeneasr)) -- docs: Updates issue and pull request templates [\#126](https://github.com/ory/oathkeeper/pull/126) ([aeneasr](https://github.com/aeneasr)) -- cmd: TLS environment variables [\#124](https://github.com/ory/oathkeeper/pull/124) ([fredbi](https://github.com/fredbi)) -- docs: Fix typo in README. [\#118](https://github.com/ory/oathkeeper/pull/118) ([ddunkin](https://github.com/ddunkin)) -- cmd: Properly document JWT refresh [\#117](https://github.com/ory/oathkeeper/pull/117) ([aeneasr](https://github.com/aeneasr)) -- cmd: Enables TLS option on serve api [\#116](https://github.com/ory/oathkeeper/pull/116) ([fredbi](https://github.com/fredbi)) -- Prepare beta.9 release [\#115](https://github.com/ory/oathkeeper/pull/115) ([aeneasr](https://github.com/aeneasr)) -- Aligned TLS options with hydra: allow cert&key to be specified with file [\#114](https://github.com/ory/oathkeeper/pull/114) ([fredbi](https://github.com/fredbi)) -- Improve integration tests [\#113](https://github.com/ory/oathkeeper/pull/113) ([aeneasr](https://github.com/aeneasr)) -- cmd: Remove config flag [\#111](https://github.com/ory/oathkeeper/pull/111) ([aeneasr](https://github.com/aeneasr)) -- \(fix\) Typo in checkResponse function print message [\#106](https://github.com/ory/oathkeeper/pull/106) ([devprincess](https://github.com/devprincess)) -- proxy: add cookies ci to handler factory [\#103](https://github.com/ory/oathkeeper/pull/103) ([zikes](https://github.com/zikes)) -- proxy: add cookies credentials issuer [\#102](https://github.com/ory/oathkeeper/pull/102) ([zikes](https://github.com/zikes)) -- Headers Credentials Issuer [\#100](https://github.com/ory/oathkeeper/pull/100) ([zikes](https://github.com/zikes)) -- Resolve various issues [\#99](https://github.com/ory/oathkeeper/pull/99) ([aeneasr](https://github.com/aeneasr)) -- Node sdk [\#94](https://github.com/ory/oathkeeper/pull/94) ([aeneasr](https://github.com/aeneasr)) -- judge: Add endpoint for answering access requests directly [\#91](https://github.com/ory/oathkeeper/pull/91) ([aeneasr](https://github.com/aeneasr)) -- health: Introduce health and version endpoint [\#90](https://github.com/ory/oathkeeper/pull/90) ([aeneasr](https://github.com/aeneasr)) -- docs: fix broken link [\#87](https://github.com/ory/oathkeeper/pull/87) ([orisano](https://github.com/orisano)) -- README: grammatical fix in stability sentence [\#86](https://github.com/ory/oathkeeper/pull/86) ([philips](https://github.com/philips)) -- rsakey: Resolve HS256 kid mismatch [\#85](https://github.com/ory/oathkeeper/pull/85) ([aeneasr](https://github.com/aeneasr)) -- cmd: Allows connectivity to MySQL [\#84](https://github.com/ory/oathkeeper/pull/84) ([aeneasr](https://github.com/aeneasr)) -- cmd: Resolves recursive stack overflow [\#81](https://github.com/ory/oathkeeper/pull/81) ([aeneasr](https://github.com/aeneasr)) -- docs: Adds link to examples repository [\#79](https://github.com/ory/oathkeeper/pull/79) ([aeneasr](https://github.com/aeneasr)) -- docs: Adds gh templates & code of conduct [\#78](https://github.com/ory/oathkeeper/pull/78) ([aeneasr](https://github.com/aeneasr)) -- ci: Prevent pushes from forks to coveralls [\#74](https://github.com/ory/oathkeeper/pull/74) ([aeneasr](https://github.com/aeneasr)) -- Reduces setup complexity [\#72](https://github.com/ory/oathkeeper/pull/72) ([aeneasr](https://github.com/aeneasr)) -- proxy: Resolves potential panic in request handler [\#70](https://github.com/ory/oathkeeper/pull/70) ([aeneasr](https://github.com/aeneasr)) -- Minor improvements [\#69](https://github.com/ory/oathkeeper/pull/69) ([aeneasr](https://github.com/aeneasr)) -- rsakey: Resolves issues with broken tests [\#68](https://github.com/ory/oathkeeper/pull/68) ([aeneasr](https://github.com/aeneasr)) -- cmd: Improves cors parsing [\#67](https://github.com/ory/oathkeeper/pull/67) ([aeneasr](https://github.com/aeneasr)) -- cmd: Doesn't fatal if no ORY Hydra is unresponsive. [\#66](https://github.com/ory/oathkeeper/pull/66) ([aeneasr](https://github.com/aeneasr)) -- Keto [\#60](https://github.com/ory/oathkeeper/pull/60) ([aeneasr](https://github.com/aeneasr)) +- Make Oathkeeper work without Hydra \(Fix JWK Manager\) + [\#65](https://github.com/ory/oathkeeper/issues/65) +- Expected at least one private key + [\#61](https://github.com/ory/oathkeeper/issues/61) +- Disallow unknown JSON fields + [\#45](https://github.com/ory/oathkeeper/issues/45) +- Write AWS Lambda function for oathkeeper + [\#44](https://github.com/ory/oathkeeper/issues/44) +- Add endpoint for answering access requests directly + [\#42](https://github.com/ory/oathkeeper/issues/42) +- Add input validator to rules + [\#41](https://github.com/ory/oathkeeper/issues/41) +- PUT rules/unknownId does not error + [\#38](https://github.com/ory/oathkeeper/issues/38) + +**Merged pull requests:** + +- docs: Improve some docs and update SDK + [\#135](https://github.com/ory/oathkeeper/pull/135) + ([aeneasr](https://github.com/aeneasr)) +- Add environment parameters \(and description\) to configure proxy server + timeout settings [\#132](https://github.com/ory/oathkeeper/pull/132) + ([7phs](https://github.com/7phs)) +- Make subject configurable using go template + [\#129](https://github.com/ory/oathkeeper/pull/129) + ([lsjostro](https://github.com/lsjostro)) +- docs: Updates issue and pull request templates + [\#127](https://github.com/ory/oathkeeper/pull/127) + ([aeneasr](https://github.com/aeneasr)) +- docs: Updates issue and pull request templates + [\#126](https://github.com/ory/oathkeeper/pull/126) + ([aeneasr](https://github.com/aeneasr)) +- cmd: TLS environment variables + [\#124](https://github.com/ory/oathkeeper/pull/124) + ([fredbi](https://github.com/fredbi)) +- docs: Fix typo in README. [\#118](https://github.com/ory/oathkeeper/pull/118) + ([ddunkin](https://github.com/ddunkin)) +- cmd: Properly document JWT refresh + [\#117](https://github.com/ory/oathkeeper/pull/117) + ([aeneasr](https://github.com/aeneasr)) +- cmd: Enables TLS option on serve api + [\#116](https://github.com/ory/oathkeeper/pull/116) + ([fredbi](https://github.com/fredbi)) +- Prepare beta.9 release [\#115](https://github.com/ory/oathkeeper/pull/115) + ([aeneasr](https://github.com/aeneasr)) +- Aligned TLS options with hydra: allow cert&key to be specified with file + [\#114](https://github.com/ory/oathkeeper/pull/114) + ([fredbi](https://github.com/fredbi)) +- Improve integration tests [\#113](https://github.com/ory/oathkeeper/pull/113) + ([aeneasr](https://github.com/aeneasr)) +- cmd: Remove config flag [\#111](https://github.com/ory/oathkeeper/pull/111) + ([aeneasr](https://github.com/aeneasr)) +- \(fix\) Typo in checkResponse function print message + [\#106](https://github.com/ory/oathkeeper/pull/106) + ([devprincess](https://github.com/devprincess)) +- proxy: add cookies ci to handler factory + [\#103](https://github.com/ory/oathkeeper/pull/103) + ([zikes](https://github.com/zikes)) +- proxy: add cookies credentials issuer + [\#102](https://github.com/ory/oathkeeper/pull/102) + ([zikes](https://github.com/zikes)) +- Headers Credentials Issuer [\#100](https://github.com/ory/oathkeeper/pull/100) + ([zikes](https://github.com/zikes)) +- Resolve various issues [\#99](https://github.com/ory/oathkeeper/pull/99) + ([aeneasr](https://github.com/aeneasr)) +- Node sdk [\#94](https://github.com/ory/oathkeeper/pull/94) + ([aeneasr](https://github.com/aeneasr)) +- judge: Add endpoint for answering access requests directly + [\#91](https://github.com/ory/oathkeeper/pull/91) + ([aeneasr](https://github.com/aeneasr)) +- health: Introduce health and version endpoint + [\#90](https://github.com/ory/oathkeeper/pull/90) + ([aeneasr](https://github.com/aeneasr)) +- docs: fix broken link [\#87](https://github.com/ory/oathkeeper/pull/87) + ([orisano](https://github.com/orisano)) +- README: grammatical fix in stability sentence + [\#86](https://github.com/ory/oathkeeper/pull/86) + ([philips](https://github.com/philips)) +- rsakey: Resolve HS256 kid mismatch + [\#85](https://github.com/ory/oathkeeper/pull/85) + ([aeneasr](https://github.com/aeneasr)) +- cmd: Allows connectivity to MySQL + [\#84](https://github.com/ory/oathkeeper/pull/84) + ([aeneasr](https://github.com/aeneasr)) +- cmd: Resolves recursive stack overflow + [\#81](https://github.com/ory/oathkeeper/pull/81) + ([aeneasr](https://github.com/aeneasr)) +- docs: Adds link to examples repository + [\#79](https://github.com/ory/oathkeeper/pull/79) + ([aeneasr](https://github.com/aeneasr)) +- docs: Adds gh templates & code of conduct + [\#78](https://github.com/ory/oathkeeper/pull/78) + ([aeneasr](https://github.com/aeneasr)) +- ci: Prevent pushes from forks to coveralls + [\#74](https://github.com/ory/oathkeeper/pull/74) + ([aeneasr](https://github.com/aeneasr)) +- Reduces setup complexity [\#72](https://github.com/ory/oathkeeper/pull/72) + ([aeneasr](https://github.com/aeneasr)) +- proxy: Resolves potential panic in request handler + [\#70](https://github.com/ory/oathkeeper/pull/70) + ([aeneasr](https://github.com/aeneasr)) +- Minor improvements [\#69](https://github.com/ory/oathkeeper/pull/69) + ([aeneasr](https://github.com/aeneasr)) +- rsakey: Resolves issues with broken tests + [\#68](https://github.com/ory/oathkeeper/pull/68) + ([aeneasr](https://github.com/aeneasr)) +- cmd: Improves cors parsing [\#67](https://github.com/ory/oathkeeper/pull/67) + ([aeneasr](https://github.com/aeneasr)) +- cmd: Doesn't fatal if no ORY Hydra is unresponsive. + [\#66](https://github.com/ory/oathkeeper/pull/66) + ([aeneasr](https://github.com/aeneasr)) +- Keto [\#60](https://github.com/ory/oathkeeper/pull/60) + ([aeneasr](https://github.com/aeneasr)) ## [v0.11.12](https://github.com/ory/oathkeeper/tree/v0.11.12) (2018-05-07) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.0.29...v0.11.12) **Closed issues:** -- Unable to refresh RSA keys for JWK signing [\#53](https://github.com/ory/oathkeeper/issues/53) -- Add well known endpoint to swagger docs [\#47](https://github.com/ory/oathkeeper/issues/47) +- Unable to refresh RSA keys for JWK signing + [\#53](https://github.com/ory/oathkeeper/issues/53) +- Add well known endpoint to swagger docs + [\#47](https://github.com/ory/oathkeeper/issues/47) **Merged pull requests:** -- Update README.md [\#58](https://github.com/ory/oathkeeper/pull/58) ([aeneasr](https://github.com/aeneasr)) -- docs: Moves documentation to new repository [\#57](https://github.com/ory/oathkeeper/pull/57) ([aeneasr](https://github.com/aeneasr)) -- Update 2-EXECUTION.md [\#56](https://github.com/ory/oathkeeper/pull/56) ([maryoush](https://github.com/maryoush)) -- Update 2-EXECUTION.md [\#55](https://github.com/ory/oathkeeper/pull/55) ([taland](https://github.com/taland)) -- Improve tests [\#54](https://github.com/ory/oathkeeper/pull/54) ([aeneasr](https://github.com/aeneasr)) -- cmd: correct logging typo [\#52](https://github.com/ory/oathkeeper/pull/52) ([euank](https://github.com/euank)) -- ci: Resolves issue with pushing docs [\#50](https://github.com/ory/oathkeeper/pull/50) ([aeneasr](https://github.com/aeneasr)) -- docs: Adds automatic summary generation [\#49](https://github.com/ory/oathkeeper/pull/49) ([aeneasr](https://github.com/aeneasr)) +- Update README.md [\#58](https://github.com/ory/oathkeeper/pull/58) + ([aeneasr](https://github.com/aeneasr)) +- docs: Moves documentation to new repository + [\#57](https://github.com/ory/oathkeeper/pull/57) + ([aeneasr](https://github.com/aeneasr)) +- Update 2-EXECUTION.md [\#56](https://github.com/ory/oathkeeper/pull/56) + ([maryoush](https://github.com/maryoush)) +- Update 2-EXECUTION.md [\#55](https://github.com/ory/oathkeeper/pull/55) + ([taland](https://github.com/taland)) +- Improve tests [\#54](https://github.com/ory/oathkeeper/pull/54) + ([aeneasr](https://github.com/aeneasr)) +- cmd: correct logging typo [\#52](https://github.com/ory/oathkeeper/pull/52) + ([euank](https://github.com/euank)) +- ci: Resolves issue with pushing docs + [\#50](https://github.com/ory/oathkeeper/pull/50) + ([aeneasr](https://github.com/aeneasr)) +- docs: Adds automatic summary generation + [\#49](https://github.com/ory/oathkeeper/pull/49) + ([aeneasr](https://github.com/aeneasr)) ## [v0.0.29](https://github.com/ory/oathkeeper/tree/v0.0.29) (2017-12-19) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.0.28...v0.0.29) **Merged pull requests:** -- Adds use field to well known [\#48](https://github.com/ory/oathkeeper/pull/48) ([aeneasr](https://github.com/aeneasr)) +- Adds use field to well known [\#48](https://github.com/ory/oathkeeper/pull/48) + ([aeneasr](https://github.com/aeneasr)) ## [v0.0.28](https://github.com/ory/oathkeeper/tree/v0.0.28) (2017-12-19) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.0.27...v0.0.28) **Closed issues:** -- Make key discovery easier with well-known feature [\#43](https://github.com/ory/oathkeeper/issues/43) +- Make key discovery easier with well-known feature + [\#43](https://github.com/ory/oathkeeper/issues/43) **Merged pull requests:** -- Replaces key discovery with well-known feature [\#46](https://github.com/ory/oathkeeper/pull/46) ([aeneasr](https://github.com/aeneasr)) +- Replaces key discovery with well-known feature + [\#46](https://github.com/ory/oathkeeper/pull/46) + ([aeneasr](https://github.com/aeneasr)) ## [v0.0.27](https://github.com/ory/oathkeeper/tree/v0.0.27) (2017-12-12) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.0.26...v0.0.27) **Merged pull requests:** -- Adds cors capabilities to management server [\#40](https://github.com/ory/oathkeeper/pull/40) ([aeneasr](https://github.com/aeneasr)) +- Adds cors capabilities to management server + [\#40](https://github.com/ory/oathkeeper/pull/40) + ([aeneasr](https://github.com/aeneasr)) ## [v0.0.26](https://github.com/ory/oathkeeper/tree/v0.0.26) (2017-12-11) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.0.25...v0.0.26) **Merged pull requests:** -- Fixes broken image link in docs [\#39](https://github.com/ory/oathkeeper/pull/39) ([aeneasr](https://github.com/aeneasr)) +- Fixes broken image link in docs + [\#39](https://github.com/ory/oathkeeper/pull/39) + ([aeneasr](https://github.com/aeneasr)) ## [v0.0.25](https://github.com/ory/oathkeeper/tree/v0.0.25) (2017-11-28) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.0.24...v0.0.25) **Merged pull requests:** -- Add extra data from token introspection to session [\#37](https://github.com/ory/oathkeeper/pull/37) ([aeneasr](https://github.com/aeneasr)) +- Add extra data from token introspection to session + [\#37](https://github.com/ory/oathkeeper/pull/37) + ([aeneasr](https://github.com/aeneasr)) ## [v0.0.24](https://github.com/ory/oathkeeper/tree/v0.0.24) (2017-11-26) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.0.23...v0.0.24) **Closed issues:** -- Document HYDRA\_JWK\_SET\_ID [\#34](https://github.com/ory/oathkeeper/issues/34) -- Investigate if the issuer should be oathkeeper or hydra [\#27](https://github.com/ory/oathkeeper/issues/27) +- Document HYDRA_JWK_SET_ID [\#34](https://github.com/ory/oathkeeper/issues/34) +- Investigate if the issuer should be oathkeeper or hydra + [\#27](https://github.com/ory/oathkeeper/issues/27) **Merged pull requests:** -- Telemetry [\#36](https://github.com/ory/oathkeeper/pull/36) ([aeneasr](https://github.com/aeneasr)) +- Telemetry [\#36](https://github.com/ory/oathkeeper/pull/36) + ([aeneasr](https://github.com/aeneasr)) ## [v0.0.23](https://github.com/ory/oathkeeper/tree/v0.0.23) (2017-11-24) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.0.22...v0.0.23) **Closed issues:** -- Rename basicAuthorizationModeEnabled to something that does not clash with HTTP basic authorization [\#29](https://github.com/ory/oathkeeper/issues/29) -- Rename bypass values for better clarity [\#13](https://github.com/ory/oathkeeper/issues/13) +- Rename basicAuthorizationModeEnabled to something that does not clash with + HTTP basic authorization [\#29](https://github.com/ory/oathkeeper/issues/29) +- Rename bypass values for better clarity + [\#13](https://github.com/ory/oathkeeper/issues/13) **Merged pull requests:** -- docs: Adds license note to all source files [\#51](https://github.com/ory/oathkeeper/pull/51) ([aeneasr](https://github.com/aeneasr)) -- Print formatted output string in rule management CLI [\#35](https://github.com/ory/oathkeeper/pull/35) ([aeneasr](https://github.com/aeneasr)) -- docs: Add JWK set docs [\#33](https://github.com/ory/oathkeeper/pull/33) ([aeneasr](https://github.com/aeneasr)) -- Update docs and add tests [\#32](https://github.com/ory/oathkeeper/pull/32) ([aeneasr](https://github.com/aeneasr)) +- docs: Adds license note to all source files + [\#51](https://github.com/ory/oathkeeper/pull/51) + ([aeneasr](https://github.com/aeneasr)) +- Print formatted output string in rule management CLI + [\#35](https://github.com/ory/oathkeeper/pull/35) + ([aeneasr](https://github.com/aeneasr)) +- docs: Add JWK set docs [\#33](https://github.com/ory/oathkeeper/pull/33) + ([aeneasr](https://github.com/aeneasr)) +- Update docs and add tests [\#32](https://github.com/ory/oathkeeper/pull/32) + ([aeneasr](https://github.com/aeneasr)) ## [v0.0.22](https://github.com/ory/oathkeeper/tree/v0.0.22) (2017-11-20) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.0.21...v0.0.22) **Merged pull requests:** -- Renames bypass values for better clarity [\#31](https://github.com/ory/oathkeeper/pull/31) ([aeneasr](https://github.com/aeneasr)) +- Renames bypass values for better clarity + [\#31](https://github.com/ory/oathkeeper/pull/31) + ([aeneasr](https://github.com/aeneasr)) ## [v0.0.21](https://github.com/ory/oathkeeper/tree/v0.0.21) (2017-11-19) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.0.20...v0.0.21) **Merged pull requests:** -- Request hydra.keys scope and fix panic [\#30](https://github.com/ory/oathkeeper/pull/30) ([aeneasr](https://github.com/aeneasr)) +- Request hydra.keys scope and fix panic + [\#30](https://github.com/ory/oathkeeper/pull/30) + ([aeneasr](https://github.com/aeneasr)) ## [v0.0.20](https://github.com/ory/oathkeeper/tree/v0.0.20) (2017-11-18) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.0.19...v0.0.20) **Merged pull requests:** -- docs: Improve swagger documentation [\#28](https://github.com/ory/oathkeeper/pull/28) ([aeneasr](https://github.com/aeneasr)) -- cmd: Add rules management capabilities to the cli [\#26](https://github.com/ory/oathkeeper/pull/26) ([aeneasr](https://github.com/aeneasr)) -- unstaged [\#25](https://github.com/ory/oathkeeper/pull/25) ([aeneasr](https://github.com/aeneasr)) +- docs: Improve swagger documentation + [\#28](https://github.com/ory/oathkeeper/pull/28) + ([aeneasr](https://github.com/aeneasr)) +- cmd: Add rules management capabilities to the cli + [\#26](https://github.com/ory/oathkeeper/pull/26) + ([aeneasr](https://github.com/aeneasr)) +- unstaged [\#25](https://github.com/ory/oathkeeper/pull/25) + ([aeneasr](https://github.com/aeneasr)) ## [v0.0.19](https://github.com/ory/oathkeeper/tree/v0.0.19) (2017-11-13) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.0.18...v0.0.19) **Closed issues:** -- evaluator: token\[:5\] will cause panic [\#22](https://github.com/ory/oathkeeper/issues/22) +- evaluator: token\[:5\] will cause panic + [\#22](https://github.com/ory/oathkeeper/issues/22) **Merged pull requests:** -- evaluator: Use full request URL [\#24](https://github.com/ory/oathkeeper/pull/24) ([aeneasr](https://github.com/aeneasr)) +- evaluator: Use full request URL + [\#24](https://github.com/ory/oathkeeper/pull/24) + ([aeneasr](https://github.com/aeneasr)) ## [v0.0.18](https://github.com/ory/oathkeeper/tree/v0.0.18) (2017-11-13) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.0.17...v0.0.18) **Merged pull requests:** -- evaluator: Resolve potential panic in token id generation [\#23](https://github.com/ory/oathkeeper/pull/23) ([aeneasr](https://github.com/aeneasr)) +- evaluator: Resolve potential panic in token id generation + [\#23](https://github.com/ory/oathkeeper/pull/23) + ([aeneasr](https://github.com/aeneasr)) ## [v0.0.17](https://github.com/ory/oathkeeper/tree/v0.0.17) (2017-11-12) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.0.16...v0.0.17) **Merged pull requests:** -- Introduces surrogate\_id to SQLManager [\#21](https://github.com/ory/oathkeeper/pull/21) ([aeneasr](https://github.com/aeneasr)) +- Introduces surrogate_id to SQLManager + [\#21](https://github.com/ory/oathkeeper/pull/21) + ([aeneasr](https://github.com/aeneasr)) ## [v0.0.16](https://github.com/ory/oathkeeper/tree/v0.0.16) (2017-11-12) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.0.15...v0.0.16) **Merged pull requests:** -- Replace MatchesPath with MatchesURL [\#20](https://github.com/ory/oathkeeper/pull/20) ([aeneasr](https://github.com/aeneasr)) +- Replace MatchesPath with MatchesURL + [\#20](https://github.com/ory/oathkeeper/pull/20) + ([aeneasr](https://github.com/aeneasr)) ## [v0.0.15](https://github.com/ory/oathkeeper/tree/v0.0.15) (2017-11-09) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.0.14...v0.0.15) **Merged pull requests:** -- Add HTTPS capabilities and document proxy/management commands [\#19](https://github.com/ory/oathkeeper/pull/19) ([aeneasr](https://github.com/aeneasr)) +- Add HTTPS capabilities and document proxy/management commands + [\#19](https://github.com/ory/oathkeeper/pull/19) + ([aeneasr](https://github.com/aeneasr)) ## [v0.0.14](https://github.com/ory/oathkeeper/tree/v0.0.14) (2017-11-07) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.0.13...v0.0.14) **Merged pull requests:** -- Make refresh\_delay configurable and skip it on boot [\#18](https://github.com/ory/oathkeeper/pull/18) ([aeneasr](https://github.com/aeneasr)) +- Make refresh_delay configurable and skip it on boot + [\#18](https://github.com/ory/oathkeeper/pull/18) + ([aeneasr](https://github.com/aeneasr)) ## [v0.0.13](https://github.com/ory/oathkeeper/tree/v0.0.13) (2017-11-07) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.0.12...v0.0.13) **Merged pull requests:** -- Store rules path match in plaintext [\#17](https://github.com/ory/oathkeeper/pull/17) ([aeneasr](https://github.com/aeneasr)) +- Store rules path match in plaintext + [\#17](https://github.com/ory/oathkeeper/pull/17) + ([aeneasr](https://github.com/aeneasr)) ## [v0.0.12](https://github.com/ory/oathkeeper/tree/v0.0.12) (2017-11-07) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.0.11...v0.0.12) **Merged pull requests:** -- Use ladon regex compiler for matches [\#16](https://github.com/ory/oathkeeper/pull/16) ([aeneasr](https://github.com/aeneasr)) +- Use ladon regex compiler for matches + [\#16](https://github.com/ory/oathkeeper/pull/16) + ([aeneasr](https://github.com/aeneasr)) ## [v0.0.11](https://github.com/ory/oathkeeper/tree/v0.0.11) (2017-11-06) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.0.10...v0.0.11) ## [v0.0.10](https://github.com/ory/oathkeeper/tree/v0.0.10) (2017-11-06) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.0.9...v0.0.10) ## [v0.0.9](https://github.com/ory/oathkeeper/tree/v0.0.9) (2017-11-06) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.0.8...v0.0.9) ## [v0.0.8](https://github.com/ory/oathkeeper/tree/v0.0.8) (2017-11-06) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.0.7...v0.0.8) **Merged pull requests:** -- Make oathkeeper binary executable\# [\#15](https://github.com/ory/oathkeeper/pull/15) ([aeneasr](https://github.com/aeneasr)) +- Make oathkeeper binary executable\# + [\#15](https://github.com/ory/oathkeeper/pull/15) + ([aeneasr](https://github.com/aeneasr)) ## [v0.0.7](https://github.com/ory/oathkeeper/tree/v0.0.7) (2017-11-06) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.0.6...v0.0.7) **Merged pull requests:** -- Build oathekeeper docker image statically [\#14](https://github.com/ory/oathkeeper/pull/14) ([aeneasr](https://github.com/aeneasr)) +- Build oathekeeper docker image statically + [\#14](https://github.com/ory/oathkeeper/pull/14) + ([aeneasr](https://github.com/aeneasr)) ## [v0.0.6](https://github.com/ory/oathkeeper/tree/v0.0.6) (2017-11-03) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.0.5...v0.0.6) **Merged pull requests:** -- Added serve all command [\#12](https://github.com/ory/oathkeeper/pull/12) ([aeneasr](https://github.com/aeneasr)) +- Added serve all command [\#12](https://github.com/ory/oathkeeper/pull/12) + ([aeneasr](https://github.com/aeneasr)) ## [v0.0.5](https://github.com/ory/oathkeeper/tree/v0.0.5) (2017-11-01) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.0.4...v0.0.5) **Merged pull requests:** -- Add cors handling to proxy [\#11](https://github.com/ory/oathkeeper/pull/11) ([aeneasr](https://github.com/aeneasr)) -- Remove goveralls from circle build [\#10](https://github.com/ory/oathkeeper/pull/10) ([aeneasr](https://github.com/aeneasr)) -- Use circle ci build status badge [\#9](https://github.com/ory/oathkeeper/pull/9) ([aeneasr](https://github.com/aeneasr)) -- Switch from glide to golang/dep for vendoring [\#8](https://github.com/ory/oathkeeper/pull/8) ([aeneasr](https://github.com/aeneasr)) -- Resolve tests by replacing nil slice [\#7](https://github.com/ory/oathkeeper/pull/7) ([aeneasr](https://github.com/aeneasr)) +- Add cors handling to proxy [\#11](https://github.com/ory/oathkeeper/pull/11) + ([aeneasr](https://github.com/aeneasr)) +- Remove goveralls from circle build + [\#10](https://github.com/ory/oathkeeper/pull/10) + ([aeneasr](https://github.com/aeneasr)) +- Use circle ci build status badge + [\#9](https://github.com/ory/oathkeeper/pull/9) + ([aeneasr](https://github.com/aeneasr)) +- Switch from glide to golang/dep for vendoring + [\#8](https://github.com/ory/oathkeeper/pull/8) + ([aeneasr](https://github.com/aeneasr)) +- Resolve tests by replacing nil slice + [\#7](https://github.com/ory/oathkeeper/pull/7) + ([aeneasr](https://github.com/aeneasr)) ## [v0.0.4](https://github.com/ory/oathkeeper/tree/v0.0.4) (2017-10-21) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.0.3...v0.0.4) **Merged pull requests:** -- Return arrays instead of null on rule creation [\#6](https://github.com/ory/oathkeeper/pull/6) ([aeneasr](https://github.com/aeneasr)) -- Add circleci configuration file [\#5](https://github.com/ory/oathkeeper/pull/5) ([aeneasr](https://github.com/aeneasr)) +- Return arrays instead of null on rule creation + [\#6](https://github.com/ory/oathkeeper/pull/6) + ([aeneasr](https://github.com/aeneasr)) +- Add circleci configuration file + [\#5](https://github.com/ory/oathkeeper/pull/5) + ([aeneasr](https://github.com/aeneasr)) ## [v0.0.3](https://github.com/ory/oathkeeper/tree/v0.0.3) (2017-10-18) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.0.2...v0.0.3) **Merged pull requests:** -- Fix unauthorized [\#4](https://github.com/ory/oathkeeper/pull/4) ([aeneasr](https://github.com/aeneasr)) +- Fix unauthorized [\#4](https://github.com/ory/oathkeeper/pull/4) + ([aeneasr](https://github.com/aeneasr)) ## [v0.0.2](https://github.com/ory/oathkeeper/tree/v0.0.2) (2017-10-12) + [Full Changelog](https://github.com/ory/oathkeeper/compare/v0.0.1...v0.0.2) **Merged pull requests:** -- Skip acp checks [\#3](https://github.com/ory/oathkeeper/pull/3) ([aeneasr](https://github.com/aeneasr)) +- Skip acp checks [\#3](https://github.com/ory/oathkeeper/pull/3) + ([aeneasr](https://github.com/aeneasr)) ## [v0.0.1](https://github.com/ory/oathkeeper/tree/v0.0.1) (2017-10-10) -**Merged pull requests:** - -- travis: add goveralls report submission [\#2](https://github.com/ory/oathkeeper/pull/2) ([aeneasr](https://github.com/aeneasr)) -- Prototype [\#1](https://github.com/ory/oathkeeper/pull/1) ([aeneasr](https://github.com/aeneasr)) +**Merged pull requests:** +- travis: add goveralls report submission + [\#2](https://github.com/ory/oathkeeper/pull/2) + ([aeneasr](https://github.com/aeneasr)) +- Prototype [\#1](https://github.com/ory/oathkeeper/pull/1) + ([aeneasr](https://github.com/aeneasr)) -\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)* \ No newline at end of file +\* _This Change Log was automatically generated by +[github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)_ diff --git a/UPGRADE.md b/UPGRADE.md index dea9fcdef2..7a70afa11b 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -46,7 +46,8 @@ before finalizing the upgrade process. ## v0.32.0-beta.1+oryOS.12 -An issue with the release pipeline has been resolved, which required several version increases. No functionality has changed in a backwards incompatible way. +An issue with the release pipeline has been resolved, which required several +version increases. No functionality has changed in a backwards incompatible way. ## v0.19.0-beta.1+oryOS.12 diff --git a/cmd/root.go b/cmd/root.go index 554ae90e9e..333bb7fd09 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -64,8 +64,8 @@ func init() { cobra.OnInitialize(func() { viperx.InitializeConfig("oathkeeper", "", nil) - logger = logrusx.New() + if err := viperx.Validate(gojsonschema.NewBytesLoader(schema)); err != nil { viperx.LoggerWithValidationErrorFields(logger, err). WithError(err). diff --git a/driver/configuration/provider_viper.go b/driver/configuration/provider_viper.go index 5f2f5227c3..753f99e838 100644 --- a/driver/configuration/provider_viper.go +++ b/driver/configuration/provider_viper.go @@ -86,37 +86,6 @@ const ( ViperKeyAuthenticatorUnauthorizedIsEnabled = "authenticators.unauthorized.enabled" ) -func BindEnvs() { - if err := viper.BindEnv( - ViperKeyProxyReadTimeout, - ViperKeyProxyWriteTimeout, - ViperKeyProxyIdleTimeout, - ViperKeyProxyServeAddressHost, - ViperKeyProxyServeAddressPort, - ViperKeyAPIServeAddressHost, - ViperKeyAPIServeAddressPort, - ViperKeyAccessRuleRepositories, - ViperKeyAuthorizerAllowIsEnabled, - ViperKeyAuthorizerDenyIsEnabled, - ViperKeyAuthorizerKetoEngineACPORYIsEnabled, - ViperKeyMutatorCookieIsEnabled, - ViperKeyMutatorHeaderIsEnabled, - ViperKeyMutatorNoopIsEnabled, - ViperKeyMutatorHydratorIsEnabled, - ViperKeyMutatorIDTokenIsEnabled, - ViperKeyMutatorIDTokenJWKSURL, - ViperKeyAuthenticatorAnonymousIsEnabled, - ViperKeyAuthenticatorNoopIsEnabled, - ViperKeyAuthenticatorCookieSessionIsEnabled, - ViperKeyAuthenticatorJWTIsEnabled, - ViperKeyAuthenticatorOAuth2ClientCredentialsIsEnabled, - ViperKeyAuthenticatorOAuth2TokenIntrospectionIsEnabled, - ViperKeyAuthenticatorUnauthorizedIsEnabled, - ); err != nil { - panic(err.Error()) - } -} - type ViperProvider struct { l logrus.FieldLogger } diff --git a/driver/configuration/provider_viper_public_test.go b/driver/configuration/provider_viper_public_test.go index 55f0d370ab..b32c42b614 100644 --- a/driver/configuration/provider_viper_public_test.go +++ b/driver/configuration/provider_viper_public_test.go @@ -25,7 +25,6 @@ import ( func TestPipelineConfig(t *testing.T) { viper.Reset() - BindEnvs() viperx.InitializeConfig( "oathkeeper", "./../../docs/", diff --git a/go.mod b/go.mod index bfee764f56..22c5c5b437 100644 --- a/go.mod +++ b/go.mod @@ -49,7 +49,7 @@ require ( github.com/ory/herodot v0.6.2 github.com/ory/ladon v1.0.1 github.com/ory/viper v1.5.6 - github.com/ory/x v0.0.77 + github.com/ory/x v0.0.78 github.com/pborman/uuid v1.2.0 github.com/pelletier/go-toml v1.6.0 // indirect github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 @@ -79,4 +79,6 @@ require ( // Fix for https://github.com/golang/lint/issues/436 replace github.com/golang/lint => github.com/golang/lint v0.0.0-20190227174305-8f45f776aaf1 +replace github.com/ory/x => ../x + go 1.13 diff --git a/go.sum b/go.sum index e8258b8c2a..60988fd1ab 100644 --- a/go.sum +++ b/go.sum @@ -527,6 +527,8 @@ github.com/ory/x v0.0.76 h1:pM9oK8szqYr/tAa0I/oGiCRVGppt4pJSm56oQUnjsvM= github.com/ory/x v0.0.76/go.mod h1:TH1ImNLBepjywXHy3fgEXDgOIxH+ZF95jkZuo4/lPEU= github.com/ory/x v0.0.77 h1:juHvrvCuletCoNmflOWNLp0K/cV61D2rHc2HlVXAwFw= github.com/ory/x v0.0.77/go.mod h1:WVlPrVNe4wtPfdXqE6B+x7a7xoTR2EFGIGxZTPdAuxw= +github.com/ory/x v0.0.78 h1:Rup+zJE/SIbdkw6o71bq2aGborCN5x93vEfb5AckBrQ= +github.com/ory/x v0.0.78/go.mod h1:WVlPrVNe4wtPfdXqE6B+x7a7xoTR2EFGIGxZTPdAuxw= github.com/parnurzeal/gorequest v0.2.15/go.mod h1:3Kh2QUMJoqw3icWAecsyzkpY7UzRfDhbRdTjtNwNiUE= github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= From 811c81ff3911f0dd8f958fc7da860fcd438a5a32 Mon Sep 17 00:00:00 2001 From: aeneasr Date: Sun, 27 Oct 2019 10:46:00 +0100 Subject: [PATCH 3/5] u --- go.mod | 5 +---- go.sum | 10 ++-------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 22c5c5b437..af189c1659 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,6 @@ require ( github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/fsnotify/fsnotify v1.4.7 github.com/ghodss/yaml v1.0.0 - github.com/go-bindata/go-bindata v3.1.2+incompatible // indirect github.com/go-openapi/analysis v0.19.0 // indirect github.com/go-openapi/errors v0.19.0 github.com/go-openapi/inflect v0.19.0 // indirect @@ -49,7 +48,7 @@ require ( github.com/ory/herodot v0.6.2 github.com/ory/ladon v1.0.1 github.com/ory/viper v1.5.6 - github.com/ory/x v0.0.78 + github.com/ory/x v0.0.79 github.com/pborman/uuid v1.2.0 github.com/pelletier/go-toml v1.6.0 // indirect github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 @@ -79,6 +78,4 @@ require ( // Fix for https://github.com/golang/lint/issues/436 replace github.com/golang/lint => github.com/golang/lint v0.0.0-20190227174305-8f45f776aaf1 -replace github.com/ory/x => ../x - go 1.13 diff --git a/go.sum b/go.sum index 60988fd1ab..c2b38b844e 100644 --- a/go.sum +++ b/go.sum @@ -84,8 +84,6 @@ github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 h1:DujepqpGd1hyOd7a github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= github.com/go-bindata/go-bindata v3.1.1+incompatible h1:tR4f0e4VTO7LK6B2YWyAoVEzG9ByG1wrXB4TL9+jiYg= github.com/go-bindata/go-bindata v3.1.1+incompatible/go.mod h1:xK8Dsgwmeed+BBsSy2XTopBn/8uK2HWuGSnA11C3Joo= -github.com/go-bindata/go-bindata v3.1.2+incompatible h1:5vjJMVhowQdPzjE1LdxyFF7YFTXg5IgGVW4gBr5IbvE= -github.com/go-bindata/go-bindata v3.1.2+incompatible/go.mod h1:xK8Dsgwmeed+BBsSy2XTopBn/8uK2HWuGSnA11C3Joo= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= @@ -523,12 +521,8 @@ github.com/ory/ladon v1.0.1/go.mod h1:1VhCA2mBtaMhRUS6VS0d9qrNVDQnFXqSRb5D0NvQUP github.com/ory/pagination v0.0.1/go.mod h1:d1ToRROAUleriPhmb2dYbhANhhLwZ8s395m2yJCDFh8= github.com/ory/viper v1.5.6 h1:w4ceGgWwWLzAFYQ7bHaDZmwNsAto2JPVdyQjQnn7VWI= github.com/ory/viper v1.5.6/go.mod h1:TYmpFpKLxjQwvT4f0QPpkOn4sDXU1kDgAwJpgLYiQ28= -github.com/ory/x v0.0.76 h1:pM9oK8szqYr/tAa0I/oGiCRVGppt4pJSm56oQUnjsvM= -github.com/ory/x v0.0.76/go.mod h1:TH1ImNLBepjywXHy3fgEXDgOIxH+ZF95jkZuo4/lPEU= -github.com/ory/x v0.0.77 h1:juHvrvCuletCoNmflOWNLp0K/cV61D2rHc2HlVXAwFw= -github.com/ory/x v0.0.77/go.mod h1:WVlPrVNe4wtPfdXqE6B+x7a7xoTR2EFGIGxZTPdAuxw= -github.com/ory/x v0.0.78 h1:Rup+zJE/SIbdkw6o71bq2aGborCN5x93vEfb5AckBrQ= -github.com/ory/x v0.0.78/go.mod h1:WVlPrVNe4wtPfdXqE6B+x7a7xoTR2EFGIGxZTPdAuxw= +github.com/ory/x v0.0.79 h1:epo/41vLUB/GdgJ1qNxKK7hYqzCUu1GpKVsAGUu9EA0= +github.com/ory/x v0.0.79/go.mod h1:WVlPrVNe4wtPfdXqE6B+x7a7xoTR2EFGIGxZTPdAuxw= github.com/parnurzeal/gorequest v0.2.15/go.mod h1:3Kh2QUMJoqw3icWAecsyzkpY7UzRfDhbRdTjtNwNiUE= github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= From 6274cf553e17d15de71e4bb2d802230680f08634 Mon Sep 17 00:00:00 2001 From: aeneasr Date: Sun, 27 Oct 2019 17:42:31 +0100 Subject: [PATCH 4/5] u --- driver/configuration/provider_viper_public_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/driver/configuration/provider_viper_public_test.go b/driver/configuration/provider_viper_public_test.go index b32c42b614..a8f36e21cd 100644 --- a/driver/configuration/provider_viper_public_test.go +++ b/driver/configuration/provider_viper_public_test.go @@ -79,7 +79,6 @@ func TestPipelineConfig(t *testing.T) { func TestViperProvider(t *testing.T) { viper.Reset() - BindEnvs() viperx.InitializeConfig( "oathkeeper", "./../../docs/", From dfc555f42de6444700d50b84043b8458942eab9a Mon Sep 17 00:00:00 2001 From: aeneasr Date: Sun, 27 Oct 2019 17:54:11 +0100 Subject: [PATCH 5/5] Resolve fsnotify permission test issues on macOS --- rule/fetcher_default_test.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/rule/fetcher_default_test.go b/rule/fetcher_default_test.go index f965f5f799..3fc37bea8d 100644 --- a/rule/fetcher_default_test.go +++ b/rule/fetcher_default_test.go @@ -117,19 +117,21 @@ access_rules: } func TestFetcherWatchRepositoryFromFS(t *testing.T) { - viper.Reset() conf := internal.NewConfigurationWithDefaults() // this resets viper!! r := internal.NewRegistry(conf) + dir := path.Join(os.TempDir(), uuid.New().String()) + require.NoError(t, os.MkdirAll(dir, 0777)) + id := uuid.New().String() - repository := path.Join(os.TempDir(), "access-rules-"+id+".json") - require.NoError(t, ioutil.WriteFile(repository, []byte("[]"), 0666)) + repository := path.Join(dir, "access-rules-"+id+".json") + require.NoError(t, ioutil.WriteFile(repository, []byte("[]"), 0777)) require.NoError(t, ioutil.WriteFile(filepath.Join(os.TempDir(), ".oathkeeper-"+id+".yml"), []byte(` access_rules: repositories: - file://`+repository+` -`), 0666)) +`), 0777)) viperx.InitializeConfig("oathkeeper-"+id, os.TempDir(), nil) viperx.WatchConfig(nil, nil) @@ -148,7 +150,7 @@ access_rules: {content: `[{"id":"2"},{"id":"3"}]`, expectIDs: []string{"2", "3"}}, } { t.Run(fmt.Sprintf("case=%d", k), func(t *testing.T) { - require.NoError(t, ioutil.WriteFile(repository, []byte(tc.content), 0666)) + require.NoError(t, ioutil.WriteFile(repository, []byte(tc.content), 0777)) time.Sleep(time.Millisecond * 500) rules, err := r.RuleRepository().List(context.Background(), 500, 0) @@ -159,7 +161,7 @@ access_rules: ids[k] = r.ID } - require.Len(t, ids, len(tc.expectIDs)) + assert.Len(t, ids, len(tc.expectIDs), "%+v", rules) for _, id := range tc.expectIDs { assert.True(t, stringslice.Has(ids, id), "\nexpected: %v\nactual: %v", tc.expectIDs, ids) }