Skip to content

Commit

Permalink
Merge branch 'master' into feat/matching-rule-header-support
Browse files Browse the repository at this point in the history
  • Loading branch information
@m-guesnon-pvotal
m-guesnon-pvotal authored Jul 12, 2022
2 parents 29138bb + 7b998a0 commit c56898a
Show file tree
Hide file tree
Showing 83 changed files with 2,874 additions and 2,493 deletions.
166 changes: 80 additions & 86 deletions .docker_compose/rules.json
View file
Original file line number Diff line number Diff line change
@@ -1,99 +1,93 @@
[
{
"id": "allow-anonymous-with-header-mutator",
"upstream": {
"url": "https://httpbin.org/anything/header"
},
"match": {
"url": "http://<127.0.0.1|localhost>:4455/anything/header",
"methods": [
"GET"
]
},
"authenticators": [
{
"handler": "anonymous"
}
],
"authorizer": {
"handler": "allow"
},
"mutators": [
{
"handler": "header",
"config": {
"headers": {
"X-User": "{{ print .Subject }}"
}
}
}
]
{
"id": "allow-anonymous-with-header-mutator",
"upstream": {
"url": "https://httpbin.org/anything/header"
},
{
"id": "deny-anonymous",
"upstream": {
"url": "https://httpbin.org/anything/deny"
},
"match": {
"url": "http://<127.0.0.1|localhost>:4455/anything/deny",
"methods": [
"GET"
]
},
"authenticators": [
{
"handler": "anonymous"
}
],
"authorizer": {
"handler": "deny"
},
"mutators": [
{
"handler": "noop"
}
],
"errors": [
"match": {
"url": "http://<127.0.0.1|localhost>:4455/anything/header",
"methods": ["GET"]
},
"authenticators": [
{
"handler": "anonymous"
}
],
"authorizer": {
"handler": "allow"
},
"mutators": [
{
"handler": "header",
"config": {
"headers": {
"X-User": "{{ print .Subject }}"
}
}
}
]
},
{
"id": "deny-anonymous",
"upstream": {
"url": "https://httpbin.org/anything/deny"
},
"match": {
"url": "http://<127.0.0.1|localhost>:4455/anything/deny",
"methods": ["GET"]
},
"authenticators": [
{
"handler": "anonymous"
}
],
"authorizer": {
"handler": "deny"
},
"mutators": [
{
"handler": "noop"
}
],
"errors": [
{
"handler": "json",
"config": {
"when": [
{
"handler": "json",
"config": {
"when": [
{
"request": {
"header": {
"accept": ["application/json"]
}
}
}
]
"request": {
"header": {
"accept": ["application/json"]
}
},
}
}
]
}
},
{
"handler": "redirect",
"config": {
"when": [
{
"handler": "redirect",
"config": {
"when": [
{
"request": {
"header": {
"accept": ["text/*"]
}
}
}
]
"request": {
"header": {
"accept": ["text/*"]
}
}
}
]
]
}
}
]
},
{
"id": "allow-anonymous-with-id-token-mutator",
"upstream": {
"url": "https://httpbin.org/anything/id_token"
},
{
"id": "allow-anonymous-with-id-token-mutator",
"upstream": {
"url": "https://httpbin.org/anything/id_token"
},
"match": {
"url": "http://<127.0.0.1|localhost>:4455/anything/id_token",
"methods": [
"GET"
]
"methods": ["GET"]
},
"authenticators": [
{
Expand Down
50 changes: 25 additions & 25 deletions .github/ISSUE_TEMPLATE/BUG-REPORT.yml
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
description: 'Create a bug report'
description: "Create a bug report"
labels:
- bug
name: 'Bug Report'
name: "Bug Report"
body:
- attributes:
value: "Thank you for taking the time to fill out this bug report!\n"
type: markdown
- attributes:
label: 'Preflight checklist'
label: "Preflight checklist"
options:
- label:
'I could not find a solution in the existing issues, docs, nor
discussions.'
"I could not find a solution in the existing issues, docs, nor
discussions."
required: true
- label:
"I agree to follow this project's [Code of
Expand All @@ -22,18 +22,18 @@ body:
Guidelines](https://github.com/ory/oathkeeper/blob/master/CONTRIBUTING.md)."
required: true
- label:
'This issue affects my [Ory Cloud](https://www.ory.sh/) project.'
"This issue affects my [Ory Cloud](https://www.ory.sh/) project."
- label:
'I have joined the [Ory Community Slack](https://slack.ory.sh).'
"I have joined the [Ory Community Slack](https://slack.ory.sh)."
- label:
'I am signed up to the [Ory Security Patch
Newsletter](https://ory.us10.list-manage.com/subscribe?u=ffb1a878e4ec6c0ed312a3480&id=f605a41b53).'
"I am signed up to the [Ory Security Patch
Newsletter](https://ory.us10.list-manage.com/subscribe?u=ffb1a878e4ec6c0ed312a3480&id=f605a41b53)."
id: checklist
type: checkboxes
- attributes:
description: 'A clear and concise description of what the bug is.'
label: 'Describe the bug'
placeholder: 'Tell us what you see!'
description: "A clear and concise description of what the bug is."
label: "Describe the bug"
placeholder: "Tell us what you see!"
id: describe-bug
type: textarea
validations:
Expand All @@ -47,28 +47,28 @@ body:
1. Run `docker run ....`
2. Make API Request to with `curl ...`
3. Request fails with response: `{"some": "error"}`
label: 'Reproducing the bug'
label: "Reproducing the bug"
id: reproduce-bug
type: textarea
validations:
required: true
- attributes:
description:
'Please copy and paste any relevant log output. This will be
"Please copy and paste any relevant log output. This will be
automatically formatted into code, so no need for backticks. Please
redact any sensitive information'
label: 'Relevant log output'
redact any sensitive information"
label: "Relevant log output"
render: shell
placeholder: |
log=error ....
id: logs
type: textarea
- attributes:
description:
'Please copy and paste any relevant configuration. This will be
"Please copy and paste any relevant configuration. This will be
automatically formatted into code, so no need for backticks. Please
redact any sensitive information!'
label: 'Relevant configuration'
redact any sensitive information!"
label: "Relevant configuration"
render: yml
placeholder: |
server:
Expand All @@ -77,14 +77,14 @@ body:
id: config
type: textarea
- attributes:
description: 'What version of our software are you running?'
description: "What version of our software are you running?"
label: Version
id: version
type: input
validations:
required: true
- attributes:
label: 'On which operating system are you observing this issue?'
label: "On which operating system are you observing this issue?"
options:
- Ory Cloud
- macOS
Expand All @@ -95,19 +95,19 @@ body:
id: operating-system
type: dropdown
- attributes:
label: 'In which environment are you deploying?'
label: "In which environment are you deploying?"
options:
- Ory Cloud
- Docker
- 'Docker Compose'
- 'Kubernetes with Helm'
- "Docker Compose"
- "Kubernetes with Helm"
- Kubernetes
- Binary
- Other
id: deployment
type: dropdown
- attributes:
description: 'Add any other context about the problem here.'
description: "Add any other context about the problem here."
label: Additional Context
id: additional
type: textarea
Loading

0 comments on commit c56898a

Please sign in to comment.