Compare commits
194 Commits
py37-catch
...
smoother-p
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e0839fe130 | ||
|
|
31d14704cb | ||
|
|
6a89f4b2fe | ||
|
|
16256522f6 | ||
|
|
205795d1e8 | ||
|
|
9cbe1fb8ad | ||
|
|
31d7ba8f8c | ||
|
|
dc3c4d1393 | ||
|
|
929d270569 | ||
|
|
93714df051 | ||
|
|
6e61eab872 | ||
|
|
6848ff24d8 | ||
|
|
666371bb92 | ||
|
|
4a2b82e42e | ||
|
|
5dd1623192 | ||
|
|
976da69e79 | ||
|
|
11a0b15194 | ||
|
|
c21999a248 | ||
|
|
c17230ef94 | ||
|
|
049983cb70 | ||
|
|
e374409567 | ||
|
|
4068a0d83d | ||
|
|
70da5e9879 | ||
|
|
f48506d620 | ||
|
|
f2cc83c1ba | ||
|
|
273825dab6 | ||
|
|
9a7dafd531 | ||
|
|
50117d174c | ||
|
|
af67801062 | ||
|
|
6eaab2a7e5 | ||
|
|
d680af3709 | ||
|
|
a8c2d77c91 | ||
|
|
6e1c787e5d | ||
|
|
932088e37e | ||
|
|
1a63b9bec0 | ||
|
|
61aa16f6ac | ||
|
|
71cd53b64e | ||
|
|
89188f5fc6 | ||
|
|
a245ab3773 | ||
|
|
ac1f56118a | ||
|
|
53820bc241 | ||
|
|
009954003c | ||
|
|
8f265b8169 | ||
|
|
5ee36fd933 | ||
|
|
08a81c81be | ||
|
|
5a0ed75171 | ||
|
|
d62a92fac9 | ||
|
|
88c918e72f | ||
|
|
c8aab8fb3d | ||
|
|
ecacfd396b | ||
|
|
3c361e9852 | ||
|
|
a5d7d03413 | ||
|
|
259e458847 | ||
|
|
cb49c2b26d | ||
|
|
dfc0704831 | ||
|
|
d238995f1b | ||
|
|
6f5303e080 | ||
|
|
5e7f6998bd | ||
|
|
c7a71cd00c | ||
|
|
9cb9e88678 | ||
|
|
30c53b6857 | ||
|
|
4ad8168bb0 | ||
|
|
28f5b3c301 | ||
|
|
c573019e7f | ||
|
|
029f564032 | ||
|
|
2abe66b670 | ||
|
|
911485d52e | ||
|
|
4744a89c33 | ||
|
|
f7040ccec8 | ||
|
|
518152d97e | ||
|
|
0e44e9cacb | ||
|
|
bfb54b0969 | ||
|
|
154863d6c6 | ||
|
|
a3ff0c13b7 | ||
|
|
95ee518aec | ||
|
|
71d3d87bcc | ||
|
|
b276b91c21 | ||
|
|
064168f3c8 | ||
|
|
db39e127bf | ||
|
|
13e9ab7ba9 | ||
|
|
92e7463721 | ||
|
|
8e720365c2 | ||
|
|
d4041161c7 | ||
|
|
f32437bf13 | ||
|
|
0909e94527 | ||
|
|
aef2673c38 | ||
|
|
4c14910d5b | ||
|
|
beae35f921 | ||
|
|
ad4e526c77 | ||
|
|
4422d0c34d | ||
|
|
ad9183d21d | ||
|
|
d70636ba2e | ||
|
|
da23f85675 | ||
|
|
3f4663b9f8 | ||
|
|
65d7447cf6 | ||
|
|
5369291c27 | ||
|
|
1c4925edf7 | ||
|
|
6b9edfd05c | ||
|
|
97f33f42df | ||
|
|
15a588a90c | ||
|
|
82421e7efc | ||
|
|
f891995b48 | ||
|
|
5052321801 | ||
|
|
23ce4eaaa4 | ||
|
|
23a430c4ad | ||
|
|
ec158ffa69 | ||
|
|
6e32270036 | ||
|
|
43ba381e7b | ||
|
|
16503319e5 | ||
|
|
389363ab71 | ||
|
|
7f894c45b3 | ||
|
|
4726cf1910 | ||
|
|
d352a4155e | ||
|
|
e5010286b4 | ||
|
|
358498db96 | ||
|
|
e4999401ab | ||
|
|
c8df0aa2cb | ||
|
|
5fb207176b | ||
|
|
a12b560478 | ||
|
|
753ee992a6 | ||
|
|
09089b1bd3 | ||
|
|
7ddbe5e844 | ||
|
|
ab5a7038af | ||
|
|
4f3c780dc3 | ||
|
|
71f7765a4c | ||
|
|
0392d1dcfc | ||
|
|
7827b1b41d | ||
|
|
8e9342e188 | ||
|
|
2f6f2bfa76 | ||
|
|
dee09d7fff | ||
|
|
9cf38a0a83 | ||
|
|
3def3d3569 | ||
|
|
e100a14fd4 | ||
|
|
2fa28f1711 | ||
|
|
9d415e4ec6 | ||
|
|
312ab298fd | ||
|
|
2fc21ad576 | ||
|
|
8f6c87c3d6 | ||
|
|
4429e76532 | ||
|
|
e4be70bae8 | ||
|
|
13d5a44278 | ||
|
|
aba333bfb6 | ||
|
|
b59da498cc | ||
|
|
70382f21ba | ||
|
|
0e1bf89fad | ||
|
|
6c48c8b3ba | ||
|
|
d1c5e8003b | ||
|
|
ce926a34f2 | ||
|
|
a744041e38 | ||
|
|
2f90a85df1 | ||
|
|
a411bc06e3 | ||
|
|
1668e1532f | ||
|
|
b87982769f | ||
|
|
65b53a5f3f | ||
|
|
49789b7841 | ||
|
|
c249004c30 | ||
|
|
4ee2e57ec8 | ||
|
|
86ae5f981c | ||
|
|
2bfa65e0de | ||
|
|
293278bb08 | ||
|
|
5d683c6ea4 | ||
|
|
78b6723149 | ||
|
|
3a6cc7389c | ||
|
|
cc97287f8e | ||
|
|
00218aa9f2 | ||
|
|
874718db94 | ||
|
|
bb4474897f | ||
|
|
0cb342aef4 | ||
|
|
030987480c | ||
|
|
f6fdc80b40 | ||
|
|
361c242473 | ||
|
|
32962d1e1c | ||
|
|
6e0a6871b5 | ||
|
|
0030425c8c | ||
|
|
c9dbc8ed26 | ||
|
|
44b108b564 | ||
|
|
2a8e91052f | ||
|
|
0c9df02e66 | ||
|
|
7523e87937 | ||
|
|
d4fb44e986 | ||
|
|
68b654d981 | ||
|
|
88bc6d8966 | ||
|
|
ac388d644b | ||
|
|
bb517ddcca | ||
|
|
b8d991420b | ||
|
|
4a416e177a | ||
|
|
8dfa49b648 | ||
|
|
8b0eaa097c | ||
|
|
101151b419 | ||
|
|
4669036f45 | ||
|
|
9bf9067c99 | ||
|
|
a7bc8b56ba | ||
|
|
371985d129 | ||
|
|
3eae00898d |
@@ -1,2 +0,0 @@
|
|||||||
[tool.black]
|
|
||||||
line-length = 79
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
exclude_patterns:
|
|
||||||
- "sanic/__main__.py"
|
|
||||||
- "sanic/application/logo.py"
|
|
||||||
- "sanic/application/motd.py"
|
|
||||||
- "sanic/reloader_helpers.py"
|
|
||||||
- "sanic/simple.py"
|
|
||||||
- "sanic/utils.py"
|
|
||||||
- ".github/"
|
|
||||||
- "changelogs/"
|
|
||||||
- "docker/"
|
|
||||||
- "docs/"
|
|
||||||
- "examples/"
|
|
||||||
- "scripts/"
|
|
||||||
- "tests/"
|
|
||||||
checks:
|
|
||||||
argument-count:
|
|
||||||
enabled: false
|
|
||||||
file-lines:
|
|
||||||
config:
|
|
||||||
threshold: 1000
|
|
||||||
method-count:
|
|
||||||
config:
|
|
||||||
threshold: 40
|
|
||||||
complex-logic:
|
|
||||||
enabled: false
|
|
||||||
method-complexity:
|
|
||||||
config:
|
|
||||||
threshold: 10
|
|
||||||
10
.coveragerc
10
.coveragerc
@@ -3,13 +3,13 @@ branch = True
|
|||||||
source = sanic
|
source = sanic
|
||||||
omit =
|
omit =
|
||||||
site-packages
|
site-packages
|
||||||
sanic/application/logo.py
|
|
||||||
sanic/application/motd.py
|
|
||||||
sanic/cli
|
|
||||||
sanic/__main__.py
|
sanic/__main__.py
|
||||||
sanic/reloader_helpers.py
|
sanic/server/legacy.py
|
||||||
|
sanic/compat.py
|
||||||
sanic/simple.py
|
sanic/simple.py
|
||||||
sanic/utils.py
|
sanic/utils.py
|
||||||
|
sanic/cli
|
||||||
|
sanic/pages
|
||||||
|
|
||||||
[html]
|
[html]
|
||||||
directory = coverage
|
directory = coverage
|
||||||
@@ -21,3 +21,5 @@ exclude_lines =
|
|||||||
noqa
|
noqa
|
||||||
NOQA
|
NOQA
|
||||||
pragma: no cover
|
pragma: no cover
|
||||||
|
TYPE_CHECKING
|
||||||
|
skip_empty = True
|
||||||
|
|||||||
78
.github/ISSUE_TEMPLATE/bug-report.yml
vendored
Normal file
78
.github/ISSUE_TEMPLATE/bug-report.yml
vendored
Normal file
@@ -0,0 +1,78 @@
|
|||||||
|
name: 🐞 Bug report
|
||||||
|
description: Create a report to help us improve
|
||||||
|
labels: ["bug", "triage"]
|
||||||
|
body:
|
||||||
|
- type: checkboxes
|
||||||
|
id: existing
|
||||||
|
attributes:
|
||||||
|
label: Is there an existing issue for this?
|
||||||
|
description: Please search to see if an issue already exists for the bug you encountered.
|
||||||
|
options:
|
||||||
|
- label: I have searched the existing issues
|
||||||
|
required: true
|
||||||
|
- type: textarea
|
||||||
|
id: description
|
||||||
|
attributes:
|
||||||
|
label: Describe the bug
|
||||||
|
description: A clear and concise description of what the bug is, make sure to paste any exceptions and tracebacks using markdown code-block syntax to make it easier to read.
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
- type: textarea
|
||||||
|
id: code
|
||||||
|
attributes:
|
||||||
|
label: Code snippet
|
||||||
|
description: |
|
||||||
|
Relevant source code, make sure to remove what is not necessary. Please try and format your code so that it is easier to read. For example:
|
||||||
|
|
||||||
|
```python
|
||||||
|
from sanic import Sanic
|
||||||
|
|
||||||
|
app = Sanic("Example")
|
||||||
|
```
|
||||||
|
validations:
|
||||||
|
required: false
|
||||||
|
- type: textarea
|
||||||
|
id: expected
|
||||||
|
attributes:
|
||||||
|
label: Expected Behavior
|
||||||
|
description: A concise description of what you expected to happen.
|
||||||
|
validations:
|
||||||
|
required: false
|
||||||
|
- type: dropdown
|
||||||
|
id: running
|
||||||
|
attributes:
|
||||||
|
label: How do you run Sanic?
|
||||||
|
options:
|
||||||
|
- Sanic CLI
|
||||||
|
- As a module
|
||||||
|
- As a script (`app.run` or `Sanic.serve`)
|
||||||
|
- ASGI
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
- type: dropdown
|
||||||
|
id: os
|
||||||
|
attributes:
|
||||||
|
label: Operating System
|
||||||
|
description: What OS?
|
||||||
|
options:
|
||||||
|
- Linux
|
||||||
|
- MacOS
|
||||||
|
- Windows
|
||||||
|
- Other (tell us in the description)
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
- type: input
|
||||||
|
id: version
|
||||||
|
attributes:
|
||||||
|
label: Sanic Version
|
||||||
|
description: Check startup logs or try `sanic --version`
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
- type: textarea
|
||||||
|
id: additional
|
||||||
|
attributes:
|
||||||
|
label: Additional context
|
||||||
|
description: Add any other context about the problem here.
|
||||||
|
validations:
|
||||||
|
required: false
|
||||||
|
|
||||||
25
.github/ISSUE_TEMPLATE/bug_report.md
vendored
25
.github/ISSUE_TEMPLATE/bug_report.md
vendored
@@ -1,25 +0,0 @@
|
|||||||
---
|
|
||||||
name: Bug report
|
|
||||||
about: Create a report to help us improve
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**Describe the bug**
|
|
||||||
A clear and concise description of what the bug is, make sure to paste any exceptions and tracebacks.
|
|
||||||
|
|
||||||
|
|
||||||
**Code snippet**
|
|
||||||
Relevant source code, make sure to remove what is not necessary.
|
|
||||||
|
|
||||||
|
|
||||||
**Expected behavior**
|
|
||||||
A clear and concise description of what you expected to happen.
|
|
||||||
|
|
||||||
|
|
||||||
**Environment (please complete the following information):**
|
|
||||||
- OS: [e.g. iOS]
|
|
||||||
- Version [e.g. 0.8.3]
|
|
||||||
|
|
||||||
|
|
||||||
**Additional context**
|
|
||||||
Add any other context about the problem here.
|
|
||||||
5
.github/ISSUE_TEMPLATE/config.yml
vendored
5
.github/ISSUE_TEMPLATE/config.yml
vendored
@@ -1,5 +1,8 @@
|
|||||||
blank_issues_enabled: true
|
blank_issues_enabled: false
|
||||||
contact_links:
|
contact_links:
|
||||||
- name: Questions and Help
|
- name: Questions and Help
|
||||||
url: https://community.sanicframework.org/c/questions-and-help
|
url: https://community.sanicframework.org/c/questions-and-help
|
||||||
about: Do you need help with Sanic? Ask your questions here.
|
about: Do you need help with Sanic? Ask your questions here.
|
||||||
|
- name: Discussion and Support
|
||||||
|
url: https://discord.gg/FARQzAEMAA
|
||||||
|
about: For live discussion and support, checkout the Sanic Discord server.
|
||||||
|
|||||||
34
.github/ISSUE_TEMPLATE/feature-request.yml
vendored
Normal file
34
.github/ISSUE_TEMPLATE/feature-request.yml
vendored
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
name: 🌟 Feature request
|
||||||
|
description: Suggest an enhancement for Sanic
|
||||||
|
labels: ["feature request"]
|
||||||
|
body:
|
||||||
|
- type: checkboxes
|
||||||
|
id: existing
|
||||||
|
attributes:
|
||||||
|
label: Is there an existing issue for this?
|
||||||
|
description: Please search to see if an issue already exists for the enhancement you are proposing.
|
||||||
|
options:
|
||||||
|
- label: I have searched the existing issues
|
||||||
|
required: true
|
||||||
|
- type: textarea
|
||||||
|
id: description
|
||||||
|
attributes:
|
||||||
|
label: Is your feature request related to a problem? Please describe.
|
||||||
|
description: A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
|
||||||
|
validations:
|
||||||
|
required: false
|
||||||
|
- type: textarea
|
||||||
|
id: code
|
||||||
|
attributes:
|
||||||
|
label: Describe the solution you'd like
|
||||||
|
description: A clear and concise description of what you want to happen.
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
- type: textarea
|
||||||
|
id: additional
|
||||||
|
attributes:
|
||||||
|
label: Additional context
|
||||||
|
description: Add any other context about the problem here.
|
||||||
|
validations:
|
||||||
|
required: false
|
||||||
|
|
||||||
16
.github/ISSUE_TEMPLATE/feature_request.md
vendored
16
.github/ISSUE_TEMPLATE/feature_request.md
vendored
@@ -1,16 +0,0 @@
|
|||||||
---
|
|
||||||
name: Feature request
|
|
||||||
about: Suggest an idea for Sanic
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**Is your feature request related to a problem? Please describe.**
|
|
||||||
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
|
|
||||||
|
|
||||||
|
|
||||||
**Describe the solution you'd like**
|
|
||||||
A clear and concise description of what you want to happen.
|
|
||||||
|
|
||||||
|
|
||||||
**Additional context**
|
|
||||||
Add any other context or sample code about the feature request here.
|
|
||||||
33
.github/ISSUE_TEMPLATE/rfc.yml
vendored
Normal file
33
.github/ISSUE_TEMPLATE/rfc.yml
vendored
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
name: 💡 Request for Comments
|
||||||
|
description: Open an RFC for discussion
|
||||||
|
labels: ["RFC"]
|
||||||
|
body:
|
||||||
|
- type: input
|
||||||
|
id: compare
|
||||||
|
attributes:
|
||||||
|
label: Link to code
|
||||||
|
description: If available, share a [comparison](https://github.com/sanic-org/sanic/compare) from a POC branch to main
|
||||||
|
placeholder: https://github.com/sanic-org/sanic/compare/main...some-new-branch
|
||||||
|
validations:
|
||||||
|
required: false
|
||||||
|
- type: textarea
|
||||||
|
id: proposal
|
||||||
|
attributes:
|
||||||
|
label: Proposal
|
||||||
|
description: A thorough discussion of the proposal discussing the problem it solves, potential code, use cases, and impacts
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
- type: textarea
|
||||||
|
id: additional
|
||||||
|
attributes:
|
||||||
|
label: Additional context
|
||||||
|
description: Add any other context that is relevant
|
||||||
|
validations:
|
||||||
|
required: false
|
||||||
|
- type: checkboxes
|
||||||
|
id: breaking
|
||||||
|
attributes:
|
||||||
|
label: Is this a breaking change?
|
||||||
|
options:
|
||||||
|
- label: "Yes"
|
||||||
|
required: false
|
||||||
10
.github/workflows/codeql-analysis.yml
vendored
10
.github/workflows/codeql-analysis.yml
vendored
@@ -2,9 +2,15 @@ name: "CodeQL"
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [ main ]
|
branches:
|
||||||
|
- main
|
||||||
|
- current-release
|
||||||
|
- "*LTS"
|
||||||
pull_request:
|
pull_request:
|
||||||
branches: [ main ]
|
branches:
|
||||||
|
- main
|
||||||
|
- current-release
|
||||||
|
- "*LTS"
|
||||||
types: [opened, synchronize, reopened, ready_for_review]
|
types: [opened, synchronize, reopened, ready_for_review]
|
||||||
schedule:
|
schedule:
|
||||||
- cron: '25 16 * * 0'
|
- cron: '25 16 * * 0'
|
||||||
|
|||||||
20
.github/workflows/coverage.yml
vendored
20
.github/workflows/coverage.yml
vendored
@@ -3,13 +3,17 @@ on:
|
|||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
|
- current-release
|
||||||
|
- "*LTS"
|
||||||
tags:
|
tags:
|
||||||
- "!*" # Do not execute on tags
|
- "!*" # Do not execute on tags
|
||||||
pull_request:
|
pull_request:
|
||||||
types: [opened, synchronize, reopened, ready_for_review]
|
branches:
|
||||||
|
- main
|
||||||
|
- current-release
|
||||||
|
- "*LTS"
|
||||||
jobs:
|
jobs:
|
||||||
test:
|
test:
|
||||||
if: github.event.pull_request.draft == false
|
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
@@ -19,7 +23,6 @@ jobs:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
|
|
||||||
- uses: actions/setup-python@v1
|
- uses: actions/setup-python@v1
|
||||||
with:
|
with:
|
||||||
python-version: ${{ matrix.python-version }}
|
python-version: ${{ matrix.python-version }}
|
||||||
@@ -28,9 +31,10 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
python -m pip install --upgrade pip
|
python -m pip install --upgrade pip
|
||||||
pip install tox
|
pip install tox
|
||||||
- uses: paambaati/codeclimate-action@v2.5.3
|
- name: Run coverage
|
||||||
if: always()
|
run: tox -e coverage
|
||||||
env:
|
continue-on-error: true
|
||||||
CC_TEST_REPORTER_ID: ${{ secrets.CODECLIMATE }}
|
- uses: codecov/codecov-action@v2
|
||||||
with:
|
with:
|
||||||
coverageCommand: tox -e coverage
|
files: ./coverage.xml
|
||||||
|
fail_ci_if_error: false
|
||||||
|
|||||||
4
.github/workflows/pr-bandit.yml
vendored
4
.github/workflows/pr-bandit.yml
vendored
@@ -3,6 +3,8 @@ on:
|
|||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
|
- current-release
|
||||||
|
- "*LTS"
|
||||||
types: [opened, synchronize, reopened, ready_for_review]
|
types: [opened, synchronize, reopened, ready_for_review]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
@@ -15,10 +17,10 @@ jobs:
|
|||||||
matrix:
|
matrix:
|
||||||
os: [ubuntu-latest]
|
os: [ubuntu-latest]
|
||||||
config:
|
config:
|
||||||
- { python-version: 3.7, tox-env: security}
|
|
||||||
- { python-version: 3.8, tox-env: security}
|
- { python-version: 3.8, tox-env: security}
|
||||||
- { python-version: 3.9, tox-env: security}
|
- { python-version: 3.9, tox-env: security}
|
||||||
- { python-version: "3.10", tox-env: security}
|
- { python-version: "3.10", tox-env: security}
|
||||||
|
- { python-version: "3.11", tox-env: security}
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout the repository
|
- name: Checkout the repository
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
|
|||||||
4
.github/workflows/pr-docs.yml
vendored
4
.github/workflows/pr-docs.yml
vendored
@@ -3,6 +3,8 @@ on:
|
|||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
|
- current-release
|
||||||
|
- "*LTS"
|
||||||
types: [opened, synchronize, reopened, ready_for_review]
|
types: [opened, synchronize, reopened, ready_for_review]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
@@ -13,7 +15,7 @@ jobs:
|
|||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
config:
|
config:
|
||||||
- {python-version: "3.8", tox-env: "docs"}
|
- {python-version: "3.10", tox-env: "docs"}
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
4
.github/workflows/pr-linter.yml
vendored
4
.github/workflows/pr-linter.yml
vendored
@@ -3,6 +3,8 @@ on:
|
|||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
|
- current-release
|
||||||
|
- "*LTS"
|
||||||
types: [opened, synchronize, reopened, ready_for_review]
|
types: [opened, synchronize, reopened, ready_for_review]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
@@ -15,7 +17,7 @@ jobs:
|
|||||||
matrix:
|
matrix:
|
||||||
os: [ubuntu-latest]
|
os: [ubuntu-latest]
|
||||||
config:
|
config:
|
||||||
- { python-version: 3.8, tox-env: lint}
|
- { python-version: "3.10", tox-env: lint}
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout the repository
|
- name: Checkout the repository
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
|
|||||||
4
.github/workflows/pr-python-pypy.yml
vendored
4
.github/workflows/pr-python-pypy.yml
vendored
@@ -5,11 +5,11 @@ on:
|
|||||||
tox-env:
|
tox-env:
|
||||||
description: "Tox Env to run on the PyPy Infra"
|
description: "Tox Env to run on the PyPy Infra"
|
||||||
required: false
|
required: false
|
||||||
default: "pypy37"
|
default: "pypy310"
|
||||||
pypy-version:
|
pypy-version:
|
||||||
description: "Version of PyPy to use"
|
description: "Version of PyPy to use"
|
||||||
required: false
|
required: false
|
||||||
default: "pypy-3.7"
|
default: "pypy-3.10"
|
||||||
jobs:
|
jobs:
|
||||||
testPyPy:
|
testPyPy:
|
||||||
name: ut-${{ matrix.config.tox-env }}-${{ matrix.os }}
|
name: ut-${{ matrix.config.tox-env }}-${{ matrix.os }}
|
||||||
|
|||||||
2
.github/workflows/pr-python310.yml
vendored
2
.github/workflows/pr-python310.yml
vendored
@@ -3,6 +3,8 @@ on:
|
|||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
|
- current-release
|
||||||
|
- "*LTS"
|
||||||
types: [opened, synchronize, reopened, ready_for_review]
|
types: [opened, synchronize, reopened, ready_for_review]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
|||||||
@@ -1,23 +1,35 @@
|
|||||||
name: Python 3.7 Tests
|
name: Python 3.11 Tests
|
||||||
on:
|
on:
|
||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
|
- current-release
|
||||||
|
- "*LTS"
|
||||||
types: [opened, synchronize, reopened, ready_for_review]
|
types: [opened, synchronize, reopened, ready_for_review]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
testPy37:
|
testPy311:
|
||||||
if: github.event.pull_request.draft == false
|
if: github.event.pull_request.draft == false
|
||||||
name: ut-${{ matrix.config.tox-env }}-${{ matrix.os }}
|
name: ut-${{ matrix.config.tox-env }}-${{ matrix.os }}
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: true
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
# os: [ubuntu-latest, macos-latest]
|
# os: [ubuntu-latest, macos-latest]
|
||||||
os: [ubuntu-latest]
|
os: [ubuntu-latest]
|
||||||
config:
|
config:
|
||||||
- { python-version: 3.7, tox-env: py37 }
|
- {
|
||||||
- { python-version: 3.7, tox-env: py37-no-ext }
|
python-version: "3.11",
|
||||||
|
tox-env: py311,
|
||||||
|
ignore-error-flake: "false",
|
||||||
|
command-timeout: "0",
|
||||||
|
}
|
||||||
|
- {
|
||||||
|
python-version: "3.11",
|
||||||
|
tox-env: py311-no-ext,
|
||||||
|
ignore-error-flake: "true",
|
||||||
|
command-timeout: "600000",
|
||||||
|
}
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout the Repository
|
- name: Checkout the Repository
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
@@ -30,5 +42,7 @@ jobs:
|
|||||||
test-infra-tool: tox
|
test-infra-tool: tox
|
||||||
test-infra-version: latest
|
test-infra-version: latest
|
||||||
action: tests
|
action: tests
|
||||||
test-additional-args: "-e=${{ matrix.config.tox-env }}"
|
test-additional-args: "-e=${{ matrix.config.tox-env }},-vv=''"
|
||||||
|
experimental-ignore-error: "${{ matrix.config.ignore-error-flake }}"
|
||||||
|
command-timeout: "${{ matrix.config.command-timeout }}"
|
||||||
test-failure-retry: "3"
|
test-failure-retry: "3"
|
||||||
2
.github/workflows/pr-python38.yml
vendored
2
.github/workflows/pr-python38.yml
vendored
@@ -3,6 +3,8 @@ on:
|
|||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
|
- current-release
|
||||||
|
- "*LTS"
|
||||||
types: [opened, synchronize, reopened, ready_for_review]
|
types: [opened, synchronize, reopened, ready_for_review]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
|||||||
2
.github/workflows/pr-python39.yml
vendored
2
.github/workflows/pr-python39.yml
vendored
@@ -3,6 +3,8 @@ on:
|
|||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
|
- current-release
|
||||||
|
- "*LTS"
|
||||||
types: [opened, synchronize, reopened, ready_for_review]
|
types: [opened, synchronize, reopened, ready_for_review]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
|||||||
4
.github/workflows/pr-type-check.yml
vendored
4
.github/workflows/pr-type-check.yml
vendored
@@ -3,6 +3,8 @@ on:
|
|||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
|
- current-release
|
||||||
|
- "*LTS"
|
||||||
types: [opened, synchronize, reopened, ready_for_review]
|
types: [opened, synchronize, reopened, ready_for_review]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
@@ -15,10 +17,10 @@ jobs:
|
|||||||
matrix:
|
matrix:
|
||||||
os: [ubuntu-latest]
|
os: [ubuntu-latest]
|
||||||
config:
|
config:
|
||||||
- { python-version: 3.7, tox-env: type-checking}
|
|
||||||
- { python-version: 3.8, tox-env: type-checking}
|
- { python-version: 3.8, tox-env: type-checking}
|
||||||
- { python-version: 3.9, tox-env: type-checking}
|
- { python-version: 3.9, tox-env: type-checking}
|
||||||
- { python-version: "3.10", tox-env: type-checking}
|
- { python-version: "3.10", tox-env: type-checking}
|
||||||
|
- { python-version: "3.11", tox-env: type-checking}
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout the repository
|
- name: Checkout the repository
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
|
|||||||
5
.github/workflows/pr-windows.yml
vendored
5
.github/workflows/pr-windows.yml
vendored
@@ -3,6 +3,8 @@ on:
|
|||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
|
- current-release
|
||||||
|
- "*LTS"
|
||||||
types: [opened, synchronize, reopened, ready_for_review]
|
types: [opened, synchronize, reopened, ready_for_review]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
@@ -14,11 +16,10 @@ jobs:
|
|||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
config:
|
config:
|
||||||
- { python-version: 3.7, tox-env: py37-no-ext }
|
|
||||||
- { python-version: 3.8, tox-env: py38-no-ext }
|
- { python-version: 3.8, tox-env: py38-no-ext }
|
||||||
- { python-version: 3.9, tox-env: py39-no-ext }
|
- { python-version: 3.9, tox-env: py39-no-ext }
|
||||||
- { python-version: "3.10", tox-env: py310-no-ext }
|
- { python-version: "3.10", tox-env: py310-no-ext }
|
||||||
- { python-version: pypy-3.7, tox-env: pypy37-no-ext }
|
- { python-version: "3.11", tox-env: py310-no-ext }
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout Repository
|
- name: Checkout Repository
|
||||||
|
|||||||
2
.github/workflows/publish-images.yml
vendored
2
.github/workflows/publish-images.yml
vendored
@@ -14,7 +14,7 @@ jobs:
|
|||||||
strategy:
|
strategy:
|
||||||
fail-fast: true
|
fail-fast: true
|
||||||
matrix:
|
matrix:
|
||||||
python-version: ["3.7", "3.8", "3.9", "3.10"]
|
python-version: ["3.8", "3.9", "3.10", "3.11"]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
|
|||||||
55
.github/workflows/publish-package.yml
vendored
55
.github/workflows/publish-package.yml
vendored
@@ -1,28 +1,39 @@
|
|||||||
name: Publish Artifacts
|
name: Upload Python Package
|
||||||
|
|
||||||
on:
|
on:
|
||||||
release:
|
release:
|
||||||
types: [created]
|
types: [created]
|
||||||
|
workflow_dispatch:
|
||||||
jobs:
|
jobs:
|
||||||
publishPythonPackage:
|
build-n-publish:
|
||||||
name: Publishing Sanic Release Artifacts
|
name: Build and publish Python 🐍 distributions 📦 to PyPI and TestPyPI
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
strategy:
|
|
||||||
fail-fast: true
|
|
||||||
matrix:
|
|
||||||
python-version: ["3.8"]
|
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout Repository
|
- uses: actions/checkout@v3
|
||||||
uses: actions/checkout@v2
|
- name: Set up Python
|
||||||
|
uses: actions/setup-python@v4
|
||||||
- name: Publish Python Package
|
with:
|
||||||
uses: harshanarayana/custom-actions@main
|
python-version: "3.x"
|
||||||
with:
|
- name: Install pypa/build
|
||||||
python-version: ${{ matrix.python-version }}
|
run: >-
|
||||||
package-infra-name: "twine"
|
python3 -m
|
||||||
pypi-user: __token__
|
pip install
|
||||||
pypi-access-token: ${{ secrets.PYPI_ACCESS_TOKEN }}
|
build
|
||||||
action: "package-publish"
|
--user
|
||||||
pypi-verify-metadata: "true"
|
- name: Build a binary wheel and a source tarball
|
||||||
|
run: >-
|
||||||
|
python3 -m
|
||||||
|
build
|
||||||
|
--sdist
|
||||||
|
--wheel
|
||||||
|
--outdir dist/
|
||||||
|
.
|
||||||
|
# - name: Publish distribution 📦 to Test PyPI
|
||||||
|
# uses: pypa/gh-action-pypi-publish@release/v1
|
||||||
|
# with:
|
||||||
|
# password: ${{ secrets.SANIC_TEST_PYPI_API_TOKEN }}
|
||||||
|
# repository-url: https://test.pypi.org/legacy/
|
||||||
|
- name: Publish distribution 📦 to PyPI
|
||||||
|
uses: pypa/gh-action-pypi-publish@release/v1
|
||||||
|
with:
|
||||||
|
password: ${{ secrets.SANIC_PYPI_API_TOKEN }}
|
||||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -21,4 +21,5 @@ dist/*
|
|||||||
pip-wheel-metadata/
|
pip-wheel-metadata/
|
||||||
.pytest_cache/*
|
.pytest_cache/*
|
||||||
.venv/*
|
.venv/*
|
||||||
|
venv/*
|
||||||
.vscode/*
|
.vscode/*
|
||||||
|
|||||||
@@ -357,11 +357,6 @@ Version 20.12.0
|
|||||||
`#1993 <https://github.com/sanic-org/sanic/pull/1993>`_
|
`#1993 <https://github.com/sanic-org/sanic/pull/1993>`_
|
||||||
Add disable app registry
|
Add disable app registry
|
||||||
|
|
||||||
Version 20.12.0
|
|
||||||
---------------
|
|
||||||
|
|
||||||
**Features**
|
|
||||||
|
|
||||||
*
|
*
|
||||||
`#1945 <https://github.com/sanic-org/sanic/pull/1945>`_
|
`#1945 <https://github.com/sanic-org/sanic/pull/1945>`_
|
||||||
Static route more verbose if file not found
|
Static route more verbose if file not found
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
|
|||||||
## Enforcement
|
## Enforcement
|
||||||
|
|
||||||
Instances of abusive, harassing, or otherwise unacceptable behavior may be
|
Instances of abusive, harassing, or otherwise unacceptable behavior may be
|
||||||
reported by contacting the project team at sanic-maintainers@googlegroups.com. All
|
reported by contacting the project team at adam@sanicframework.org. All
|
||||||
complaints will be reviewed and investigated and will result in a response that
|
complaints will be reviewed and investigated and will result in a response that
|
||||||
is deemed necessary and appropriate to the circumstances. The project team is
|
is deemed necessary and appropriate to the circumstances. The project team is
|
||||||
obligated to maintain confidentiality with regard to the reporter of an incident.
|
obligated to maintain confidentiality with regard to the reporter of an incident.
|
||||||
@@ -71,9 +71,9 @@ To execute only unittests, run ``tox`` with environment like so:
|
|||||||
|
|
||||||
.. code-block:: bash
|
.. code-block:: bash
|
||||||
|
|
||||||
tox -e py36 -v -- tests/test_config.py
|
|
||||||
# or
|
|
||||||
tox -e py37 -v -- tests/test_config.py
|
tox -e py37 -v -- tests/test_config.py
|
||||||
|
# or
|
||||||
|
tox -e py310 -v -- tests/test_config.py
|
||||||
|
|
||||||
Run lint checks
|
Run lint checks
|
||||||
---------------
|
---------------
|
||||||
@@ -140,6 +140,7 @@ To maintain the code consistency, Sanic uses following tools.
|
|||||||
#. `isort <https://github.com/timothycrosley/isort>`_
|
#. `isort <https://github.com/timothycrosley/isort>`_
|
||||||
#. `black <https://github.com/python/black>`_
|
#. `black <https://github.com/python/black>`_
|
||||||
#. `flake8 <https://github.com/PyCQA/flake8>`_
|
#. `flake8 <https://github.com/PyCQA/flake8>`_
|
||||||
|
#. `slotscheck <https://github.com/ariebovenberg/slotscheck>`_
|
||||||
|
|
||||||
isort
|
isort
|
||||||
*****
|
*****
|
||||||
@@ -167,7 +168,13 @@ flake8
|
|||||||
#. pycodestyle
|
#. pycodestyle
|
||||||
#. Ned Batchelder's McCabe script
|
#. Ned Batchelder's McCabe script
|
||||||
|
|
||||||
``isort``\ , ``black`` and ``flake8`` checks are performed during ``tox`` lint checks.
|
slotscheck
|
||||||
|
**********
|
||||||
|
|
||||||
|
``slotscheck`` ensures that there are no problems with ``__slots__``
|
||||||
|
(e.g. overlaps, or missing slots in base classes).
|
||||||
|
|
||||||
|
``isort``\ , ``black``\ , ``flake8`` and ``slotscheck`` checks are performed during ``tox`` lint checks.
|
||||||
|
|
||||||
The **easiest** way to make your code conform is to run the following before committing.
|
The **easiest** way to make your code conform is to run the following before committing.
|
||||||
|
|
||||||
|
|||||||
6
Makefile
6
Makefile
@@ -66,15 +66,15 @@ ifdef include_tests
|
|||||||
isort -rc sanic tests
|
isort -rc sanic tests
|
||||||
else
|
else
|
||||||
$(info Sorting Imports)
|
$(info Sorting Imports)
|
||||||
isort -rc sanic tests --profile=black
|
isort -rc sanic tests
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
black:
|
black:
|
||||||
black --config ./.black.toml sanic tests
|
black sanic tests
|
||||||
|
|
||||||
isort:
|
isort:
|
||||||
isort sanic tests --profile=black
|
isort sanic tests
|
||||||
|
|
||||||
pretty: black isort
|
pretty: black isort
|
||||||
|
|
||||||
|
|||||||
36
README.rst
36
README.rst
@@ -11,7 +11,7 @@ Sanic | Build fast. Run fast.
|
|||||||
:stub-columns: 1
|
:stub-columns: 1
|
||||||
|
|
||||||
* - Build
|
* - Build
|
||||||
- | |Py310Test| |Py39Test| |Py38Test| |Py37Test|
|
- | |Py310Test| |Py39Test| |Py38Test|
|
||||||
* - Docs
|
* - Docs
|
||||||
- | |UserGuide| |Documentation|
|
- | |UserGuide| |Documentation|
|
||||||
* - Package
|
* - Package
|
||||||
@@ -19,7 +19,7 @@ Sanic | Build fast. Run fast.
|
|||||||
* - Support
|
* - Support
|
||||||
- | |Forums| |Discord| |Awesome|
|
- | |Forums| |Discord| |Awesome|
|
||||||
* - Stats
|
* - Stats
|
||||||
- | |Downloads| |WkDownloads| |Conda downloads|
|
- | |Monthly Downloads| |Weekly Downloads| |Conda downloads|
|
||||||
|
|
||||||
.. |UserGuide| image:: https://img.shields.io/badge/user%20guide-sanic-ff0068
|
.. |UserGuide| image:: https://img.shields.io/badge/user%20guide-sanic-ff0068
|
||||||
:target: https://sanicframework.org/
|
:target: https://sanicframework.org/
|
||||||
@@ -33,8 +33,6 @@ Sanic | Build fast. Run fast.
|
|||||||
:target: https://github.com/sanic-org/sanic/actions/workflows/pr-python39.yml
|
:target: https://github.com/sanic-org/sanic/actions/workflows/pr-python39.yml
|
||||||
.. |Py38Test| image:: https://github.com/sanic-org/sanic/actions/workflows/pr-python38.yml/badge.svg?branch=main
|
.. |Py38Test| image:: https://github.com/sanic-org/sanic/actions/workflows/pr-python38.yml/badge.svg?branch=main
|
||||||
:target: https://github.com/sanic-org/sanic/actions/workflows/pr-python38.yml
|
:target: https://github.com/sanic-org/sanic/actions/workflows/pr-python38.yml
|
||||||
.. |Py37Test| image:: https://github.com/sanic-org/sanic/actions/workflows/pr-python37.yml/badge.svg?branch=main
|
|
||||||
:target: https://github.com/sanic-org/sanic/actions/workflows/pr-python37.yml
|
|
||||||
.. |Documentation| image:: https://readthedocs.org/projects/sanic/badge/?version=latest
|
.. |Documentation| image:: https://readthedocs.org/projects/sanic/badge/?version=latest
|
||||||
:target: http://sanic.readthedocs.io/en/latest/?badge=latest
|
:target: http://sanic.readthedocs.io/en/latest/?badge=latest
|
||||||
.. |PyPI| image:: https://img.shields.io/pypi/v/sanic.svg
|
.. |PyPI| image:: https://img.shields.io/pypi/v/sanic.svg
|
||||||
@@ -52,21 +50,25 @@ Sanic | Build fast. Run fast.
|
|||||||
.. |Awesome| image:: https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg
|
.. |Awesome| image:: https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg
|
||||||
:alt: Awesome Sanic List
|
:alt: Awesome Sanic List
|
||||||
:target: https://github.com/mekicha/awesome-sanic
|
:target: https://github.com/mekicha/awesome-sanic
|
||||||
.. |Downloads| image:: https://pepy.tech/badge/sanic/month
|
.. |Monthly Downloads| image:: https://img.shields.io/pypi/dm/sanic.svg
|
||||||
:alt: Downloads
|
:alt: Downloads
|
||||||
:target: https://pepy.tech/project/sanic
|
:target: https://pepy.tech/project/sanic
|
||||||
.. |WkDownloads| image:: https://pepy.tech/badge/sanic/week
|
.. |Weekly Downloads| image:: https://img.shields.io/pypi/dw/sanic.svg
|
||||||
:alt: Downloads
|
:alt: Downloads
|
||||||
:target: https://pepy.tech/project/sanic
|
:target: https://pepy.tech/project/sanic
|
||||||
.. |Conda downloads| image:: https://img.shields.io/conda/dn/conda-forge/sanic.svg
|
.. |Conda downloads| image:: https://img.shields.io/conda/dn/conda-forge/sanic.svg
|
||||||
:alt: Downloads
|
:alt: Downloads
|
||||||
:target: https://anaconda.org/conda-forge/sanic
|
:target: https://anaconda.org/conda-forge/sanic
|
||||||
|
.. |Linode| image:: https://www.linode.com/wp-content/uploads/2021/01/Linode-Logo-Black.svg
|
||||||
|
:alt: Linode
|
||||||
|
:target: https://www.linode.com
|
||||||
|
:width: 200px
|
||||||
|
|
||||||
.. end-badges
|
.. end-badges
|
||||||
|
|
||||||
Sanic is a **Python 3.7+** web server and web framework that's written to go fast. It allows the usage of the ``async/await`` syntax added in Python 3.5, which makes your code non-blocking and speedy.
|
Sanic is a **Python 3.8+** web server and web framework that's written to go fast. It allows the usage of the ``async/await`` syntax added in Python 3.5, which makes your code non-blocking and speedy.
|
||||||
|
|
||||||
Sanic is also ASGI compliant, so you can deploy it with an `alternative ASGI webserver <https://sanic.readthedocs.io/en/latest/sanic/deploying.html#running-via-asgi>`_.
|
Sanic is also ASGI compliant, so you can deploy it with an `alternative ASGI webserver <https://sanicframework.org/en/guide/deployment/running.html#asgi>`_.
|
||||||
|
|
||||||
`Source code on GitHub <https://github.com/sanic-org/sanic/>`_ | `Help and discussion board <https://community.sanicframework.org/>`_ | `User Guide <https://sanicframework.org>`_ | `Chat on Discord <https://discord.gg/FARQzAEMAA>`_
|
`Source code on GitHub <https://github.com/sanic-org/sanic/>`_ | `Help and discussion board <https://community.sanicframework.org/>`_ | `User Guide <https://sanicframework.org>`_ | `Chat on Discord <https://discord.gg/FARQzAEMAA>`_
|
||||||
|
|
||||||
@@ -77,7 +79,7 @@ The goal of the project is to provide a simple way to get up and running a highl
|
|||||||
Sponsor
|
Sponsor
|
||||||
-------
|
-------
|
||||||
|
|
||||||
Check out `open collective <https://opencollective.com/sanic-org>`_ to learn more about helping to fund Sanic.
|
Check out `open collective <https://opencollective.com/sanic-org>`_ to learn more about helping to fund Sanic.
|
||||||
|
|
||||||
Thanks to `Linode <https://www.linode.com>`_ for their contribution towards the development and community of Sanic.
|
Thanks to `Linode <https://www.linode.com>`_ for their contribution towards the development and community of Sanic.
|
||||||
|
|
||||||
@@ -102,9 +104,6 @@ Installation
|
|||||||
If you are running on a clean install of Fedora 28 or above, please make sure you have the ``redhat-rpm-config`` package installed in case if you want to
|
If you are running on a clean install of Fedora 28 or above, please make sure you have the ``redhat-rpm-config`` package installed in case if you want to
|
||||||
use ``sanic`` with ``ujson`` dependency.
|
use ``sanic`` with ``ujson`` dependency.
|
||||||
|
|
||||||
.. note::
|
|
||||||
|
|
||||||
Windows support is currently "experimental" and on a best-effort basis. Multiple workers are also not currently supported on Windows (see `Issue #1517 <https://github.com/sanic-org/sanic/issues/1517>`_), but setting ``workers=1`` should launch the server successfully.
|
|
||||||
|
|
||||||
Hello World Example
|
Hello World Example
|
||||||
-------------------
|
-------------------
|
||||||
@@ -114,7 +113,7 @@ Hello World Example
|
|||||||
from sanic import Sanic
|
from sanic import Sanic
|
||||||
from sanic.response import json
|
from sanic.response import json
|
||||||
|
|
||||||
app = Sanic("My Hello, world app")
|
app = Sanic("my-hello-world-app")
|
||||||
|
|
||||||
@app.route('/')
|
@app.route('/')
|
||||||
async def test(request):
|
async def test(request):
|
||||||
@@ -144,17 +143,17 @@ And, we can verify it is working: ``curl localhost:8000 -i``
|
|||||||
|
|
||||||
**Now, let's go build something fast!**
|
**Now, let's go build something fast!**
|
||||||
|
|
||||||
Minimum Python version is 3.7. If you need Python 3.6 support, please use v20.12LTS.
|
Minimum Python version is 3.8. If you need Python 3.7 support, please use v22.12LTS.
|
||||||
|
|
||||||
Documentation
|
Documentation
|
||||||
-------------
|
-------------
|
||||||
|
|
||||||
`User Guide <https://sanicframework.org>`__ and `API Documentation <http://sanic.readthedocs.io/>`__.
|
`User Guide <https://sanic.dev>`__ and `API Documentation <http://sanic.readthedocs.io/>`__.
|
||||||
|
|
||||||
Changelog
|
Changelog
|
||||||
---------
|
---------
|
||||||
|
|
||||||
`Release Changelogs <https://github.com/sanic-org/sanic/blob/master/CHANGELOG.rst>`__.
|
`Release Changelogs <https://sanic.readthedocs.io/en/stable/sanic/changelog.html>`__.
|
||||||
|
|
||||||
|
|
||||||
Questions and Discussion
|
Questions and Discussion
|
||||||
@@ -166,8 +165,3 @@ Contribution
|
|||||||
------------
|
------------
|
||||||
|
|
||||||
We are always happy to have new contributions. We have `marked issues good for anyone looking to get started <https://github.com/sanic-org/sanic/issues?q=is%3Aopen+is%3Aissue+label%3Abeginner>`_, and welcome `questions on the forums <https://community.sanicframework.org/>`_. Please take a look at our `Contribution guidelines <https://github.com/sanic-org/sanic/blob/master/CONTRIBUTING.rst>`_.
|
We are always happy to have new contributions. We have `marked issues good for anyone looking to get started <https://github.com/sanic-org/sanic/issues?q=is%3Aopen+is%3Aissue+label%3Abeginner>`_, and welcome `questions on the forums <https://community.sanicframework.org/>`_. Please take a look at our `Contribution guidelines <https://github.com/sanic-org/sanic/blob/master/CONTRIBUTING.rst>`_.
|
||||||
|
|
||||||
.. |Linode| image:: https://www.linode.com/wp-content/uploads/2021/01/Linode-Logo-Black.svg
|
|
||||||
:alt: Linode
|
|
||||||
:target: https://www.linode.com
|
|
||||||
:width: 200px
|
|
||||||
|
|||||||
53
SECURITY.md
53
SECURITY.md
@@ -4,31 +4,42 @@
|
|||||||
|
|
||||||
Sanic releases long term support release once a year in December. LTS releases receive bug and security updates for **24 months**. Interim releases throughout the year occur every three months, and are supported until the subsequent interim release.
|
Sanic releases long term support release once a year in December. LTS releases receive bug and security updates for **24 months**. Interim releases throughout the year occur every three months, and are supported until the subsequent interim release.
|
||||||
|
|
||||||
| Version | LTS | Supported |
|
|
||||||
| ------- | ------------- | ------------------ |
|
|
||||||
| 20.12 | until 2022-12 | :heavy_check_mark: |
|
|
||||||
| 20.9 | | :x: |
|
|
||||||
| 20.6 | | :x: |
|
|
||||||
| 20.3 | | :x: |
|
|
||||||
| 19.12 | until 2021-12 | :white_check_mark: |
|
|
||||||
| 19.9 | | :x: |
|
|
||||||
| 19.6 | | :x: |
|
|
||||||
| 19.3 | | :x: |
|
|
||||||
| 18.12 | | :x: |
|
|
||||||
| 0.8.3 | | :x: |
|
|
||||||
| 0.7.0 | | :x: |
|
|
||||||
| 0.6.0 | | :x: |
|
|
||||||
| 0.5.4 | | :x: |
|
|
||||||
| 0.4.1 | | :x: |
|
|
||||||
| 0.3.1 | | :x: |
|
|
||||||
| 0.2.0 | | :x: |
|
|
||||||
| 0.1.9 | | :x: |
|
|
||||||
|
|
||||||
:white_check_mark: = security/bug fixes
|
| Version | LTS | Supported |
|
||||||
:heavy_check_mark: = full support
|
| ------- | ------------- | ----------------------- |
|
||||||
|
| 22.12 | until 2024-12 | :white_check_mark: |
|
||||||
|
| 22.9 | | :x: |
|
||||||
|
| 22.6 | | :x: |
|
||||||
|
| 22.3 | | :x: |
|
||||||
|
| 21.12 | until 2023-12 | :ballot_box_with_check: |
|
||||||
|
| 21.9 | | :x: |
|
||||||
|
| 21.6 | | :x: |
|
||||||
|
| 21.3 | | :x: |
|
||||||
|
| 20.12 | | :x: |
|
||||||
|
| 20.9 | | :x: |
|
||||||
|
| 20.6 | | :x: |
|
||||||
|
| 20.3 | | :x: |
|
||||||
|
| 19.12 | | :x: |
|
||||||
|
| 19.9 | | :x: |
|
||||||
|
| 19.6 | | :x: |
|
||||||
|
| 19.3 | | :x: |
|
||||||
|
| 18.12 | | :x: |
|
||||||
|
| 0.8.3 | | :x: |
|
||||||
|
| 0.7.0 | | :x: |
|
||||||
|
| 0.6.0 | | :x: |
|
||||||
|
| 0.5.4 | | :x: |
|
||||||
|
| 0.4.1 | | :x: |
|
||||||
|
| 0.3.1 | | :x: |
|
||||||
|
| 0.2.0 | | :x: |
|
||||||
|
| 0.1.9 | | :x: |
|
||||||
|
|
||||||
|
:ballot_box_with_check: = security/bug fixes
|
||||||
|
:white_check_mark: = full support
|
||||||
|
|
||||||
## Reporting a Vulnerability
|
## Reporting a Vulnerability
|
||||||
|
|
||||||
If you discover a security vulnerability, we ask that you **do not** create an issue on GitHub. Instead, please [send a message to the core-devs](https://community.sanicframework.org/g/core-devs) on the community forums. Once logged in, you can send a message to the core-devs by clicking the message button.
|
If you discover a security vulnerability, we ask that you **do not** create an issue on GitHub. Instead, please [send a message to the core-devs](https://community.sanicframework.org/g/core-devs) on the community forums. Once logged in, you can send a message to the core-devs by clicking the message button.
|
||||||
|
|
||||||
|
Alternatively, you can send a private message to Adam Hopkins on Discord. Find him on the [Sanic discord server](https://discord.gg/FARQzAEMAA).
|
||||||
|
|
||||||
This will help to not publicize the issue until the team can address it and resolve it.
|
This will help to not publicize the issue until the team can address it and resolve it.
|
||||||
|
|||||||
28
codecov.yml
Normal file
28
codecov.yml
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
coverage:
|
||||||
|
status:
|
||||||
|
patch:
|
||||||
|
default:
|
||||||
|
target: auto
|
||||||
|
threshold: 0.75
|
||||||
|
informational: true
|
||||||
|
project:
|
||||||
|
default:
|
||||||
|
target: auto
|
||||||
|
threshold: 0.5
|
||||||
|
precision: 3
|
||||||
|
codecov:
|
||||||
|
require_ci_to_pass: false
|
||||||
|
ignore:
|
||||||
|
- "sanic/__main__.py"
|
||||||
|
- "sanic/compat.py"
|
||||||
|
- "sanic/simple.py"
|
||||||
|
- "sanic/utils.py"
|
||||||
|
- "sanic/cli/"
|
||||||
|
- "sanic/pages/"
|
||||||
|
- ".github/"
|
||||||
|
- "changelogs/"
|
||||||
|
- "docker/"
|
||||||
|
- "docs/"
|
||||||
|
- "examples/"
|
||||||
|
- "scripts/"
|
||||||
|
- "tests/"
|
||||||
9
docs/_static/custom.css
vendored
9
docs/_static/custom.css
vendored
@@ -2,3 +2,12 @@
|
|||||||
.wy-nav-top {
|
.wy-nav-top {
|
||||||
background: #444444;
|
background: #444444;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#changelog section {
|
||||||
|
padding-left: 3rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
#changelog section h2,
|
||||||
|
#changelog section h3 {
|
||||||
|
margin-left: -3rem;
|
||||||
|
}
|
||||||
|
|||||||
@@ -24,7 +24,11 @@ import sanic
|
|||||||
|
|
||||||
# -- General configuration ------------------------------------------------
|
# -- General configuration ------------------------------------------------
|
||||||
|
|
||||||
extensions = ["sphinx.ext.autodoc", "m2r2"]
|
extensions = [
|
||||||
|
"sphinx.ext.autodoc",
|
||||||
|
"m2r2",
|
||||||
|
"enum_tools.autoenum",
|
||||||
|
]
|
||||||
|
|
||||||
templates_path = ["_templates"]
|
templates_path = ["_templates"]
|
||||||
|
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ API
|
|||||||
===
|
===
|
||||||
|
|
||||||
.. toctree::
|
.. toctree::
|
||||||
:maxdepth: 2
|
:maxdepth: 3
|
||||||
|
|
||||||
👥 User Guide <https://sanicframework.org/guide/>
|
👥 User Guide <https://sanicframework.org/guide/>
|
||||||
sanic/api_reference
|
sanic/api_reference
|
||||||
|
|||||||
@@ -15,3 +15,19 @@ sanic.config
|
|||||||
.. automodule:: sanic.config
|
.. automodule:: sanic.config
|
||||||
:members:
|
:members:
|
||||||
:show-inheritance:
|
:show-inheritance:
|
||||||
|
|
||||||
|
sanic.application.constants
|
||||||
|
---------------------------
|
||||||
|
|
||||||
|
.. automodule:: sanic.application.constants
|
||||||
|
:exclude-members: StrEnum
|
||||||
|
:members:
|
||||||
|
:show-inheritance:
|
||||||
|
:inherited-members:
|
||||||
|
|
||||||
|
sanic.application.state
|
||||||
|
-----------------------
|
||||||
|
|
||||||
|
.. automodule:: sanic.application.state
|
||||||
|
:members:
|
||||||
|
:show-inheritance:
|
||||||
|
|||||||
@@ -17,6 +17,14 @@ sanic.handlers
|
|||||||
:show-inheritance:
|
:show-inheritance:
|
||||||
|
|
||||||
|
|
||||||
|
sanic.headers
|
||||||
|
--------------
|
||||||
|
|
||||||
|
.. automodule:: sanic.headers
|
||||||
|
:members:
|
||||||
|
:show-inheritance:
|
||||||
|
|
||||||
|
|
||||||
sanic.request
|
sanic.request
|
||||||
-------------
|
-------------
|
||||||
|
|
||||||
|
|||||||
@@ -16,10 +16,3 @@ sanic.server
|
|||||||
:members:
|
:members:
|
||||||
:show-inheritance:
|
:show-inheritance:
|
||||||
|
|
||||||
|
|
||||||
sanic.worker
|
|
||||||
------------
|
|
||||||
|
|
||||||
.. automodule:: sanic.worker
|
|
||||||
:members:
|
|
||||||
:show-inheritance:
|
|
||||||
|
|||||||
@@ -1,6 +1,16 @@
|
|||||||
📜 Changelog
|
📜 Changelog
|
||||||
============
|
============
|
||||||
|
|
||||||
|
| 🔶 Current release
|
||||||
|
| 🔷 In support release
|
||||||
|
|
|
||||||
|
|
||||||
|
.. mdinclude:: ./releases/23/23.6.md
|
||||||
|
.. mdinclude:: ./releases/23/23.3.md
|
||||||
|
.. mdinclude:: ./releases/22/22.12.md
|
||||||
|
.. mdinclude:: ./releases/22/22.9.md
|
||||||
|
.. mdinclude:: ./releases/22/22.6.md
|
||||||
|
.. mdinclude:: ./releases/22/22.3.md
|
||||||
.. mdinclude:: ./releases/21/21.12.md
|
.. mdinclude:: ./releases/21/21.12.md
|
||||||
.. mdinclude:: ./releases/21/21.9.md
|
.. mdinclude:: ./releases/21/21.9.md
|
||||||
.. include:: ../../CHANGELOG.rst
|
.. include:: ../../CHANGELOG.rst
|
||||||
|
|||||||
@@ -1,4 +1,12 @@
|
|||||||
## Version 21.12.0
|
## Version 21.12.1 🔷
|
||||||
|
|
||||||
|
_Current LTS version_
|
||||||
|
|
||||||
|
- [#2349](https://github.com/sanic-org/sanic/pull/2349) Only display MOTD on startup
|
||||||
|
- [#2354](https://github.com/sanic-org/sanic/pull/2354) Ignore name argument in Python 3.7
|
||||||
|
- [#2355](https://github.com/sanic-org/sanic/pull/2355) Add config.update support for all config values
|
||||||
|
|
||||||
|
## Version 21.12.0 🔹
|
||||||
|
|
||||||
### Features
|
### Features
|
||||||
- [#2260](https://github.com/sanic-org/sanic/pull/2260) Allow early Blueprint registrations to still apply later added objects
|
- [#2260](https://github.com/sanic-org/sanic/pull/2260) Allow early Blueprint registrations to still apply later added objects
|
||||||
|
|||||||
55
docs/sanic/releases/22/22.12.md
Normal file
55
docs/sanic/releases/22/22.12.md
Normal file
@@ -0,0 +1,55 @@
|
|||||||
|
## Version 22.12.0 🔷
|
||||||
|
|
||||||
|
_Current version_
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
- [#2569](https://github.com/sanic-org/sanic/pull/2569) Add `JSONResponse` class with some convenient methods when updating a response object
|
||||||
|
- [#2598](https://github.com/sanic-org/sanic/pull/2598) Change `uvloop` requirement to `>=0.15.0`
|
||||||
|
- [#2609](https://github.com/sanic-org/sanic/pull/2609) Add compatibility with `websockets` v11.0
|
||||||
|
- [#2610](https://github.com/sanic-org/sanic/pull/2610) Kill server early on worker error
|
||||||
|
- Raise deadlock timeout to 30s
|
||||||
|
- [#2617](https://github.com/sanic-org/sanic/pull/2617) Scale number of running server workers
|
||||||
|
- [#2621](https://github.com/sanic-org/sanic/pull/2621) [#2634](https://github.com/sanic-org/sanic/pull/2634) Send `SIGKILL` on subsequent `ctrl+c` to force worker exit
|
||||||
|
- [#2622](https://github.com/sanic-org/sanic/pull/2622) Add API to restart all workers from the multiplexer
|
||||||
|
- [#2624](https://github.com/sanic-org/sanic/pull/2624) Default to `spawn` for all subprocesses unless specifically set:
|
||||||
|
```python
|
||||||
|
from sanic import Sanic
|
||||||
|
|
||||||
|
Sanic.start_method = "fork"
|
||||||
|
```
|
||||||
|
- [#2625](https://github.com/sanic-org/sanic/pull/2625) Filename normalisation of form-data/multipart file uploads
|
||||||
|
- [#2626](https://github.com/sanic-org/sanic/pull/2626) Move to HTTP Inspector:
|
||||||
|
- Remote access to inspect running Sanic instances
|
||||||
|
- TLS support for encrypted calls to Inspector
|
||||||
|
- Authentication to Inspector with API key
|
||||||
|
- Ability to extend Inspector with custom commands
|
||||||
|
- [#2632](https://github.com/sanic-org/sanic/pull/2632) Control order of restart operations
|
||||||
|
- [#2633](https://github.com/sanic-org/sanic/pull/2633) Move reload interval to class variable
|
||||||
|
- [#2636](https://github.com/sanic-org/sanic/pull/2636) Add `priority` to `register_middleware` method
|
||||||
|
- [#2639](https://github.com/sanic-org/sanic/pull/2639) Add `unquote` to `add_route` method
|
||||||
|
- [#2640](https://github.com/sanic-org/sanic/pull/2640) ASGI websockets to receive `text` or `bytes`
|
||||||
|
|
||||||
|
|
||||||
|
### Bugfixes
|
||||||
|
|
||||||
|
- [#2607](https://github.com/sanic-org/sanic/pull/2607) Force socket shutdown before close to allow rebinding
|
||||||
|
- [#2590](https://github.com/sanic-org/sanic/pull/2590) Use actual `StrEnum` in Python 3.11+
|
||||||
|
- [#2615](https://github.com/sanic-org/sanic/pull/2615) Ensure middleware executes only once per request timeout
|
||||||
|
- [#2627](https://github.com/sanic-org/sanic/pull/2627) Crash ASGI application on lifespan failure
|
||||||
|
- [#2635](https://github.com/sanic-org/sanic/pull/2635) Resolve error with low-level server creation on Windows
|
||||||
|
|
||||||
|
|
||||||
|
### Deprecations and Removals
|
||||||
|
|
||||||
|
- [#2608](https://github.com/sanic-org/sanic/pull/2608) [#2630](https://github.com/sanic-org/sanic/pull/2630) Signal conditions and triggers saved on `signal.extra`
|
||||||
|
- [#2626](https://github.com/sanic-org/sanic/pull/2626) Move to HTTP Inspector
|
||||||
|
- 🚨 *BREAKING CHANGE*: Moves the Inspector to a Sanic app from a simple TCP socket with a custom protocol
|
||||||
|
- *DEPRECATE*: The `--inspect*` commands have been deprecated in favor of `inspect ...` commands
|
||||||
|
- [#2628](https://github.com/sanic-org/sanic/pull/2628) Replace deprecated `distutils.strtobool`
|
||||||
|
|
||||||
|
|
||||||
|
### Developer infrastructure
|
||||||
|
|
||||||
|
- [#2612](https://github.com/sanic-org/sanic/pull/2612) Add CI testing for Python 3.11
|
||||||
|
|
||||||
52
docs/sanic/releases/22/22.3.md
Normal file
52
docs/sanic/releases/22/22.3.md
Normal file
@@ -0,0 +1,52 @@
|
|||||||
|
## Version 22.3.0
|
||||||
|
|
||||||
|
### Features
|
||||||
|
- [#2347](https://github.com/sanic-org/sanic/pull/2347) API for multi-application server
|
||||||
|
- 🚨 *BREAKING CHANGE*: The old `sanic.worker.GunicornWorker` has been **removed**. To run Sanic with `gunicorn`, you should use it thru `uvicorn` [as described in their docs](https://www.uvicorn.org/#running-with-gunicorn).
|
||||||
|
- 🧁 *SIDE EFFECT*: Named background tasks are now supported, even in Python 3.7
|
||||||
|
- [#2357](https://github.com/sanic-org/sanic/pull/2357) Parse `Authorization` header as `Request.credentials`
|
||||||
|
- [#2361](https://github.com/sanic-org/sanic/pull/2361) Add config option to skip `Touchup` step in application startup
|
||||||
|
- [#2372](https://github.com/sanic-org/sanic/pull/2372) Updates to CLI help messaging
|
||||||
|
- [#2382](https://github.com/sanic-org/sanic/pull/2382) Downgrade warnings to backwater debug messages
|
||||||
|
- [#2396](https://github.com/sanic-org/sanic/pull/2396) Allow for `multidict` v0.6
|
||||||
|
- [#2401](https://github.com/sanic-org/sanic/pull/2401) Upgrade CLI catching for alternative application run types
|
||||||
|
- [#2402](https://github.com/sanic-org/sanic/pull/2402) Conditionally inject CLI arguments into factory
|
||||||
|
- [#2413](https://github.com/sanic-org/sanic/pull/2413) Add new start and stop event listeners to reloader process
|
||||||
|
- [#2414](https://github.com/sanic-org/sanic/pull/2414) Remove loop as required listener arg
|
||||||
|
- [#2415](https://github.com/sanic-org/sanic/pull/2415) Better exception for bad URL parsing
|
||||||
|
- [sanic-routing#47](https://github.com/sanic-org/sanic-routing/pull/47) Add a new extention parameter type: `<file:ext>`, `<file:ext=jpg>`, `<file:ext=jpg|png|gif|svg>`, `<file=int:ext>`, `<file=int:ext=jpg|png|gif|svg>`, `<file=float:ext=tar.gz>`
|
||||||
|
- 👶 *BETA FEATURE*: This feature will not work with `path` type matching, and is being released as a beta feature only.
|
||||||
|
- [sanic-routing#57](https://github.com/sanic-org/sanic-routing/pull/57) Change `register_pattern` to accept a `str` or `Pattern`
|
||||||
|
- [sanic-routing#58](https://github.com/sanic-org/sanic-routing/pull/58) Default matching on non-empty strings only, and new `strorempty` pattern type
|
||||||
|
- 🚨 *BREAKING CHANGE*: Previously a route with a dynamic string parameter (`/<foo>` or `/<foo:str>`) would match on any string, including empty strings. It will now **only** match a non-empty string. To retain the old behavior, you should use the new parameter type: `/<foo:strorempty>`.
|
||||||
|
|
||||||
|
### Bugfixes
|
||||||
|
- [#2373](https://github.com/sanic-org/sanic/pull/2373) Remove `error_logger` on websockets
|
||||||
|
- [#2381](https://github.com/sanic-org/sanic/pull/2381) Fix newly assigned `None` in task registry
|
||||||
|
- [sanic-routing#52](https://github.com/sanic-org/sanic-routing/pull/52) Add type casting to regex route matching
|
||||||
|
- [sanic-routing#60](https://github.com/sanic-org/sanic-routing/pull/60) Add requirements check on regex routes (this resolves, for example, multiple static directories with differing `host` values)
|
||||||
|
|
||||||
|
### Deprecations and Removals
|
||||||
|
- [#2362](https://github.com/sanic-org/sanic/pull/2362) 22.3 Deprecations and changes
|
||||||
|
1. `debug=True` and `--debug` do _NOT_ automatically run `auto_reload`
|
||||||
|
2. Default error render is with plain text (browsers still get HTML by default because `auto` looks at headers)
|
||||||
|
3. `config` is required for `ErrorHandler.finalize`
|
||||||
|
4. `ErrorHandler.lookup` requires two positional args
|
||||||
|
5. Unused websocket protocol args removed
|
||||||
|
- [#2344](https://github.com/sanic-org/sanic/pull/2344) Deprecate loading of lowercase environment variables
|
||||||
|
|
||||||
|
### Developer infrastructure
|
||||||
|
- [#2363](https://github.com/sanic-org/sanic/pull/2363) Revert code coverage back to Codecov
|
||||||
|
- [#2405](https://github.com/sanic-org/sanic/pull/2405) Upgrade tests for `sanic-routing` changes
|
||||||
|
- [sanic-testing#35](https://github.com/sanic-org/sanic-testing/pull/35) Allow for httpx v0.22
|
||||||
|
|
||||||
|
### Improved Documentation
|
||||||
|
- [#2350](https://github.com/sanic-org/sanic/pull/2350) Fix link in README for ASGI
|
||||||
|
- [#2398](https://github.com/sanic-org/sanic/pull/2398) Document middleware on_request and on_response
|
||||||
|
- [#2409](https://github.com/sanic-org/sanic/pull/2409) Add missing documentation for `Request.respond`
|
||||||
|
|
||||||
|
### Miscellaneous
|
||||||
|
- [#2376](https://github.com/sanic-org/sanic/pull/2376) Fix typing for `ListenerMixin.listener`
|
||||||
|
- [#2383](https://github.com/sanic-org/sanic/pull/2383) Clear deprecation warning in `asyncio.wait`
|
||||||
|
- [#2387](https://github.com/sanic-org/sanic/pull/2387) Cleanup `__slots__` implementations
|
||||||
|
- [#2390](https://github.com/sanic-org/sanic/pull/2390) Clear deprecation warning in `asyncio.get_event_loop`
|
||||||
54
docs/sanic/releases/22/22.6.md
Normal file
54
docs/sanic/releases/22/22.6.md
Normal file
@@ -0,0 +1,54 @@
|
|||||||
|
## Version 22.6.2
|
||||||
|
|
||||||
|
### Bugfixes
|
||||||
|
|
||||||
|
- [#2522](https://github.com/sanic-org/sanic/pull/2522) Always show server location in ASGI
|
||||||
|
|
||||||
|
## Version 22.6.1
|
||||||
|
|
||||||
|
### Bugfixes
|
||||||
|
|
||||||
|
- [#2477](https://github.com/sanic-org/sanic/pull/2477) Sanic static directory fails when folder name ends with ".."
|
||||||
|
|
||||||
|
|
||||||
|
## Version 22.6.0
|
||||||
|
|
||||||
|
### Features
|
||||||
|
- [#2378](https://github.com/sanic-org/sanic/pull/2378) Introduce HTTP/3 and autogeneration of TLS certificates in `DEBUG` mode
|
||||||
|
- 👶 *EARLY RELEASE FEATURE*: Serving Sanic over HTTP/3 is an early release feature. It does not yet fully cover the HTTP/3 spec, but instead aims for feature parity with Sanic's existing HTTP/1.1 server. Websockets, WebTransport, push responses are examples of some features not yet implemented.
|
||||||
|
- 📦 *EXTRA REQUIREMENT*: Not all HTTP clients are capable of interfacing with HTTP/3 servers. You may need to install a [HTTP/3 capable client](https://curl.se/docs/http3.html).
|
||||||
|
- 📦 *EXTRA REQUIREMENT*: In order to use TLS autogeneration, you must install either [mkcert](https://github.com/FiloSottile/mkcert) or [trustme](https://github.com/python-trio/trustme).
|
||||||
|
- [#2416](https://github.com/sanic-org/sanic/pull/2416) Add message to `task.cancel`
|
||||||
|
- [#2420](https://github.com/sanic-org/sanic/pull/2420) Add exception aliases for more consistent naming with standard HTTP response types (`BadRequest`, `MethodNotAllowed`, `RangeNotSatisfiable`)
|
||||||
|
- [#2432](https://github.com/sanic-org/sanic/pull/2432) Expose ASGI `scope` as a property on the `Request` object
|
||||||
|
- [#2438](https://github.com/sanic-org/sanic/pull/2438) Easier access to websocket class for annotation: `from sanic import Websocket`
|
||||||
|
- [#2439](https://github.com/sanic-org/sanic/pull/2439) New API for reading form values with options: `Request.get_form`
|
||||||
|
- [#2445](https://github.com/sanic-org/sanic/pull/2445) Add custom `loads` function
|
||||||
|
- [#2447](https://github.com/sanic-org/sanic/pull/2447), [#2486](https://github.com/sanic-org/sanic/pull/2486) Improved API to support setting cache control headers
|
||||||
|
- [#2453](https://github.com/sanic-org/sanic/pull/2453) Move verbosity filtering to logger
|
||||||
|
- [#2475](https://github.com/sanic-org/sanic/pull/2475) Expose getter for current request using `Request.get_current()`
|
||||||
|
|
||||||
|
### Bugfixes
|
||||||
|
- [#2448](https://github.com/sanic-org/sanic/pull/2448) Fix to allow running with `pythonw.exe` or places where there is no `sys.stdout`
|
||||||
|
- [#2451](https://github.com/sanic-org/sanic/pull/2451) Trigger `http.lifecycle.request` signal in ASGI mode
|
||||||
|
- [#2455](https://github.com/sanic-org/sanic/pull/2455) Resolve typing of stacked route definitions
|
||||||
|
- [#2463](https://github.com/sanic-org/sanic/pull/2463) Properly catch websocket CancelledError in websocket handler in Python 3.7
|
||||||
|
|
||||||
|
### Deprecations and Removals
|
||||||
|
- [#2487](https://github.com/sanic-org/sanic/pull/2487) v22.6 deprecations and changes
|
||||||
|
1. Optional application registry
|
||||||
|
1. Execution of custom handlers after some part of response was sent
|
||||||
|
1. Configuring fallback handlers on the `ErrorHandler`
|
||||||
|
1. Custom `LOGO` setting
|
||||||
|
1. `sanic.response.stream`
|
||||||
|
1. `AsyncioServer.init`
|
||||||
|
|
||||||
|
### Developer infrastructure
|
||||||
|
- [#2449](https://github.com/sanic-org/sanic/pull/2449) Clean up `black` and `isort` config
|
||||||
|
- [#2479](https://github.com/sanic-org/sanic/pull/2479) Fix some flappy tests
|
||||||
|
|
||||||
|
### Improved Documentation
|
||||||
|
- [#2461](https://github.com/sanic-org/sanic/pull/2461) Update example to match current application naming standards
|
||||||
|
- [#2466](https://github.com/sanic-org/sanic/pull/2466) Better type annotation for `Extend`
|
||||||
|
- [#2485](https://github.com/sanic-org/sanic/pull/2485) Improved help messages in CLI
|
||||||
|
|
||||||
74
docs/sanic/releases/22/22.9.md
Normal file
74
docs/sanic/releases/22/22.9.md
Normal file
@@ -0,0 +1,74 @@
|
|||||||
|
## Version 22.9.1
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
- [#2585](https://github.com/sanic-org/sanic/pull/2585) Improved error message when no applications have been registered
|
||||||
|
|
||||||
|
|
||||||
|
### Bugfixes
|
||||||
|
|
||||||
|
- [#2578](https://github.com/sanic-org/sanic/pull/2578) Add certificate loader for in process certificate creation
|
||||||
|
- [#2591](https://github.com/sanic-org/sanic/pull/2591) Do not use sentinel identity for `spawn` compatibility
|
||||||
|
- [#2592](https://github.com/sanic-org/sanic/pull/2592) Fix properties in nested blueprint groups
|
||||||
|
- [#2595](https://github.com/sanic-org/sanic/pull/2595) Introduce sleep interval on new worker reloader
|
||||||
|
|
||||||
|
|
||||||
|
### Deprecations and Removals
|
||||||
|
|
||||||
|
|
||||||
|
### Developer infrastructure
|
||||||
|
|
||||||
|
- [#2588](https://github.com/sanic-org/sanic/pull/2588) Markdown templates on issue forms
|
||||||
|
|
||||||
|
|
||||||
|
### Improved Documentation
|
||||||
|
|
||||||
|
- [#2556](https://github.com/sanic-org/sanic/pull/2556) v22.9 documentation
|
||||||
|
- [#2582](https://github.com/sanic-org/sanic/pull/2582) Cleanup documentation on Windows support
|
||||||
|
|
||||||
|
|
||||||
|
## Version 22.9.0
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
- [#2445](https://github.com/sanic-org/sanic/pull/2445) Add custom loads function
|
||||||
|
- [#2490](https://github.com/sanic-org/sanic/pull/2490) Make `WebsocketImplProtocol` async iterable
|
||||||
|
- [#2499](https://github.com/sanic-org/sanic/pull/2499) Sanic Server WorkerManager refactor
|
||||||
|
- [#2506](https://github.com/sanic-org/sanic/pull/2506) Use `pathlib` for path resolution (for static file serving)
|
||||||
|
- [#2508](https://github.com/sanic-org/sanic/pull/2508) Use `path.parts` instead of `match` (for static file serving)
|
||||||
|
- [#2513](https://github.com/sanic-org/sanic/pull/2513) Better request cancel handling
|
||||||
|
- [#2516](https://github.com/sanic-org/sanic/pull/2516) Add request properties for HTTP method info:
|
||||||
|
- `request.is_safe`
|
||||||
|
- `request.is_idempotent`
|
||||||
|
- `request.is_cacheable`
|
||||||
|
- *See* [MDN docs](https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods) *for more information about when these apply*
|
||||||
|
- [#2522](https://github.com/sanic-org/sanic/pull/2522) Always show server location in ASGI
|
||||||
|
- [#2526](https://github.com/sanic-org/sanic/pull/2526) Cache control support for static files for returning 304 when appropriate
|
||||||
|
- [#2533](https://github.com/sanic-org/sanic/pull/2533) Refactor `_static_request_handler`
|
||||||
|
- [#2540](https://github.com/sanic-org/sanic/pull/2540) Add signals before and after handler execution
|
||||||
|
- `http.handler.before`
|
||||||
|
- `http.handler.after`
|
||||||
|
- [#2542](https://github.com/sanic-org/sanic/pull/2542) Add *[redacted]* to CLI :)
|
||||||
|
- [#2546](https://github.com/sanic-org/sanic/pull/2546) Add deprecation warning filter
|
||||||
|
- [#2550](https://github.com/sanic-org/sanic/pull/2550) Middleware priority and performance enhancements
|
||||||
|
|
||||||
|
### Bugfixes
|
||||||
|
|
||||||
|
- [#2495](https://github.com/sanic-org/sanic/pull/2495) Prevent directory traversion with static files
|
||||||
|
- [#2515](https://github.com/sanic-org/sanic/pull/2515) Do not apply double slash to paths in certain static dirs in Blueprints
|
||||||
|
|
||||||
|
### Deprecations and Removals
|
||||||
|
|
||||||
|
- [#2525](https://github.com/sanic-org/sanic/pull/2525) Warn on duplicate route names, will be prevented outright in v23.3
|
||||||
|
- [#2537](https://github.com/sanic-org/sanic/pull/2537) Raise warning and deprecation notice on duplicate exceptions, will be prevented outright in v23.3
|
||||||
|
|
||||||
|
### Developer infrastructure
|
||||||
|
|
||||||
|
- [#2504](https://github.com/sanic-org/sanic/pull/2504) Cleanup test suite
|
||||||
|
- [#2505](https://github.com/sanic-org/sanic/pull/2505) Replace Unsupported Python Version Number from the Contributing Doc
|
||||||
|
- [#2530](https://github.com/sanic-org/sanic/pull/2530) Do not include tests folder in installed package resolver
|
||||||
|
|
||||||
|
### Improved Documentation
|
||||||
|
|
||||||
|
- [#2502](https://github.com/sanic-org/sanic/pull/2502) Fix a few typos
|
||||||
|
- [#2517](https://github.com/sanic-org/sanic/pull/2517) [#2536](https://github.com/sanic-org/sanic/pull/2536) Add some type hints
|
||||||
53
docs/sanic/releases/23/23.3.md
Normal file
53
docs/sanic/releases/23/23.3.md
Normal file
@@ -0,0 +1,53 @@
|
|||||||
|
## Version 23.3.0
|
||||||
|
|
||||||
|
### Features
|
||||||
|
- [#2545](https://github.com/sanic-org/sanic/pull/2545) Standardize init of exceptions for more consistent control of HTTP responses using exceptions
|
||||||
|
- [#2606](https://github.com/sanic-org/sanic/pull/2606) Decode headers as UTF-8 also in ASGI
|
||||||
|
- [#2646](https://github.com/sanic-org/sanic/pull/2646) Separate ASGI request and lifespan callables
|
||||||
|
- [#2659](https://github.com/sanic-org/sanic/pull/2659) Use ``FALLBACK_ERROR_FORMAT`` for handlers that return ``empty()``
|
||||||
|
- [#2662](https://github.com/sanic-org/sanic/pull/2662) Add basic file browser (HTML page) and auto-index serving
|
||||||
|
- [#2667](https://github.com/sanic-org/sanic/pull/2667) Nicer traceback formatting (HTML page)
|
||||||
|
- [#2668](https://github.com/sanic-org/sanic/pull/2668) Smarter error page rendering format selection; more reliant upon header and "common sense" defaults
|
||||||
|
- [#2680](https://github.com/sanic-org/sanic/pull/2680) Check the status of socket before shutting down with ``SHUT_RDWR``
|
||||||
|
- [#2687](https://github.com/sanic-org/sanic/pull/2687) Refresh ``Request.accept`` functionality to be more performant and spec-compliant
|
||||||
|
- [#2696](https://github.com/sanic-org/sanic/pull/2696) Add header accessors as properties
|
||||||
|
```
|
||||||
|
Example-Field: Foo, Bar
|
||||||
|
Example-Field: Baz
|
||||||
|
```
|
||||||
|
```python
|
||||||
|
request.headers.example_field == "Foo, Bar,Baz"
|
||||||
|
```
|
||||||
|
- [#2700](https://github.com/sanic-org/sanic/pull/2700) Simpler CLI targets
|
||||||
|
|
||||||
|
```sh
|
||||||
|
$ sanic path.to.module:app # global app instance
|
||||||
|
$ sanic path.to.module:create_app # factory pattern
|
||||||
|
$ sanic ./path/to/directory/ # simple serve
|
||||||
|
```
|
||||||
|
- [#2701](https://github.com/sanic-org/sanic/pull/2701) API to define a number of workers in managed processes
|
||||||
|
- [#2704](https://github.com/sanic-org/sanic/pull/2704) Add convenience for dynamic changes to routing
|
||||||
|
- [#2706](https://github.com/sanic-org/sanic/pull/2706) Add convenience methods for cookie creation and deletion
|
||||||
|
|
||||||
|
```python
|
||||||
|
response = text("...")
|
||||||
|
response.add_cookie("test", "It worked!", domain=".yummy-yummy-cookie.com")
|
||||||
|
```
|
||||||
|
- [#2707](https://github.com/sanic-org/sanic/pull/2707) Simplified ``parse_content_header`` escaping to be RFC-compliant and remove outdated FF hack
|
||||||
|
- [#2710](https://github.com/sanic-org/sanic/pull/2710) Stricter charset handling and escaping of request URLs
|
||||||
|
- [#2711](https://github.com/sanic-org/sanic/pull/2711) Consume body on ``DELETE`` by default
|
||||||
|
- [#2719](https://github.com/sanic-org/sanic/pull/2719) Allow ``password`` to be passed to TLS context
|
||||||
|
- [#2720](https://github.com/sanic-org/sanic/pull/2720) Skip middleware on ``RequestCancelled``
|
||||||
|
- [#2721](https://github.com/sanic-org/sanic/pull/2721) Change access logging format to ``%s``
|
||||||
|
- [#2722](https://github.com/sanic-org/sanic/pull/2722) Add ``CertLoader`` as application option for directly controlling ``SSLContext`` objects
|
||||||
|
- [#2725](https://github.com/sanic-org/sanic/pull/2725) Worker sync state tolerance on race condition
|
||||||
|
|
||||||
|
### Bugfixes
|
||||||
|
- [#2651](https://github.com/sanic-org/sanic/pull/2651) ASGI websocket to pass thru bytes as is
|
||||||
|
- [#2697](https://github.com/sanic-org/sanic/pull/2697) Fix comparison between datetime aware and naive in ``file`` when using ``If-Modified-Since``
|
||||||
|
|
||||||
|
### Deprecations and Removals
|
||||||
|
- [#2666](https://github.com/sanic-org/sanic/pull/2666) Remove deprecated ``__blueprintname__`` property
|
||||||
|
|
||||||
|
### Improved Documentation
|
||||||
|
- [#2712](https://github.com/sanic-org/sanic/pull/2712) Improved example using ``'https'`` to create the redirect
|
||||||
33
docs/sanic/releases/23/23.6.md
Normal file
33
docs/sanic/releases/23/23.6.md
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
## Version 23.6.0 🔶
|
||||||
|
|
||||||
|
### Features
|
||||||
|
- [#2670](https://github.com/sanic-org/sanic/pull/2670) Increase `KEEP_ALIVE_TIMEOUT` default to 120 seconds
|
||||||
|
- [#2716](https://github.com/sanic-org/sanic/pull/2716) Adding allow route overwrite option in blueprint
|
||||||
|
- [#2724](https://github.com/sanic-org/sanic/pull/2724) and [#2792](https://github.com/sanic-org/sanic/pull/2792) Add a new exception signal for ALL exceptions raised anywhere in application
|
||||||
|
- [#2727](https://github.com/sanic-org/sanic/pull/2727) Add name prefixing to BP groups
|
||||||
|
- [#2754](https://github.com/sanic-org/sanic/pull/2754) Update request type on middleware types
|
||||||
|
- [#2770](https://github.com/sanic-org/sanic/pull/2770) Better exception message on startup time application induced import error
|
||||||
|
- [#2776](https://github.com/sanic-org/sanic/pull/2776) Set multiprocessing start method early
|
||||||
|
- [#2785](https://github.com/sanic-org/sanic/pull/2785) Add custom typing to config and ctx objects
|
||||||
|
- [#2790](https://github.com/sanic-org/sanic/pull/2790) Add `request.client_ip`
|
||||||
|
|
||||||
|
### Bugfixes
|
||||||
|
- [#2728](https://github.com/sanic-org/sanic/pull/2728) Fix traversals for intended results
|
||||||
|
- [#2729](https://github.com/sanic-org/sanic/pull/2729) Handle case when headers argument of ResponseStream constructor is None
|
||||||
|
- [#2737](https://github.com/sanic-org/sanic/pull/2737) Fix type annotation for `JSONREsponse` default content type
|
||||||
|
- [#2740](https://github.com/sanic-org/sanic/pull/2740) Use Sanic's serializer for JSON responses in the Inspector
|
||||||
|
- [#2760](https://github.com/sanic-org/sanic/pull/2760) Support for `Request.get_current` in ASGI mode
|
||||||
|
- [#2773](https://github.com/sanic-org/sanic/pull/2773) Alow Blueprint routes to explicitly define error_format
|
||||||
|
- [#2774](https://github.com/sanic-org/sanic/pull/2774) Resolve headers on different renderers
|
||||||
|
- [#2782](https://github.com/sanic-org/sanic/pull/2782) Resolve pypy compatibility issues
|
||||||
|
|
||||||
|
### Deprecations and Removals
|
||||||
|
- [#2777](https://github.com/sanic-org/sanic/pull/2777) Remove Python 3.7 support
|
||||||
|
|
||||||
|
### Developer infrastructure
|
||||||
|
- [#2766](https://github.com/sanic-org/sanic/pull/2766) Unpin setuptools version
|
||||||
|
- [#2779](https://github.com/sanic-org/sanic/pull/2779) Run keep alive tests in loop to get available port
|
||||||
|
|
||||||
|
### Improved Documentation
|
||||||
|
- [#2741](https://github.com/sanic-org/sanic/pull/2741) Better documentation examples about running Sanic
|
||||||
|
From that list, the items to highlight in the release notes:
|
||||||
@@ -25,5 +25,5 @@ def key_exist_handler(request):
|
|||||||
|
|
||||||
return text("num does not exist in request")
|
return text("num does not exist in request")
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
app.run(host="0.0.0.0", port=8000, debug=True)
|
app.run(host="0.0.0.0", port=8000, debug=True)
|
||||||
|
|||||||
@@ -50,4 +50,5 @@ def pop_handler(request):
|
|||||||
|
|
||||||
app.blueprint(bp, url_prefix="/bp")
|
app.blueprint(bp, url_prefix="/bp")
|
||||||
|
|
||||||
app.run(host="0.0.0.0", port=8000, debug=True, auto_reload=False)
|
if __name__ == "__main__":
|
||||||
|
app.run(host="0.0.0.0", port=8000, debug=True, auto_reload=False)
|
||||||
|
|||||||
@@ -37,4 +37,5 @@ app.blueprint(blueprint)
|
|||||||
app.blueprint(blueprint2)
|
app.blueprint(blueprint2)
|
||||||
app.blueprint(blueprint3)
|
app.blueprint(blueprint3)
|
||||||
|
|
||||||
app.run(host="0.0.0.0", port=9999, debug=True)
|
if __name__ == "__main__":
|
||||||
|
app.run(host="0.0.0.0", port=9999, debug=True)
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ from sanic import Sanic, response
|
|||||||
|
|
||||||
|
|
||||||
app = Sanic("DelayedResponseApp", strict_slashes=True)
|
app = Sanic("DelayedResponseApp", strict_slashes=True)
|
||||||
|
app.config.AUTO_EXTEND = False
|
||||||
|
|
||||||
|
|
||||||
@app.get("/")
|
@app.get("/")
|
||||||
@@ -11,7 +12,7 @@ async def handler(request):
|
|||||||
return response.redirect("/sleep/3")
|
return response.redirect("/sleep/3")
|
||||||
|
|
||||||
|
|
||||||
@app.get("/sleep/<t:number>")
|
@app.get("/sleep/<t:float>")
|
||||||
async def handler2(request, t=0.3):
|
async def handler2(request, t=0.3):
|
||||||
await sleep(t)
|
await sleep(t)
|
||||||
return response.text(f"Slept {t:.1f} seconds.\n")
|
return response.text(f"Slept {t:.1f} seconds.\n")
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ def proxy(request, path):
|
|||||||
path=path,
|
path=path,
|
||||||
_server=https.config.SERVER_NAME,
|
_server=https.config.SERVER_NAME,
|
||||||
_external=True,
|
_external=True,
|
||||||
_scheme="http",
|
_scheme="https",
|
||||||
)
|
)
|
||||||
return response.redirect(url)
|
return response.redirect(url)
|
||||||
|
|
||||||
@@ -69,5 +69,5 @@ async def runner(app: Sanic, app_server: AsyncioServer):
|
|||||||
app.is_running = False
|
app.is_running = False
|
||||||
app.is_stopping = True
|
app.is_stopping = True
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
https.run(port=HTTPS_PORT, debug=True)
|
https.run(port=HTTPS_PORT, debug=True)
|
||||||
|
|||||||
@@ -39,4 +39,5 @@ async def test(request):
|
|||||||
return json(response)
|
return json(response)
|
||||||
|
|
||||||
|
|
||||||
app.run(host="0.0.0.0", port=8000, workers=2)
|
if __name__ == "__main__":
|
||||||
|
app.run(host="0.0.0.0", port=8000, workers=2)
|
||||||
|
|||||||
@@ -20,4 +20,5 @@ def test(request):
|
|||||||
return text("hey")
|
return text("hey")
|
||||||
|
|
||||||
|
|
||||||
app.run(host="0.0.0.0", port=8000)
|
if __name__ == "__main__":
|
||||||
|
app.run(host="0.0.0.0", port=8000)
|
||||||
|
|||||||
@@ -6,5 +6,5 @@ data = ""
|
|||||||
for i in range(1, 250000):
|
for i in range(1, 250000):
|
||||||
data += str(i)
|
data += str(i)
|
||||||
|
|
||||||
r = requests.post('http://0.0.0.0:8000/stream', data=data)
|
r = requests.post("http://0.0.0.0:8000/stream", data=data)
|
||||||
print(r.text)
|
print(r.text)
|
||||||
|
|||||||
@@ -20,4 +20,5 @@ def timeout(request, exception):
|
|||||||
return response.text("RequestTimeout from error_handler.", 408)
|
return response.text("RequestTimeout from error_handler.", 408)
|
||||||
|
|
||||||
|
|
||||||
app.run(host="0.0.0.0", port=8000)
|
if __name__ == "__main__":
|
||||||
|
app.run(host="0.0.0.0", port=8000)
|
||||||
|
|||||||
@@ -35,34 +35,34 @@ async def after_server_stop(app, loop):
|
|||||||
async def test(request):
|
async def test(request):
|
||||||
return response.json({"answer": "42"})
|
return response.json({"answer": "42"})
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
asyncio.set_event_loop(uvloop.new_event_loop())
|
||||||
|
serv_coro = app.create_server(
|
||||||
|
host="0.0.0.0", port=8000, return_asyncio_server=True
|
||||||
|
)
|
||||||
|
loop = asyncio.get_event_loop()
|
||||||
|
serv_task = asyncio.ensure_future(serv_coro, loop=loop)
|
||||||
|
signal(SIGINT, lambda s, f: loop.stop())
|
||||||
|
server: AsyncioServer = loop.run_until_complete(serv_task)
|
||||||
|
loop.run_until_complete(server.startup())
|
||||||
|
|
||||||
asyncio.set_event_loop(uvloop.new_event_loop())
|
# When using app.run(), this actually triggers before the serv_coro.
|
||||||
serv_coro = app.create_server(
|
# But, in this example, we are using the convenience method, even if it is
|
||||||
host="0.0.0.0", port=8000, return_asyncio_server=True
|
# out of order.
|
||||||
)
|
loop.run_until_complete(server.before_start())
|
||||||
loop = asyncio.get_event_loop()
|
loop.run_until_complete(server.after_start())
|
||||||
serv_task = asyncio.ensure_future(serv_coro, loop=loop)
|
try:
|
||||||
signal(SIGINT, lambda s, f: loop.stop())
|
loop.run_forever()
|
||||||
server: AsyncioServer = loop.run_until_complete(serv_task)
|
except KeyboardInterrupt:
|
||||||
loop.run_until_complete(server.startup())
|
loop.stop()
|
||||||
|
finally:
|
||||||
|
loop.run_until_complete(server.before_stop())
|
||||||
|
|
||||||
# When using app.run(), this actually triggers before the serv_coro.
|
# Wait for server to close
|
||||||
# But, in this example, we are using the convenience method, even if it is
|
close_task = server.close()
|
||||||
# out of order.
|
loop.run_until_complete(close_task)
|
||||||
loop.run_until_complete(server.before_start())
|
|
||||||
loop.run_until_complete(server.after_start())
|
|
||||||
try:
|
|
||||||
loop.run_forever()
|
|
||||||
except KeyboardInterrupt:
|
|
||||||
loop.stop()
|
|
||||||
finally:
|
|
||||||
loop.run_until_complete(server.before_stop())
|
|
||||||
|
|
||||||
# Wait for server to close
|
# Complete all tasks on the loop
|
||||||
close_task = server.close()
|
for connection in server.connections:
|
||||||
loop.run_until_complete(close_task)
|
connection.close_if_idle()
|
||||||
|
loop.run_until_complete(server.after_stop())
|
||||||
# Complete all tasks on the loop
|
|
||||||
for connection in server.connections:
|
|
||||||
connection.close_if_idle()
|
|
||||||
loop.run_until_complete(server.after_stop())
|
|
||||||
|
|||||||
@@ -1,6 +1,3 @@
|
|||||||
import os
|
|
||||||
import socket
|
|
||||||
|
|
||||||
from sanic import Sanic, response
|
from sanic import Sanic, response
|
||||||
|
|
||||||
|
|
||||||
@@ -13,13 +10,4 @@ async def test(request):
|
|||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
server_address = "./uds_socket"
|
app.run(unix="./uds_socket")
|
||||||
# Make sure the socket does not already exist
|
|
||||||
try:
|
|
||||||
os.unlink(server_address)
|
|
||||||
except OSError:
|
|
||||||
if os.path.exists(server_address):
|
|
||||||
raise
|
|
||||||
sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
|
|
||||||
sock.bind(server_address)
|
|
||||||
app.run(sock=sock)
|
|
||||||
|
|||||||
@@ -1,3 +1,29 @@
|
|||||||
[build-system]
|
[build-system]
|
||||||
requires = ["setuptools", "wheel"]
|
requires = ["setuptools", "wheel"]
|
||||||
build-backend = "setuptools.build_meta"
|
build-backend = "setuptools.build_meta"
|
||||||
|
|
||||||
|
[tool.black]
|
||||||
|
line-length = 79
|
||||||
|
|
||||||
|
[tool.isort]
|
||||||
|
atomic = true
|
||||||
|
default_section = "THIRDPARTY"
|
||||||
|
include_trailing_comma = true
|
||||||
|
known_first_party = "sanic"
|
||||||
|
known_third_party = "pytest"
|
||||||
|
line_length = 79
|
||||||
|
lines_after_imports = 2
|
||||||
|
lines_between_types = 1
|
||||||
|
multi_line_output = 3
|
||||||
|
profile = "black"
|
||||||
|
|
||||||
|
[[tool.mypy.overrides]]
|
||||||
|
module = [
|
||||||
|
"httptools.*",
|
||||||
|
"trustme.*",
|
||||||
|
"sanic_routing.*",
|
||||||
|
"aioquic.*",
|
||||||
|
"html5tagger.*",
|
||||||
|
"tracerite.*",
|
||||||
|
]
|
||||||
|
ignore_missing_imports = true
|
||||||
|
|||||||
@@ -6,4 +6,4 @@ python:
|
|||||||
path: .
|
path: .
|
||||||
extra_requirements:
|
extra_requirements:
|
||||||
- docs
|
- docs
|
||||||
system_packages: true
|
system_packages: true
|
||||||
|
|||||||
@@ -1,19 +1,86 @@
|
|||||||
|
from types import SimpleNamespace
|
||||||
|
|
||||||
|
from typing_extensions import TypeAlias
|
||||||
|
|
||||||
from sanic.__version__ import __version__
|
from sanic.__version__ import __version__
|
||||||
from sanic.app import Sanic
|
from sanic.app import Sanic
|
||||||
from sanic.blueprints import Blueprint
|
from sanic.blueprints import Blueprint
|
||||||
|
from sanic.config import Config
|
||||||
from sanic.constants import HTTPMethod
|
from sanic.constants import HTTPMethod
|
||||||
|
from sanic.exceptions import (
|
||||||
|
BadRequest,
|
||||||
|
ExpectationFailed,
|
||||||
|
FileNotFound,
|
||||||
|
Forbidden,
|
||||||
|
HeaderNotFound,
|
||||||
|
InternalServerError,
|
||||||
|
InvalidHeader,
|
||||||
|
MethodNotAllowed,
|
||||||
|
NotFound,
|
||||||
|
RangeNotSatisfiable,
|
||||||
|
SanicException,
|
||||||
|
ServerError,
|
||||||
|
ServiceUnavailable,
|
||||||
|
Unauthorized,
|
||||||
|
)
|
||||||
from sanic.request import Request
|
from sanic.request import Request
|
||||||
from sanic.response import HTTPResponse, html, json, text
|
from sanic.response import (
|
||||||
|
HTTPResponse,
|
||||||
|
empty,
|
||||||
|
file,
|
||||||
|
html,
|
||||||
|
json,
|
||||||
|
raw,
|
||||||
|
redirect,
|
||||||
|
text,
|
||||||
|
)
|
||||||
|
from sanic.server.websockets.impl import WebsocketImplProtocol as Websocket
|
||||||
|
|
||||||
|
|
||||||
|
DefaultSanic: TypeAlias = "Sanic[Config, SimpleNamespace]"
|
||||||
|
"""
|
||||||
|
A type alias for a Sanic app with a default config and namespace.
|
||||||
|
"""
|
||||||
|
|
||||||
|
DefaultRequest: TypeAlias = Request[DefaultSanic, SimpleNamespace]
|
||||||
|
"""
|
||||||
|
A type alias for a request with a default Sanic app and namespace.
|
||||||
|
"""
|
||||||
|
|
||||||
__all__ = (
|
__all__ = (
|
||||||
"__version__",
|
"__version__",
|
||||||
|
# Common objects
|
||||||
"Sanic",
|
"Sanic",
|
||||||
|
"Config",
|
||||||
"Blueprint",
|
"Blueprint",
|
||||||
"HTTPMethod",
|
"HTTPMethod",
|
||||||
"HTTPResponse",
|
"HTTPResponse",
|
||||||
"Request",
|
"Request",
|
||||||
|
"Websocket",
|
||||||
|
# Common types
|
||||||
|
"DefaultSanic",
|
||||||
|
"DefaultRequest",
|
||||||
|
# Common exceptions
|
||||||
|
"BadRequest",
|
||||||
|
"ExpectationFailed",
|
||||||
|
"FileNotFound",
|
||||||
|
"Forbidden",
|
||||||
|
"HeaderNotFound",
|
||||||
|
"InternalServerError",
|
||||||
|
"InvalidHeader",
|
||||||
|
"MethodNotAllowed",
|
||||||
|
"NotFound",
|
||||||
|
"RangeNotSatisfiable",
|
||||||
|
"SanicException",
|
||||||
|
"ServerError",
|
||||||
|
"ServiceUnavailable",
|
||||||
|
"Unauthorized",
|
||||||
|
# Common response methods
|
||||||
|
"empty",
|
||||||
|
"file",
|
||||||
"html",
|
"html",
|
||||||
"json",
|
"json",
|
||||||
|
"raw",
|
||||||
|
"redirect",
|
||||||
"text",
|
"text",
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -6,10 +6,10 @@ if OS_IS_WINDOWS:
|
|||||||
enable_windows_color_support()
|
enable_windows_color_support()
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main(args=None):
|
||||||
cli = SanicCLI()
|
cli = SanicCLI()
|
||||||
cli.attach()
|
cli.attach()
|
||||||
cli.run()
|
cli.run(args)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
__version__ = "21.12.0"
|
__version__ = "23.6.0"
|
||||||
|
|||||||
1316
sanic/app.py
1316
sanic/app.py
File diff suppressed because it is too large
Load Diff
32
sanic/application/constants.py
Normal file
32
sanic/application/constants.py
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
from enum import Enum, IntEnum, auto
|
||||||
|
|
||||||
|
|
||||||
|
class StrEnum(str, Enum): # no cov
|
||||||
|
def _generate_next_value_(name: str, *args) -> str: # type: ignore
|
||||||
|
return name.lower()
|
||||||
|
|
||||||
|
def __eq__(self, value: object) -> bool:
|
||||||
|
value = str(value).upper()
|
||||||
|
return super().__eq__(value)
|
||||||
|
|
||||||
|
def __hash__(self) -> int:
|
||||||
|
return hash(self.value)
|
||||||
|
|
||||||
|
def __str__(self) -> str:
|
||||||
|
return self.value
|
||||||
|
|
||||||
|
|
||||||
|
class Server(StrEnum):
|
||||||
|
SANIC = auto()
|
||||||
|
ASGI = auto()
|
||||||
|
|
||||||
|
|
||||||
|
class Mode(StrEnum):
|
||||||
|
PRODUCTION = auto()
|
||||||
|
DEBUG = auto()
|
||||||
|
|
||||||
|
|
||||||
|
class ServerStage(IntEnum):
|
||||||
|
STOPPED = auto()
|
||||||
|
PARTIAL = auto()
|
||||||
|
SERVING = auto()
|
||||||
@@ -5,14 +5,9 @@ from importlib import import_module
|
|||||||
from typing import TYPE_CHECKING
|
from typing import TYPE_CHECKING
|
||||||
|
|
||||||
|
|
||||||
if TYPE_CHECKING: # no cov
|
if TYPE_CHECKING:
|
||||||
from sanic import Sanic
|
from sanic import Sanic
|
||||||
|
|
||||||
try:
|
|
||||||
from sanic_ext import Extend # type: ignore
|
|
||||||
except ImportError:
|
|
||||||
...
|
|
||||||
|
|
||||||
|
|
||||||
def setup_ext(app: Sanic, *, fail: bool = False, **kwargs):
|
def setup_ext(app: Sanic, *, fail: bool = False, **kwargs):
|
||||||
if not app.config.AUTO_EXTEND:
|
if not app.config.AUTO_EXTEND:
|
||||||
@@ -22,7 +17,7 @@ def setup_ext(app: Sanic, *, fail: bool = False, **kwargs):
|
|||||||
with suppress(ModuleNotFoundError):
|
with suppress(ModuleNotFoundError):
|
||||||
sanic_ext = import_module("sanic_ext")
|
sanic_ext = import_module("sanic_ext")
|
||||||
|
|
||||||
if not sanic_ext:
|
if not sanic_ext: # no cov
|
||||||
if fail:
|
if fail:
|
||||||
raise RuntimeError(
|
raise RuntimeError(
|
||||||
"Sanic Extensions is not installed. You can add it to your "
|
"Sanic Extensions is not installed. You can add it to your "
|
||||||
@@ -33,7 +28,7 @@ def setup_ext(app: Sanic, *, fail: bool = False, **kwargs):
|
|||||||
return
|
return
|
||||||
|
|
||||||
if not getattr(app, "_ext", None):
|
if not getattr(app, "_ext", None):
|
||||||
Ext: Extend = getattr(sanic_ext, "Extend")
|
Ext = getattr(sanic_ext, "Extend")
|
||||||
app._ext = Ext(app, **kwargs)
|
app._ext = Ext(app, **kwargs)
|
||||||
|
|
||||||
return app.ext
|
return app.ext
|
||||||
|
|||||||
@@ -3,6 +3,8 @@ import sys
|
|||||||
|
|
||||||
from os import environ
|
from os import environ
|
||||||
|
|
||||||
|
from sanic.helpers import is_atty
|
||||||
|
|
||||||
|
|
||||||
BASE_LOGO = """
|
BASE_LOGO = """
|
||||||
|
|
||||||
@@ -38,13 +40,15 @@ FULL_COLOR_LOGO = """
|
|||||||
|
|
||||||
""" # noqa
|
""" # noqa
|
||||||
|
|
||||||
|
SVG_LOGO_SIMPLE = """<svg id=logo-simple viewBox="0 0 964 279"><desc>Sanic</desc><path d="M107 222c9-2 10-20 1-22s-20-2-30-2-17 7-16 14 6 10 15 10h30zm115-1c16-2 30-11 35-23s6-24 2-33-6-14-15-20-24-11-38-10c-7 3-10 13-5 19s17-1 24 4 15 14 13 24-5 15-14 18-50 0-74 0h-17c-6 4-10 15-4 20s16 2 23 3zM251 83q9-1 9-7 0-15-10-16h-13c-10 6-10 20 0 22zM147 60c-4 0-10 3-11 11s5 13 10 12 42 0 67 0c5-3 7-10 6-15s-4-8-9-8zm-33 1c-8 0-16 0-24 3s-20 10-25 20-6 24-4 36 15 22 26 27 78 8 94 3c4-4 4-12 0-18s-69 8-93-10c-8-7-9-23 0-30s12-10 20-10 12 2 16-3 1-15-5-18z" fill="#ff0d68"/><path d="M676 74c0-14-18-9-20 0s0 30 0 39 20 9 20 2zm-297-10c-12 2-15 12-23 23l-41 58H340l22-30c8-12 23-13 30-4s20 24 24 38-10 10-17 10l-68 2q-17 1-48 30c-7 6-10 20 0 24s15-8 20-13 20 -20 58-21h50 c20 2 33 9 52 30 8 10 24-4 16-13L384 65q-3-2-5-1zm131 0c-10 1-12 12-11 20v96c1 10-3 23 5 32s20-5 17-15c0-23-3-46 2-67 5-12 22-14 32-5l103 87c7 5 19 1 18-9v-64c-3-10-20-9-21 2s-20 22-30 13l-97-80c-5-4-10-10-18-10zM701 76v128c2 10 15 12 20 4s0-102 0-124s-20-18-20-7z M850 63c-35 0-69-2-86 15s-20 60-13 66 13 8 16 0 1-10 1-27 12-26 20-32 66-5 85-5 31 4 31-10-18-7-54-7M764 159c-6-2-15-2-16 12s19 37 33 43 23 8 25-4-4-11-11-14q-9-3-22-18c-4-7-3-16-10-19zM828 196c-4 0-8 1-10 5s-4 12 0 15 8 2 12 2h60c5 0 10-2 12-6 3-7-1-16-8-16z" fill="#1f1f1f"/></svg>""" # noqa
|
||||||
|
|
||||||
ansi_pattern = re.compile(r"\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])")
|
ansi_pattern = re.compile(r"\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])")
|
||||||
|
|
||||||
|
|
||||||
def get_logo(full=False, coffee=False):
|
def get_logo(full=False, coffee=False):
|
||||||
logo = (
|
logo = (
|
||||||
(FULL_COLOR_LOGO if full else (COFFEE_LOGO if coffee else COLOR_LOGO))
|
(FULL_COLOR_LOGO if full else (COFFEE_LOGO if coffee else COLOR_LOGO))
|
||||||
if sys.stdout.isatty()
|
if is_atty()
|
||||||
else BASE_LOGO
|
else BASE_LOGO
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,10 @@
|
|||||||
import sys
|
|
||||||
|
|
||||||
from abc import ABC, abstractmethod
|
from abc import ABC, abstractmethod
|
||||||
from shutil import get_terminal_size
|
from shutil import get_terminal_size
|
||||||
from textwrap import indent, wrap
|
from textwrap import indent, wrap
|
||||||
from typing import Dict, Optional
|
from typing import Dict, Optional
|
||||||
|
|
||||||
from sanic import __version__
|
from sanic import __version__
|
||||||
|
from sanic.helpers import is_atty
|
||||||
from sanic.log import logger
|
from sanic.log import logger
|
||||||
|
|
||||||
|
|
||||||
@@ -36,7 +35,7 @@ class MOTD(ABC):
|
|||||||
data: Dict[str, str],
|
data: Dict[str, str],
|
||||||
extra: Dict[str, str],
|
extra: Dict[str, str],
|
||||||
) -> None:
|
) -> None:
|
||||||
motd_class = MOTDTTY if sys.stdout.isatty() else MOTDBasic
|
motd_class = MOTDTTY if is_atty() else MOTDBasic
|
||||||
motd_class(logo, serve_location, data, extra).display()
|
motd_class(logo, serve_location, data, extra).display()
|
||||||
|
|
||||||
|
|
||||||
@@ -81,20 +80,23 @@ class MOTDTTY(MOTD):
|
|||||||
)
|
)
|
||||||
self.display_length = self.key_width + self.value_width + 2
|
self.display_length = self.key_width + self.value_width + 2
|
||||||
|
|
||||||
def display(self):
|
def display(self, version=True, action="Goin' Fast", out=None):
|
||||||
version = f"Sanic v{__version__}".center(self.centering_length)
|
if not out:
|
||||||
|
out = logger.info
|
||||||
|
header = "Sanic"
|
||||||
|
if version:
|
||||||
|
header += f" v{__version__}"
|
||||||
|
header = header.center(self.centering_length)
|
||||||
running = (
|
running = (
|
||||||
f"Goin' Fast @ {self.serve_location}"
|
f"{action} @ {self.serve_location}" if self.serve_location else ""
|
||||||
if self.serve_location
|
|
||||||
else ""
|
|
||||||
).center(self.centering_length)
|
).center(self.centering_length)
|
||||||
length = len(version) + 2 - self.logo_line_length
|
length = len(header) + 2 - self.logo_line_length
|
||||||
first_filler = "─" * (self.logo_line_length - 1)
|
first_filler = "─" * (self.logo_line_length - 1)
|
||||||
second_filler = "─" * length
|
second_filler = "─" * length
|
||||||
display_filler = "─" * (self.display_length + 2)
|
display_filler = "─" * (self.display_length + 2)
|
||||||
lines = [
|
lines = [
|
||||||
f"\n┌{first_filler}─{second_filler}┐",
|
f"\n┌{first_filler}─{second_filler}┐",
|
||||||
f"│ {version} │",
|
f"│ {header} │",
|
||||||
f"│ {running} │",
|
f"│ {running} │",
|
||||||
f"├{first_filler}┬{second_filler}┤",
|
f"├{first_filler}┬{second_filler}┤",
|
||||||
]
|
]
|
||||||
@@ -108,7 +110,7 @@ class MOTDTTY(MOTD):
|
|||||||
self._render_fill(lines)
|
self._render_fill(lines)
|
||||||
|
|
||||||
lines.append(f"└{first_filler}┴{second_filler}┘\n")
|
lines.append(f"└{first_filler}┴{second_filler}┘\n")
|
||||||
logger.info(indent("\n".join(lines), " "))
|
out(indent("\n".join(lines), " "))
|
||||||
|
|
||||||
def _render_data(self, lines, data, start):
|
def _render_data(self, lines, data, start):
|
||||||
offset = 0
|
offset = 0
|
||||||
|
|||||||
86
sanic/application/spinner.py
Normal file
86
sanic/application/spinner.py
Normal file
@@ -0,0 +1,86 @@
|
|||||||
|
import os
|
||||||
|
import sys
|
||||||
|
import time
|
||||||
|
|
||||||
|
from contextlib import contextmanager
|
||||||
|
from queue import Queue
|
||||||
|
from threading import Thread
|
||||||
|
|
||||||
|
|
||||||
|
if os.name == "nt": # noqa
|
||||||
|
import ctypes # noqa
|
||||||
|
|
||||||
|
class _CursorInfo(ctypes.Structure):
|
||||||
|
_fields_ = [("size", ctypes.c_int), ("visible", ctypes.c_byte)]
|
||||||
|
|
||||||
|
|
||||||
|
class Spinner: # noqa
|
||||||
|
def __init__(self, message: str) -> None:
|
||||||
|
self.message = message
|
||||||
|
self.queue: Queue[int] = Queue()
|
||||||
|
self.spinner = self.cursor()
|
||||||
|
self.thread = Thread(target=self.run)
|
||||||
|
|
||||||
|
def start(self):
|
||||||
|
self.queue.put(1)
|
||||||
|
self.thread.start()
|
||||||
|
self.hide()
|
||||||
|
|
||||||
|
def run(self):
|
||||||
|
while self.queue.get():
|
||||||
|
output = f"\r{self.message} [{next(self.spinner)}]"
|
||||||
|
sys.stdout.write(output)
|
||||||
|
sys.stdout.flush()
|
||||||
|
time.sleep(0.1)
|
||||||
|
self.queue.put(1)
|
||||||
|
|
||||||
|
def stop(self):
|
||||||
|
self.queue.put(0)
|
||||||
|
self.thread.join()
|
||||||
|
self.show()
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def cursor():
|
||||||
|
while True:
|
||||||
|
for cursor in "|/-\\":
|
||||||
|
yield cursor
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def hide():
|
||||||
|
if os.name == "nt":
|
||||||
|
ci = _CursorInfo()
|
||||||
|
handle = ctypes.windll.kernel32.GetStdHandle(-11)
|
||||||
|
ctypes.windll.kernel32.GetConsoleCursorInfo(
|
||||||
|
handle, ctypes.byref(ci)
|
||||||
|
)
|
||||||
|
ci.visible = False
|
||||||
|
ctypes.windll.kernel32.SetConsoleCursorInfo(
|
||||||
|
handle, ctypes.byref(ci)
|
||||||
|
)
|
||||||
|
elif os.name == "posix":
|
||||||
|
sys.stdout.write("\033[?25l")
|
||||||
|
sys.stdout.flush()
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def show():
|
||||||
|
if os.name == "nt":
|
||||||
|
ci = _CursorInfo()
|
||||||
|
handle = ctypes.windll.kernel32.GetStdHandle(-11)
|
||||||
|
ctypes.windll.kernel32.GetConsoleCursorInfo(
|
||||||
|
handle, ctypes.byref(ci)
|
||||||
|
)
|
||||||
|
ci.visible = True
|
||||||
|
ctypes.windll.kernel32.SetConsoleCursorInfo(
|
||||||
|
handle, ctypes.byref(ci)
|
||||||
|
)
|
||||||
|
elif os.name == "posix":
|
||||||
|
sys.stdout.write("\033[?25h")
|
||||||
|
sys.stdout.flush()
|
||||||
|
|
||||||
|
|
||||||
|
@contextmanager
|
||||||
|
def loading(message: str = "Loading"): # noqa
|
||||||
|
spinner = Spinner(message)
|
||||||
|
spinner.start()
|
||||||
|
yield
|
||||||
|
spinner.stop()
|
||||||
@@ -3,33 +3,25 @@ from __future__ import annotations
|
|||||||
import logging
|
import logging
|
||||||
|
|
||||||
from dataclasses import dataclass, field
|
from dataclasses import dataclass, field
|
||||||
from enum import Enum, auto
|
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from socket import socket
|
from socket import socket
|
||||||
from ssl import SSLContext
|
from ssl import SSLContext
|
||||||
from typing import TYPE_CHECKING, Any, Optional, Set, Union
|
from typing import TYPE_CHECKING, Any, Dict, List, Optional, Set, Union
|
||||||
|
|
||||||
from sanic.log import logger
|
from sanic.application.constants import Mode, Server, ServerStage
|
||||||
|
from sanic.log import VerbosityFilter, logger
|
||||||
|
from sanic.server.async_server import AsyncioServer
|
||||||
|
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from sanic import Sanic
|
from sanic import Sanic
|
||||||
|
|
||||||
|
|
||||||
class StrEnum(str, Enum):
|
@dataclass
|
||||||
def _generate_next_value_(name: str, *args) -> str: # type: ignore
|
class ApplicationServerInfo:
|
||||||
return name.lower()
|
settings: Dict[str, Any]
|
||||||
|
stage: ServerStage = field(default=ServerStage.STOPPED)
|
||||||
|
server: Optional[AsyncioServer] = field(default=None)
|
||||||
class Server(StrEnum):
|
|
||||||
SANIC = auto()
|
|
||||||
ASGI = auto()
|
|
||||||
GUNICORN = auto()
|
|
||||||
|
|
||||||
|
|
||||||
class Mode(StrEnum):
|
|
||||||
PRODUCTION = auto()
|
|
||||||
DEBUG = auto()
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
@@ -45,12 +37,15 @@ class ApplicationState:
|
|||||||
unix: Optional[str] = field(default=None)
|
unix: Optional[str] = field(default=None)
|
||||||
mode: Mode = field(default=Mode.PRODUCTION)
|
mode: Mode = field(default=Mode.PRODUCTION)
|
||||||
reload_dirs: Set[Path] = field(default_factory=set)
|
reload_dirs: Set[Path] = field(default_factory=set)
|
||||||
|
auto_reload: bool = field(default=False)
|
||||||
server: Server = field(default=Server.SANIC)
|
server: Server = field(default=Server.SANIC)
|
||||||
is_running: bool = field(default=False)
|
is_running: bool = field(default=False)
|
||||||
is_started: bool = field(default=False)
|
is_started: bool = field(default=False)
|
||||||
is_stopping: bool = field(default=False)
|
is_stopping: bool = field(default=False)
|
||||||
verbosity: int = field(default=0)
|
verbosity: int = field(default=0)
|
||||||
workers: int = field(default=0)
|
workers: int = field(default=0)
|
||||||
|
primary: bool = field(default=True)
|
||||||
|
server_info: List[ApplicationServerInfo] = field(default_factory=list)
|
||||||
|
|
||||||
# This property relates to the ApplicationState instance and should
|
# This property relates to the ApplicationState instance and should
|
||||||
# not be changed except in the __post_init__ method
|
# not be changed except in the __post_init__ method
|
||||||
@@ -74,6 +69,23 @@ class ApplicationState:
|
|||||||
if getattr(self.app, "configure_logging", False) and self.app.debug:
|
if getattr(self.app, "configure_logging", False) and self.app.debug:
|
||||||
logger.setLevel(logging.DEBUG)
|
logger.setLevel(logging.DEBUG)
|
||||||
|
|
||||||
|
def set_verbosity(self, value: int):
|
||||||
|
VerbosityFilter.verbosity = value
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def is_debug(self):
|
def is_debug(self):
|
||||||
return self.mode is Mode.DEBUG
|
return self.mode is Mode.DEBUG
|
||||||
|
|
||||||
|
@property
|
||||||
|
def stage(self) -> ServerStage:
|
||||||
|
if not self.server_info:
|
||||||
|
return ServerStage.STOPPED
|
||||||
|
|
||||||
|
if all(info.stage is ServerStage.SERVING for info in self.server_info):
|
||||||
|
return ServerStage.SERVING
|
||||||
|
elif any(
|
||||||
|
info.stage is ServerStage.SERVING for info in self.server_info
|
||||||
|
):
|
||||||
|
return ServerStage.PARTIAL
|
||||||
|
|
||||||
|
return ServerStage.STOPPED
|
||||||
|
|||||||
205
sanic/asgi.py
205
sanic/asgi.py
@@ -1,14 +1,14 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
import warnings
|
import warnings
|
||||||
|
|
||||||
from typing import Optional
|
from typing import TYPE_CHECKING, Optional
|
||||||
from urllib.parse import quote
|
|
||||||
|
|
||||||
import sanic.app # noqa
|
|
||||||
|
|
||||||
from sanic.compat import Header
|
from sanic.compat import Header
|
||||||
from sanic.exceptions import ServerError
|
from sanic.exceptions import BadRequest, ServerError
|
||||||
from sanic.helpers import _default
|
from sanic.helpers import Default
|
||||||
from sanic.http import Stage
|
from sanic.http import Stage
|
||||||
|
from sanic.log import error_logger, logger
|
||||||
from sanic.models.asgi import ASGIReceive, ASGIScope, ASGISend, MockTransport
|
from sanic.models.asgi import ASGIReceive, ASGIScope, ASGISend, MockTransport
|
||||||
from sanic.request import Request
|
from sanic.request import Request
|
||||||
from sanic.response import BaseHTTPResponse
|
from sanic.response import BaseHTTPResponse
|
||||||
@@ -16,29 +16,34 @@ from sanic.server import ConnInfo
|
|||||||
from sanic.server.websockets.connection import WebSocketConnection
|
from sanic.server.websockets.connection import WebSocketConnection
|
||||||
|
|
||||||
|
|
||||||
class Lifespan:
|
if TYPE_CHECKING:
|
||||||
def __init__(self, asgi_app: "ASGIApp") -> None:
|
from sanic import Sanic
|
||||||
self.asgi_app = asgi_app
|
|
||||||
|
|
||||||
if (
|
|
||||||
"server.init.before"
|
class Lifespan:
|
||||||
in self.asgi_app.sanic_app.signal_router.name_index
|
def __init__(
|
||||||
):
|
self, sanic_app, scope: ASGIScope, receive: ASGIReceive, send: ASGISend
|
||||||
warnings.warn(
|
) -> None:
|
||||||
|
self.sanic_app = sanic_app
|
||||||
|
self.scope = scope
|
||||||
|
self.receive = receive
|
||||||
|
self.send = send
|
||||||
|
|
||||||
|
if "server.init.before" in self.sanic_app.signal_router.name_index:
|
||||||
|
logger.debug(
|
||||||
'You have set a listener for "before_server_start" '
|
'You have set a listener for "before_server_start" '
|
||||||
"in ASGI mode. "
|
"in ASGI mode. "
|
||||||
"It will be executed as early as possible, but not before "
|
"It will be executed as early as possible, but not before "
|
||||||
"the ASGI server is started."
|
"the ASGI server is started.",
|
||||||
|
extra={"verbosity": 1},
|
||||||
)
|
)
|
||||||
if (
|
if "server.shutdown.after" in self.sanic_app.signal_router.name_index:
|
||||||
"server.shutdown.after"
|
logger.debug(
|
||||||
in self.asgi_app.sanic_app.signal_router.name_index
|
|
||||||
):
|
|
||||||
warnings.warn(
|
|
||||||
'You have set a listener for "after_server_stop" '
|
'You have set a listener for "after_server_stop" '
|
||||||
"in ASGI mode. "
|
"in ASGI mode. "
|
||||||
"It will be executed as late as possible, but not after "
|
"It will be executed as late as possible, but not after "
|
||||||
"the ASGI server is stopped."
|
"the ASGI server is stopped.",
|
||||||
|
extra={"verbosity": 1},
|
||||||
)
|
)
|
||||||
|
|
||||||
async def startup(self) -> None:
|
async def startup(self) -> None:
|
||||||
@@ -50,11 +55,11 @@ class Lifespan:
|
|||||||
in sequence since the ASGI lifespan protocol only supports a single
|
in sequence since the ASGI lifespan protocol only supports a single
|
||||||
startup event.
|
startup event.
|
||||||
"""
|
"""
|
||||||
await self.asgi_app.sanic_app._startup()
|
await self.sanic_app._startup()
|
||||||
await self.asgi_app.sanic_app._server_event("init", "before")
|
await self.sanic_app._server_event("init", "before")
|
||||||
await self.asgi_app.sanic_app._server_event("init", "after")
|
await self.sanic_app._server_event("init", "after")
|
||||||
|
|
||||||
if self.asgi_app.sanic_app.config.USE_UVLOOP is not _default:
|
if not isinstance(self.sanic_app.config.USE_UVLOOP, Default):
|
||||||
warnings.warn(
|
warnings.warn(
|
||||||
"You have set the USE_UVLOOP configuration option, but Sanic "
|
"You have set the USE_UVLOOP configuration option, but Sanic "
|
||||||
"cannot control the event loop when running in ASGI mode."
|
"cannot control the event loop when running in ASGI mode."
|
||||||
@@ -70,25 +75,37 @@ class Lifespan:
|
|||||||
in sequence since the ASGI lifespan protocol only supports a single
|
in sequence since the ASGI lifespan protocol only supports a single
|
||||||
shutdown event.
|
shutdown event.
|
||||||
"""
|
"""
|
||||||
await self.asgi_app.sanic_app._server_event("shutdown", "before")
|
await self.sanic_app._server_event("shutdown", "before")
|
||||||
await self.asgi_app.sanic_app._server_event("shutdown", "after")
|
await self.sanic_app._server_event("shutdown", "after")
|
||||||
|
|
||||||
async def __call__(
|
async def __call__(self) -> None:
|
||||||
self, scope: ASGIScope, receive: ASGIReceive, send: ASGISend
|
while True:
|
||||||
) -> None:
|
message = await self.receive()
|
||||||
message = await receive()
|
if message["type"] == "lifespan.startup":
|
||||||
if message["type"] == "lifespan.startup":
|
try:
|
||||||
await self.startup()
|
await self.startup()
|
||||||
await send({"type": "lifespan.startup.complete"})
|
except Exception as e:
|
||||||
|
error_logger.exception(e)
|
||||||
message = await receive()
|
await self.send(
|
||||||
if message["type"] == "lifespan.shutdown":
|
{"type": "lifespan.startup.failed", "message": str(e)}
|
||||||
await self.shutdown()
|
)
|
||||||
await send({"type": "lifespan.shutdown.complete"})
|
else:
|
||||||
|
await self.send({"type": "lifespan.startup.complete"})
|
||||||
|
elif message["type"] == "lifespan.shutdown":
|
||||||
|
try:
|
||||||
|
await self.shutdown()
|
||||||
|
except Exception as e:
|
||||||
|
error_logger.exception(e)
|
||||||
|
await self.send(
|
||||||
|
{"type": "lifespan.shutdown.failed", "message": str(e)}
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
await self.send({"type": "lifespan.shutdown.complete"})
|
||||||
|
return
|
||||||
|
|
||||||
|
|
||||||
class ASGIApp:
|
class ASGIApp:
|
||||||
sanic_app: "sanic.app.Sanic"
|
sanic_app: Sanic
|
||||||
request: Request
|
request: Request
|
||||||
transport: MockTransport
|
transport: MockTransport
|
||||||
lifespan: Lifespan
|
lifespan: Lifespan
|
||||||
@@ -96,66 +113,79 @@ class ASGIApp:
|
|||||||
stage: Stage
|
stage: Stage
|
||||||
response: Optional[BaseHTTPResponse]
|
response: Optional[BaseHTTPResponse]
|
||||||
|
|
||||||
def __init__(self) -> None:
|
|
||||||
self.ws = None
|
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
async def create(
|
async def create(
|
||||||
cls, sanic_app, scope: ASGIScope, receive: ASGIReceive, send: ASGISend
|
cls,
|
||||||
) -> "ASGIApp":
|
sanic_app: Sanic,
|
||||||
|
scope: ASGIScope,
|
||||||
|
receive: ASGIReceive,
|
||||||
|
send: ASGISend,
|
||||||
|
) -> ASGIApp:
|
||||||
instance = cls()
|
instance = cls()
|
||||||
|
instance.ws = None
|
||||||
instance.sanic_app = sanic_app
|
instance.sanic_app = sanic_app
|
||||||
instance.transport = MockTransport(scope, receive, send)
|
instance.transport = MockTransport(scope, receive, send)
|
||||||
instance.transport.loop = sanic_app.loop
|
instance.transport.loop = sanic_app.loop
|
||||||
instance.stage = Stage.IDLE
|
instance.stage = Stage.IDLE
|
||||||
instance.response = None
|
instance.response = None
|
||||||
|
instance.sanic_app.state.is_started = True
|
||||||
setattr(instance.transport, "add_task", sanic_app.loop.create_task)
|
setattr(instance.transport, "add_task", sanic_app.loop.create_task)
|
||||||
|
|
||||||
headers = Header(
|
try:
|
||||||
[
|
headers = Header(
|
||||||
(key.decode("latin-1"), value.decode("latin-1"))
|
[
|
||||||
for key, value in scope.get("headers", [])
|
(
|
||||||
]
|
key.decode("ASCII"),
|
||||||
)
|
value.decode(errors="surrogateescape"),
|
||||||
instance.lifespan = Lifespan(instance)
|
)
|
||||||
|
for key, value in scope.get("headers", [])
|
||||||
|
]
|
||||||
|
)
|
||||||
|
except UnicodeDecodeError:
|
||||||
|
raise BadRequest(
|
||||||
|
"Header names can only contain US-ASCII characters"
|
||||||
|
)
|
||||||
|
|
||||||
if scope["type"] == "lifespan":
|
if scope["type"] == "http":
|
||||||
await instance.lifespan(scope, receive, send)
|
version = scope["http_version"]
|
||||||
|
method = scope["method"]
|
||||||
|
elif scope["type"] == "websocket":
|
||||||
|
version = "1.1"
|
||||||
|
method = "GET"
|
||||||
|
|
||||||
|
instance.ws = instance.transport.create_websocket_connection(
|
||||||
|
send, receive
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
path = (
|
raise ServerError("Received unknown ASGI scope")
|
||||||
scope["path"][1:]
|
|
||||||
if scope["path"].startswith("/")
|
|
||||||
else scope["path"]
|
|
||||||
)
|
|
||||||
url = "/".join([scope.get("root_path", ""), quote(path)])
|
|
||||||
url_bytes = url.encode("latin-1")
|
|
||||||
url_bytes += b"?" + scope["query_string"]
|
|
||||||
|
|
||||||
if scope["type"] == "http":
|
url_bytes, query = scope["raw_path"], scope["query_string"]
|
||||||
version = scope["http_version"]
|
if query:
|
||||||
method = scope["method"]
|
# httpx ASGI client sends query string as part of raw_path
|
||||||
elif scope["type"] == "websocket":
|
url_bytes = url_bytes.split(b"?", 1)[0]
|
||||||
version = "1.1"
|
# All servers send them separately
|
||||||
method = "GET"
|
url_bytes = b"%b?%b" % (url_bytes, query)
|
||||||
|
|
||||||
instance.ws = instance.transport.create_websocket_connection(
|
request_class = sanic_app.request_class or Request
|
||||||
send, receive
|
instance.request = request_class(
|
||||||
)
|
url_bytes,
|
||||||
else:
|
headers,
|
||||||
raise ServerError("Received unknown ASGI scope")
|
version,
|
||||||
|
method,
|
||||||
|
instance.transport,
|
||||||
|
sanic_app,
|
||||||
|
)
|
||||||
|
request_class._current.set(instance.request)
|
||||||
|
instance.request.stream = instance # type: ignore
|
||||||
|
instance.request_body = True
|
||||||
|
instance.request.conn_info = ConnInfo(instance.transport)
|
||||||
|
|
||||||
request_class = sanic_app.request_class or Request
|
await instance.sanic_app.dispatch(
|
||||||
instance.request = request_class(
|
"http.lifecycle.request",
|
||||||
url_bytes,
|
inline=True,
|
||||||
headers,
|
context={"request": instance.request},
|
||||||
version,
|
fail_not_found=False,
|
||||||
method,
|
)
|
||||||
instance.transport,
|
|
||||||
sanic_app,
|
|
||||||
)
|
|
||||||
instance.request.stream = instance
|
|
||||||
instance.request_body = True
|
|
||||||
instance.request.conn_info = ConnInfo(instance.transport)
|
|
||||||
|
|
||||||
return instance
|
return instance
|
||||||
|
|
||||||
@@ -220,4 +250,7 @@ class ASGIApp:
|
|||||||
self.stage = Stage.HANDLER
|
self.stage = Stage.HANDLER
|
||||||
await self.sanic_app.handle_request(self.request)
|
await self.sanic_app.handle_request(self.request)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
await self.sanic_app.handle_exception(self.request, e)
|
try:
|
||||||
|
await self.sanic_app.handle_exception(self.request, e)
|
||||||
|
except Exception as exc:
|
||||||
|
await self.sanic_app.handle_exception(self.request, exc, False)
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import re
|
import re
|
||||||
|
|
||||||
from typing import Any
|
from typing import Any, Optional
|
||||||
|
|
||||||
from sanic.base.meta import SanicMeta
|
from sanic.base.meta import SanicMeta
|
||||||
from sanic.exceptions import SanicException
|
from sanic.exceptions import SanicException
|
||||||
@@ -9,6 +9,7 @@ from sanic.mixins.listeners import ListenerMixin
|
|||||||
from sanic.mixins.middleware import MiddlewareMixin
|
from sanic.mixins.middleware import MiddlewareMixin
|
||||||
from sanic.mixins.routes import RouteMixin
|
from sanic.mixins.routes import RouteMixin
|
||||||
from sanic.mixins.signals import SignalMixin
|
from sanic.mixins.signals import SignalMixin
|
||||||
|
from sanic.mixins.static import StaticMixin
|
||||||
|
|
||||||
|
|
||||||
VALID_NAME = re.compile(r"^[a-zA-Z_][a-zA-Z0-9_\-]*$")
|
VALID_NAME = re.compile(r"^[a-zA-Z_][a-zA-Z0-9_\-]*$")
|
||||||
@@ -16,6 +17,7 @@ VALID_NAME = re.compile(r"^[a-zA-Z_][a-zA-Z0-9_\-]*$")
|
|||||||
|
|
||||||
class BaseSanic(
|
class BaseSanic(
|
||||||
RouteMixin,
|
RouteMixin,
|
||||||
|
StaticMixin,
|
||||||
MiddlewareMixin,
|
MiddlewareMixin,
|
||||||
ListenerMixin,
|
ListenerMixin,
|
||||||
ExceptionMixin,
|
ExceptionMixin,
|
||||||
@@ -24,7 +26,9 @@ class BaseSanic(
|
|||||||
):
|
):
|
||||||
__slots__ = ("name",)
|
__slots__ = ("name",)
|
||||||
|
|
||||||
def __init__(self, name: str = None, *args: Any, **kwargs: Any) -> None:
|
def __init__(
|
||||||
|
self, name: Optional[str] = None, *args: Any, **kwargs: Any
|
||||||
|
) -> None:
|
||||||
class_name = self.__class__.__name__
|
class_name = self.__class__.__name__
|
||||||
|
|
||||||
if name is None:
|
if name is None:
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ from functools import partial
|
|||||||
from typing import TYPE_CHECKING, List, Optional, Union
|
from typing import TYPE_CHECKING, List, Optional, Union
|
||||||
|
|
||||||
|
|
||||||
if TYPE_CHECKING: # no cov
|
if TYPE_CHECKING:
|
||||||
from sanic.blueprints import Blueprint
|
from sanic.blueprints import Blueprint
|
||||||
|
|
||||||
|
|
||||||
@@ -65,6 +65,7 @@ class BlueprintGroup(MutableSequence):
|
|||||||
"_version",
|
"_version",
|
||||||
"_strict_slashes",
|
"_strict_slashes",
|
||||||
"_version_prefix",
|
"_version_prefix",
|
||||||
|
"_name_prefix",
|
||||||
)
|
)
|
||||||
|
|
||||||
def __init__(
|
def __init__(
|
||||||
@@ -73,6 +74,7 @@ class BlueprintGroup(MutableSequence):
|
|||||||
version: Optional[Union[int, str, float]] = None,
|
version: Optional[Union[int, str, float]] = None,
|
||||||
strict_slashes: Optional[bool] = None,
|
strict_slashes: Optional[bool] = None,
|
||||||
version_prefix: str = "/v",
|
version_prefix: str = "/v",
|
||||||
|
name_prefix: Optional[str] = "",
|
||||||
):
|
):
|
||||||
"""
|
"""
|
||||||
Create a new Blueprint Group
|
Create a new Blueprint Group
|
||||||
@@ -87,6 +89,7 @@ class BlueprintGroup(MutableSequence):
|
|||||||
self._version = version
|
self._version = version
|
||||||
self._version_prefix = version_prefix
|
self._version_prefix = version_prefix
|
||||||
self._strict_slashes = strict_slashes
|
self._strict_slashes = strict_slashes
|
||||||
|
self._name_prefix = name_prefix
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def url_prefix(self) -> Optional[Union[int, str, float]]:
|
def url_prefix(self) -> Optional[Union[int, str, float]]:
|
||||||
@@ -134,6 +137,15 @@ class BlueprintGroup(MutableSequence):
|
|||||||
"""
|
"""
|
||||||
return self._version_prefix
|
return self._version_prefix
|
||||||
|
|
||||||
|
@property
|
||||||
|
def name_prefix(self) -> Optional[str]:
|
||||||
|
"""
|
||||||
|
Name prefix for the blueprint group
|
||||||
|
|
||||||
|
:return: str
|
||||||
|
"""
|
||||||
|
return self._name_prefix
|
||||||
|
|
||||||
def __iter__(self):
|
def __iter__(self):
|
||||||
"""
|
"""
|
||||||
Tun the class Blueprint Group into an Iterable item
|
Tun the class Blueprint Group into an Iterable item
|
||||||
|
|||||||
@@ -21,8 +21,8 @@ from typing import (
|
|||||||
Union,
|
Union,
|
||||||
)
|
)
|
||||||
|
|
||||||
from sanic_routing.exceptions import NotFound # type: ignore
|
from sanic_routing.exceptions import NotFound
|
||||||
from sanic_routing.route import Route # type: ignore
|
from sanic_routing.route import Route
|
||||||
|
|
||||||
from sanic.base.root import BaseSanic
|
from sanic.base.root import BaseSanic
|
||||||
from sanic.blueprint_group import BlueprintGroup
|
from sanic.blueprint_group import BlueprintGroup
|
||||||
@@ -36,7 +36,7 @@ from sanic.models.handler_types import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
if TYPE_CHECKING: # no cov
|
if TYPE_CHECKING:
|
||||||
from sanic import Sanic
|
from sanic import Sanic
|
||||||
|
|
||||||
|
|
||||||
@@ -93,6 +93,8 @@ class Blueprint(BaseSanic):
|
|||||||
"_future_listeners",
|
"_future_listeners",
|
||||||
"_future_exceptions",
|
"_future_exceptions",
|
||||||
"_future_signals",
|
"_future_signals",
|
||||||
|
"_allow_route_overwrite",
|
||||||
|
"copied_from",
|
||||||
"ctx",
|
"ctx",
|
||||||
"exceptions",
|
"exceptions",
|
||||||
"host",
|
"host",
|
||||||
@@ -109,7 +111,7 @@ class Blueprint(BaseSanic):
|
|||||||
|
|
||||||
def __init__(
|
def __init__(
|
||||||
self,
|
self,
|
||||||
name: str = None,
|
name: str,
|
||||||
url_prefix: Optional[str] = None,
|
url_prefix: Optional[str] = None,
|
||||||
host: Optional[Union[List[str], str]] = None,
|
host: Optional[Union[List[str], str]] = None,
|
||||||
version: Optional[Union[int, str, float]] = None,
|
version: Optional[Union[int, str, float]] = None,
|
||||||
@@ -118,6 +120,8 @@ class Blueprint(BaseSanic):
|
|||||||
):
|
):
|
||||||
super().__init__(name=name)
|
super().__init__(name=name)
|
||||||
self.reset()
|
self.reset()
|
||||||
|
self._allow_route_overwrite = False
|
||||||
|
self.copied_from = ""
|
||||||
self.ctx = SimpleNamespace()
|
self.ctx = SimpleNamespace()
|
||||||
self.host = host
|
self.host = host
|
||||||
self.strict_slashes = strict_slashes
|
self.strict_slashes = strict_slashes
|
||||||
@@ -167,6 +171,7 @@ class Blueprint(BaseSanic):
|
|||||||
|
|
||||||
def reset(self):
|
def reset(self):
|
||||||
self._apps: Set[Sanic] = set()
|
self._apps: Set[Sanic] = set()
|
||||||
|
self._allow_route_overwrite = False
|
||||||
self.exceptions: List[RouteHandler] = []
|
self.exceptions: List[RouteHandler] = []
|
||||||
self.listeners: Dict[str, List[ListenerType[Any]]] = {}
|
self.listeners: Dict[str, List[ListenerType[Any]]] = {}
|
||||||
self.middlewares: List[MiddlewareType] = []
|
self.middlewares: List[MiddlewareType] = []
|
||||||
@@ -180,6 +185,7 @@ class Blueprint(BaseSanic):
|
|||||||
url_prefix: Optional[Union[str, Default]] = _default,
|
url_prefix: Optional[Union[str, Default]] = _default,
|
||||||
version: Optional[Union[int, str, float, Default]] = _default,
|
version: Optional[Union[int, str, float, Default]] = _default,
|
||||||
version_prefix: Union[str, Default] = _default,
|
version_prefix: Union[str, Default] = _default,
|
||||||
|
allow_route_overwrite: Union[bool, Default] = _default,
|
||||||
strict_slashes: Optional[Union[bool, Default]] = _default,
|
strict_slashes: Optional[Union[bool, Default]] = _default,
|
||||||
with_registration: bool = True,
|
with_registration: bool = True,
|
||||||
with_ctx: bool = False,
|
with_ctx: bool = False,
|
||||||
@@ -213,6 +219,7 @@ class Blueprint(BaseSanic):
|
|||||||
self.reset()
|
self.reset()
|
||||||
new_bp = deepcopy(self)
|
new_bp = deepcopy(self)
|
||||||
new_bp.name = name
|
new_bp.name = name
|
||||||
|
new_bp.copied_from = self.name
|
||||||
|
|
||||||
if not isinstance(url_prefix, Default):
|
if not isinstance(url_prefix, Default):
|
||||||
new_bp.url_prefix = url_prefix
|
new_bp.url_prefix = url_prefix
|
||||||
@@ -222,6 +229,8 @@ class Blueprint(BaseSanic):
|
|||||||
new_bp.strict_slashes = strict_slashes
|
new_bp.strict_slashes = strict_slashes
|
||||||
if not isinstance(version_prefix, Default):
|
if not isinstance(version_prefix, Default):
|
||||||
new_bp.version_prefix = version_prefix
|
new_bp.version_prefix = version_prefix
|
||||||
|
if not isinstance(allow_route_overwrite, Default):
|
||||||
|
new_bp._allow_route_overwrite = allow_route_overwrite
|
||||||
|
|
||||||
for key, value in attrs_backup.items():
|
for key, value in attrs_backup.items():
|
||||||
setattr(self, key, value)
|
setattr(self, key, value)
|
||||||
@@ -247,6 +256,7 @@ class Blueprint(BaseSanic):
|
|||||||
version: Optional[Union[int, str, float]] = None,
|
version: Optional[Union[int, str, float]] = None,
|
||||||
strict_slashes: Optional[bool] = None,
|
strict_slashes: Optional[bool] = None,
|
||||||
version_prefix: str = "/v",
|
version_prefix: str = "/v",
|
||||||
|
name_prefix: Optional[str] = "",
|
||||||
) -> BlueprintGroup:
|
) -> BlueprintGroup:
|
||||||
"""
|
"""
|
||||||
Create a list of blueprints, optionally grouping them under a
|
Create a list of blueprints, optionally grouping them under a
|
||||||
@@ -272,6 +282,7 @@ class Blueprint(BaseSanic):
|
|||||||
version=version,
|
version=version,
|
||||||
strict_slashes=strict_slashes,
|
strict_slashes=strict_slashes,
|
||||||
version_prefix=version_prefix,
|
version_prefix=version_prefix,
|
||||||
|
name_prefix=name_prefix,
|
||||||
)
|
)
|
||||||
for bp in chain(blueprints):
|
for bp in chain(blueprints):
|
||||||
bps.append(bp)
|
bps.append(bp)
|
||||||
@@ -292,6 +303,7 @@ class Blueprint(BaseSanic):
|
|||||||
opt_version = options.get("version", None)
|
opt_version = options.get("version", None)
|
||||||
opt_strict_slashes = options.get("strict_slashes", None)
|
opt_strict_slashes = options.get("strict_slashes", None)
|
||||||
opt_version_prefix = options.get("version_prefix", self.version_prefix)
|
opt_version_prefix = options.get("version_prefix", self.version_prefix)
|
||||||
|
opt_name_prefix = options.get("name_prefix", None)
|
||||||
error_format = options.get(
|
error_format = options.get(
|
||||||
"error_format", app.config.FALLBACK_ERROR_FORMAT
|
"error_format", app.config.FALLBACK_ERROR_FORMAT
|
||||||
)
|
)
|
||||||
@@ -304,11 +316,12 @@ class Blueprint(BaseSanic):
|
|||||||
|
|
||||||
# Routes
|
# Routes
|
||||||
for future in self._future_routes:
|
for future in self._future_routes:
|
||||||
# attach the blueprint name to the handler so that it can be
|
|
||||||
# prefixed properly in the router
|
|
||||||
future.handler.__blueprintname__ = self.name
|
|
||||||
# Prepend the blueprint URI prefix if available
|
# Prepend the blueprint URI prefix if available
|
||||||
uri = url_prefix + future.uri if url_prefix else future.uri
|
uri = self._setup_uri(future.uri, url_prefix)
|
||||||
|
|
||||||
|
route_error_format = (
|
||||||
|
future.error_format if future.error_format else error_format
|
||||||
|
)
|
||||||
|
|
||||||
version_prefix = self.version_prefix
|
version_prefix = self.version_prefix
|
||||||
for prefix in (
|
for prefix in (
|
||||||
@@ -326,14 +339,17 @@ class Blueprint(BaseSanic):
|
|||||||
future.strict_slashes, opt_strict_slashes, self.strict_slashes
|
future.strict_slashes, opt_strict_slashes, self.strict_slashes
|
||||||
)
|
)
|
||||||
|
|
||||||
name = app._generate_name(future.name)
|
name = future.name
|
||||||
|
if opt_name_prefix:
|
||||||
|
name = f"{opt_name_prefix}_{future.name}"
|
||||||
|
name = app._generate_name(name)
|
||||||
host = future.host or self.host
|
host = future.host or self.host
|
||||||
if isinstance(host, list):
|
if isinstance(host, list):
|
||||||
host = tuple(host)
|
host = tuple(host)
|
||||||
|
|
||||||
apply_route = FutureRoute(
|
apply_route = FutureRoute(
|
||||||
future.handler,
|
future.handler,
|
||||||
uri[1:] if uri.startswith("//") else uri,
|
uri,
|
||||||
future.methods,
|
future.methods,
|
||||||
host,
|
host,
|
||||||
strict_slashes,
|
strict_slashes,
|
||||||
@@ -346,7 +362,7 @@ class Blueprint(BaseSanic):
|
|||||||
future.unquote,
|
future.unquote,
|
||||||
future.static,
|
future.static,
|
||||||
version_prefix,
|
version_prefix,
|
||||||
error_format,
|
route_error_format,
|
||||||
future.route_context,
|
future.route_context,
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -354,7 +370,19 @@ class Blueprint(BaseSanic):
|
|||||||
continue
|
continue
|
||||||
|
|
||||||
registered.add(apply_route)
|
registered.add(apply_route)
|
||||||
route = app._apply_route(apply_route)
|
route = app._apply_route(
|
||||||
|
apply_route, overwrite=self._allow_route_overwrite
|
||||||
|
)
|
||||||
|
|
||||||
|
# If it is a copied BP, then make sure all of the names of routes
|
||||||
|
# matchup with the new BP name
|
||||||
|
if self.copied_from:
|
||||||
|
for r in route:
|
||||||
|
r.name = r.name.replace(self.copied_from, self.name)
|
||||||
|
r.extra.ident = r.extra.ident.replace(
|
||||||
|
self.copied_from, self.name
|
||||||
|
)
|
||||||
|
|
||||||
operation = (
|
operation = (
|
||||||
routes.extend if isinstance(route, list) else routes.append
|
routes.extend if isinstance(route, list) else routes.append
|
||||||
)
|
)
|
||||||
@@ -363,7 +391,7 @@ class Blueprint(BaseSanic):
|
|||||||
# Static Files
|
# Static Files
|
||||||
for future in self._future_statics:
|
for future in self._future_statics:
|
||||||
# Prepend the blueprint URI prefix if available
|
# Prepend the blueprint URI prefix if available
|
||||||
uri = url_prefix + future.uri if url_prefix else future.uri
|
uri = self._setup_uri(future.uri, url_prefix)
|
||||||
apply_route = FutureStatic(uri, *future[1:])
|
apply_route = FutureStatic(uri, *future[1:])
|
||||||
|
|
||||||
if (self, apply_route) in app._future_registry:
|
if (self, apply_route) in app._future_registry:
|
||||||
@@ -406,7 +434,7 @@ class Blueprint(BaseSanic):
|
|||||||
|
|
||||||
self.routes += [route for route in routes if isinstance(route, Route)]
|
self.routes += [route for route in routes if isinstance(route, Route)]
|
||||||
self.websocket_routes += [
|
self.websocket_routes += [
|
||||||
route for route in self.routes if route.ctx.websocket
|
route for route in self.routes if route.extra.websocket
|
||||||
]
|
]
|
||||||
self.middlewares += middleware
|
self.middlewares += middleware
|
||||||
self.exceptions += exception_handlers
|
self.exceptions += exception_handlers
|
||||||
@@ -442,7 +470,7 @@ class Blueprint(BaseSanic):
|
|||||||
events.add(signal.ctx.event)
|
events.add(signal.ctx.event)
|
||||||
|
|
||||||
return asyncio.wait(
|
return asyncio.wait(
|
||||||
[event.wait() for event in events],
|
[asyncio.create_task(event.wait()) for event in events],
|
||||||
return_when=asyncio.FIRST_COMPLETED,
|
return_when=asyncio.FIRST_COMPLETED,
|
||||||
timeout=timeout,
|
timeout=timeout,
|
||||||
)
|
)
|
||||||
@@ -456,6 +484,18 @@ class Blueprint(BaseSanic):
|
|||||||
break
|
break
|
||||||
return value
|
return value
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def _setup_uri(base: str, prefix: Optional[str]):
|
||||||
|
uri = base
|
||||||
|
if prefix:
|
||||||
|
uri = prefix
|
||||||
|
if base.startswith("/") and prefix.endswith("/"):
|
||||||
|
uri += base[1:]
|
||||||
|
else:
|
||||||
|
uri += base
|
||||||
|
|
||||||
|
return uri[1:] if uri.startswith("//") else uri
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def register_futures(
|
def register_futures(
|
||||||
apps: Set[Sanic], bp: Blueprint, futures: Sequence[Tuple[Any, ...]]
|
apps: Set[Sanic], bp: Blueprint, futures: Sequence[Tuple[Any, ...]]
|
||||||
|
|||||||
186
sanic/cli/app.py
186
sanic/cli/app.py
@@ -2,21 +2,19 @@ import os
|
|||||||
import shutil
|
import shutil
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
from argparse import ArgumentParser, RawTextHelpFormatter
|
from argparse import Namespace
|
||||||
from importlib import import_module
|
from functools import partial
|
||||||
from pathlib import Path
|
|
||||||
from textwrap import indent
|
from textwrap import indent
|
||||||
from typing import Any, List, Union
|
from typing import List, Union
|
||||||
|
|
||||||
from sanic.app import Sanic
|
from sanic.app import Sanic
|
||||||
from sanic.application.logo import get_logo
|
from sanic.application.logo import get_logo
|
||||||
from sanic.cli.arguments import Group
|
from sanic.cli.arguments import Group
|
||||||
|
from sanic.cli.base import SanicArgumentParser, SanicHelpFormatter
|
||||||
|
from sanic.cli.inspector import make_inspector_parser
|
||||||
|
from sanic.cli.inspector_client import InspectorClient
|
||||||
from sanic.log import error_logger
|
from sanic.log import error_logger
|
||||||
from sanic.simple import create_simple_server
|
from sanic.worker.loader import AppLoader
|
||||||
|
|
||||||
|
|
||||||
class SanicArgumentParser(ArgumentParser):
|
|
||||||
...
|
|
||||||
|
|
||||||
|
|
||||||
class SanicCLI:
|
class SanicCLI:
|
||||||
@@ -25,17 +23,22 @@ class SanicCLI:
|
|||||||
{get_logo(True)}
|
{get_logo(True)}
|
||||||
|
|
||||||
To start running a Sanic application, provide a path to the module, where
|
To start running a Sanic application, provide a path to the module, where
|
||||||
app is a Sanic() instance:
|
app is a Sanic() instance in the global scope:
|
||||||
|
|
||||||
$ sanic path.to.server:app
|
$ sanic path.to.server:app
|
||||||
|
|
||||||
|
If the Sanic instance variable is called 'app', you can leave off the last
|
||||||
|
part, and only provide a path to the module where the instance is:
|
||||||
|
|
||||||
|
$ sanic path.to.server
|
||||||
|
|
||||||
Or, a path to a callable that returns a Sanic() instance:
|
Or, a path to a callable that returns a Sanic() instance:
|
||||||
|
|
||||||
$ sanic path.to.factory:create_app --factory
|
$ sanic path.to.factory:create_app
|
||||||
|
|
||||||
Or, a path to a directory to run as a simple HTTP server:
|
Or, a path to a directory to run as a simple HTTP server:
|
||||||
|
|
||||||
$ sanic ./path/to/static --simple
|
$ sanic ./path/to/static
|
||||||
""",
|
""",
|
||||||
prefix=" ",
|
prefix=" ",
|
||||||
)
|
)
|
||||||
@@ -45,7 +48,7 @@ Or, a path to a directory to run as a simple HTTP server:
|
|||||||
self.parser = SanicArgumentParser(
|
self.parser = SanicArgumentParser(
|
||||||
prog="sanic",
|
prog="sanic",
|
||||||
description=self.DESCRIPTION,
|
description=self.DESCRIPTION,
|
||||||
formatter_class=lambda prog: RawTextHelpFormatter(
|
formatter_class=lambda prog: SanicHelpFormatter(
|
||||||
prog,
|
prog,
|
||||||
max_help_position=36 if width > 96 else 24,
|
max_help_position=36 if width > 96 else 24,
|
||||||
indent_increment=4,
|
indent_increment=4,
|
||||||
@@ -57,36 +60,96 @@ Or, a path to a directory to run as a simple HTTP server:
|
|||||||
self.main_process = (
|
self.main_process = (
|
||||||
os.environ.get("SANIC_RELOADER_PROCESS", "") != "true"
|
os.environ.get("SANIC_RELOADER_PROCESS", "") != "true"
|
||||||
)
|
)
|
||||||
self.args: List[Any] = []
|
self.args: Namespace = Namespace()
|
||||||
|
self.groups: List[Group] = []
|
||||||
|
self.inspecting = False
|
||||||
|
|
||||||
def attach(self):
|
def attach(self):
|
||||||
for group in Group._registry:
|
if len(sys.argv) > 1 and sys.argv[1] == "inspect":
|
||||||
group.create(self.parser).attach()
|
self.inspecting = True
|
||||||
|
self.parser.description = get_logo(True)
|
||||||
|
make_inspector_parser(self.parser)
|
||||||
|
return
|
||||||
|
|
||||||
def run(self):
|
for group in Group._registry:
|
||||||
# This is to provide backwards compat -v to display version
|
instance = group.create(self.parser)
|
||||||
legacy_version = len(sys.argv) == 2 and sys.argv[-1] == "-v"
|
instance.attach()
|
||||||
parse_args = ["--version"] if legacy_version else None
|
self.groups.append(instance)
|
||||||
|
|
||||||
|
def run(self, parse_args=None):
|
||||||
|
if self.inspecting:
|
||||||
|
self._inspector()
|
||||||
|
return
|
||||||
|
|
||||||
|
legacy_version = False
|
||||||
|
if not parse_args:
|
||||||
|
# This is to provide backwards compat -v to display version
|
||||||
|
legacy_version = len(sys.argv) == 2 and sys.argv[-1] == "-v"
|
||||||
|
parse_args = ["--version"] if legacy_version else None
|
||||||
|
elif parse_args == ["-v"]:
|
||||||
|
parse_args = ["--version"]
|
||||||
|
|
||||||
|
if not legacy_version:
|
||||||
|
parsed, unknown = self.parser.parse_known_args(args=parse_args)
|
||||||
|
if unknown and parsed.factory:
|
||||||
|
for arg in unknown:
|
||||||
|
if arg.startswith("--"):
|
||||||
|
self.parser.add_argument(arg.split("=")[0])
|
||||||
|
|
||||||
self.args = self.parser.parse_args(args=parse_args)
|
self.args = self.parser.parse_args(args=parse_args)
|
||||||
self._precheck()
|
self._precheck()
|
||||||
|
app_loader = AppLoader(
|
||||||
|
self.args.target, self.args.factory, self.args.simple, self.args
|
||||||
|
)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
app = self._get_app()
|
app = self._get_app(app_loader)
|
||||||
kwargs = self._build_run_kwargs()
|
kwargs = self._build_run_kwargs()
|
||||||
app.run(**kwargs)
|
except ValueError as e:
|
||||||
except ValueError:
|
error_logger.exception(f"Failed to run app: {e}")
|
||||||
error_logger.exception("Failed to run app")
|
else:
|
||||||
|
for http_version in self.args.http:
|
||||||
|
app.prepare(**kwargs, version=http_version)
|
||||||
|
if self.args.single:
|
||||||
|
serve = Sanic.serve_single
|
||||||
|
else:
|
||||||
|
serve = partial(Sanic.serve, app_loader=app_loader)
|
||||||
|
serve(app)
|
||||||
|
|
||||||
|
def _inspector(self):
|
||||||
|
args = sys.argv[2:]
|
||||||
|
self.args, unknown = self.parser.parse_known_args(args=args)
|
||||||
|
if unknown:
|
||||||
|
for arg in unknown:
|
||||||
|
if arg.startswith("--"):
|
||||||
|
try:
|
||||||
|
key, value = arg.split("=")
|
||||||
|
key = key.lstrip("-")
|
||||||
|
except ValueError:
|
||||||
|
value = False if arg.startswith("--no-") else True
|
||||||
|
key = (
|
||||||
|
arg.replace("--no-", "")
|
||||||
|
.lstrip("-")
|
||||||
|
.replace("-", "_")
|
||||||
|
)
|
||||||
|
setattr(self.args, key, value)
|
||||||
|
|
||||||
|
kwargs = {**self.args.__dict__}
|
||||||
|
host = kwargs.pop("host")
|
||||||
|
port = kwargs.pop("port")
|
||||||
|
secure = kwargs.pop("secure")
|
||||||
|
raw = kwargs.pop("raw")
|
||||||
|
action = kwargs.pop("action") or "info"
|
||||||
|
api_key = kwargs.pop("api_key")
|
||||||
|
positional = kwargs.pop("positional", None)
|
||||||
|
if action == "<custom>" and positional:
|
||||||
|
action = positional[0]
|
||||||
|
if len(positional) > 1:
|
||||||
|
kwargs["args"] = positional[1:]
|
||||||
|
InspectorClient(host, port, secure, raw, api_key).do(action, **kwargs)
|
||||||
|
|
||||||
def _precheck(self):
|
def _precheck(self):
|
||||||
if self.args.debug and self.main_process:
|
# Custom TLS mismatch handling for better diagnostics
|
||||||
error_logger.warning(
|
|
||||||
"Starting in v22.3, --debug will no "
|
|
||||||
"longer automatically run the auto-reloader.\n Switch to "
|
|
||||||
"--dev to continue using that functionality."
|
|
||||||
)
|
|
||||||
|
|
||||||
# # Custom TLS mismatch handling for better diagnostics
|
|
||||||
if self.main_process and (
|
if self.main_process and (
|
||||||
# one of cert/key missing
|
# one of cert/key missing
|
||||||
bool(self.args.cert) != bool(self.args.key)
|
bool(self.args.cert) != bool(self.args.key)
|
||||||
@@ -107,47 +170,28 @@ Or, a path to a directory to run as a simple HTTP server:
|
|||||||
error_logger.error(message)
|
error_logger.error(message)
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
def _get_app(self):
|
def _get_app(self, app_loader: AppLoader):
|
||||||
try:
|
try:
|
||||||
module_path = os.path.abspath(os.getcwd())
|
app = app_loader.load()
|
||||||
if module_path not in sys.path:
|
|
||||||
sys.path.append(module_path)
|
|
||||||
|
|
||||||
if self.args.simple:
|
|
||||||
path = Path(self.args.module)
|
|
||||||
app = create_simple_server(path)
|
|
||||||
else:
|
|
||||||
delimiter = ":" if ":" in self.args.module else "."
|
|
||||||
module_name, app_name = self.args.module.rsplit(delimiter, 1)
|
|
||||||
|
|
||||||
if app_name.endswith("()"):
|
|
||||||
self.args.factory = True
|
|
||||||
app_name = app_name[:-2]
|
|
||||||
|
|
||||||
module = import_module(module_name)
|
|
||||||
app = getattr(module, app_name, None)
|
|
||||||
if self.args.factory:
|
|
||||||
app = app()
|
|
||||||
|
|
||||||
app_type_name = type(app).__name__
|
|
||||||
|
|
||||||
if not isinstance(app, Sanic):
|
|
||||||
raise ValueError(
|
|
||||||
f"Module is not a Sanic app, it is a {app_type_name}\n"
|
|
||||||
f" Perhaps you meant {self.args.module}.app?"
|
|
||||||
)
|
|
||||||
except ImportError as e:
|
except ImportError as e:
|
||||||
if module_name.startswith(e.name):
|
if app_loader.module_name.startswith(e.name): # type: ignore
|
||||||
error_logger.error(
|
error_logger.error(
|
||||||
f"No module named {e.name} found.\n"
|
f"No module named {e.name} found.\n"
|
||||||
" Example File: project/sanic_server.py -> app\n"
|
" Example File: project/sanic_server.py -> app\n"
|
||||||
" Example Module: project.sanic_server.app"
|
" Example Module: project.sanic_server.app"
|
||||||
)
|
)
|
||||||
|
error_logger.error(
|
||||||
|
"\nThe error below might have caused the above one:\n"
|
||||||
|
f"{e.msg}"
|
||||||
|
)
|
||||||
|
sys.exit(1)
|
||||||
else:
|
else:
|
||||||
raise e
|
raise e
|
||||||
return app
|
return app
|
||||||
|
|
||||||
def _build_run_kwargs(self):
|
def _build_run_kwargs(self):
|
||||||
|
for group in self.groups:
|
||||||
|
group.prepare(self.args)
|
||||||
ssl: Union[None, dict, str, list] = []
|
ssl: Union[None, dict, str, list] = []
|
||||||
if self.args.tlshost:
|
if self.args.tlshost:
|
||||||
ssl.append(None)
|
ssl.append(None)
|
||||||
@@ -160,8 +204,10 @@ Or, a path to a directory to run as a simple HTTP server:
|
|||||||
elif len(ssl) == 1 and ssl[0] is not None:
|
elif len(ssl) == 1 and ssl[0] is not None:
|
||||||
# Use only one cert, no TLSSelector.
|
# Use only one cert, no TLSSelector.
|
||||||
ssl = ssl[0]
|
ssl = ssl[0]
|
||||||
|
|
||||||
kwargs = {
|
kwargs = {
|
||||||
"access_log": self.args.access_log,
|
"access_log": self.args.access_log,
|
||||||
|
"coffee": self.args.coffee,
|
||||||
"debug": self.args.debug,
|
"debug": self.args.debug,
|
||||||
"fast": self.args.fast,
|
"fast": self.args.fast,
|
||||||
"host": self.args.host,
|
"host": self.args.host,
|
||||||
@@ -172,18 +218,16 @@ Or, a path to a directory to run as a simple HTTP server:
|
|||||||
"unix": self.args.unix,
|
"unix": self.args.unix,
|
||||||
"verbosity": self.args.verbosity or 0,
|
"verbosity": self.args.verbosity or 0,
|
||||||
"workers": self.args.workers,
|
"workers": self.args.workers,
|
||||||
|
"auto_tls": self.args.auto_tls,
|
||||||
|
"single_process": self.args.single,
|
||||||
}
|
}
|
||||||
|
|
||||||
if self.args.auto_reload:
|
for maybe_arg in ("auto_reload", "dev"):
|
||||||
kwargs["auto_reload"] = True
|
if getattr(self.args, maybe_arg, False):
|
||||||
|
kwargs[maybe_arg] = True
|
||||||
|
|
||||||
if self.args.path:
|
if self.args.path:
|
||||||
if self.args.auto_reload or self.args.debug:
|
kwargs["auto_reload"] = True
|
||||||
kwargs["reload_dir"] = self.args.path
|
kwargs["reload_dir"] = self.args.path
|
||||||
else:
|
|
||||||
error_logger.warning(
|
|
||||||
"Ignoring '--reload-dir' since auto reloading was not "
|
|
||||||
"enabled. If you would like to watch directories for "
|
|
||||||
"changes, consider using --debug or --auto-reload."
|
|
||||||
)
|
|
||||||
return kwargs
|
return kwargs
|
||||||
|
|||||||
@@ -3,9 +3,10 @@ from __future__ import annotations
|
|||||||
from argparse import ArgumentParser, _ArgumentGroup
|
from argparse import ArgumentParser, _ArgumentGroup
|
||||||
from typing import List, Optional, Type, Union
|
from typing import List, Optional, Type, Union
|
||||||
|
|
||||||
from sanic_routing import __version__ as __routing_version__ # type: ignore
|
from sanic_routing import __version__ as __routing_version__
|
||||||
|
|
||||||
from sanic import __version__
|
from sanic import __version__
|
||||||
|
from sanic.http.constants import HTTP
|
||||||
|
|
||||||
|
|
||||||
class Group:
|
class Group:
|
||||||
@@ -29,7 +30,7 @@ class Group:
|
|||||||
instance = cls(parser, cls.name)
|
instance = cls(parser, cls.name)
|
||||||
return instance
|
return instance
|
||||||
|
|
||||||
def add_bool_arguments(self, *args, **kwargs):
|
def add_bool_arguments(self, *args, nullable=False, **kwargs):
|
||||||
group = self.container.add_mutually_exclusive_group()
|
group = self.container.add_mutually_exclusive_group()
|
||||||
kwargs["help"] = kwargs["help"].capitalize()
|
kwargs["help"] = kwargs["help"].capitalize()
|
||||||
group.add_argument(*args, action="store_true", **kwargs)
|
group.add_argument(*args, action="store_true", **kwargs)
|
||||||
@@ -37,6 +38,12 @@ class Group:
|
|||||||
group.add_argument(
|
group.add_argument(
|
||||||
"--no-" + args[0][2:], *args[1:], action="store_false", **kwargs
|
"--no-" + args[0][2:], *args[1:], action="store_false", **kwargs
|
||||||
)
|
)
|
||||||
|
if nullable:
|
||||||
|
params = {args[0][2:].replace("-", "_"): None}
|
||||||
|
group.set_defaults(**params)
|
||||||
|
|
||||||
|
def prepare(self, args) -> None:
|
||||||
|
...
|
||||||
|
|
||||||
|
|
||||||
class GeneralGroup(Group):
|
class GeneralGroup(Group):
|
||||||
@@ -50,11 +57,15 @@ class GeneralGroup(Group):
|
|||||||
)
|
)
|
||||||
|
|
||||||
self.container.add_argument(
|
self.container.add_argument(
|
||||||
"module",
|
"target",
|
||||||
help=(
|
help=(
|
||||||
"Path to your Sanic app. Example: path.to.server:app\n"
|
"Path to your Sanic app instance.\n"
|
||||||
"If running a Simple Server, path to directory to serve. "
|
"\tExample: path.to.server:app\n"
|
||||||
"Example: ./\n"
|
"If running a Simple Server, path to directory to serve.\n"
|
||||||
|
"\tExample: ./\n"
|
||||||
|
"Additionally, this can be a path to a factory function\n"
|
||||||
|
"that returns a Sanic app instance.\n"
|
||||||
|
"\tExample: path.to.server:create_app\n"
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -63,7 +74,8 @@ class ApplicationGroup(Group):
|
|||||||
name = "Application"
|
name = "Application"
|
||||||
|
|
||||||
def attach(self):
|
def attach(self):
|
||||||
self.container.add_argument(
|
group = self.container.add_mutually_exclusive_group()
|
||||||
|
group.add_argument(
|
||||||
"--factory",
|
"--factory",
|
||||||
action="store_true",
|
action="store_true",
|
||||||
help=(
|
help=(
|
||||||
@@ -71,7 +83,7 @@ class ApplicationGroup(Group):
|
|||||||
"i.e. a () -> <Sanic app> callable"
|
"i.e. a () -> <Sanic app> callable"
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
self.container.add_argument(
|
group.add_argument(
|
||||||
"-s",
|
"-s",
|
||||||
"--simple",
|
"--simple",
|
||||||
dest="simple",
|
dest="simple",
|
||||||
@@ -83,6 +95,44 @@ class ApplicationGroup(Group):
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class HTTPVersionGroup(Group):
|
||||||
|
name = "HTTP version"
|
||||||
|
|
||||||
|
def attach(self):
|
||||||
|
http_values = [http.value for http in HTTP.__members__.values()]
|
||||||
|
|
||||||
|
self.container.add_argument(
|
||||||
|
"--http",
|
||||||
|
dest="http",
|
||||||
|
action="append",
|
||||||
|
choices=http_values,
|
||||||
|
type=int,
|
||||||
|
help=(
|
||||||
|
"Which HTTP version to use: HTTP/1.1 or HTTP/3. Value should\n"
|
||||||
|
"be either 1, or 3. [default 1]"
|
||||||
|
),
|
||||||
|
)
|
||||||
|
self.container.add_argument(
|
||||||
|
"-1",
|
||||||
|
dest="http",
|
||||||
|
action="append_const",
|
||||||
|
const=1,
|
||||||
|
help=("Run Sanic server using HTTP/1.1"),
|
||||||
|
)
|
||||||
|
self.container.add_argument(
|
||||||
|
"-3",
|
||||||
|
dest="http",
|
||||||
|
action="append_const",
|
||||||
|
const=3,
|
||||||
|
help=("Run Sanic server using HTTP/3"),
|
||||||
|
)
|
||||||
|
|
||||||
|
def prepare(self, args):
|
||||||
|
if not args.http:
|
||||||
|
args.http = [1]
|
||||||
|
args.http = tuple(sorted(set(map(HTTP, args.http)), reverse=True))
|
||||||
|
|
||||||
|
|
||||||
class SocketGroup(Group):
|
class SocketGroup(Group):
|
||||||
name = "Socket binding"
|
name = "Socket binding"
|
||||||
|
|
||||||
@@ -92,7 +142,6 @@ class SocketGroup(Group):
|
|||||||
"--host",
|
"--host",
|
||||||
dest="host",
|
dest="host",
|
||||||
type=str,
|
type=str,
|
||||||
default="127.0.0.1",
|
|
||||||
help="Host address [default 127.0.0.1]",
|
help="Host address [default 127.0.0.1]",
|
||||||
)
|
)
|
||||||
self.container.add_argument(
|
self.container.add_argument(
|
||||||
@@ -100,7 +149,6 @@ class SocketGroup(Group):
|
|||||||
"--port",
|
"--port",
|
||||||
dest="port",
|
dest="port",
|
||||||
type=int,
|
type=int,
|
||||||
default=8000,
|
|
||||||
help="Port to serve on [default 8000]",
|
help="Port to serve on [default 8000]",
|
||||||
)
|
)
|
||||||
self.container.add_argument(
|
self.container.add_argument(
|
||||||
@@ -167,8 +215,17 @@ class WorkerGroup(Group):
|
|||||||
action="store_true",
|
action="store_true",
|
||||||
help="Set the number of workers to max allowed",
|
help="Set the number of workers to max allowed",
|
||||||
)
|
)
|
||||||
|
group.add_argument(
|
||||||
|
"--single-process",
|
||||||
|
dest="single",
|
||||||
|
action="store_true",
|
||||||
|
help="Do not use multiprocessing, run server in a single process",
|
||||||
|
)
|
||||||
self.add_bool_arguments(
|
self.add_bool_arguments(
|
||||||
"--access-logs", dest="access_log", help="display access logs"
|
"--access-logs",
|
||||||
|
dest="access_log",
|
||||||
|
help="display access logs",
|
||||||
|
default=None,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@@ -182,18 +239,6 @@ class DevelopmentGroup(Group):
|
|||||||
action="store_true",
|
action="store_true",
|
||||||
help="Run the server in debug mode",
|
help="Run the server in debug mode",
|
||||||
)
|
)
|
||||||
self.container.add_argument(
|
|
||||||
"-d",
|
|
||||||
"--dev",
|
|
||||||
dest="debug",
|
|
||||||
action="store_true",
|
|
||||||
help=(
|
|
||||||
"Currently is an alias for --debug. But starting in v22.3, \n"
|
|
||||||
"--debug will no longer automatically trigger auto_restart. \n"
|
|
||||||
"However, --dev will continue, effectively making it the \n"
|
|
||||||
"same as debug + auto_reload."
|
|
||||||
),
|
|
||||||
)
|
|
||||||
self.container.add_argument(
|
self.container.add_argument(
|
||||||
"-r",
|
"-r",
|
||||||
"--reload",
|
"--reload",
|
||||||
@@ -212,12 +257,34 @@ class DevelopmentGroup(Group):
|
|||||||
action="append",
|
action="append",
|
||||||
help="Extra directories to watch and reload on changes",
|
help="Extra directories to watch and reload on changes",
|
||||||
)
|
)
|
||||||
|
self.container.add_argument(
|
||||||
|
"-d",
|
||||||
|
"--dev",
|
||||||
|
dest="dev",
|
||||||
|
action="store_true",
|
||||||
|
help=("debug + auto reload"),
|
||||||
|
)
|
||||||
|
self.container.add_argument(
|
||||||
|
"--auto-tls",
|
||||||
|
dest="auto_tls",
|
||||||
|
action="store_true",
|
||||||
|
help=(
|
||||||
|
"Create a temporary TLS certificate for local development "
|
||||||
|
"(requires mkcert or trustme)"
|
||||||
|
),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class OutputGroup(Group):
|
class OutputGroup(Group):
|
||||||
name = "Output"
|
name = "Output"
|
||||||
|
|
||||||
def attach(self):
|
def attach(self):
|
||||||
|
self.add_bool_arguments(
|
||||||
|
"--coffee",
|
||||||
|
dest="coffee",
|
||||||
|
default=False,
|
||||||
|
help="Uhm, coffee?",
|
||||||
|
)
|
||||||
self.add_bool_arguments(
|
self.add_bool_arguments(
|
||||||
"--motd",
|
"--motd",
|
||||||
dest="motd",
|
dest="motd",
|
||||||
|
|||||||
35
sanic/cli/base.py
Normal file
35
sanic/cli/base.py
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
from argparse import (
|
||||||
|
SUPPRESS,
|
||||||
|
Action,
|
||||||
|
ArgumentParser,
|
||||||
|
RawTextHelpFormatter,
|
||||||
|
_SubParsersAction,
|
||||||
|
)
|
||||||
|
from typing import Any
|
||||||
|
|
||||||
|
|
||||||
|
class SanicArgumentParser(ArgumentParser):
|
||||||
|
def _check_value(self, action: Action, value: Any) -> None:
|
||||||
|
if isinstance(action, SanicSubParsersAction):
|
||||||
|
return
|
||||||
|
super()._check_value(action, value)
|
||||||
|
|
||||||
|
|
||||||
|
class SanicHelpFormatter(RawTextHelpFormatter):
|
||||||
|
def add_usage(self, usage, actions, groups, prefix=None):
|
||||||
|
if not usage:
|
||||||
|
usage = SUPPRESS
|
||||||
|
# Add one linebreak, but not two
|
||||||
|
self.add_text("\x1b[1A")
|
||||||
|
super().add_usage(usage, actions, groups, prefix)
|
||||||
|
|
||||||
|
|
||||||
|
class SanicSubParsersAction(_SubParsersAction):
|
||||||
|
def __call__(self, parser, namespace, values, option_string=None):
|
||||||
|
self._name_parser_map
|
||||||
|
parser_name = values[0]
|
||||||
|
if parser_name not in self._name_parser_map:
|
||||||
|
self._name_parser_map[parser_name] = parser
|
||||||
|
values = ["<custom>", *values]
|
||||||
|
|
||||||
|
super().__call__(parser, namespace, values, option_string)
|
||||||
105
sanic/cli/inspector.py
Normal file
105
sanic/cli/inspector.py
Normal file
@@ -0,0 +1,105 @@
|
|||||||
|
from argparse import ArgumentParser
|
||||||
|
|
||||||
|
from sanic.application.logo import get_logo
|
||||||
|
from sanic.cli.base import SanicHelpFormatter, SanicSubParsersAction
|
||||||
|
|
||||||
|
|
||||||
|
def _add_shared(parser: ArgumentParser) -> None:
|
||||||
|
parser.add_argument(
|
||||||
|
"--host",
|
||||||
|
"-H",
|
||||||
|
default="localhost",
|
||||||
|
help="Inspector host address [default 127.0.0.1]",
|
||||||
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
"--port",
|
||||||
|
"-p",
|
||||||
|
default=6457,
|
||||||
|
type=int,
|
||||||
|
help="Inspector port [default 6457]",
|
||||||
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
"--secure",
|
||||||
|
"-s",
|
||||||
|
action="store_true",
|
||||||
|
help="Whether to access the Inspector via TLS encryption",
|
||||||
|
)
|
||||||
|
parser.add_argument("--api-key", "-k", help="Inspector authentication key")
|
||||||
|
parser.add_argument(
|
||||||
|
"--raw",
|
||||||
|
action="store_true",
|
||||||
|
help="Whether to output the raw response information",
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class InspectorSubParser(ArgumentParser):
|
||||||
|
def __init__(self, *args, **kwargs):
|
||||||
|
super().__init__(*args, **kwargs)
|
||||||
|
_add_shared(self)
|
||||||
|
if not self.description:
|
||||||
|
self.description = ""
|
||||||
|
self.description = get_logo(True) + self.description
|
||||||
|
|
||||||
|
|
||||||
|
def make_inspector_parser(parser: ArgumentParser) -> None:
|
||||||
|
_add_shared(parser)
|
||||||
|
subparsers = parser.add_subparsers(
|
||||||
|
action=SanicSubParsersAction,
|
||||||
|
dest="action",
|
||||||
|
description=(
|
||||||
|
"Run one or none of the below subcommands. Using inspect without "
|
||||||
|
"a subcommand will fetch general information about the state "
|
||||||
|
"of the application instance.\n\n"
|
||||||
|
"Or, you can optionally follow inspect with a subcommand. "
|
||||||
|
"If you have created a custom "
|
||||||
|
"Inspector instance, then you can run custom commands. See "
|
||||||
|
"https://sanic.dev/en/guide/deployment/inspector.html "
|
||||||
|
"for more details."
|
||||||
|
),
|
||||||
|
title=" Subcommands",
|
||||||
|
parser_class=InspectorSubParser,
|
||||||
|
)
|
||||||
|
reloader = subparsers.add_parser(
|
||||||
|
"reload",
|
||||||
|
help="Trigger a reload of the server workers",
|
||||||
|
formatter_class=SanicHelpFormatter,
|
||||||
|
)
|
||||||
|
reloader.add_argument(
|
||||||
|
"--zero-downtime",
|
||||||
|
action="store_true",
|
||||||
|
help=(
|
||||||
|
"Whether to wait for the new process to be online before "
|
||||||
|
"terminating the old"
|
||||||
|
),
|
||||||
|
)
|
||||||
|
subparsers.add_parser(
|
||||||
|
"shutdown",
|
||||||
|
help="Shutdown the application and all processes",
|
||||||
|
formatter_class=SanicHelpFormatter,
|
||||||
|
)
|
||||||
|
scale = subparsers.add_parser(
|
||||||
|
"scale",
|
||||||
|
help="Scale the number of workers",
|
||||||
|
formatter_class=SanicHelpFormatter,
|
||||||
|
)
|
||||||
|
scale.add_argument(
|
||||||
|
"replicas",
|
||||||
|
type=int,
|
||||||
|
help="Number of workers requested",
|
||||||
|
)
|
||||||
|
|
||||||
|
custom = subparsers.add_parser(
|
||||||
|
"<custom>",
|
||||||
|
help="Run a custom command",
|
||||||
|
description=(
|
||||||
|
"keyword arguments:\n When running a custom command, you can "
|
||||||
|
"add keyword arguments by appending them to your command\n\n"
|
||||||
|
"\tsanic inspect foo --one=1 --two=2"
|
||||||
|
),
|
||||||
|
formatter_class=SanicHelpFormatter,
|
||||||
|
)
|
||||||
|
custom.add_argument(
|
||||||
|
"positional",
|
||||||
|
nargs="*",
|
||||||
|
help="Add one or more non-keyword args to your custom command",
|
||||||
|
)
|
||||||
119
sanic/cli/inspector_client.py
Normal file
119
sanic/cli/inspector_client.py
Normal file
@@ -0,0 +1,119 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import sys
|
||||||
|
|
||||||
|
from http.client import RemoteDisconnected
|
||||||
|
from textwrap import indent
|
||||||
|
from typing import Any, Dict, Optional
|
||||||
|
from urllib.error import URLError
|
||||||
|
from urllib.request import Request as URequest
|
||||||
|
from urllib.request import urlopen
|
||||||
|
|
||||||
|
from sanic.application.logo import get_logo
|
||||||
|
from sanic.application.motd import MOTDTTY
|
||||||
|
from sanic.log import Colors
|
||||||
|
|
||||||
|
|
||||||
|
try: # no cov
|
||||||
|
from ujson import dumps, loads
|
||||||
|
except ModuleNotFoundError: # no cov
|
||||||
|
from json import dumps, loads # type: ignore
|
||||||
|
|
||||||
|
|
||||||
|
class InspectorClient:
|
||||||
|
def __init__(
|
||||||
|
self,
|
||||||
|
host: str,
|
||||||
|
port: int,
|
||||||
|
secure: bool,
|
||||||
|
raw: bool,
|
||||||
|
api_key: Optional[str],
|
||||||
|
) -> None:
|
||||||
|
self.scheme = "https" if secure else "http"
|
||||||
|
self.host = host
|
||||||
|
self.port = port
|
||||||
|
self.raw = raw
|
||||||
|
self.api_key = api_key
|
||||||
|
|
||||||
|
for scheme in ("http", "https"):
|
||||||
|
full = f"{scheme}://"
|
||||||
|
if self.host.startswith(full):
|
||||||
|
self.scheme = scheme
|
||||||
|
self.host = self.host[len(full) :] # noqa E203
|
||||||
|
|
||||||
|
def do(self, action: str, **kwargs: Any) -> None:
|
||||||
|
if action == "info":
|
||||||
|
self.info()
|
||||||
|
return
|
||||||
|
result = self.request(action, **kwargs).get("result")
|
||||||
|
if result:
|
||||||
|
out = (
|
||||||
|
dumps(result)
|
||||||
|
if isinstance(result, (list, dict))
|
||||||
|
else str(result)
|
||||||
|
)
|
||||||
|
sys.stdout.write(out + "\n")
|
||||||
|
|
||||||
|
def info(self) -> None:
|
||||||
|
out = sys.stdout.write
|
||||||
|
response = self.request("", "GET")
|
||||||
|
if self.raw or not response:
|
||||||
|
return
|
||||||
|
data = response["result"]
|
||||||
|
display = data.pop("info")
|
||||||
|
extra = display.pop("extra", {})
|
||||||
|
display["packages"] = ", ".join(display["packages"])
|
||||||
|
MOTDTTY(get_logo(), self.base_url, display, extra).display(
|
||||||
|
version=False,
|
||||||
|
action="Inspecting",
|
||||||
|
out=out,
|
||||||
|
)
|
||||||
|
for name, info in data["workers"].items():
|
||||||
|
info = "\n".join(
|
||||||
|
f"\t{key}: {Colors.BLUE}{value}{Colors.END}"
|
||||||
|
for key, value in info.items()
|
||||||
|
)
|
||||||
|
out(
|
||||||
|
"\n"
|
||||||
|
+ indent(
|
||||||
|
"\n".join(
|
||||||
|
[
|
||||||
|
f"{Colors.BOLD}{Colors.SANIC}{name}{Colors.END}",
|
||||||
|
info,
|
||||||
|
]
|
||||||
|
),
|
||||||
|
" ",
|
||||||
|
)
|
||||||
|
+ "\n"
|
||||||
|
)
|
||||||
|
|
||||||
|
def request(self, action: str, method: str = "POST", **kwargs: Any) -> Any:
|
||||||
|
url = f"{self.base_url}/{action}"
|
||||||
|
params: Dict[str, Any] = {"method": method, "headers": {}}
|
||||||
|
if kwargs:
|
||||||
|
params["data"] = dumps(kwargs).encode()
|
||||||
|
params["headers"]["content-type"] = "application/json"
|
||||||
|
if self.api_key:
|
||||||
|
params["headers"]["authorization"] = f"Bearer {self.api_key}"
|
||||||
|
request = URequest(url, **params)
|
||||||
|
|
||||||
|
try:
|
||||||
|
with urlopen(request) as response: # nosec B310
|
||||||
|
raw = response.read()
|
||||||
|
loaded = loads(raw)
|
||||||
|
if self.raw:
|
||||||
|
sys.stdout.write(dumps(loaded.get("result")) + "\n")
|
||||||
|
return {}
|
||||||
|
return loaded
|
||||||
|
except (URLError, RemoteDisconnected) as e:
|
||||||
|
sys.stderr.write(
|
||||||
|
f"{Colors.RED}Could not connect to inspector at: "
|
||||||
|
f"{Colors.YELLOW}{self.base_url}{Colors.END}\n"
|
||||||
|
"Either the application is not running, or it did not start "
|
||||||
|
f"an inspector instance.\n{e}\n"
|
||||||
|
)
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def base_url(self):
|
||||||
|
return f"{self.scheme}://{self.host}:{self.port}"
|
||||||
105
sanic/compat.py
105
sanic/compat.py
@@ -1,13 +1,30 @@
|
|||||||
import asyncio
|
import asyncio
|
||||||
import os
|
import os
|
||||||
|
import platform
|
||||||
import signal
|
import signal
|
||||||
|
import sys
|
||||||
|
|
||||||
from sys import argv
|
from contextlib import contextmanager
|
||||||
|
from enum import Enum
|
||||||
|
from typing import Awaitable, Union
|
||||||
|
|
||||||
from multidict import CIMultiDict # type: ignore
|
from multidict import CIMultiDict # type: ignore
|
||||||
|
|
||||||
|
from sanic.helpers import Default
|
||||||
|
from sanic.log import error_logger
|
||||||
|
|
||||||
|
|
||||||
|
if sys.version_info < (3, 8): # no cov
|
||||||
|
StartMethod = Union[Default, str]
|
||||||
|
else: # no cov
|
||||||
|
from typing import Literal
|
||||||
|
|
||||||
|
StartMethod = Union[
|
||||||
|
Default, Literal["fork"], Literal["forkserver"], Literal["spawn"]
|
||||||
|
]
|
||||||
|
|
||||||
OS_IS_WINDOWS = os.name == "nt"
|
OS_IS_WINDOWS = os.name == "nt"
|
||||||
|
PYPY_IMPLEMENTATION = platform.python_implementation() == "PyPy"
|
||||||
UVLOOP_INSTALLED = False
|
UVLOOP_INSTALLED = False
|
||||||
|
|
||||||
try:
|
try:
|
||||||
@@ -17,6 +34,40 @@ try:
|
|||||||
except ImportError:
|
except ImportError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
# Python 3.11 changed the way Enum formatting works for mixed-in types.
|
||||||
|
if sys.version_info < (3, 11, 0):
|
||||||
|
|
||||||
|
class StrEnum(str, Enum):
|
||||||
|
pass
|
||||||
|
|
||||||
|
else:
|
||||||
|
from enum import StrEnum # type: ignore # noqa
|
||||||
|
|
||||||
|
|
||||||
|
class UpperStrEnum(StrEnum):
|
||||||
|
def _generate_next_value_(name, start, count, last_values):
|
||||||
|
return name.upper()
|
||||||
|
|
||||||
|
def __eq__(self, value: object) -> bool:
|
||||||
|
value = str(value).upper()
|
||||||
|
return super().__eq__(value)
|
||||||
|
|
||||||
|
def __hash__(self) -> int:
|
||||||
|
return hash(self.value)
|
||||||
|
|
||||||
|
def __str__(self) -> str:
|
||||||
|
return self.value
|
||||||
|
|
||||||
|
|
||||||
|
@contextmanager
|
||||||
|
def use_context(method: StartMethod):
|
||||||
|
from sanic import Sanic
|
||||||
|
|
||||||
|
orig = Sanic.start_method
|
||||||
|
Sanic.start_method = method
|
||||||
|
yield
|
||||||
|
Sanic.start_method = orig
|
||||||
|
|
||||||
|
|
||||||
def enable_windows_color_support():
|
def enable_windows_color_support():
|
||||||
import ctypes
|
import ctypes
|
||||||
@@ -25,6 +76,38 @@ def enable_windows_color_support():
|
|||||||
kernel.SetConsoleMode(kernel.GetStdHandle(-11), 7)
|
kernel.SetConsoleMode(kernel.GetStdHandle(-11), 7)
|
||||||
|
|
||||||
|
|
||||||
|
def pypy_os_module_patch() -> None:
|
||||||
|
"""
|
||||||
|
The PyPy os module is missing the 'readlink' function, which causes issues
|
||||||
|
withaiofiles. This workaround replaces the missing 'readlink' function
|
||||||
|
with 'os.path.realpath', which serves the same purpose.
|
||||||
|
"""
|
||||||
|
if hasattr(os, "readlink"):
|
||||||
|
error_logger.warning(
|
||||||
|
"PyPy: Skipping patching of the os module as it appears the "
|
||||||
|
"'readlink' function has been added."
|
||||||
|
)
|
||||||
|
return
|
||||||
|
|
||||||
|
module = sys.modules["os"]
|
||||||
|
module.readlink = os.path.realpath # type: ignore
|
||||||
|
|
||||||
|
|
||||||
|
def pypy_windows_set_console_cp_patch() -> None:
|
||||||
|
"""
|
||||||
|
A patch function for PyPy on Windows that sets the console code page to
|
||||||
|
UTF-8 encodingto allow for proper handling of non-ASCII characters. This
|
||||||
|
function uses ctypes to call the Windows API functions SetConsoleCP and
|
||||||
|
SetConsoleOutputCP to set the code page.
|
||||||
|
"""
|
||||||
|
from ctypes import windll # type: ignore
|
||||||
|
|
||||||
|
code: int = windll.kernel32.GetConsoleOutputCP()
|
||||||
|
if code != 65001:
|
||||||
|
windll.kernel32.SetConsoleCP(65001)
|
||||||
|
windll.kernel32.SetConsoleOutputCP(65001)
|
||||||
|
|
||||||
|
|
||||||
class Header(CIMultiDict):
|
class Header(CIMultiDict):
|
||||||
"""
|
"""
|
||||||
Container used for both request and response headers. It is a subclass of
|
Container used for both request and response headers. It is a subclass of
|
||||||
@@ -38,7 +121,13 @@ class Header(CIMultiDict):
|
|||||||
<https://multidict.readthedocs.io/en/stable/multidict.html#multidict>`_
|
<https://multidict.readthedocs.io/en/stable/multidict.html#multidict>`_
|
||||||
for more details about how to use the object. In general, it should work
|
for more details about how to use the object. In general, it should work
|
||||||
very similar to a regular dictionary.
|
very similar to a regular dictionary.
|
||||||
"""
|
""" # noqa: E501
|
||||||
|
|
||||||
|
def __getattr__(self, key: str) -> str:
|
||||||
|
if key.startswith("_"):
|
||||||
|
return self.__getattribute__(key)
|
||||||
|
key = key.rstrip("_").replace("_", "-")
|
||||||
|
return ",".join(self.getall(key, default=[]))
|
||||||
|
|
||||||
def get_all(self, key: str):
|
def get_all(self, key: str):
|
||||||
"""
|
"""
|
||||||
@@ -47,17 +136,23 @@ class Header(CIMultiDict):
|
|||||||
return self.getall(key, default=[])
|
return self.getall(key, default=[])
|
||||||
|
|
||||||
|
|
||||||
use_trio = argv[0].endswith("hypercorn") and "trio" in argv
|
use_trio = sys.argv[0].endswith("hypercorn") and "trio" in sys.argv
|
||||||
|
|
||||||
if use_trio: # pragma: no cover
|
if use_trio: # pragma: no cover
|
||||||
import trio # type: ignore
|
import trio # type: ignore
|
||||||
|
|
||||||
def stat_async(path):
|
def stat_async(path) -> Awaitable[os.stat_result]:
|
||||||
return trio.Path(path).stat()
|
return trio.Path(path).stat()
|
||||||
|
|
||||||
open_async = trio.open_file
|
open_async = trio.open_file
|
||||||
CancelledErrors = tuple([asyncio.CancelledError, trio.Cancelled])
|
CancelledErrors = tuple([asyncio.CancelledError, trio.Cancelled])
|
||||||
else:
|
else:
|
||||||
|
if PYPY_IMPLEMENTATION:
|
||||||
|
pypy_os_module_patch()
|
||||||
|
|
||||||
|
if OS_IS_WINDOWS:
|
||||||
|
pypy_windows_set_console_cp_patch()
|
||||||
|
|
||||||
from aiofiles import open as aio_open # type: ignore
|
from aiofiles import open as aio_open # type: ignore
|
||||||
from aiofiles.os import stat as stat_async # type: ignore # noqa: F401
|
from aiofiles.os import stat as stat_async # type: ignore # noqa: F401
|
||||||
|
|
||||||
@@ -72,7 +167,7 @@ def ctrlc_workaround_for_windows(app):
|
|||||||
"""Asyncio wakeups to allow receiving SIGINT in Python"""
|
"""Asyncio wakeups to allow receiving SIGINT in Python"""
|
||||||
while not die:
|
while not die:
|
||||||
# If someone else stopped the app, just exit
|
# If someone else stopped the app, just exit
|
||||||
if app.is_stopping:
|
if app.state.is_stopping:
|
||||||
return
|
return
|
||||||
# Windows Python blocks signal handlers while the event loop is
|
# Windows Python blocks signal handlers while the event loop is
|
||||||
# waiting for I/O. Frequent wakeups keep interrupts flowing.
|
# waiting for I/O. Frequent wakeups keep interrupts flowing.
|
||||||
|
|||||||
149
sanic/config.py
149
sanic/config.py
@@ -1,55 +1,82 @@
|
|||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import sys
|
||||||
|
|
||||||
|
from abc import ABCMeta
|
||||||
from inspect import getmembers, isclass, isdatadescriptor
|
from inspect import getmembers, isclass, isdatadescriptor
|
||||||
from os import environ
|
from os import environ
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import Any, Callable, Dict, Optional, Sequence, Union
|
from typing import Any, Callable, Dict, Optional, Sequence, Union
|
||||||
|
from warnings import filterwarnings
|
||||||
|
|
||||||
|
from sanic.constants import LocalCertCreator
|
||||||
from sanic.errorpages import DEFAULT_FORMAT, check_error_format
|
from sanic.errorpages import DEFAULT_FORMAT, check_error_format
|
||||||
from sanic.helpers import Default, _default
|
from sanic.helpers import Default, _default
|
||||||
from sanic.http import Http
|
from sanic.http import Http
|
||||||
from sanic.log import deprecation, error_logger
|
from sanic.log import error_logger
|
||||||
from sanic.utils import load_module_from_file_location, str_to_bool
|
from sanic.utils import load_module_from_file_location, str_to_bool
|
||||||
|
|
||||||
|
|
||||||
|
if sys.version_info >= (3, 8):
|
||||||
|
from typing import Literal
|
||||||
|
|
||||||
|
FilterWarningType = Union[
|
||||||
|
Literal["default"],
|
||||||
|
Literal["error"],
|
||||||
|
Literal["ignore"],
|
||||||
|
Literal["always"],
|
||||||
|
Literal["module"],
|
||||||
|
Literal["once"],
|
||||||
|
]
|
||||||
|
else:
|
||||||
|
FilterWarningType = str
|
||||||
|
|
||||||
SANIC_PREFIX = "SANIC_"
|
SANIC_PREFIX = "SANIC_"
|
||||||
|
|
||||||
|
|
||||||
DEFAULT_CONFIG = {
|
DEFAULT_CONFIG = {
|
||||||
"_FALLBACK_ERROR_FORMAT": _default,
|
"_FALLBACK_ERROR_FORMAT": _default,
|
||||||
"ACCESS_LOG": True,
|
"ACCESS_LOG": False,
|
||||||
"AUTO_EXTEND": True,
|
"AUTO_EXTEND": True,
|
||||||
"AUTO_RELOAD": False,
|
"AUTO_RELOAD": False,
|
||||||
"EVENT_AUTOREGISTER": False,
|
"EVENT_AUTOREGISTER": False,
|
||||||
|
"DEPRECATION_FILTER": "once",
|
||||||
"FORWARDED_FOR_HEADER": "X-Forwarded-For",
|
"FORWARDED_FOR_HEADER": "X-Forwarded-For",
|
||||||
"FORWARDED_SECRET": None,
|
"FORWARDED_SECRET": None,
|
||||||
"GRACEFUL_SHUTDOWN_TIMEOUT": 15.0, # 15 sec
|
"GRACEFUL_SHUTDOWN_TIMEOUT": 15.0,
|
||||||
"KEEP_ALIVE_TIMEOUT": 5, # 5 seconds
|
"INSPECTOR": False,
|
||||||
|
"INSPECTOR_HOST": "localhost",
|
||||||
|
"INSPECTOR_PORT": 6457,
|
||||||
|
"INSPECTOR_TLS_KEY": _default,
|
||||||
|
"INSPECTOR_TLS_CERT": _default,
|
||||||
|
"INSPECTOR_API_KEY": "",
|
||||||
|
"KEEP_ALIVE_TIMEOUT": 120,
|
||||||
"KEEP_ALIVE": True,
|
"KEEP_ALIVE": True,
|
||||||
|
"LOCAL_CERT_CREATOR": LocalCertCreator.AUTO,
|
||||||
|
"LOCAL_TLS_KEY": _default,
|
||||||
|
"LOCAL_TLS_CERT": _default,
|
||||||
|
"LOCALHOST": "localhost",
|
||||||
"MOTD": True,
|
"MOTD": True,
|
||||||
"MOTD_DISPLAY": {},
|
"MOTD_DISPLAY": {},
|
||||||
"NOISY_EXCEPTIONS": False,
|
"NOISY_EXCEPTIONS": False,
|
||||||
"PROXIES_COUNT": None,
|
"PROXIES_COUNT": None,
|
||||||
"REAL_IP_HEADER": None,
|
"REAL_IP_HEADER": None,
|
||||||
"REGISTER": True,
|
"REQUEST_BUFFER_SIZE": 65536,
|
||||||
"REQUEST_BUFFER_SIZE": 65536, # 64 KiB
|
"REQUEST_MAX_HEADER_SIZE": 8192, # Cannot exceed 16384
|
||||||
"REQUEST_MAX_HEADER_SIZE": 8192, # 8 KiB, but cannot exceed 16384
|
|
||||||
"REQUEST_ID_HEADER": "X-Request-ID",
|
"REQUEST_ID_HEADER": "X-Request-ID",
|
||||||
"REQUEST_MAX_SIZE": 100000000, # 100 megabytes
|
"REQUEST_MAX_SIZE": 100_000_000,
|
||||||
"REQUEST_TIMEOUT": 60, # 60 seconds
|
"REQUEST_TIMEOUT": 60,
|
||||||
"RESPONSE_TIMEOUT": 60, # 60 seconds
|
"RESPONSE_TIMEOUT": 60,
|
||||||
|
"TLS_CERT_PASSWORD": "",
|
||||||
|
"TOUCHUP": _default,
|
||||||
"USE_UVLOOP": _default,
|
"USE_UVLOOP": _default,
|
||||||
"WEBSOCKET_MAX_SIZE": 2 ** 20, # 1 megabyte
|
"WEBSOCKET_MAX_SIZE": 2**20, # 1 MiB
|
||||||
"WEBSOCKET_PING_INTERVAL": 20,
|
"WEBSOCKET_PING_INTERVAL": 20,
|
||||||
"WEBSOCKET_PING_TIMEOUT": 20,
|
"WEBSOCKET_PING_TIMEOUT": 20,
|
||||||
}
|
}
|
||||||
|
|
||||||
# These values will be removed from the Config object in v22.6 and moved
|
|
||||||
# to the application state
|
|
||||||
DEPRECATED_CONFIG = ("SERVER_RUNNING", "RELOADER_PROCESS", "RELOADED_FILES")
|
|
||||||
|
|
||||||
|
class DescriptorMeta(ABCMeta):
|
||||||
class DescriptorMeta(type):
|
|
||||||
def __init__(cls, *_):
|
def __init__(cls, *_):
|
||||||
cls.__setters__ = {name for name, _ in getmembers(cls, cls._is_setter)}
|
cls.__setters__ = {name for name, _ in getmembers(cls, cls._is_setter)}
|
||||||
|
|
||||||
@@ -63,17 +90,27 @@ class Config(dict, metaclass=DescriptorMeta):
|
|||||||
AUTO_EXTEND: bool
|
AUTO_EXTEND: bool
|
||||||
AUTO_RELOAD: bool
|
AUTO_RELOAD: bool
|
||||||
EVENT_AUTOREGISTER: bool
|
EVENT_AUTOREGISTER: bool
|
||||||
|
DEPRECATION_FILTER: FilterWarningType
|
||||||
FORWARDED_FOR_HEADER: str
|
FORWARDED_FOR_HEADER: str
|
||||||
FORWARDED_SECRET: Optional[str]
|
FORWARDED_SECRET: Optional[str]
|
||||||
GRACEFUL_SHUTDOWN_TIMEOUT: float
|
GRACEFUL_SHUTDOWN_TIMEOUT: float
|
||||||
|
INSPECTOR: bool
|
||||||
|
INSPECTOR_HOST: str
|
||||||
|
INSPECTOR_PORT: int
|
||||||
|
INSPECTOR_TLS_KEY: Union[Path, str, Default]
|
||||||
|
INSPECTOR_TLS_CERT: Union[Path, str, Default]
|
||||||
|
INSPECTOR_API_KEY: str
|
||||||
KEEP_ALIVE_TIMEOUT: int
|
KEEP_ALIVE_TIMEOUT: int
|
||||||
KEEP_ALIVE: bool
|
KEEP_ALIVE: bool
|
||||||
NOISY_EXCEPTIONS: bool
|
LOCAL_CERT_CREATOR: Union[str, LocalCertCreator]
|
||||||
|
LOCAL_TLS_KEY: Union[Path, str, Default]
|
||||||
|
LOCAL_TLS_CERT: Union[Path, str, Default]
|
||||||
|
LOCALHOST: str
|
||||||
MOTD: bool
|
MOTD: bool
|
||||||
MOTD_DISPLAY: Dict[str, str]
|
MOTD_DISPLAY: Dict[str, str]
|
||||||
|
NOISY_EXCEPTIONS: bool
|
||||||
PROXIES_COUNT: Optional[int]
|
PROXIES_COUNT: Optional[int]
|
||||||
REAL_IP_HEADER: Optional[str]
|
REAL_IP_HEADER: Optional[str]
|
||||||
REGISTER: bool
|
|
||||||
REQUEST_BUFFER_SIZE: int
|
REQUEST_BUFFER_SIZE: int
|
||||||
REQUEST_MAX_HEADER_SIZE: int
|
REQUEST_MAX_HEADER_SIZE: int
|
||||||
REQUEST_ID_HEADER: str
|
REQUEST_ID_HEADER: str
|
||||||
@@ -81,6 +118,8 @@ class Config(dict, metaclass=DescriptorMeta):
|
|||||||
REQUEST_TIMEOUT: int
|
REQUEST_TIMEOUT: int
|
||||||
RESPONSE_TIMEOUT: int
|
RESPONSE_TIMEOUT: int
|
||||||
SERVER_NAME: str
|
SERVER_NAME: str
|
||||||
|
TLS_CERT_PASSWORD: str
|
||||||
|
TOUCHUP: Union[Default, bool]
|
||||||
USE_UVLOOP: Union[Default, bool]
|
USE_UVLOOP: Union[Default, bool]
|
||||||
WEBSOCKET_MAX_SIZE: int
|
WEBSOCKET_MAX_SIZE: int
|
||||||
WEBSOCKET_PING_INTERVAL: int
|
WEBSOCKET_PING_INTERVAL: int
|
||||||
@@ -88,7 +127,9 @@ class Config(dict, metaclass=DescriptorMeta):
|
|||||||
|
|
||||||
def __init__(
|
def __init__(
|
||||||
self,
|
self,
|
||||||
defaults: Dict[str, Union[str, bool, int, float, None]] = None,
|
defaults: Optional[
|
||||||
|
Dict[str, Union[str, bool, int, float, None]]
|
||||||
|
] = None,
|
||||||
env_prefix: Optional[str] = SANIC_PREFIX,
|
env_prefix: Optional[str] = SANIC_PREFIX,
|
||||||
keep_alive: Optional[bool] = None,
|
keep_alive: Optional[bool] = None,
|
||||||
*,
|
*,
|
||||||
@@ -96,9 +137,9 @@ class Config(dict, metaclass=DescriptorMeta):
|
|||||||
):
|
):
|
||||||
defaults = defaults or {}
|
defaults = defaults or {}
|
||||||
super().__init__({**DEFAULT_CONFIG, **defaults})
|
super().__init__({**DEFAULT_CONFIG, **defaults})
|
||||||
|
self._configure_warnings()
|
||||||
|
|
||||||
self._converters = [str, str_to_bool, float, int]
|
self._converters = [str, str_to_bool, float, int]
|
||||||
self._LOGO = ""
|
|
||||||
|
|
||||||
if converters:
|
if converters:
|
||||||
for converter in converters:
|
for converter in converters:
|
||||||
@@ -117,29 +158,34 @@ class Config(dict, metaclass=DescriptorMeta):
|
|||||||
self._check_error_format()
|
self._check_error_format()
|
||||||
self._init = True
|
self._init = True
|
||||||
|
|
||||||
def __getattr__(self, attr):
|
def __getattr__(self, attr: Any):
|
||||||
try:
|
try:
|
||||||
return self[attr]
|
return self[attr]
|
||||||
except KeyError as ke:
|
except KeyError as ke:
|
||||||
raise AttributeError(f"Config has no '{ke.args[0]}'")
|
raise AttributeError(f"Config has no '{ke.args[0]}'")
|
||||||
|
|
||||||
def __setattr__(self, attr, value) -> None:
|
def __setattr__(self, attr: str, value: Any) -> None:
|
||||||
if attr in self.__class__.__setters__:
|
self.update({attr: value})
|
||||||
|
|
||||||
|
def __setitem__(self, attr: str, value: Any) -> None:
|
||||||
|
self.update({attr: value})
|
||||||
|
|
||||||
|
def update(self, *other: Any, **kwargs: Any) -> None:
|
||||||
|
kwargs.update({k: v for item in other for k, v in dict(item).items()})
|
||||||
|
setters: Dict[str, Any] = {
|
||||||
|
k: kwargs.pop(k)
|
||||||
|
for k in {**kwargs}.keys()
|
||||||
|
if k in self.__class__.__setters__
|
||||||
|
}
|
||||||
|
|
||||||
|
for key, value in setters.items():
|
||||||
try:
|
try:
|
||||||
super().__setattr__(attr, value)
|
super().__setattr__(key, value)
|
||||||
except AttributeError:
|
except AttributeError:
|
||||||
...
|
...
|
||||||
else:
|
|
||||||
return None
|
|
||||||
self.update({attr: value})
|
|
||||||
|
|
||||||
def __setitem__(self, attr, value) -> None:
|
super().update(**kwargs)
|
||||||
self.update({attr: value})
|
for attr, value in {**setters, **kwargs}.items():
|
||||||
|
|
||||||
def update(self, *other, **kwargs) -> None:
|
|
||||||
other_mapping = {k: v for item in other for k, v in dict(item).items()}
|
|
||||||
super().update(*other, **kwargs)
|
|
||||||
for attr, value in {**other_mapping, **kwargs}.items():
|
|
||||||
self._post_set(attr, value)
|
self._post_set(attr, value)
|
||||||
|
|
||||||
def _post_set(self, attr, value) -> None:
|
def _post_set(self, attr, value) -> None:
|
||||||
@@ -150,21 +196,19 @@ class Config(dict, metaclass=DescriptorMeta):
|
|||||||
"REQUEST_MAX_SIZE",
|
"REQUEST_MAX_SIZE",
|
||||||
):
|
):
|
||||||
self._configure_header_size()
|
self._configure_header_size()
|
||||||
elif attr == "LOGO":
|
|
||||||
self._LOGO = value
|
|
||||||
deprecation(
|
|
||||||
"Setting the config.LOGO is deprecated and will no longer "
|
|
||||||
"be supported starting in v22.6.",
|
|
||||||
22.6,
|
|
||||||
)
|
|
||||||
|
|
||||||
@property
|
if attr == "LOCAL_CERT_CREATOR" and not isinstance(
|
||||||
def LOGO(self):
|
self.LOCAL_CERT_CREATOR, LocalCertCreator
|
||||||
return self._LOGO
|
):
|
||||||
|
self.LOCAL_CERT_CREATOR = LocalCertCreator[
|
||||||
|
self.LOCAL_CERT_CREATOR.upper()
|
||||||
|
]
|
||||||
|
elif attr == "DEPRECATION_FILTER":
|
||||||
|
self._configure_warnings()
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def FALLBACK_ERROR_FORMAT(self) -> str:
|
def FALLBACK_ERROR_FORMAT(self) -> str:
|
||||||
if self._FALLBACK_ERROR_FORMAT is _default:
|
if isinstance(self._FALLBACK_ERROR_FORMAT, Default):
|
||||||
return DEFAULT_FORMAT
|
return DEFAULT_FORMAT
|
||||||
return self._FALLBACK_ERROR_FORMAT
|
return self._FALLBACK_ERROR_FORMAT
|
||||||
|
|
||||||
@@ -172,7 +216,7 @@ class Config(dict, metaclass=DescriptorMeta):
|
|||||||
def FALLBACK_ERROR_FORMAT(self, value):
|
def FALLBACK_ERROR_FORMAT(self, value):
|
||||||
self._check_error_format(value)
|
self._check_error_format(value)
|
||||||
if (
|
if (
|
||||||
self._FALLBACK_ERROR_FORMAT is not _default
|
not isinstance(self._FALLBACK_ERROR_FORMAT, Default)
|
||||||
and value != self._FALLBACK_ERROR_FORMAT
|
and value != self._FALLBACK_ERROR_FORMAT
|
||||||
):
|
):
|
||||||
error_logger.warning(
|
error_logger.warning(
|
||||||
@@ -188,6 +232,13 @@ class Config(dict, metaclass=DescriptorMeta):
|
|||||||
self.REQUEST_MAX_SIZE,
|
self.REQUEST_MAX_SIZE,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def _configure_warnings(self):
|
||||||
|
filterwarnings(
|
||||||
|
self.DEPRECATION_FILTER,
|
||||||
|
category=DeprecationWarning,
|
||||||
|
module=r"sanic.*",
|
||||||
|
)
|
||||||
|
|
||||||
def _check_error_format(self, format: Optional[str] = None):
|
def _check_error_format(self, format: Optional[str] = None):
|
||||||
check_error_format(format or self.FALLBACK_ERROR_FORMAT)
|
check_error_format(format or self.FALLBACK_ERROR_FORMAT)
|
||||||
|
|
||||||
@@ -195,7 +246,9 @@ class Config(dict, metaclass=DescriptorMeta):
|
|||||||
"""
|
"""
|
||||||
Looks for prefixed environment variables and applies them to the
|
Looks for prefixed environment variables and applies them to the
|
||||||
configuration if present. This is called automatically when Sanic
|
configuration if present. This is called automatically when Sanic
|
||||||
starts up to load environment variables into config.
|
starts up to load environment variables into config. Environment
|
||||||
|
variables should start with the defined prefix and should only
|
||||||
|
contain uppercase letters.
|
||||||
|
|
||||||
It will automatically hydrate the following types:
|
It will automatically hydrate the following types:
|
||||||
|
|
||||||
@@ -222,7 +275,7 @@ class Config(dict, metaclass=DescriptorMeta):
|
|||||||
<https://sanicframework.org/guide/deployment/configuration.html>`__
|
<https://sanicframework.org/guide/deployment/configuration.html>`__
|
||||||
"""
|
"""
|
||||||
for key, value in environ.items():
|
for key, value in environ.items():
|
||||||
if not key.startswith(prefix):
|
if not key.startswith(prefix) or not key.isupper():
|
||||||
continue
|
continue
|
||||||
|
|
||||||
_, config_key = key.split(prefix, 1)
|
_, config_key = key.split(prefix, 1)
|
||||||
|
|||||||
@@ -1,20 +1,9 @@
|
|||||||
from enum import Enum, auto
|
from enum import auto
|
||||||
|
|
||||||
|
from sanic.compat import UpperStrEnum
|
||||||
|
|
||||||
|
|
||||||
class HTTPMethod(str, Enum):
|
class HTTPMethod(UpperStrEnum):
|
||||||
def _generate_next_value_(name, start, count, last_values):
|
|
||||||
return name.upper()
|
|
||||||
|
|
||||||
def __eq__(self, value: object) -> bool:
|
|
||||||
value = str(value).upper()
|
|
||||||
return super().__eq__(value)
|
|
||||||
|
|
||||||
def __hash__(self) -> int:
|
|
||||||
return hash(self.value)
|
|
||||||
|
|
||||||
def __str__(self) -> str:
|
|
||||||
return self.value
|
|
||||||
|
|
||||||
GET = auto()
|
GET = auto()
|
||||||
POST = auto()
|
POST = auto()
|
||||||
PUT = auto()
|
PUT = auto()
|
||||||
@@ -24,5 +13,22 @@ class HTTPMethod(str, Enum):
|
|||||||
DELETE = auto()
|
DELETE = auto()
|
||||||
|
|
||||||
|
|
||||||
|
class LocalCertCreator(UpperStrEnum):
|
||||||
|
AUTO = auto()
|
||||||
|
TRUSTME = auto()
|
||||||
|
MKCERT = auto()
|
||||||
|
|
||||||
|
|
||||||
HTTP_METHODS = tuple(HTTPMethod.__members__.values())
|
HTTP_METHODS = tuple(HTTPMethod.__members__.values())
|
||||||
|
SAFE_HTTP_METHODS = (HTTPMethod.GET, HTTPMethod.HEAD, HTTPMethod.OPTIONS)
|
||||||
|
IDEMPOTENT_HTTP_METHODS = (
|
||||||
|
HTTPMethod.GET,
|
||||||
|
HTTPMethod.HEAD,
|
||||||
|
HTTPMethod.PUT,
|
||||||
|
HTTPMethod.DELETE,
|
||||||
|
HTTPMethod.OPTIONS,
|
||||||
|
)
|
||||||
|
CACHEABLE_HTTP_METHODS = (HTTPMethod.GET, HTTPMethod.HEAD)
|
||||||
DEFAULT_HTTP_CONTENT_TYPE = "application/octet-stream"
|
DEFAULT_HTTP_CONTENT_TYPE = "application/octet-stream"
|
||||||
|
DEFAULT_LOCAL_TLS_KEY = "key.pem"
|
||||||
|
DEFAULT_LOCAL_TLS_CERT = "cert.pem"
|
||||||
|
|||||||
156
sanic/cookies.py
156
sanic/cookies.py
@@ -1,156 +0,0 @@
|
|||||||
import re
|
|
||||||
import string
|
|
||||||
|
|
||||||
from datetime import datetime
|
|
||||||
from typing import Dict
|
|
||||||
|
|
||||||
|
|
||||||
DEFAULT_MAX_AGE = 0
|
|
||||||
|
|
||||||
# ------------------------------------------------------------ #
|
|
||||||
# SimpleCookie
|
|
||||||
# ------------------------------------------------------------ #
|
|
||||||
|
|
||||||
# Straight up copied this section of dark magic from SimpleCookie
|
|
||||||
|
|
||||||
_LegalChars = string.ascii_letters + string.digits + "!#$%&'*+-.^_`|~:"
|
|
||||||
_UnescapedChars = _LegalChars + " ()/<=>?@[]{}"
|
|
||||||
|
|
||||||
_Translator = {
|
|
||||||
n: "\\%03o" % n for n in set(range(256)) - set(map(ord, _UnescapedChars))
|
|
||||||
}
|
|
||||||
_Translator.update({ord('"'): '\\"', ord("\\"): "\\\\"})
|
|
||||||
|
|
||||||
|
|
||||||
def _quote(str):
|
|
||||||
r"""Quote a string for use in a cookie header.
|
|
||||||
If the string does not need to be double-quoted, then just return the
|
|
||||||
string. Otherwise, surround the string in doublequotes and quote
|
|
||||||
(with a \) special characters.
|
|
||||||
"""
|
|
||||||
if str is None or _is_legal_key(str):
|
|
||||||
return str
|
|
||||||
else:
|
|
||||||
return '"' + str.translate(_Translator) + '"'
|
|
||||||
|
|
||||||
|
|
||||||
_is_legal_key = re.compile("[%s]+" % re.escape(_LegalChars)).fullmatch
|
|
||||||
|
|
||||||
# ------------------------------------------------------------ #
|
|
||||||
# Custom SimpleCookie
|
|
||||||
# ------------------------------------------------------------ #
|
|
||||||
|
|
||||||
|
|
||||||
class CookieJar(dict):
|
|
||||||
"""
|
|
||||||
CookieJar dynamically writes headers as cookies are added and removed
|
|
||||||
It gets around the limitation of one header per name by using the
|
|
||||||
MultiHeader class to provide a unique key that encodes to Set-Cookie.
|
|
||||||
"""
|
|
||||||
|
|
||||||
def __init__(self, headers):
|
|
||||||
super().__init__()
|
|
||||||
self.headers: Dict[str, str] = headers
|
|
||||||
self.cookie_headers: Dict[str, str] = {}
|
|
||||||
self.header_key: str = "Set-Cookie"
|
|
||||||
|
|
||||||
def __setitem__(self, key, value):
|
|
||||||
# If this cookie doesn't exist, add it to the header keys
|
|
||||||
if not self.cookie_headers.get(key):
|
|
||||||
cookie = Cookie(key, value)
|
|
||||||
cookie["path"] = "/"
|
|
||||||
self.cookie_headers[key] = self.header_key
|
|
||||||
self.headers.add(self.header_key, cookie)
|
|
||||||
return super().__setitem__(key, cookie)
|
|
||||||
else:
|
|
||||||
self[key].value = value
|
|
||||||
|
|
||||||
def __delitem__(self, key):
|
|
||||||
if key not in self.cookie_headers:
|
|
||||||
self[key] = ""
|
|
||||||
self[key]["max-age"] = 0
|
|
||||||
else:
|
|
||||||
cookie_header = self.cookie_headers[key]
|
|
||||||
# remove it from header
|
|
||||||
cookies = self.headers.popall(cookie_header)
|
|
||||||
for cookie in cookies:
|
|
||||||
if cookie.key != key:
|
|
||||||
self.headers.add(cookie_header, cookie)
|
|
||||||
del self.cookie_headers[key]
|
|
||||||
return super().__delitem__(key)
|
|
||||||
|
|
||||||
|
|
||||||
class Cookie(dict):
|
|
||||||
"""A stripped down version of Morsel from SimpleCookie #gottagofast"""
|
|
||||||
|
|
||||||
_keys = {
|
|
||||||
"expires": "expires",
|
|
||||||
"path": "Path",
|
|
||||||
"comment": "Comment",
|
|
||||||
"domain": "Domain",
|
|
||||||
"max-age": "Max-Age",
|
|
||||||
"secure": "Secure",
|
|
||||||
"httponly": "HttpOnly",
|
|
||||||
"version": "Version",
|
|
||||||
"samesite": "SameSite",
|
|
||||||
}
|
|
||||||
_flags = {"secure", "httponly"}
|
|
||||||
|
|
||||||
def __init__(self, key, value):
|
|
||||||
if key in self._keys:
|
|
||||||
raise KeyError("Cookie name is a reserved word")
|
|
||||||
if not _is_legal_key(key):
|
|
||||||
raise KeyError("Cookie key contains illegal characters")
|
|
||||||
self.key = key
|
|
||||||
self.value = value
|
|
||||||
super().__init__()
|
|
||||||
|
|
||||||
def __setitem__(self, key, value):
|
|
||||||
if key not in self._keys:
|
|
||||||
raise KeyError("Unknown cookie property")
|
|
||||||
if value is not False:
|
|
||||||
if key.lower() == "max-age":
|
|
||||||
if not str(value).isdigit():
|
|
||||||
raise ValueError("Cookie max-age must be an integer")
|
|
||||||
elif key.lower() == "expires":
|
|
||||||
if not isinstance(value, datetime):
|
|
||||||
raise TypeError(
|
|
||||||
"Cookie 'expires' property must be a datetime"
|
|
||||||
)
|
|
||||||
return super().__setitem__(key, value)
|
|
||||||
|
|
||||||
def encode(self, encoding):
|
|
||||||
"""
|
|
||||||
Encode the cookie content in a specific type of encoding instructed
|
|
||||||
by the developer. Leverages the :func:`str.encode` method provided
|
|
||||||
by python.
|
|
||||||
|
|
||||||
This method can be used to encode and embed ``utf-8`` content into
|
|
||||||
the cookies.
|
|
||||||
|
|
||||||
:param encoding: Encoding to be used with the cookie
|
|
||||||
:return: Cookie encoded in a codec of choosing.
|
|
||||||
:except: UnicodeEncodeError
|
|
||||||
"""
|
|
||||||
return str(self).encode(encoding)
|
|
||||||
|
|
||||||
def __str__(self):
|
|
||||||
"""Format as a Set-Cookie header value."""
|
|
||||||
output = ["%s=%s" % (self.key, _quote(self.value))]
|
|
||||||
for key, value in self.items():
|
|
||||||
if key == "max-age":
|
|
||||||
try:
|
|
||||||
output.append("%s=%d" % (self._keys[key], value))
|
|
||||||
except TypeError:
|
|
||||||
output.append("%s=%s" % (self._keys[key], value))
|
|
||||||
elif key == "expires":
|
|
||||||
output.append(
|
|
||||||
"%s=%s"
|
|
||||||
% (self._keys[key], value.strftime("%a, %d-%b-%Y %T GMT"))
|
|
||||||
)
|
|
||||||
elif key in self._flags and self[key]:
|
|
||||||
output.append(self._keys[key])
|
|
||||||
else:
|
|
||||||
output.append("%s=%s" % (self._keys[key], value))
|
|
||||||
|
|
||||||
return "; ".join(output)
|
|
||||||
4
sanic/cookies/__init__.py
Normal file
4
sanic/cookies/__init__.py
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
from .response import Cookie, CookieJar
|
||||||
|
|
||||||
|
|
||||||
|
__all__ = ("Cookie", "CookieJar")
|
||||||
119
sanic/cookies/request.py
Normal file
119
sanic/cookies/request.py
Normal file
@@ -0,0 +1,119 @@
|
|||||||
|
import re
|
||||||
|
|
||||||
|
from typing import Any, Dict, List, Optional
|
||||||
|
|
||||||
|
from sanic.cookies.response import Cookie
|
||||||
|
from sanic.log import deprecation
|
||||||
|
from sanic.request.parameters import RequestParameters
|
||||||
|
|
||||||
|
|
||||||
|
COOKIE_NAME_RESERVED_CHARS = re.compile(
|
||||||
|
'[\x00-\x1F\x7F-\xFF()<>@,;:\\\\"/[\\]?={} \x09]'
|
||||||
|
)
|
||||||
|
OCTAL_PATTERN = re.compile(r"\\[0-3][0-7][0-7]")
|
||||||
|
QUOTE_PATTERN = re.compile(r"[\\].")
|
||||||
|
|
||||||
|
|
||||||
|
def _unquote(str): # no cov
|
||||||
|
if str is None or len(str) < 2:
|
||||||
|
return str
|
||||||
|
if str[0] != '"' or str[-1] != '"':
|
||||||
|
return str
|
||||||
|
|
||||||
|
str = str[1:-1]
|
||||||
|
|
||||||
|
i = 0
|
||||||
|
n = len(str)
|
||||||
|
res = []
|
||||||
|
while 0 <= i < n:
|
||||||
|
o_match = OCTAL_PATTERN.search(str, i)
|
||||||
|
q_match = QUOTE_PATTERN.search(str, i)
|
||||||
|
if not o_match and not q_match:
|
||||||
|
res.append(str[i:])
|
||||||
|
break
|
||||||
|
# else:
|
||||||
|
j = k = -1
|
||||||
|
if o_match:
|
||||||
|
j = o_match.start(0)
|
||||||
|
if q_match:
|
||||||
|
k = q_match.start(0)
|
||||||
|
if q_match and (not o_match or k < j):
|
||||||
|
res.append(str[i:k])
|
||||||
|
res.append(str[k + 1])
|
||||||
|
i = k + 2
|
||||||
|
else:
|
||||||
|
res.append(str[i:j])
|
||||||
|
res.append(chr(int(str[j + 1 : j + 4], 8))) # noqa: E203
|
||||||
|
i = j + 4
|
||||||
|
return "".join(res)
|
||||||
|
|
||||||
|
|
||||||
|
def parse_cookie(raw: str):
|
||||||
|
cookies: Dict[str, List] = {}
|
||||||
|
|
||||||
|
for token in raw.split(";"):
|
||||||
|
name, __, value = token.partition("=")
|
||||||
|
name = name.strip()
|
||||||
|
value = value.strip()
|
||||||
|
|
||||||
|
if not name:
|
||||||
|
continue
|
||||||
|
|
||||||
|
if COOKIE_NAME_RESERVED_CHARS.search(name): # no cov
|
||||||
|
continue
|
||||||
|
|
||||||
|
if len(value) > 2 and value[0] == '"' and value[-1] == '"': # no cov
|
||||||
|
value = _unquote(value)
|
||||||
|
|
||||||
|
if name in cookies:
|
||||||
|
cookies[name].append(value)
|
||||||
|
else:
|
||||||
|
cookies[name] = [value]
|
||||||
|
|
||||||
|
return cookies
|
||||||
|
|
||||||
|
|
||||||
|
class CookieRequestParameters(RequestParameters):
|
||||||
|
def __getitem__(self, key: str) -> Optional[str]:
|
||||||
|
deprecation(
|
||||||
|
f"You are accessing cookie key '{key}', which is currently in "
|
||||||
|
"compat mode returning a single cookie value. Starting in v24.3 "
|
||||||
|
"accessing a cookie value like this will return a list of values. "
|
||||||
|
"To avoid this behavior and continue accessing a single value, "
|
||||||
|
f"please upgrade from request.cookies['{key}'] to "
|
||||||
|
f"request.cookies.get('{key}'). See more details: "
|
||||||
|
"https://sanic.dev/en/guide/release-notes/v23.3.html#request-cookies", # noqa
|
||||||
|
24.3,
|
||||||
|
)
|
||||||
|
try:
|
||||||
|
value = self._get_prefixed_cookie(key)
|
||||||
|
except KeyError:
|
||||||
|
value = super().__getitem__(key)
|
||||||
|
return value[0]
|
||||||
|
|
||||||
|
def __getattr__(self, key: str) -> str:
|
||||||
|
if key.startswith("_"):
|
||||||
|
return self.__getattribute__(key)
|
||||||
|
key = key.rstrip("_").replace("_", "-")
|
||||||
|
return str(self.get(key, ""))
|
||||||
|
|
||||||
|
def get(self, name: str, default: Optional[Any] = None) -> Optional[Any]:
|
||||||
|
try:
|
||||||
|
return self._get_prefixed_cookie(name)[0]
|
||||||
|
except KeyError:
|
||||||
|
return super().get(name, default)
|
||||||
|
|
||||||
|
def getlist(
|
||||||
|
self, name: str, default: Optional[Any] = None
|
||||||
|
) -> Optional[Any]:
|
||||||
|
try:
|
||||||
|
return self._get_prefixed_cookie(name)
|
||||||
|
except KeyError:
|
||||||
|
return super().getlist(name, default)
|
||||||
|
|
||||||
|
def _get_prefixed_cookie(self, name: str) -> Any:
|
||||||
|
getitem = super().__getitem__
|
||||||
|
try:
|
||||||
|
return getitem(f"{Cookie.HOST_PREFIX}{name}")
|
||||||
|
except KeyError:
|
||||||
|
return getitem(f"{Cookie.SECURE_PREFIX}{name}")
|
||||||
617
sanic/cookies/response.py
Normal file
617
sanic/cookies/response.py
Normal file
@@ -0,0 +1,617 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import re
|
||||||
|
import string
|
||||||
|
import sys
|
||||||
|
|
||||||
|
from datetime import datetime
|
||||||
|
from typing import TYPE_CHECKING, Any, Dict, List, Optional, Union
|
||||||
|
|
||||||
|
from sanic.exceptions import ServerError
|
||||||
|
from sanic.log import deprecation
|
||||||
|
|
||||||
|
|
||||||
|
if TYPE_CHECKING:
|
||||||
|
from sanic.compat import Header
|
||||||
|
|
||||||
|
if sys.version_info < (3, 8): # no cov
|
||||||
|
SameSite = str
|
||||||
|
else: # no cov
|
||||||
|
from typing import Literal
|
||||||
|
|
||||||
|
SameSite = Union[
|
||||||
|
Literal["Strict"],
|
||||||
|
Literal["Lax"],
|
||||||
|
Literal["None"],
|
||||||
|
Literal["strict"],
|
||||||
|
Literal["lax"],
|
||||||
|
Literal["none"],
|
||||||
|
]
|
||||||
|
|
||||||
|
DEFAULT_MAX_AGE = 0
|
||||||
|
SAMESITE_VALUES = ("strict", "lax", "none")
|
||||||
|
|
||||||
|
LEGAL_CHARS = string.ascii_letters + string.digits + "!#$%&'*+-.^_`|~:"
|
||||||
|
UNESCAPED_CHARS = LEGAL_CHARS + " ()/<=>?@[]{}"
|
||||||
|
TRANSLATOR = {ch: f"\\{ch:03o}" for ch in bytes(range(32)) + b'";\\\x7F'}
|
||||||
|
|
||||||
|
|
||||||
|
def _quote(str): # no cov
|
||||||
|
r"""Quote a string for use in a cookie header.
|
||||||
|
If the string does not need to be double-quoted, then just return the
|
||||||
|
string. Otherwise, surround the string in doublequotes and quote
|
||||||
|
(with a \) special characters.
|
||||||
|
"""
|
||||||
|
if str is None or _is_legal_key(str):
|
||||||
|
return str
|
||||||
|
else:
|
||||||
|
return f'"{str.translate(TRANSLATOR)}"'
|
||||||
|
|
||||||
|
|
||||||
|
_is_legal_key = re.compile("[%s]+" % re.escape(LEGAL_CHARS)).fullmatch
|
||||||
|
|
||||||
|
|
||||||
|
# In v24.3, we should remove this as being a subclass of dict
|
||||||
|
class CookieJar(dict):
|
||||||
|
"""
|
||||||
|
CookieJar dynamically writes headers as cookies are added and removed
|
||||||
|
It gets around the limitation of one header per name by using the
|
||||||
|
MultiHeader class to provide a unique key that encodes to Set-Cookie.
|
||||||
|
"""
|
||||||
|
|
||||||
|
HEADER_KEY = "Set-Cookie"
|
||||||
|
|
||||||
|
def __init__(self, headers: Header):
|
||||||
|
super().__init__()
|
||||||
|
self.headers = headers
|
||||||
|
|
||||||
|
def __setitem__(self, key, value):
|
||||||
|
# If this cookie doesn't exist, add it to the header keys
|
||||||
|
deprecation(
|
||||||
|
"Setting cookie values using the dict pattern has been "
|
||||||
|
"deprecated. You should instead use the cookies.add_cookie "
|
||||||
|
"method. To learn more, please see: "
|
||||||
|
"https://sanic.dev/en/guide/release-notes/v23.3.html#response-cookies", # noqa
|
||||||
|
0,
|
||||||
|
)
|
||||||
|
if key not in self:
|
||||||
|
self.add_cookie(key, value, secure=False, samesite=None)
|
||||||
|
else:
|
||||||
|
self[key].value = value
|
||||||
|
|
||||||
|
def __delitem__(self, key):
|
||||||
|
deprecation(
|
||||||
|
"Deleting cookie values using the dict pattern has been "
|
||||||
|
"deprecated. You should instead use the cookies.delete_cookie "
|
||||||
|
"method. To learn more, please see: "
|
||||||
|
"https://sanic.dev/en/guide/release-notes/v23.3.html#response-cookies", # noqa
|
||||||
|
0,
|
||||||
|
)
|
||||||
|
if key in self:
|
||||||
|
super().__delitem__(key)
|
||||||
|
self.delete_cookie(key)
|
||||||
|
|
||||||
|
def __len__(self): # no cov
|
||||||
|
return len(self.cookies)
|
||||||
|
|
||||||
|
def __getitem__(self, key: str) -> Cookie:
|
||||||
|
deprecation(
|
||||||
|
"Accessing cookies from the CookieJar by dict key is deprecated. "
|
||||||
|
"You should instead use the cookies.get_cookie method. "
|
||||||
|
"To learn more, please see: "
|
||||||
|
"https://sanic.dev/en/guide/release-notes/v23.3.html#response-cookies", # noqa
|
||||||
|
0,
|
||||||
|
)
|
||||||
|
return super().__getitem__(key)
|
||||||
|
|
||||||
|
def __iter__(self): # no cov
|
||||||
|
deprecation(
|
||||||
|
"Iterating over the CookieJar has been deprecated and will be "
|
||||||
|
"removed in v24.3. To learn more, please see: "
|
||||||
|
"https://sanic.dev/en/guide/release-notes/v23.3.html#response-cookies", # noqa
|
||||||
|
24.3,
|
||||||
|
)
|
||||||
|
return super().__iter__()
|
||||||
|
|
||||||
|
def keys(self): # no cov
|
||||||
|
deprecation(
|
||||||
|
"Accessing CookieJar.keys() has been deprecated and will be "
|
||||||
|
"removed in v24.3. To learn more, please see: "
|
||||||
|
"https://sanic.dev/en/guide/release-notes/v23.3.html#response-cookies", # noqa
|
||||||
|
24.3,
|
||||||
|
)
|
||||||
|
return super().keys()
|
||||||
|
|
||||||
|
def values(self): # no cov
|
||||||
|
deprecation(
|
||||||
|
"Accessing CookieJar.values() has been deprecated and will be "
|
||||||
|
"removed in v24.3. To learn more, please see: "
|
||||||
|
"https://sanic.dev/en/guide/release-notes/v23.3.html#response-cookies", # noqa
|
||||||
|
24.3,
|
||||||
|
)
|
||||||
|
return super().values()
|
||||||
|
|
||||||
|
def items(self): # no cov
|
||||||
|
deprecation(
|
||||||
|
"Accessing CookieJar.items() has been deprecated and will be "
|
||||||
|
"removed in v24.3. To learn more, please see: "
|
||||||
|
"https://sanic.dev/en/guide/release-notes/v23.3.html#response-cookies", # noqa
|
||||||
|
24.3,
|
||||||
|
)
|
||||||
|
return super().items()
|
||||||
|
|
||||||
|
def get(self, *args, **kwargs): # no cov
|
||||||
|
deprecation(
|
||||||
|
"Accessing cookies from the CookieJar using get is deprecated "
|
||||||
|
"and will be removed in v24.3. You should instead use the "
|
||||||
|
"cookies.get_cookie method. To learn more, please see: "
|
||||||
|
"https://sanic.dev/en/guide/release-notes/v23.3.html#response-cookies", # noqa
|
||||||
|
24.3,
|
||||||
|
)
|
||||||
|
return super().get(*args, **kwargs)
|
||||||
|
|
||||||
|
def pop(self, key, *args, **kwargs): # no cov
|
||||||
|
deprecation(
|
||||||
|
"Using CookieJar.pop() has been deprecated and will be "
|
||||||
|
"removed in v24.3. To learn more, please see: "
|
||||||
|
"https://sanic.dev/en/guide/release-notes/v23.3.html#response-cookies", # noqa
|
||||||
|
24.3,
|
||||||
|
)
|
||||||
|
self.delete(key)
|
||||||
|
return super().pop(key, *args, **kwargs)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def header_key(self): # no cov
|
||||||
|
deprecation(
|
||||||
|
"The CookieJar.header_key property has been deprecated and will "
|
||||||
|
"be removed in version 24.3. Use CookieJar.HEADER_KEY. ",
|
||||||
|
24.3,
|
||||||
|
)
|
||||||
|
return CookieJar.HEADER_KEY
|
||||||
|
|
||||||
|
@property
|
||||||
|
def cookie_headers(self) -> Dict[str, str]: # no cov
|
||||||
|
deprecation(
|
||||||
|
"The CookieJar.coookie_headers property has been deprecated "
|
||||||
|
"and will be removed in version 24.3. If you need to check if a "
|
||||||
|
"particular cookie key has been set, use CookieJar.has_cookie.",
|
||||||
|
24.3,
|
||||||
|
)
|
||||||
|
return {key: self.header_key for key in self}
|
||||||
|
|
||||||
|
@property
|
||||||
|
def cookies(self) -> List[Cookie]:
|
||||||
|
return self.headers.getall(self.HEADER_KEY)
|
||||||
|
|
||||||
|
def get_cookie(
|
||||||
|
self,
|
||||||
|
key: str,
|
||||||
|
path: str = "/",
|
||||||
|
domain: Optional[str] = None,
|
||||||
|
host_prefix: bool = False,
|
||||||
|
secure_prefix: bool = False,
|
||||||
|
) -> Optional[Cookie]:
|
||||||
|
for cookie in self.cookies:
|
||||||
|
if (
|
||||||
|
cookie.key == Cookie.make_key(key, host_prefix, secure_prefix)
|
||||||
|
and cookie.path == path
|
||||||
|
and cookie.domain == domain
|
||||||
|
):
|
||||||
|
return cookie
|
||||||
|
return None
|
||||||
|
|
||||||
|
def has_cookie(
|
||||||
|
self,
|
||||||
|
key: str,
|
||||||
|
path: str = "/",
|
||||||
|
domain: Optional[str] = None,
|
||||||
|
host_prefix: bool = False,
|
||||||
|
secure_prefix: bool = False,
|
||||||
|
) -> bool:
|
||||||
|
for cookie in self.cookies:
|
||||||
|
if (
|
||||||
|
cookie.key == Cookie.make_key(key, host_prefix, secure_prefix)
|
||||||
|
and cookie.path == path
|
||||||
|
and cookie.domain == domain
|
||||||
|
):
|
||||||
|
return True
|
||||||
|
return False
|
||||||
|
|
||||||
|
def add_cookie(
|
||||||
|
self,
|
||||||
|
key: str,
|
||||||
|
value: str,
|
||||||
|
*,
|
||||||
|
path: str = "/",
|
||||||
|
domain: Optional[str] = None,
|
||||||
|
secure: bool = True,
|
||||||
|
max_age: Optional[int] = None,
|
||||||
|
expires: Optional[datetime] = None,
|
||||||
|
httponly: bool = False,
|
||||||
|
samesite: Optional[SameSite] = "Lax",
|
||||||
|
partitioned: bool = False,
|
||||||
|
comment: Optional[str] = None,
|
||||||
|
host_prefix: bool = False,
|
||||||
|
secure_prefix: bool = False,
|
||||||
|
) -> Cookie:
|
||||||
|
"""
|
||||||
|
Add a cookie to the CookieJar
|
||||||
|
|
||||||
|
:param key: Key of the cookie
|
||||||
|
:type key: str
|
||||||
|
:param value: Value of the cookie
|
||||||
|
:type value: str
|
||||||
|
:param path: Path of the cookie, defaults to None
|
||||||
|
:type path: Optional[str], optional
|
||||||
|
:param domain: Domain of the cookie, defaults to None
|
||||||
|
:type domain: Optional[str], optional
|
||||||
|
:param secure: Whether to set it as a secure cookie, defaults to True
|
||||||
|
:type secure: bool
|
||||||
|
:param max_age: Max age of the cookie in seconds; if set to 0 a
|
||||||
|
browser should delete it, defaults to None
|
||||||
|
:type max_age: Optional[int], optional
|
||||||
|
:param expires: When the cookie expires; if set to None browsers
|
||||||
|
should set it as a session cookie, defaults to None
|
||||||
|
:type expires: Optional[datetime], optional
|
||||||
|
:param httponly: Whether to set it as HTTP only, defaults to False
|
||||||
|
:type httponly: bool
|
||||||
|
:param samesite: How to set the samesite property, should be
|
||||||
|
strict, lax or none (case insensitive), defaults to Lax
|
||||||
|
:type samesite: Optional[SameSite], optional
|
||||||
|
:param partitioned: Whether to set it as partitioned, defaults to False
|
||||||
|
:type partitioned: bool
|
||||||
|
:param comment: A cookie comment, defaults to None
|
||||||
|
:type comment: Optional[str], optional
|
||||||
|
:param host_prefix: Whether to add __Host- as a prefix to the key.
|
||||||
|
This requires that path="/", domain=None, and secure=True,
|
||||||
|
defaults to False
|
||||||
|
:type host_prefix: bool
|
||||||
|
:param secure_prefix: Whether to add __Secure- as a prefix to the key.
|
||||||
|
This requires that secure=True, defaults to False
|
||||||
|
:type secure_prefix: bool
|
||||||
|
:return: The instance of the created cookie
|
||||||
|
:rtype: Cookie
|
||||||
|
"""
|
||||||
|
cookie = Cookie(
|
||||||
|
key,
|
||||||
|
value,
|
||||||
|
path=path,
|
||||||
|
expires=expires,
|
||||||
|
comment=comment,
|
||||||
|
domain=domain,
|
||||||
|
max_age=max_age,
|
||||||
|
secure=secure,
|
||||||
|
httponly=httponly,
|
||||||
|
samesite=samesite,
|
||||||
|
partitioned=partitioned,
|
||||||
|
host_prefix=host_prefix,
|
||||||
|
secure_prefix=secure_prefix,
|
||||||
|
)
|
||||||
|
self.headers.add(self.HEADER_KEY, cookie)
|
||||||
|
|
||||||
|
# This should be removed in v24.3
|
||||||
|
super().__setitem__(key, cookie)
|
||||||
|
|
||||||
|
return cookie
|
||||||
|
|
||||||
|
def delete_cookie(
|
||||||
|
self,
|
||||||
|
key: str,
|
||||||
|
*,
|
||||||
|
path: str = "/",
|
||||||
|
domain: Optional[str] = None,
|
||||||
|
host_prefix: bool = False,
|
||||||
|
secure_prefix: bool = False,
|
||||||
|
) -> None:
|
||||||
|
"""
|
||||||
|
Delete a cookie
|
||||||
|
|
||||||
|
This will effectively set it as Max-Age: 0, which a browser should
|
||||||
|
interpret it to mean: "delete the cookie".
|
||||||
|
|
||||||
|
Since it is a browser/client implementation, your results may vary
|
||||||
|
depending upon which client is being used.
|
||||||
|
|
||||||
|
:param key: The key to be deleted
|
||||||
|
:type key: str
|
||||||
|
:param path: Path of the cookie, defaults to None
|
||||||
|
:type path: Optional[str], optional
|
||||||
|
:param domain: Domain of the cookie, defaults to None
|
||||||
|
:type domain: Optional[str], optional
|
||||||
|
:param host_prefix: Whether to add __Host- as a prefix to the key.
|
||||||
|
This requires that path="/", domain=None, and secure=True,
|
||||||
|
defaults to False
|
||||||
|
:type host_prefix: bool
|
||||||
|
:param secure_prefix: Whether to add __Secure- as a prefix to the key.
|
||||||
|
This requires that secure=True, defaults to False
|
||||||
|
:type secure_prefix: bool
|
||||||
|
"""
|
||||||
|
# remove it from header
|
||||||
|
cookies: List[Cookie] = self.headers.popall(self.HEADER_KEY, [])
|
||||||
|
for cookie in cookies:
|
||||||
|
if (
|
||||||
|
cookie.key != Cookie.make_key(key, host_prefix, secure_prefix)
|
||||||
|
or cookie.path != path
|
||||||
|
or cookie.domain != domain
|
||||||
|
):
|
||||||
|
self.headers.add(self.HEADER_KEY, cookie)
|
||||||
|
|
||||||
|
# This should be removed in v24.3
|
||||||
|
try:
|
||||||
|
super().__delitem__(key)
|
||||||
|
except KeyError:
|
||||||
|
...
|
||||||
|
|
||||||
|
self.add_cookie(
|
||||||
|
key=key,
|
||||||
|
value="",
|
||||||
|
path=path,
|
||||||
|
domain=domain,
|
||||||
|
max_age=0,
|
||||||
|
samesite=None,
|
||||||
|
host_prefix=host_prefix,
|
||||||
|
secure_prefix=secure_prefix,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
# In v24.3, we should remove this as being a subclass of dict
|
||||||
|
# Instead, it should be an object with __slots__
|
||||||
|
# All of the current property accessors should be removed in favor
|
||||||
|
# of actual slotted properties.
|
||||||
|
class Cookie(dict):
|
||||||
|
"""A stripped down version of Morsel from SimpleCookie"""
|
||||||
|
|
||||||
|
HOST_PREFIX = "__Host-"
|
||||||
|
SECURE_PREFIX = "__Secure-"
|
||||||
|
|
||||||
|
_keys = {
|
||||||
|
"path": "Path",
|
||||||
|
"comment": "Comment",
|
||||||
|
"domain": "Domain",
|
||||||
|
"max-age": "Max-Age",
|
||||||
|
"expires": "expires",
|
||||||
|
"samesite": "SameSite",
|
||||||
|
"version": "Version",
|
||||||
|
"secure": "Secure",
|
||||||
|
"httponly": "HttpOnly",
|
||||||
|
"partitioned": "Partitioned",
|
||||||
|
}
|
||||||
|
_flags = {"secure", "httponly", "partitioned"}
|
||||||
|
|
||||||
|
def __init__(
|
||||||
|
self,
|
||||||
|
key: str,
|
||||||
|
value: str,
|
||||||
|
*,
|
||||||
|
path: str = "/",
|
||||||
|
domain: Optional[str] = None,
|
||||||
|
secure: bool = True,
|
||||||
|
max_age: Optional[int] = None,
|
||||||
|
expires: Optional[datetime] = None,
|
||||||
|
httponly: bool = False,
|
||||||
|
samesite: Optional[SameSite] = "Lax",
|
||||||
|
partitioned: bool = False,
|
||||||
|
comment: Optional[str] = None,
|
||||||
|
host_prefix: bool = False,
|
||||||
|
secure_prefix: bool = False,
|
||||||
|
):
|
||||||
|
if key in self._keys:
|
||||||
|
raise KeyError("Cookie name is a reserved word")
|
||||||
|
if not _is_legal_key(key):
|
||||||
|
raise KeyError("Cookie key contains illegal characters")
|
||||||
|
if host_prefix:
|
||||||
|
if not secure:
|
||||||
|
raise ServerError(
|
||||||
|
"Cannot set host_prefix on a cookie without secure=True"
|
||||||
|
)
|
||||||
|
if path != "/":
|
||||||
|
raise ServerError(
|
||||||
|
"Cannot set host_prefix on a cookie unless path='/'"
|
||||||
|
)
|
||||||
|
if domain:
|
||||||
|
raise ServerError(
|
||||||
|
"Cannot set host_prefix on a cookie with a defined domain"
|
||||||
|
)
|
||||||
|
elif secure_prefix and not secure:
|
||||||
|
raise ServerError(
|
||||||
|
"Cannot set secure_prefix on a cookie without secure=True"
|
||||||
|
)
|
||||||
|
if partitioned and not host_prefix:
|
||||||
|
# This is technically possible, but it is not advisable so we will
|
||||||
|
# take a stand and say "don't shoot yourself in the foot"
|
||||||
|
raise ServerError(
|
||||||
|
"Cannot create a partitioned cookie without "
|
||||||
|
"also setting host_prefix=True"
|
||||||
|
)
|
||||||
|
|
||||||
|
self.key = self.make_key(key, host_prefix, secure_prefix)
|
||||||
|
self.value = value
|
||||||
|
super().__init__()
|
||||||
|
|
||||||
|
# This is a temporary solution while this object is a dict. We update
|
||||||
|
# all of the values in bulk, except for the values that have
|
||||||
|
# key-specific validation in _set_value
|
||||||
|
self.update(
|
||||||
|
{
|
||||||
|
"path": path,
|
||||||
|
"comment": comment,
|
||||||
|
"domain": domain,
|
||||||
|
"secure": secure,
|
||||||
|
"httponly": httponly,
|
||||||
|
"partitioned": partitioned,
|
||||||
|
"expires": None,
|
||||||
|
"max-age": None,
|
||||||
|
"samesite": None,
|
||||||
|
}
|
||||||
|
)
|
||||||
|
if expires is not None:
|
||||||
|
self._set_value("expires", expires)
|
||||||
|
if max_age is not None:
|
||||||
|
self._set_value("max-age", max_age)
|
||||||
|
if samesite is not None:
|
||||||
|
self._set_value("samesite", samesite)
|
||||||
|
|
||||||
|
def __setitem__(self, key, value):
|
||||||
|
deprecation(
|
||||||
|
"Setting values on a Cookie object as a dict has been deprecated. "
|
||||||
|
"This feature will be removed in v24.3. You should instead set "
|
||||||
|
f"values on cookies as object properties: cookie.{key}=... ",
|
||||||
|
24.3,
|
||||||
|
)
|
||||||
|
self._set_value(key, value)
|
||||||
|
|
||||||
|
# This is a temporary method for backwards compat and should be removed
|
||||||
|
# in v24.3 when this is no longer a dict
|
||||||
|
def _set_value(self, key: str, value: Any) -> None:
|
||||||
|
if key not in self._keys:
|
||||||
|
raise KeyError("Unknown cookie property: %s=%s" % (key, value))
|
||||||
|
|
||||||
|
if value is not None:
|
||||||
|
if key.lower() == "max-age" and not str(value).isdigit():
|
||||||
|
raise ValueError("Cookie max-age must be an integer")
|
||||||
|
elif key.lower() == "expires" and not isinstance(value, datetime):
|
||||||
|
raise TypeError("Cookie 'expires' property must be a datetime")
|
||||||
|
elif key.lower() == "samesite":
|
||||||
|
if value.lower() not in SAMESITE_VALUES:
|
||||||
|
raise TypeError(
|
||||||
|
"Cookie 'samesite' property must "
|
||||||
|
f"be one of: {','.join(SAMESITE_VALUES)}"
|
||||||
|
)
|
||||||
|
value = value.title()
|
||||||
|
|
||||||
|
super().__setitem__(key, value)
|
||||||
|
|
||||||
|
def encode(self, encoding):
|
||||||
|
"""
|
||||||
|
Encode the cookie content in a specific type of encoding instructed
|
||||||
|
by the developer. Leverages the :func:`str.encode` method provided
|
||||||
|
by python.
|
||||||
|
|
||||||
|
This method can be used to encode and embed ``utf-8`` content into
|
||||||
|
the cookies.
|
||||||
|
|
||||||
|
:param encoding: Encoding to be used with the cookie
|
||||||
|
:return: Cookie encoded in a codec of choosing.
|
||||||
|
:except: UnicodeEncodeError
|
||||||
|
"""
|
||||||
|
deprecation(
|
||||||
|
"Direct encoding of a Cookie object has been deprecated and will "
|
||||||
|
"be removed in v24.3.",
|
||||||
|
24.3,
|
||||||
|
)
|
||||||
|
return str(self).encode(encoding)
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
"""Format as a Set-Cookie header value."""
|
||||||
|
output = ["%s=%s" % (self.key, _quote(self.value))]
|
||||||
|
key_index = list(self._keys)
|
||||||
|
for key, value in sorted(
|
||||||
|
self.items(), key=lambda x: key_index.index(x[0])
|
||||||
|
):
|
||||||
|
if value is not None and value is not False:
|
||||||
|
if key == "max-age":
|
||||||
|
try:
|
||||||
|
output.append("%s=%d" % (self._keys[key], value))
|
||||||
|
except TypeError:
|
||||||
|
output.append("%s=%s" % (self._keys[key], value))
|
||||||
|
elif key == "expires":
|
||||||
|
output.append(
|
||||||
|
"%s=%s"
|
||||||
|
% (
|
||||||
|
self._keys[key],
|
||||||
|
value.strftime("%a, %d-%b-%Y %T GMT"),
|
||||||
|
)
|
||||||
|
)
|
||||||
|
elif key in self._flags:
|
||||||
|
output.append(self._keys[key])
|
||||||
|
else:
|
||||||
|
output.append("%s=%s" % (self._keys[key], value))
|
||||||
|
|
||||||
|
return "; ".join(output)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def path(self) -> str: # no cov
|
||||||
|
return self["path"]
|
||||||
|
|
||||||
|
@path.setter
|
||||||
|
def path(self, value: str) -> None: # no cov
|
||||||
|
self._set_value("path", value)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def expires(self) -> Optional[datetime]: # no cov
|
||||||
|
return self.get("expires")
|
||||||
|
|
||||||
|
@expires.setter
|
||||||
|
def expires(self, value: datetime) -> None: # no cov
|
||||||
|
self._set_value("expires", value)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def comment(self) -> Optional[str]: # no cov
|
||||||
|
return self.get("comment")
|
||||||
|
|
||||||
|
@comment.setter
|
||||||
|
def comment(self, value: str) -> None: # no cov
|
||||||
|
self._set_value("comment", value)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def domain(self) -> Optional[str]: # no cov
|
||||||
|
return self.get("domain")
|
||||||
|
|
||||||
|
@domain.setter
|
||||||
|
def domain(self, value: str) -> None: # no cov
|
||||||
|
self._set_value("domain", value)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def max_age(self) -> Optional[int]: # no cov
|
||||||
|
return self.get("max-age")
|
||||||
|
|
||||||
|
@max_age.setter
|
||||||
|
def max_age(self, value: int) -> None: # no cov
|
||||||
|
self._set_value("max-age", value)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def secure(self) -> bool: # no cov
|
||||||
|
return self.get("secure", False)
|
||||||
|
|
||||||
|
@secure.setter
|
||||||
|
def secure(self, value: bool) -> None: # no cov
|
||||||
|
self._set_value("secure", value)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def httponly(self) -> bool: # no cov
|
||||||
|
return self.get("httponly", False)
|
||||||
|
|
||||||
|
@httponly.setter
|
||||||
|
def httponly(self, value: bool) -> None: # no cov
|
||||||
|
self._set_value("httponly", value)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def samesite(self) -> Optional[SameSite]: # no cov
|
||||||
|
return self.get("samesite")
|
||||||
|
|
||||||
|
@samesite.setter
|
||||||
|
def samesite(self, value: SameSite) -> None: # no cov
|
||||||
|
self._set_value("samesite", value)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def partitioned(self) -> bool: # no cov
|
||||||
|
return self.get("partitioned", False)
|
||||||
|
|
||||||
|
@partitioned.setter
|
||||||
|
def partitioned(self, value: bool) -> None: # no cov
|
||||||
|
self._set_value("partitioned", value)
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def make_key(
|
||||||
|
cls, key: str, host_prefix: bool = False, secure_prefix: bool = False
|
||||||
|
) -> str:
|
||||||
|
if host_prefix and secure_prefix:
|
||||||
|
raise ServerError(
|
||||||
|
"Both host_prefix and secure_prefix were requested. "
|
||||||
|
"A cookie should have only one prefix."
|
||||||
|
)
|
||||||
|
elif host_prefix:
|
||||||
|
key = cls.HOST_PREFIX + key
|
||||||
|
elif secure_prefix:
|
||||||
|
key = cls.SECURE_PREFIX + key
|
||||||
|
return key
|
||||||
@@ -12,6 +12,7 @@ Setting ``app.config.FALLBACK_ERROR_FORMAT = "auto"`` will enable a switch that
|
|||||||
will attempt to provide an appropriate response format based upon the
|
will attempt to provide an appropriate response format based upon the
|
||||||
request type.
|
request type.
|
||||||
"""
|
"""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
import sys
|
import sys
|
||||||
import typing as t
|
import typing as t
|
||||||
@@ -19,10 +20,11 @@ import typing as t
|
|||||||
from functools import partial
|
from functools import partial
|
||||||
from traceback import extract_tb
|
from traceback import extract_tb
|
||||||
|
|
||||||
from sanic.exceptions import InvalidUsage, SanicException
|
from sanic.exceptions import BadRequest, SanicException
|
||||||
from sanic.helpers import STATUS_CODES
|
from sanic.helpers import STATUS_CODES
|
||||||
from sanic.request import Request
|
from sanic.log import deprecation, logger
|
||||||
from sanic.response import HTTPResponse, html, json, text
|
from sanic.pages.error import ErrorPage
|
||||||
|
from sanic.response import html, json, text
|
||||||
|
|
||||||
|
|
||||||
dumps: t.Callable[..., str]
|
dumps: t.Callable[..., str]
|
||||||
@@ -33,13 +35,15 @@ try:
|
|||||||
except ImportError: # noqa
|
except ImportError: # noqa
|
||||||
from json import dumps
|
from json import dumps
|
||||||
|
|
||||||
|
if t.TYPE_CHECKING:
|
||||||
|
from sanic import HTTPResponse, Request
|
||||||
|
|
||||||
DEFAULT_FORMAT = "auto"
|
DEFAULT_FORMAT = "auto"
|
||||||
FALLBACK_TEXT = (
|
FALLBACK_TEXT = """\
|
||||||
"The server encountered an internal error and "
|
The application encountered an unexpected error and could not continue.\
|
||||||
"cannot complete your request."
|
"""
|
||||||
)
|
|
||||||
FALLBACK_STATUS = 500
|
FALLBACK_STATUS = 500
|
||||||
|
JSON = "application/json"
|
||||||
|
|
||||||
|
|
||||||
class BaseRenderer:
|
class BaseRenderer:
|
||||||
@@ -88,8 +92,10 @@ class BaseRenderer:
|
|||||||
self.full
|
self.full
|
||||||
if self.debug and not getattr(self.exception, "quiet", False)
|
if self.debug and not getattr(self.exception, "quiet", False)
|
||||||
else self.minimal
|
else self.minimal
|
||||||
)
|
)()
|
||||||
return output()
|
output.status = self.status
|
||||||
|
output.headers.update(self.headers)
|
||||||
|
return output
|
||||||
|
|
||||||
def minimal(self) -> HTTPResponse: # noqa
|
def minimal(self) -> HTTPResponse: # noqa
|
||||||
"""
|
"""
|
||||||
@@ -113,134 +119,18 @@ class HTMLRenderer(BaseRenderer):
|
|||||||
The default fallback type.
|
The default fallback type.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
TRACEBACK_STYLE = """
|
|
||||||
html { font-family: sans-serif }
|
|
||||||
h2 { color: #888; }
|
|
||||||
.tb-wrapper p, dl, dd { margin: 0 }
|
|
||||||
.frame-border { margin: 1rem }
|
|
||||||
.frame-line > *, dt, dd { padding: 0.3rem 0.6rem }
|
|
||||||
.frame-line, dl { margin-bottom: 0.3rem }
|
|
||||||
.frame-code, dd { font-size: 16px; padding-left: 4ch }
|
|
||||||
.tb-wrapper, dl { border: 1px solid #eee }
|
|
||||||
.tb-header,.obj-header {
|
|
||||||
background: #eee; padding: 0.3rem; font-weight: bold
|
|
||||||
}
|
|
||||||
.frame-descriptor, dt { background: #e2eafb; font-size: 14px }
|
|
||||||
"""
|
|
||||||
TRACEBACK_WRAPPER_HTML = (
|
|
||||||
"<div class=tb-header>{exc_name}: {exc_value}</div>"
|
|
||||||
"<div class=tb-wrapper>{frame_html}</div>"
|
|
||||||
)
|
|
||||||
TRACEBACK_BORDER = (
|
|
||||||
"<div class=frame-border>"
|
|
||||||
"The above exception was the direct cause of the following exception:"
|
|
||||||
"</div>"
|
|
||||||
)
|
|
||||||
TRACEBACK_LINE_HTML = (
|
|
||||||
"<div class=frame-line>"
|
|
||||||
"<p class=frame-descriptor>"
|
|
||||||
"File {0.filename}, line <i>{0.lineno}</i>, "
|
|
||||||
"in <code><b>{0.name}</b></code>"
|
|
||||||
"<p class=frame-code><code>{0.line}</code>"
|
|
||||||
"</div>"
|
|
||||||
)
|
|
||||||
OBJECT_WRAPPER_HTML = (
|
|
||||||
"<div class=obj-header>{title}</div>"
|
|
||||||
"<dl class={obj_type}>{display_html}</dl>"
|
|
||||||
)
|
|
||||||
OBJECT_DISPLAY_HTML = "<dt>{key}</dt><dd><code>{value}</code></dd>"
|
|
||||||
OUTPUT_HTML = (
|
|
||||||
"<!DOCTYPE html><html lang=en>"
|
|
||||||
"<meta charset=UTF-8><title>{title}</title>\n"
|
|
||||||
"<style>{style}</style>\n"
|
|
||||||
"<h1>{title}</h1><p>{text}\n"
|
|
||||||
"{body}"
|
|
||||||
)
|
|
||||||
|
|
||||||
def full(self) -> HTTPResponse:
|
def full(self) -> HTTPResponse:
|
||||||
return html(
|
page = ErrorPage(
|
||||||
self.OUTPUT_HTML.format(
|
debug=self.debug,
|
||||||
title=self.title,
|
title=super().title,
|
||||||
text=self.text,
|
text=super().text,
|
||||||
style=self.TRACEBACK_STYLE,
|
request=self.request,
|
||||||
body=self._generate_body(full=True),
|
exc=self.exception,
|
||||||
),
|
|
||||||
status=self.status,
|
|
||||||
)
|
)
|
||||||
|
return html(page.render())
|
||||||
|
|
||||||
def minimal(self) -> HTTPResponse:
|
def minimal(self) -> HTTPResponse:
|
||||||
return html(
|
return self.full()
|
||||||
self.OUTPUT_HTML.format(
|
|
||||||
title=self.title,
|
|
||||||
text=self.text,
|
|
||||||
style=self.TRACEBACK_STYLE,
|
|
||||||
body=self._generate_body(full=False),
|
|
||||||
),
|
|
||||||
status=self.status,
|
|
||||||
headers=self.headers,
|
|
||||||
)
|
|
||||||
|
|
||||||
@property
|
|
||||||
def text(self):
|
|
||||||
return escape(super().text)
|
|
||||||
|
|
||||||
@property
|
|
||||||
def title(self):
|
|
||||||
return escape(f"⚠️ {super().title}")
|
|
||||||
|
|
||||||
def _generate_body(self, *, full):
|
|
||||||
lines = []
|
|
||||||
if full:
|
|
||||||
_, exc_value, __ = sys.exc_info()
|
|
||||||
exceptions = []
|
|
||||||
while exc_value:
|
|
||||||
exceptions.append(self._format_exc(exc_value))
|
|
||||||
exc_value = exc_value.__cause__
|
|
||||||
|
|
||||||
traceback_html = self.TRACEBACK_BORDER.join(reversed(exceptions))
|
|
||||||
appname = escape(self.request.app.name)
|
|
||||||
name = escape(self.exception.__class__.__name__)
|
|
||||||
value = escape(self.exception)
|
|
||||||
path = escape(self.request.path)
|
|
||||||
lines += [
|
|
||||||
f"<h2>Traceback of {appname} " "(most recent call last):</h2>",
|
|
||||||
f"{traceback_html}",
|
|
||||||
"<div class=summary><p>",
|
|
||||||
f"<b>{name}: {value}</b> "
|
|
||||||
f"while handling path <code>{path}</code>",
|
|
||||||
"</div>",
|
|
||||||
]
|
|
||||||
|
|
||||||
for attr, display in (("context", True), ("extra", bool(full))):
|
|
||||||
info = getattr(self.exception, attr, None)
|
|
||||||
if info and display:
|
|
||||||
lines.append(self._generate_object_display(info, attr))
|
|
||||||
|
|
||||||
return "\n".join(lines)
|
|
||||||
|
|
||||||
def _generate_object_display(
|
|
||||||
self, obj: t.Dict[str, t.Any], descriptor: str
|
|
||||||
) -> str:
|
|
||||||
display = "".join(
|
|
||||||
self.OBJECT_DISPLAY_HTML.format(key=key, value=value)
|
|
||||||
for key, value in obj.items()
|
|
||||||
)
|
|
||||||
return self.OBJECT_WRAPPER_HTML.format(
|
|
||||||
title=descriptor.title(),
|
|
||||||
display_html=display,
|
|
||||||
obj_type=descriptor.lower(),
|
|
||||||
)
|
|
||||||
|
|
||||||
def _format_exc(self, exc):
|
|
||||||
frames = extract_tb(exc.__traceback__)
|
|
||||||
frame_html = "".join(
|
|
||||||
self.TRACEBACK_LINE_HTML.format(frame) for frame in frames
|
|
||||||
)
|
|
||||||
return self.TRACEBACK_WRAPPER_HTML.format(
|
|
||||||
exc_name=escape(exc.__class__.__name__),
|
|
||||||
exc_value=escape(exc),
|
|
||||||
frame_html=frame_html,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class TextRenderer(BaseRenderer):
|
class TextRenderer(BaseRenderer):
|
||||||
@@ -258,8 +148,7 @@ class TextRenderer(BaseRenderer):
|
|||||||
text=self.text,
|
text=self.text,
|
||||||
bar=("=" * len(self.title)),
|
bar=("=" * len(self.title)),
|
||||||
body=self._generate_body(full=True),
|
body=self._generate_body(full=True),
|
||||||
),
|
)
|
||||||
status=self.status,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
def minimal(self) -> HTTPResponse:
|
def minimal(self) -> HTTPResponse:
|
||||||
@@ -269,9 +158,7 @@ class TextRenderer(BaseRenderer):
|
|||||||
text=self.text,
|
text=self.text,
|
||||||
bar=("=" * len(self.title)),
|
bar=("=" * len(self.title)),
|
||||||
body=self._generate_body(full=False),
|
body=self._generate_body(full=False),
|
||||||
),
|
)
|
||||||
status=self.status,
|
|
||||||
headers=self.headers,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
@@ -330,11 +217,11 @@ class JSONRenderer(BaseRenderer):
|
|||||||
|
|
||||||
def full(self) -> HTTPResponse:
|
def full(self) -> HTTPResponse:
|
||||||
output = self._generate_output(full=True)
|
output = self._generate_output(full=True)
|
||||||
return json(output, status=self.status, dumps=self.dumps)
|
return json(output, dumps=self.dumps)
|
||||||
|
|
||||||
def minimal(self) -> HTTPResponse:
|
def minimal(self) -> HTTPResponse:
|
||||||
output = self._generate_output(full=False)
|
output = self._generate_output(full=False)
|
||||||
return json(output, status=self.status, dumps=self.dumps)
|
return json(output, dumps=self.dumps)
|
||||||
|
|
||||||
def _generate_output(self, *, full):
|
def _generate_output(self, *, full):
|
||||||
output = {
|
output = {
|
||||||
@@ -388,32 +275,26 @@ def escape(text):
|
|||||||
return f"{text}".replace("&", "&").replace("<", "<")
|
return f"{text}".replace("&", "&").replace("<", "<")
|
||||||
|
|
||||||
|
|
||||||
RENDERERS_BY_CONFIG = {
|
MIME_BY_CONFIG = {
|
||||||
"html": HTMLRenderer,
|
"text": "text/plain",
|
||||||
"json": JSONRenderer,
|
"json": "application/json",
|
||||||
"text": TextRenderer,
|
"html": "text/html",
|
||||||
}
|
}
|
||||||
|
CONFIG_BY_MIME = {v: k for k, v in MIME_BY_CONFIG.items()}
|
||||||
RENDERERS_BY_CONTENT_TYPE = {
|
RENDERERS_BY_CONTENT_TYPE = {
|
||||||
"text/plain": TextRenderer,
|
"text/plain": TextRenderer,
|
||||||
"application/json": JSONRenderer,
|
"application/json": JSONRenderer,
|
||||||
"multipart/form-data": HTMLRenderer,
|
"multipart/form-data": HTMLRenderer,
|
||||||
"text/html": HTMLRenderer,
|
"text/html": HTMLRenderer,
|
||||||
}
|
}
|
||||||
CONTENT_TYPE_BY_RENDERERS = {
|
|
||||||
v: k for k, v in RENDERERS_BY_CONTENT_TYPE.items()
|
|
||||||
}
|
|
||||||
|
|
||||||
|
# Handler source code is checked for which response types it returns with the
|
||||||
|
# route error_format="auto" (default) to determine which format to use.
|
||||||
RESPONSE_MAPPING = {
|
RESPONSE_MAPPING = {
|
||||||
"empty": "html",
|
|
||||||
"json": "json",
|
"json": "json",
|
||||||
"text": "text",
|
"text": "text",
|
||||||
"raw": "text",
|
|
||||||
"html": "html",
|
"html": "html",
|
||||||
"file": "html",
|
"JSONResponse": "json",
|
||||||
"file_stream": "text",
|
|
||||||
"stream": "text",
|
|
||||||
"redirect": "html",
|
|
||||||
"text/plain": "text",
|
"text/plain": "text",
|
||||||
"text/html": "html",
|
"text/html": "html",
|
||||||
"application/json": "json",
|
"application/json": "json",
|
||||||
@@ -421,7 +302,7 @@ RESPONSE_MAPPING = {
|
|||||||
|
|
||||||
|
|
||||||
def check_error_format(format):
|
def check_error_format(format):
|
||||||
if format not in RENDERERS_BY_CONFIG and format != "auto":
|
if format not in MIME_BY_CONFIG and format != "auto":
|
||||||
raise SanicException(f"Unknown format: {format}")
|
raise SanicException(f"Unknown format: {format}")
|
||||||
|
|
||||||
|
|
||||||
@@ -431,103 +312,73 @@ def exception_response(
|
|||||||
debug: bool,
|
debug: bool,
|
||||||
fallback: str,
|
fallback: str,
|
||||||
base: t.Type[BaseRenderer],
|
base: t.Type[BaseRenderer],
|
||||||
renderer: t.Type[t.Optional[BaseRenderer]] = None,
|
renderer: t.Optional[t.Type[BaseRenderer]] = None,
|
||||||
) -> HTTPResponse:
|
) -> HTTPResponse:
|
||||||
"""
|
"""
|
||||||
Render a response for the default FALLBACK exception handler.
|
Render a response for the default FALLBACK exception handler.
|
||||||
"""
|
"""
|
||||||
content_type = None
|
|
||||||
|
|
||||||
if not renderer:
|
if not renderer:
|
||||||
# Make sure we have something set
|
mt = guess_mime(request, fallback)
|
||||||
renderer = base
|
renderer = RENDERERS_BY_CONTENT_TYPE.get(mt, base)
|
||||||
render_format = fallback
|
|
||||||
|
|
||||||
if request:
|
|
||||||
# If there is a request, try and get the format
|
|
||||||
# from the route
|
|
||||||
if request.route:
|
|
||||||
try:
|
|
||||||
if request.route.ctx.error_format:
|
|
||||||
render_format = request.route.ctx.error_format
|
|
||||||
except AttributeError:
|
|
||||||
...
|
|
||||||
|
|
||||||
content_type = request.headers.getone("content-type", "").split(
|
|
||||||
";"
|
|
||||||
)[0]
|
|
||||||
|
|
||||||
acceptable = request.accept
|
|
||||||
|
|
||||||
# If the format is auto still, make a guess
|
|
||||||
if render_format == "auto":
|
|
||||||
# First, if there is an Accept header, check if text/html
|
|
||||||
# is the first option
|
|
||||||
# According to MDN Web Docs, all major browsers use text/html
|
|
||||||
# as the primary value in Accept (with the exception of IE 8,
|
|
||||||
# and, well, if you are supporting IE 8, then you have bigger
|
|
||||||
# problems to concern yourself with than what default exception
|
|
||||||
# renderer is used)
|
|
||||||
# Source:
|
|
||||||
# https://developer.mozilla.org/en-US/docs/Web/HTTP/Content_negotiation/List_of_default_Accept_values
|
|
||||||
|
|
||||||
if acceptable and acceptable[0].match(
|
|
||||||
"text/html",
|
|
||||||
allow_type_wildcard=False,
|
|
||||||
allow_subtype_wildcard=False,
|
|
||||||
):
|
|
||||||
renderer = HTMLRenderer
|
|
||||||
|
|
||||||
# Second, if there is an Accept header, check if
|
|
||||||
# application/json is an option, or if the content-type
|
|
||||||
# is application/json
|
|
||||||
elif (
|
|
||||||
acceptable
|
|
||||||
and acceptable.match(
|
|
||||||
"application/json",
|
|
||||||
allow_type_wildcard=False,
|
|
||||||
allow_subtype_wildcard=False,
|
|
||||||
)
|
|
||||||
or content_type == "application/json"
|
|
||||||
):
|
|
||||||
renderer = JSONRenderer
|
|
||||||
|
|
||||||
# Third, if there is no Accept header, assume we want text.
|
|
||||||
# The likely use case here is a raw socket.
|
|
||||||
elif not acceptable:
|
|
||||||
renderer = TextRenderer
|
|
||||||
else:
|
|
||||||
# Fourth, look to see if there was a JSON body
|
|
||||||
# When in this situation, the request is probably coming
|
|
||||||
# from curl, an API client like Postman or Insomnia, or a
|
|
||||||
# package like requests or httpx
|
|
||||||
try:
|
|
||||||
# Give them the benefit of the doubt if they did:
|
|
||||||
# $ curl localhost:8000 -d '{"foo": "bar"}'
|
|
||||||
# And provide them with JSONRenderer
|
|
||||||
renderer = JSONRenderer if request.json else base
|
|
||||||
except InvalidUsage:
|
|
||||||
renderer = base
|
|
||||||
else:
|
|
||||||
renderer = RENDERERS_BY_CONFIG.get(render_format, renderer)
|
|
||||||
|
|
||||||
# Lastly, if there is an Accept header, make sure
|
|
||||||
# our choice is okay
|
|
||||||
if acceptable:
|
|
||||||
type_ = CONTENT_TYPE_BY_RENDERERS.get(renderer) # type: ignore
|
|
||||||
if type_ and type_ not in acceptable:
|
|
||||||
# If the renderer selected is not in the Accept header
|
|
||||||
# look through what is in the Accept header, and select
|
|
||||||
# the first option that matches. Otherwise, just drop back
|
|
||||||
# to the original default
|
|
||||||
for accept in acceptable:
|
|
||||||
mtype = f"{accept.type_}/{accept.subtype}"
|
|
||||||
maybe = RENDERERS_BY_CONTENT_TYPE.get(mtype)
|
|
||||||
if maybe:
|
|
||||||
renderer = maybe
|
|
||||||
break
|
|
||||||
else:
|
|
||||||
renderer = base
|
|
||||||
|
|
||||||
renderer = t.cast(t.Type[BaseRenderer], renderer)
|
renderer = t.cast(t.Type[BaseRenderer], renderer)
|
||||||
return renderer(request, exception, debug).render()
|
return renderer(request, exception, debug).render()
|
||||||
|
|
||||||
|
|
||||||
|
def guess_mime(req: Request, fallback: str) -> str:
|
||||||
|
# Attempt to find a suitable MIME format for the response.
|
||||||
|
# Insertion-ordered map of formats["html"] = "source of that suggestion"
|
||||||
|
formats = {}
|
||||||
|
name = ""
|
||||||
|
# Route error_format (by magic from handler code if auto, the default)
|
||||||
|
if req.route:
|
||||||
|
name = req.route.name
|
||||||
|
f = req.route.extra.error_format
|
||||||
|
if f in MIME_BY_CONFIG:
|
||||||
|
formats[f] = name
|
||||||
|
|
||||||
|
if not formats and fallback in MIME_BY_CONFIG:
|
||||||
|
formats[fallback] = "FALLBACK_ERROR_FORMAT"
|
||||||
|
|
||||||
|
# If still not known, check for the request for clues of JSON
|
||||||
|
if not formats and fallback == "auto" and req.accept.match(JSON):
|
||||||
|
if JSON in req.accept: # Literally, not wildcard
|
||||||
|
formats["json"] = "request.accept"
|
||||||
|
elif JSON in req.headers.getone("content-type", ""):
|
||||||
|
formats["json"] = "content-type"
|
||||||
|
# DEPRECATION: Remove this block in 24.3
|
||||||
|
else:
|
||||||
|
c = None
|
||||||
|
try:
|
||||||
|
c = req.json
|
||||||
|
except BadRequest:
|
||||||
|
pass
|
||||||
|
if c:
|
||||||
|
formats["json"] = "request.json"
|
||||||
|
deprecation(
|
||||||
|
"Response type was determined by the JSON content of "
|
||||||
|
"the request. This behavior is deprecated and will be "
|
||||||
|
"removed in v24.3. Please specify the format either by\n"
|
||||||
|
f' error_format="json" on route {name}, by\n'
|
||||||
|
' FALLBACK_ERROR_FORMAT = "json", or by adding header\n'
|
||||||
|
" accept: application/json to your requests.",
|
||||||
|
24.3,
|
||||||
|
)
|
||||||
|
|
||||||
|
# Any other supported formats
|
||||||
|
if fallback == "auto":
|
||||||
|
for k in MIME_BY_CONFIG:
|
||||||
|
if k not in formats:
|
||||||
|
formats[k] = "any"
|
||||||
|
|
||||||
|
mimes = [MIME_BY_CONFIG[k] for k in formats]
|
||||||
|
m = req.accept.match(*mimes)
|
||||||
|
if m:
|
||||||
|
format = CONFIG_BY_MIME[m.mime]
|
||||||
|
source = formats[format]
|
||||||
|
logger.debug(
|
||||||
|
f"The client accepts {m.header}, using '{format}' from {source}"
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
logger.debug(f"No format found, the client accepts {req.accept!r}")
|
||||||
|
return m.mime
|
||||||
|
|||||||
@@ -1,92 +1,301 @@
|
|||||||
from typing import Any, Dict, Optional, Union
|
from asyncio import CancelledError, Protocol
|
||||||
|
from os import PathLike
|
||||||
|
from typing import Any, Dict, Optional, Sequence, Union
|
||||||
|
|
||||||
from sanic.helpers import STATUS_CODES
|
from sanic.helpers import STATUS_CODES
|
||||||
|
|
||||||
|
|
||||||
|
class RequestCancelled(CancelledError):
|
||||||
|
quiet = True
|
||||||
|
|
||||||
|
|
||||||
|
class ServerKilled(Exception):
|
||||||
|
"""
|
||||||
|
Exception Sanic server uses when killing a server process for something
|
||||||
|
unexpected happening.
|
||||||
|
"""
|
||||||
|
|
||||||
|
|
||||||
class SanicException(Exception):
|
class SanicException(Exception):
|
||||||
|
"""
|
||||||
|
Generic exception that will generate an HTTP response when raised
|
||||||
|
in the context of a request lifecycle.
|
||||||
|
|
||||||
|
Usually it is best practice to use one of the more specific exceptions
|
||||||
|
than this generic. Even when trying to raise a 500, it is generally
|
||||||
|
preferrable to use :class:`.ServerError`
|
||||||
|
|
||||||
|
.. code-block:: python
|
||||||
|
|
||||||
|
raise SanicException(
|
||||||
|
"Something went wrong",
|
||||||
|
status_code=999,
|
||||||
|
context={
|
||||||
|
"info": "Some additional details",
|
||||||
|
},
|
||||||
|
headers={
|
||||||
|
"X-Foo": "bar"
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
:param message: The message to be sent to the client. If ``None``
|
||||||
|
then the appropriate HTTP response status message will be used
|
||||||
|
instead, defaults to None
|
||||||
|
:type message: Optional[Union[str, bytes]], optional
|
||||||
|
:param status_code: The HTTP response code to send, if applicable. If
|
||||||
|
``None``, then it will be 500, defaults to None
|
||||||
|
:type status_code: Optional[int], optional
|
||||||
|
:param quiet: When ``True``, the error traceback will be suppressed
|
||||||
|
from the logs, defaults to None
|
||||||
|
:type quiet: Optional[bool], optional
|
||||||
|
:param context: Additional mapping of key/value data that will be
|
||||||
|
sent to the client upon exception, defaults to None
|
||||||
|
:type context: Optional[Dict[str, Any]], optional
|
||||||
|
:param extra: Additional mapping of key/value data that will NOT be
|
||||||
|
sent to the client when in PRODUCTION mode, defaults to None
|
||||||
|
:type extra: Optional[Dict[str, Any]], optional
|
||||||
|
:param headers: Additional headers that should be sent with the HTTP
|
||||||
|
response, defaults to None
|
||||||
|
:type headers: Optional[Dict[str, Any]], optional
|
||||||
|
"""
|
||||||
|
|
||||||
|
status_code: int = 500
|
||||||
|
quiet: Optional[bool] = False
|
||||||
|
headers: Dict[str, str] = {}
|
||||||
message: str = ""
|
message: str = ""
|
||||||
|
|
||||||
def __init__(
|
def __init__(
|
||||||
self,
|
self,
|
||||||
message: Optional[Union[str, bytes]] = None,
|
message: Optional[Union[str, bytes]] = None,
|
||||||
status_code: Optional[int] = None,
|
status_code: Optional[int] = None,
|
||||||
|
*,
|
||||||
quiet: Optional[bool] = None,
|
quiet: Optional[bool] = None,
|
||||||
context: Optional[Dict[str, Any]] = None,
|
context: Optional[Dict[str, Any]] = None,
|
||||||
extra: Optional[Dict[str, Any]] = None,
|
extra: Optional[Dict[str, Any]] = None,
|
||||||
|
headers: Optional[Dict[str, Any]] = None,
|
||||||
) -> None:
|
) -> None:
|
||||||
self.context = context
|
self.context = context
|
||||||
self.extra = extra
|
self.extra = extra
|
||||||
|
status_code = status_code or getattr(
|
||||||
|
self.__class__, "status_code", None
|
||||||
|
)
|
||||||
|
quiet = quiet or getattr(self.__class__, "quiet", None)
|
||||||
|
headers = headers or getattr(self.__class__, "headers", {})
|
||||||
if message is None:
|
if message is None:
|
||||||
if self.message:
|
if self.message:
|
||||||
message = self.message
|
message = self.message
|
||||||
elif status_code is not None:
|
elif status_code:
|
||||||
msg: bytes = STATUS_CODES.get(status_code, b"")
|
msg: bytes = STATUS_CODES.get(status_code, b"")
|
||||||
message = msg.decode("utf8")
|
message = msg.decode("utf8")
|
||||||
|
|
||||||
super().__init__(message)
|
super().__init__(message)
|
||||||
|
|
||||||
if status_code is not None:
|
self.status_code = status_code or self.status_code
|
||||||
self.status_code = status_code
|
self.quiet = quiet
|
||||||
|
self.headers = headers
|
||||||
# quiet=None/False/True with None meaning choose by status
|
|
||||||
if quiet or quiet is None and status_code not in (None, 500):
|
|
||||||
self.quiet = True
|
|
||||||
|
|
||||||
|
|
||||||
class NotFound(SanicException):
|
class HTTPException(SanicException):
|
||||||
|
"""
|
||||||
|
A base class for other exceptions and should not be called directly.
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(
|
||||||
|
self,
|
||||||
|
message: Optional[Union[str, bytes]] = None,
|
||||||
|
*,
|
||||||
|
quiet: Optional[bool] = None,
|
||||||
|
context: Optional[Dict[str, Any]] = None,
|
||||||
|
extra: Optional[Dict[str, Any]] = None,
|
||||||
|
headers: Optional[Dict[str, Any]] = None,
|
||||||
|
) -> None:
|
||||||
|
super().__init__(
|
||||||
|
message,
|
||||||
|
quiet=quiet,
|
||||||
|
context=context,
|
||||||
|
extra=extra,
|
||||||
|
headers=headers,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class NotFound(HTTPException):
|
||||||
"""
|
"""
|
||||||
**Status**: 404 Not Found
|
**Status**: 404 Not Found
|
||||||
|
|
||||||
|
:param message: The message to be sent to the client. If ``None``
|
||||||
|
then the HTTP status 'Not Found' will be sent, defaults to None
|
||||||
|
:type message: Optional[Union[str, bytes]], optional
|
||||||
|
:param quiet: When ``True``, the error traceback will be suppressed
|
||||||
|
from the logs, defaults to None
|
||||||
|
:type quiet: Optional[bool], optional
|
||||||
|
:param context: Additional mapping of key/value data that will be
|
||||||
|
sent to the client upon exception, defaults to None
|
||||||
|
:type context: Optional[Dict[str, Any]], optional
|
||||||
|
:param extra: Additional mapping of key/value data that will NOT be
|
||||||
|
sent to the client when in PRODUCTION mode, defaults to None
|
||||||
|
:type extra: Optional[Dict[str, Any]], optional
|
||||||
|
:param headers: Additional headers that should be sent with the HTTP
|
||||||
|
response, defaults to None
|
||||||
|
:type headers: Optional[Dict[str, Any]], optional
|
||||||
"""
|
"""
|
||||||
|
|
||||||
status_code = 404
|
status_code = 404
|
||||||
quiet = True
|
quiet = True
|
||||||
|
|
||||||
|
|
||||||
class InvalidUsage(SanicException):
|
class BadRequest(HTTPException):
|
||||||
"""
|
"""
|
||||||
**Status**: 400 Bad Request
|
**Status**: 400 Bad Request
|
||||||
|
|
||||||
|
:param message: The message to be sent to the client. If ``None``
|
||||||
|
then the HTTP status 'Bad Request' will be sent, defaults to None
|
||||||
|
:type message: Optional[Union[str, bytes]], optional
|
||||||
|
:param quiet: When ``True``, the error traceback will be suppressed
|
||||||
|
from the logs, defaults to None
|
||||||
|
:type quiet: Optional[bool], optional
|
||||||
|
:param context: Additional mapping of key/value data that will be
|
||||||
|
sent to the client upon exception, defaults to None
|
||||||
|
:type context: Optional[Dict[str, Any]], optional
|
||||||
|
:param extra: Additional mapping of key/value data that will NOT be
|
||||||
|
sent to the client when in PRODUCTION mode, defaults to None
|
||||||
|
:type extra: Optional[Dict[str, Any]], optional
|
||||||
|
:param headers: Additional headers that should be sent with the HTTP
|
||||||
|
response, defaults to None
|
||||||
|
:type headers: Optional[Dict[str, Any]], optional
|
||||||
"""
|
"""
|
||||||
|
|
||||||
status_code = 400
|
status_code = 400
|
||||||
quiet = True
|
quiet = True
|
||||||
|
|
||||||
|
|
||||||
class MethodNotSupported(SanicException):
|
InvalidUsage = BadRequest
|
||||||
|
BadURL = BadRequest
|
||||||
|
|
||||||
|
|
||||||
|
class MethodNotAllowed(HTTPException):
|
||||||
"""
|
"""
|
||||||
**Status**: 405 Method Not Allowed
|
**Status**: 405 Method Not Allowed
|
||||||
|
|
||||||
|
:param message: The message to be sent to the client. If ``None``
|
||||||
|
then the HTTP status 'Method Not Allowed' will be sent,
|
||||||
|
defaults to None
|
||||||
|
:type message: Optional[Union[str, bytes]], optional
|
||||||
|
:param method: The HTTP method that was used, defaults to an empty string
|
||||||
|
:type method: Optional[str], optional
|
||||||
|
:param allowed_methods: The HTTP methods that can be used instead of the
|
||||||
|
one that was attempted
|
||||||
|
:type allowed_methods: Optional[Sequence[str]], optional
|
||||||
|
:param quiet: When ``True``, the error traceback will be suppressed
|
||||||
|
from the logs, defaults to None
|
||||||
|
:type quiet: Optional[bool], optional
|
||||||
|
:param context: Additional mapping of key/value data that will be
|
||||||
|
sent to the client upon exception, defaults to None
|
||||||
|
:type context: Optional[Dict[str, Any]], optional
|
||||||
|
:param extra: Additional mapping of key/value data that will NOT be
|
||||||
|
sent to the client when in PRODUCTION mode, defaults to None
|
||||||
|
:type extra: Optional[Dict[str, Any]], optional
|
||||||
|
:param headers: Additional headers that should be sent with the HTTP
|
||||||
|
response, defaults to None
|
||||||
|
:type headers: Optional[Dict[str, Any]], optional
|
||||||
"""
|
"""
|
||||||
|
|
||||||
status_code = 405
|
status_code = 405
|
||||||
quiet = True
|
quiet = True
|
||||||
|
|
||||||
def __init__(self, message, method, allowed_methods):
|
def __init__(
|
||||||
super().__init__(message)
|
self,
|
||||||
self.headers = {"Allow": ", ".join(allowed_methods)}
|
message: Optional[Union[str, bytes]] = None,
|
||||||
|
method: str = "",
|
||||||
|
allowed_methods: Optional[Sequence[str]] = None,
|
||||||
|
*,
|
||||||
|
quiet: Optional[bool] = None,
|
||||||
|
context: Optional[Dict[str, Any]] = None,
|
||||||
|
extra: Optional[Dict[str, Any]] = None,
|
||||||
|
headers: Optional[Dict[str, Any]] = None,
|
||||||
|
):
|
||||||
|
super().__init__(
|
||||||
|
message,
|
||||||
|
quiet=quiet,
|
||||||
|
context=context,
|
||||||
|
extra=extra,
|
||||||
|
headers=headers,
|
||||||
|
)
|
||||||
|
if allowed_methods:
|
||||||
|
self.headers = {
|
||||||
|
**self.headers,
|
||||||
|
"Allow": ", ".join(allowed_methods),
|
||||||
|
}
|
||||||
|
self.method = method
|
||||||
|
self.allowed_methods = allowed_methods
|
||||||
|
|
||||||
|
|
||||||
class ServerError(SanicException):
|
MethodNotSupported = MethodNotAllowed
|
||||||
|
|
||||||
|
|
||||||
|
class ServerError(HTTPException):
|
||||||
"""
|
"""
|
||||||
**Status**: 500 Internal Server Error
|
**Status**: 500 Internal Server Error
|
||||||
|
|
||||||
|
A general server-side error has occurred. If no other HTTP exception is
|
||||||
|
appropriate, then this should be used
|
||||||
|
|
||||||
|
:param message: The message to be sent to the client. If ``None``
|
||||||
|
then the HTTP status 'Internal Server Error' will be sent,
|
||||||
|
defaults to None
|
||||||
|
:type message: Optional[Union[str, bytes]], optional
|
||||||
|
:param quiet: When ``True``, the error traceback will be suppressed
|
||||||
|
from the logs, defaults to None
|
||||||
|
:type quiet: Optional[bool], optional
|
||||||
|
:param context: Additional mapping of key/value data that will be
|
||||||
|
sent to the client upon exception, defaults to None
|
||||||
|
:type context: Optional[Dict[str, Any]], optional
|
||||||
|
:param extra: Additional mapping of key/value data that will NOT be
|
||||||
|
sent to the client when in PRODUCTION mode, defaults to None
|
||||||
|
:type extra: Optional[Dict[str, Any]], optional
|
||||||
|
:param headers: Additional headers that should be sent with the HTTP
|
||||||
|
response, defaults to None
|
||||||
|
:type headers: Optional[Dict[str, Any]], optional
|
||||||
"""
|
"""
|
||||||
|
|
||||||
status_code = 500
|
status_code = 500
|
||||||
|
|
||||||
|
|
||||||
class ServiceUnavailable(SanicException):
|
InternalServerError = ServerError
|
||||||
|
|
||||||
|
|
||||||
|
class ServiceUnavailable(HTTPException):
|
||||||
"""
|
"""
|
||||||
**Status**: 503 Service Unavailable
|
**Status**: 503 Service Unavailable
|
||||||
|
|
||||||
The server is currently unavailable (because it is overloaded or
|
The server is currently unavailable (because it is overloaded or
|
||||||
down for maintenance). Generally, this is a temporary state.
|
down for maintenance). Generally, this is a temporary state.
|
||||||
|
|
||||||
|
:param message: The message to be sent to the client. If ``None``
|
||||||
|
then the HTTP status 'Bad Request' will be sent, defaults to None
|
||||||
|
:type message: Optional[Union[str, bytes]], optional
|
||||||
|
:param quiet: When ``True``, the error traceback will be suppressed
|
||||||
|
from the logs, defaults to None
|
||||||
|
:type quiet: Optional[bool], optional
|
||||||
|
:param context: Additional mapping of key/value data that will be
|
||||||
|
sent to the client upon exception, defaults to None
|
||||||
|
:type context: Optional[Dict[str, Any]], optional
|
||||||
|
:param extra: Additional mapping of key/value data that will NOT be
|
||||||
|
sent to the client when in PRODUCTION mode, defaults to None
|
||||||
|
:type extra: Optional[Dict[str, Any]], optional
|
||||||
|
:param headers: Additional headers that should be sent with the HTTP
|
||||||
|
response, defaults to None
|
||||||
|
:type headers: Optional[Dict[str, Any]], optional
|
||||||
"""
|
"""
|
||||||
|
|
||||||
status_code = 503
|
status_code = 503
|
||||||
quiet = True
|
quiet = True
|
||||||
|
|
||||||
|
|
||||||
class URLBuildError(ServerError):
|
class URLBuildError(HTTPException):
|
||||||
"""
|
"""
|
||||||
**Status**: 500 Internal Server Error
|
**Status**: 500 Internal Server Error
|
||||||
|
|
||||||
|
An exception used by Sanic internals when unable to build a URL.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
status_code = 500
|
status_code = 500
|
||||||
@@ -95,80 +304,241 @@ class URLBuildError(ServerError):
|
|||||||
class FileNotFound(NotFound):
|
class FileNotFound(NotFound):
|
||||||
"""
|
"""
|
||||||
**Status**: 404 Not Found
|
**Status**: 404 Not Found
|
||||||
|
|
||||||
|
A specific form of :class:`.NotFound` that is specifically when looking
|
||||||
|
for a file on the file system at a known path.
|
||||||
|
|
||||||
|
:param message: The message to be sent to the client. If ``None``
|
||||||
|
then the HTTP status 'Not Found' will be sent, defaults to None
|
||||||
|
:type message: Optional[Union[str, bytes]], optional
|
||||||
|
:param path: The path, if any, to the file that could not
|
||||||
|
be found, defaults to None
|
||||||
|
:type path: Optional[PathLike], optional
|
||||||
|
:param relative_url: A relative URL of the file, defaults to None
|
||||||
|
:type relative_url: Optional[str], optional
|
||||||
|
:param quiet: When ``True``, the error traceback will be suppressed
|
||||||
|
from the logs, defaults to None
|
||||||
|
:type quiet: Optional[bool], optional
|
||||||
|
:param context: Additional mapping of key/value data that will be
|
||||||
|
sent to the client upon exception, defaults to None
|
||||||
|
:type context: Optional[Dict[str, Any]], optional
|
||||||
|
:param extra: Additional mapping of key/value data that will NOT be
|
||||||
|
sent to the client when in PRODUCTION mode, defaults to None
|
||||||
|
:type extra: Optional[Dict[str, Any]], optional
|
||||||
|
:param headers: Additional headers that should be sent with the HTTP
|
||||||
|
response, defaults to None
|
||||||
|
:type headers: Optional[Dict[str, Any]], optional
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def __init__(self, message, path, relative_url):
|
def __init__(
|
||||||
super().__init__(message)
|
self,
|
||||||
|
message: Optional[Union[str, bytes]] = None,
|
||||||
|
path: Optional[PathLike] = None,
|
||||||
|
relative_url: Optional[str] = None,
|
||||||
|
*,
|
||||||
|
quiet: Optional[bool] = None,
|
||||||
|
context: Optional[Dict[str, Any]] = None,
|
||||||
|
extra: Optional[Dict[str, Any]] = None,
|
||||||
|
headers: Optional[Dict[str, Any]] = None,
|
||||||
|
):
|
||||||
|
super().__init__(
|
||||||
|
message,
|
||||||
|
quiet=quiet,
|
||||||
|
context=context,
|
||||||
|
extra=extra,
|
||||||
|
headers=headers,
|
||||||
|
)
|
||||||
self.path = path
|
self.path = path
|
||||||
self.relative_url = relative_url
|
self.relative_url = relative_url
|
||||||
|
|
||||||
|
|
||||||
class RequestTimeout(SanicException):
|
class RequestTimeout(HTTPException):
|
||||||
"""The Web server (running the Web site) thinks that there has been too
|
"""
|
||||||
|
The Web server (running the Web site) thinks that there has been too
|
||||||
long an interval of time between 1) the establishment of an IP
|
long an interval of time between 1) the establishment of an IP
|
||||||
connection (socket) between the client and the server and
|
connection (socket) between the client and the server and
|
||||||
2) the receipt of any data on that socket, so the server has dropped
|
2) the receipt of any data on that socket, so the server has dropped
|
||||||
the connection. The socket connection has actually been lost - the Web
|
the connection. The socket connection has actually been lost - the Web
|
||||||
server has 'timed out' on that particular socket connection.
|
server has 'timed out' on that particular socket connection.
|
||||||
|
|
||||||
|
This is an internal exception thrown by Sanic and should not be used
|
||||||
|
directly.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
status_code = 408
|
status_code = 408
|
||||||
quiet = True
|
quiet = True
|
||||||
|
|
||||||
|
|
||||||
class PayloadTooLarge(SanicException):
|
class PayloadTooLarge(HTTPException):
|
||||||
"""
|
"""
|
||||||
**Status**: 413 Payload Too Large
|
**Status**: 413 Payload Too Large
|
||||||
|
|
||||||
|
This is an internal exception thrown by Sanic and should not be used
|
||||||
|
directly.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
status_code = 413
|
status_code = 413
|
||||||
quiet = True
|
quiet = True
|
||||||
|
|
||||||
|
|
||||||
class HeaderNotFound(InvalidUsage):
|
class HeaderNotFound(BadRequest):
|
||||||
"""
|
"""
|
||||||
**Status**: 400 Bad Request
|
**Status**: 400 Bad Request
|
||||||
|
|
||||||
|
:param message: The message to be sent to the client. If ``None``
|
||||||
|
then the HTTP status 'Bad Request' will be sent, defaults to None
|
||||||
|
:type message: Optional[Union[str, bytes]], optional
|
||||||
|
:param quiet: When ``True``, the error traceback will be suppressed
|
||||||
|
from the logs, defaults to None
|
||||||
|
:type quiet: Optional[bool], optional
|
||||||
|
:param context: Additional mapping of key/value data that will be
|
||||||
|
sent to the client upon exception, defaults to None
|
||||||
|
:type context: Optional[Dict[str, Any]], optional
|
||||||
|
:param extra: Additional mapping of key/value data that will NOT be
|
||||||
|
sent to the client when in PRODUCTION mode, defaults to None
|
||||||
|
:type extra: Optional[Dict[str, Any]], optional
|
||||||
|
:param headers: Additional headers that should be sent with the HTTP
|
||||||
|
response, defaults to None
|
||||||
|
:type headers: Optional[Dict[str, Any]], optional
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
||||||
class InvalidHeader(InvalidUsage):
|
class InvalidHeader(BadRequest):
|
||||||
"""
|
"""
|
||||||
**Status**: 400 Bad Request
|
**Status**: 400 Bad Request
|
||||||
|
|
||||||
|
:param message: The message to be sent to the client. If ``None``
|
||||||
|
then the HTTP status 'Bad Request' will be sent, defaults to None
|
||||||
|
:type message: Optional[Union[str, bytes]], optional
|
||||||
|
:param quiet: When ``True``, the error traceback will be suppressed
|
||||||
|
from the logs, defaults to None
|
||||||
|
:type quiet: Optional[bool], optional
|
||||||
|
:param context: Additional mapping of key/value data that will be
|
||||||
|
sent to the client upon exception, defaults to None
|
||||||
|
:type context: Optional[Dict[str, Any]], optional
|
||||||
|
:param extra: Additional mapping of key/value data that will NOT be
|
||||||
|
sent to the client when in PRODUCTION mode, defaults to None
|
||||||
|
:type extra: Optional[Dict[str, Any]], optional
|
||||||
|
:param headers: Additional headers that should be sent with the HTTP
|
||||||
|
response, defaults to None
|
||||||
|
:type headers: Optional[Dict[str, Any]], optional
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
||||||
class ContentRangeError(SanicException):
|
class ContentRange(Protocol):
|
||||||
|
total: int
|
||||||
|
|
||||||
|
|
||||||
|
class RangeNotSatisfiable(HTTPException):
|
||||||
"""
|
"""
|
||||||
**Status**: 416 Range Not Satisfiable
|
**Status**: 416 Range Not Satisfiable
|
||||||
|
|
||||||
|
:param message: The message to be sent to the client. If ``None``
|
||||||
|
then the HTTP status 'Range Not Satisfiable' will be sent,
|
||||||
|
defaults to None
|
||||||
|
:type message: Optional[Union[str, bytes]], optional
|
||||||
|
:param content_range: An object meeting the :class:`.ContentRange` protocol
|
||||||
|
that has a ``total`` property, defaults to None
|
||||||
|
:type content_range: Optional[ContentRange], optional
|
||||||
|
:param quiet: When ``True``, the error traceback will be suppressed
|
||||||
|
from the logs, defaults to None
|
||||||
|
:type quiet: Optional[bool], optional
|
||||||
|
:param context: Additional mapping of key/value data that will be
|
||||||
|
sent to the client upon exception, defaults to None
|
||||||
|
:type context: Optional[Dict[str, Any]], optional
|
||||||
|
:param extra: Additional mapping of key/value data that will NOT be
|
||||||
|
sent to the client when in PRODUCTION mode, defaults to None
|
||||||
|
:type extra: Optional[Dict[str, Any]], optional
|
||||||
|
:param headers: Additional headers that should be sent with the HTTP
|
||||||
|
response, defaults to None
|
||||||
|
:type headers: Optional[Dict[str, Any]], optional
|
||||||
"""
|
"""
|
||||||
|
|
||||||
status_code = 416
|
status_code = 416
|
||||||
quiet = True
|
quiet = True
|
||||||
|
|
||||||
def __init__(self, message, content_range):
|
def __init__(
|
||||||
super().__init__(message)
|
self,
|
||||||
self.headers = {"Content-Range": f"bytes */{content_range.total}"}
|
message: Optional[Union[str, bytes]] = None,
|
||||||
|
content_range: Optional[ContentRange] = None,
|
||||||
|
*,
|
||||||
|
quiet: Optional[bool] = None,
|
||||||
|
context: Optional[Dict[str, Any]] = None,
|
||||||
|
extra: Optional[Dict[str, Any]] = None,
|
||||||
|
headers: Optional[Dict[str, Any]] = None,
|
||||||
|
):
|
||||||
|
super().__init__(
|
||||||
|
message,
|
||||||
|
quiet=quiet,
|
||||||
|
context=context,
|
||||||
|
extra=extra,
|
||||||
|
headers=headers,
|
||||||
|
)
|
||||||
|
if content_range is not None:
|
||||||
|
self.headers = {
|
||||||
|
**self.headers,
|
||||||
|
"Content-Range": f"bytes */{content_range.total}",
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
class HeaderExpectationFailed(SanicException):
|
ContentRangeError = RangeNotSatisfiable
|
||||||
|
|
||||||
|
|
||||||
|
class ExpectationFailed(HTTPException):
|
||||||
"""
|
"""
|
||||||
**Status**: 417 Expectation Failed
|
**Status**: 417 Expectation Failed
|
||||||
|
|
||||||
|
:param message: The message to be sent to the client. If ``None``
|
||||||
|
then the HTTP status 'Expectation Failed' will be sent,
|
||||||
|
defaults to None
|
||||||
|
:type message: Optional[Union[str, bytes]], optional
|
||||||
|
:param quiet: When ``True``, the error traceback will be suppressed
|
||||||
|
from the logs, defaults to None
|
||||||
|
:type quiet: Optional[bool], optional
|
||||||
|
:param context: Additional mapping of key/value data that will be
|
||||||
|
sent to the client upon exception, defaults to None
|
||||||
|
:type context: Optional[Dict[str, Any]], optional
|
||||||
|
:param extra: Additional mapping of key/value data that will NOT be
|
||||||
|
sent to the client when in PRODUCTION mode, defaults to None
|
||||||
|
:type extra: Optional[Dict[str, Any]], optional
|
||||||
|
:param headers: Additional headers that should be sent with the HTTP
|
||||||
|
response, defaults to None
|
||||||
|
:type headers: Optional[Dict[str, Any]], optional
|
||||||
"""
|
"""
|
||||||
|
|
||||||
status_code = 417
|
status_code = 417
|
||||||
quiet = True
|
quiet = True
|
||||||
|
|
||||||
|
|
||||||
class Forbidden(SanicException):
|
HeaderExpectationFailed = ExpectationFailed
|
||||||
|
|
||||||
|
|
||||||
|
class Forbidden(HTTPException):
|
||||||
"""
|
"""
|
||||||
**Status**: 403 Forbidden
|
**Status**: 403 Forbidden
|
||||||
|
|
||||||
|
:param message: The message to be sent to the client. If ``None``
|
||||||
|
then the HTTP status 'Forbidden' will be sent, defaults to None
|
||||||
|
:type message: Optional[Union[str, bytes]], optional
|
||||||
|
:param quiet: When ``True``, the error traceback will be suppressed
|
||||||
|
from the logs, defaults to None
|
||||||
|
:type quiet: Optional[bool], optional
|
||||||
|
:param context: Additional mapping of key/value data that will be
|
||||||
|
sent to the client upon exception, defaults to None
|
||||||
|
:type context: Optional[Dict[str, Any]], optional
|
||||||
|
:param extra: Additional mapping of key/value data that will NOT be
|
||||||
|
sent to the client when in PRODUCTION mode, defaults to None
|
||||||
|
:type extra: Optional[Dict[str, Any]], optional
|
||||||
|
:param headers: Additional headers that should be sent with the HTTP
|
||||||
|
response, defaults to None
|
||||||
|
:type headers: Optional[Dict[str, Any]], optional
|
||||||
"""
|
"""
|
||||||
|
|
||||||
status_code = 403
|
status_code = 403
|
||||||
quiet = True
|
quiet = True
|
||||||
|
|
||||||
|
|
||||||
class InvalidRangeType(ContentRangeError):
|
class InvalidRangeType(RangeNotSatisfiable):
|
||||||
"""
|
"""
|
||||||
**Status**: 416 Range Not Satisfiable
|
**Status**: 416 Range Not Satisfiable
|
||||||
"""
|
"""
|
||||||
@@ -177,20 +547,33 @@ class InvalidRangeType(ContentRangeError):
|
|||||||
quiet = True
|
quiet = True
|
||||||
|
|
||||||
|
|
||||||
class PyFileError(Exception):
|
class PyFileError(SanicException):
|
||||||
def __init__(self, file):
|
def __init__(
|
||||||
super().__init__("could not execute config file %s", file)
|
self,
|
||||||
|
file,
|
||||||
|
status_code: Optional[int] = None,
|
||||||
|
*,
|
||||||
|
quiet: Optional[bool] = None,
|
||||||
|
context: Optional[Dict[str, Any]] = None,
|
||||||
|
extra: Optional[Dict[str, Any]] = None,
|
||||||
|
headers: Optional[Dict[str, Any]] = None,
|
||||||
|
):
|
||||||
|
super().__init__(
|
||||||
|
"could not execute config file %s" % file,
|
||||||
|
status_code=status_code,
|
||||||
|
quiet=quiet,
|
||||||
|
context=context,
|
||||||
|
extra=extra,
|
||||||
|
headers=headers,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class Unauthorized(SanicException):
|
class Unauthorized(HTTPException):
|
||||||
"""
|
"""
|
||||||
**Status**: 401 Unauthorized
|
**Status**: 401 Unauthorized
|
||||||
|
|
||||||
:param message: Message describing the exception.
|
When present, additional keyword arguments may be used to complete
|
||||||
:param status_code: HTTP Status code.
|
the WWW-Authentication header.
|
||||||
:param scheme: Name of the authentication scheme to be used.
|
|
||||||
|
|
||||||
When present, kwargs is used to complete the WWW-Authentication header.
|
|
||||||
|
|
||||||
Examples::
|
Examples::
|
||||||
|
|
||||||
@@ -215,21 +598,58 @@ class Unauthorized(SanicException):
|
|||||||
raise Unauthorized("Auth required.",
|
raise Unauthorized("Auth required.",
|
||||||
scheme="Bearer",
|
scheme="Bearer",
|
||||||
realm="Restricted Area")
|
realm="Restricted Area")
|
||||||
|
|
||||||
|
:param message: The message to be sent to the client. If ``None``
|
||||||
|
then the HTTP status 'Bad Request' will be sent, defaults to None
|
||||||
|
:type message: Optional[Union[str, bytes]], optional
|
||||||
|
:param scheme: Name of the authentication scheme to be used.
|
||||||
|
:type scheme: Optional[str], optional
|
||||||
|
:param quiet: When ``True``, the error traceback will be suppressed
|
||||||
|
from the logs, defaults to None
|
||||||
|
:type quiet: Optional[bool], optional
|
||||||
|
:param context: Additional mapping of key/value data that will be
|
||||||
|
sent to the client upon exception, defaults to None
|
||||||
|
:type context: Optional[Dict[str, Any]], optional
|
||||||
|
:param extra: Additional mapping of key/value data that will NOT be
|
||||||
|
sent to the client when in PRODUCTION mode, defaults to None
|
||||||
|
:type extra: Optional[Dict[str, Any]], optional
|
||||||
|
:param headers: Additional headers that should be sent with the HTTP
|
||||||
|
response, defaults to None
|
||||||
|
:type headers: Optional[Dict[str, Any]], optional
|
||||||
"""
|
"""
|
||||||
|
|
||||||
status_code = 401
|
status_code = 401
|
||||||
quiet = True
|
quiet = True
|
||||||
|
|
||||||
def __init__(self, message, status_code=None, scheme=None, **kwargs):
|
def __init__(
|
||||||
super().__init__(message, status_code)
|
self,
|
||||||
|
message: Optional[Union[str, bytes]] = None,
|
||||||
|
scheme: Optional[str] = None,
|
||||||
|
*,
|
||||||
|
quiet: Optional[bool] = None,
|
||||||
|
context: Optional[Dict[str, Any]] = None,
|
||||||
|
extra: Optional[Dict[str, Any]] = None,
|
||||||
|
headers: Optional[Dict[str, Any]] = None,
|
||||||
|
**challenges,
|
||||||
|
):
|
||||||
|
super().__init__(
|
||||||
|
message,
|
||||||
|
quiet=quiet,
|
||||||
|
context=context,
|
||||||
|
extra=extra,
|
||||||
|
headers=headers,
|
||||||
|
)
|
||||||
|
|
||||||
# if auth-scheme is specified, set "WWW-Authenticate" header
|
# if auth-scheme is specified, set "WWW-Authenticate" header
|
||||||
if scheme is not None:
|
if scheme is not None:
|
||||||
values = ['{!s}="{!s}"'.format(k, v) for k, v in kwargs.items()]
|
values = [
|
||||||
|
'{!s}="{!s}"'.format(k, v) for k, v in challenges.items()
|
||||||
|
]
|
||||||
challenge = ", ".join(values)
|
challenge = ", ".join(values)
|
||||||
|
|
||||||
self.headers = {
|
self.headers = {
|
||||||
"WWW-Authenticate": f"{scheme} {challenge}".rstrip()
|
**self.headers,
|
||||||
|
"WWW-Authenticate": f"{scheme} {challenge}".rstrip(),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,360 +0,0 @@
|
|||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
from inspect import signature
|
|
||||||
from typing import Dict, List, Optional, Tuple, Type, Union
|
|
||||||
|
|
||||||
from sanic.config import Config
|
|
||||||
from sanic.errorpages import (
|
|
||||||
DEFAULT_FORMAT,
|
|
||||||
BaseRenderer,
|
|
||||||
HTMLRenderer,
|
|
||||||
exception_response,
|
|
||||||
)
|
|
||||||
from sanic.exceptions import (
|
|
||||||
ContentRangeError,
|
|
||||||
HeaderNotFound,
|
|
||||||
InvalidRangeType,
|
|
||||||
SanicException,
|
|
||||||
)
|
|
||||||
from sanic.helpers import Default, _default
|
|
||||||
from sanic.log import deprecation, error_logger
|
|
||||||
from sanic.models.handler_types import RouteHandler
|
|
||||||
from sanic.response import text
|
|
||||||
|
|
||||||
|
|
||||||
class ErrorHandler:
|
|
||||||
"""
|
|
||||||
Provide :class:`sanic.app.Sanic` application with a mechanism to handle
|
|
||||||
and process any and all uncaught exceptions in a way the application
|
|
||||||
developer will set fit.
|
|
||||||
|
|
||||||
This error handling framework is built into the core that can be extended
|
|
||||||
by the developers to perform a wide range of tasks from recording the error
|
|
||||||
stats to reporting them to an external service that can be used for
|
|
||||||
realtime alerting system.
|
|
||||||
|
|
||||||
"""
|
|
||||||
|
|
||||||
# Beginning in v22.3, the base renderer will be TextRenderer
|
|
||||||
def __init__(
|
|
||||||
self,
|
|
||||||
fallback: Union[str, Default] = _default,
|
|
||||||
base: Type[BaseRenderer] = HTMLRenderer,
|
|
||||||
):
|
|
||||||
self.handlers: List[Tuple[Type[BaseException], RouteHandler]] = []
|
|
||||||
self.cached_handlers: Dict[
|
|
||||||
Tuple[Type[BaseException], Optional[str]], Optional[RouteHandler]
|
|
||||||
] = {}
|
|
||||||
self.debug = False
|
|
||||||
self._fallback = fallback
|
|
||||||
self.base = base
|
|
||||||
|
|
||||||
if fallback is not _default:
|
|
||||||
self._warn_fallback_deprecation()
|
|
||||||
|
|
||||||
@property
|
|
||||||
def fallback(self):
|
|
||||||
# This is for backwards compat and can be removed in v22.6
|
|
||||||
if self._fallback is _default:
|
|
||||||
return DEFAULT_FORMAT
|
|
||||||
return self._fallback
|
|
||||||
|
|
||||||
@fallback.setter
|
|
||||||
def fallback(self, value: str):
|
|
||||||
self._warn_fallback_deprecation()
|
|
||||||
if not isinstance(value, str):
|
|
||||||
raise SanicException(
|
|
||||||
f"Cannot set error handler fallback to: value={value}"
|
|
||||||
)
|
|
||||||
self._fallback = value
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def _warn_fallback_deprecation():
|
|
||||||
deprecation(
|
|
||||||
"Setting the ErrorHandler fallback value directly is "
|
|
||||||
"deprecated and no longer supported. This feature will "
|
|
||||||
"be removed in v22.6. Instead, use "
|
|
||||||
"app.config.FALLBACK_ERROR_FORMAT.",
|
|
||||||
22.6,
|
|
||||||
)
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def _get_fallback_value(cls, error_handler: ErrorHandler, config: Config):
|
|
||||||
if error_handler._fallback is not _default:
|
|
||||||
if config._FALLBACK_ERROR_FORMAT is _default:
|
|
||||||
return error_handler.fallback
|
|
||||||
|
|
||||||
error_logger.warning(
|
|
||||||
"Conflicting error fallback values were found in the "
|
|
||||||
"error handler and in the app.config while handling an "
|
|
||||||
"exception. Using the value from app.config."
|
|
||||||
)
|
|
||||||
return config.FALLBACK_ERROR_FORMAT
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def finalize(
|
|
||||||
cls,
|
|
||||||
error_handler: ErrorHandler,
|
|
||||||
fallback: Optional[str] = None,
|
|
||||||
config: Optional[Config] = None,
|
|
||||||
):
|
|
||||||
if fallback:
|
|
||||||
deprecation(
|
|
||||||
"Setting the ErrorHandler fallback value via finalize() "
|
|
||||||
"is deprecated and no longer supported. This feature will "
|
|
||||||
"be removed in v22.6. Instead, use "
|
|
||||||
"app.config.FALLBACK_ERROR_FORMAT.",
|
|
||||||
22.6,
|
|
||||||
)
|
|
||||||
|
|
||||||
if config is None:
|
|
||||||
deprecation(
|
|
||||||
"Starting in v22.3, config will be a required argument "
|
|
||||||
"for ErrorHandler.finalize().",
|
|
||||||
22.3,
|
|
||||||
)
|
|
||||||
|
|
||||||
if fallback and fallback != DEFAULT_FORMAT:
|
|
||||||
if error_handler._fallback is not _default:
|
|
||||||
error_logger.warning(
|
|
||||||
f"Setting the fallback value to {fallback}. This changes "
|
|
||||||
"the current non-default value "
|
|
||||||
f"'{error_handler._fallback}'."
|
|
||||||
)
|
|
||||||
error_handler._fallback = fallback
|
|
||||||
|
|
||||||
if not isinstance(error_handler, cls):
|
|
||||||
error_logger.warning(
|
|
||||||
f"Error handler is non-conforming: {type(error_handler)}"
|
|
||||||
)
|
|
||||||
|
|
||||||
sig = signature(error_handler.lookup)
|
|
||||||
if len(sig.parameters) == 1:
|
|
||||||
deprecation(
|
|
||||||
"You are using a deprecated error handler. The lookup "
|
|
||||||
"method should accept two positional parameters: "
|
|
||||||
"(exception, route_name: Optional[str]). "
|
|
||||||
"Until you upgrade your ErrorHandler.lookup, Blueprint "
|
|
||||||
"specific exceptions will not work properly. Beginning "
|
|
||||||
"in v22.3, the legacy style lookup method will not "
|
|
||||||
"work at all.",
|
|
||||||
22.3,
|
|
||||||
)
|
|
||||||
legacy_lookup = error_handler._legacy_lookup
|
|
||||||
error_handler._lookup = legacy_lookup # type: ignore
|
|
||||||
|
|
||||||
def _full_lookup(self, exception, route_name: Optional[str] = None):
|
|
||||||
return self.lookup(exception, route_name)
|
|
||||||
|
|
||||||
def _legacy_lookup(self, exception, route_name: Optional[str] = None):
|
|
||||||
return self.lookup(exception)
|
|
||||||
|
|
||||||
def add(self, exception, handler, route_names: Optional[List[str]] = None):
|
|
||||||
"""
|
|
||||||
Add a new exception handler to an already existing handler object.
|
|
||||||
|
|
||||||
:param exception: Type of exception that need to be handled
|
|
||||||
:param handler: Reference to the method that will handle the exception
|
|
||||||
|
|
||||||
:type exception: :class:`sanic.exceptions.SanicException` or
|
|
||||||
:class:`Exception`
|
|
||||||
:type handler: ``function``
|
|
||||||
|
|
||||||
:return: None
|
|
||||||
"""
|
|
||||||
# self.handlers is deprecated and will be removed in version 22.3
|
|
||||||
self.handlers.append((exception, handler))
|
|
||||||
|
|
||||||
if route_names:
|
|
||||||
for route in route_names:
|
|
||||||
self.cached_handlers[(exception, route)] = handler
|
|
||||||
else:
|
|
||||||
self.cached_handlers[(exception, None)] = handler
|
|
||||||
|
|
||||||
def lookup(self, exception, route_name: Optional[str] = None):
|
|
||||||
"""
|
|
||||||
Lookup the existing instance of :class:`ErrorHandler` and fetch the
|
|
||||||
registered handler for a specific type of exception.
|
|
||||||
|
|
||||||
This method leverages a dict lookup to speedup the retrieval process.
|
|
||||||
|
|
||||||
:param exception: Type of exception
|
|
||||||
|
|
||||||
:type exception: :class:`sanic.exceptions.SanicException` or
|
|
||||||
:class:`Exception`
|
|
||||||
|
|
||||||
:return: Registered function if found ``None`` otherwise
|
|
||||||
"""
|
|
||||||
exception_class = type(exception)
|
|
||||||
|
|
||||||
for name in (route_name, None):
|
|
||||||
exception_key = (exception_class, name)
|
|
||||||
handler = self.cached_handlers.get(exception_key)
|
|
||||||
if handler:
|
|
||||||
return handler
|
|
||||||
|
|
||||||
for name in (route_name, None):
|
|
||||||
for ancestor in type.mro(exception_class):
|
|
||||||
exception_key = (ancestor, name)
|
|
||||||
if exception_key in self.cached_handlers:
|
|
||||||
handler = self.cached_handlers[exception_key]
|
|
||||||
self.cached_handlers[
|
|
||||||
(exception_class, route_name)
|
|
||||||
] = handler
|
|
||||||
return handler
|
|
||||||
|
|
||||||
if ancestor is BaseException:
|
|
||||||
break
|
|
||||||
self.cached_handlers[(exception_class, route_name)] = None
|
|
||||||
handler = None
|
|
||||||
return handler
|
|
||||||
|
|
||||||
_lookup = _full_lookup
|
|
||||||
|
|
||||||
def response(self, request, exception):
|
|
||||||
"""Fetches and executes an exception handler and returns a response
|
|
||||||
object
|
|
||||||
|
|
||||||
:param request: Instance of :class:`sanic.request.Request`
|
|
||||||
:param exception: Exception to handle
|
|
||||||
|
|
||||||
:type request: :class:`sanic.request.Request`
|
|
||||||
:type exception: :class:`sanic.exceptions.SanicException` or
|
|
||||||
:class:`Exception`
|
|
||||||
|
|
||||||
:return: Wrap the return value obtained from :func:`default`
|
|
||||||
or registered handler for that type of exception.
|
|
||||||
"""
|
|
||||||
route_name = request.name if request else None
|
|
||||||
handler = self._lookup(exception, route_name)
|
|
||||||
response = None
|
|
||||||
try:
|
|
||||||
if handler:
|
|
||||||
response = handler(request, exception)
|
|
||||||
if response is None:
|
|
||||||
response = self.default(request, exception)
|
|
||||||
except Exception:
|
|
||||||
try:
|
|
||||||
url = repr(request.url)
|
|
||||||
except AttributeError:
|
|
||||||
url = "unknown"
|
|
||||||
response_message = (
|
|
||||||
"Exception raised in exception handler " '"%s" for uri: %s'
|
|
||||||
)
|
|
||||||
error_logger.exception(response_message, handler.__name__, url)
|
|
||||||
|
|
||||||
if self.debug:
|
|
||||||
return text(response_message % (handler.__name__, url), 500)
|
|
||||||
else:
|
|
||||||
return text("An error occurred while handling an error", 500)
|
|
||||||
return response
|
|
||||||
|
|
||||||
def default(self, request, exception):
|
|
||||||
"""
|
|
||||||
Provide a default behavior for the objects of :class:`ErrorHandler`.
|
|
||||||
If a developer chooses to extent the :class:`ErrorHandler` they can
|
|
||||||
provide a custom implementation for this method to behave in a way
|
|
||||||
they see fit.
|
|
||||||
|
|
||||||
:param request: Incoming request
|
|
||||||
:param exception: Exception object
|
|
||||||
|
|
||||||
:type request: :class:`sanic.request.Request`
|
|
||||||
:type exception: :class:`sanic.exceptions.SanicException` or
|
|
||||||
:class:`Exception`
|
|
||||||
:return:
|
|
||||||
"""
|
|
||||||
self.log(request, exception)
|
|
||||||
fallback = ErrorHandler._get_fallback_value(self, request.app.config)
|
|
||||||
return exception_response(
|
|
||||||
request,
|
|
||||||
exception,
|
|
||||||
debug=self.debug,
|
|
||||||
base=self.base,
|
|
||||||
fallback=fallback,
|
|
||||||
)
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def log(request, exception):
|
|
||||||
quiet = getattr(exception, "quiet", False)
|
|
||||||
noisy = getattr(request.app.config, "NOISY_EXCEPTIONS", False)
|
|
||||||
if quiet is False or noisy is True:
|
|
||||||
try:
|
|
||||||
url = repr(request.url)
|
|
||||||
except AttributeError:
|
|
||||||
url = "unknown"
|
|
||||||
|
|
||||||
error_logger.exception(
|
|
||||||
"Exception occurred while handling uri: %s", url
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class ContentRangeHandler:
|
|
||||||
"""
|
|
||||||
A mechanism to parse and process the incoming request headers to
|
|
||||||
extract the content range information.
|
|
||||||
|
|
||||||
:param request: Incoming api request
|
|
||||||
:param stats: Stats related to the content
|
|
||||||
|
|
||||||
:type request: :class:`sanic.request.Request`
|
|
||||||
:type stats: :class:`posix.stat_result`
|
|
||||||
|
|
||||||
:ivar start: Content Range start
|
|
||||||
:ivar end: Content Range end
|
|
||||||
:ivar size: Length of the content
|
|
||||||
:ivar total: Total size identified by the :class:`posix.stat_result`
|
|
||||||
instance
|
|
||||||
:ivar ContentRangeHandler.headers: Content range header ``dict``
|
|
||||||
"""
|
|
||||||
|
|
||||||
__slots__ = ("start", "end", "size", "total", "headers")
|
|
||||||
|
|
||||||
def __init__(self, request, stats):
|
|
||||||
self.total = stats.st_size
|
|
||||||
_range = request.headers.getone("range", None)
|
|
||||||
if _range is None:
|
|
||||||
raise HeaderNotFound("Range Header Not Found")
|
|
||||||
unit, _, value = tuple(map(str.strip, _range.partition("=")))
|
|
||||||
if unit != "bytes":
|
|
||||||
raise InvalidRangeType(
|
|
||||||
"%s is not a valid Range Type" % (unit,), self
|
|
||||||
)
|
|
||||||
start_b, _, end_b = tuple(map(str.strip, value.partition("-")))
|
|
||||||
try:
|
|
||||||
self.start = int(start_b) if start_b else None
|
|
||||||
except ValueError:
|
|
||||||
raise ContentRangeError(
|
|
||||||
"'%s' is invalid for Content Range" % (start_b,), self
|
|
||||||
)
|
|
||||||
try:
|
|
||||||
self.end = int(end_b) if end_b else None
|
|
||||||
except ValueError:
|
|
||||||
raise ContentRangeError(
|
|
||||||
"'%s' is invalid for Content Range" % (end_b,), self
|
|
||||||
)
|
|
||||||
if self.end is None:
|
|
||||||
if self.start is None:
|
|
||||||
raise ContentRangeError(
|
|
||||||
"Invalid for Content Range parameters", self
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
# this case represents `Content-Range: bytes 5-`
|
|
||||||
self.end = self.total - 1
|
|
||||||
else:
|
|
||||||
if self.start is None:
|
|
||||||
# this case represents `Content-Range: bytes -5`
|
|
||||||
self.start = self.total - self.end
|
|
||||||
self.end = self.total - 1
|
|
||||||
if self.start >= self.end:
|
|
||||||
raise ContentRangeError(
|
|
||||||
"Invalid for Content Range parameters", self
|
|
||||||
)
|
|
||||||
self.size = self.end - self.start + 1
|
|
||||||
self.headers = {
|
|
||||||
"Content-Range": "bytes %s-%s/%s"
|
|
||||||
% (self.start, self.end, self.total)
|
|
||||||
}
|
|
||||||
|
|
||||||
def __bool__(self):
|
|
||||||
return self.size > 0
|
|
||||||
10
sanic/handlers/__init__.py
Normal file
10
sanic/handlers/__init__.py
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
from .content_range import ContentRangeHandler
|
||||||
|
from .directory import DirectoryHandler
|
||||||
|
from .error import ErrorHandler
|
||||||
|
|
||||||
|
|
||||||
|
__all__ = (
|
||||||
|
"ContentRangeHandler",
|
||||||
|
"DirectoryHandler",
|
||||||
|
"ErrorHandler",
|
||||||
|
)
|
||||||
78
sanic/handlers/content_range.py
Normal file
78
sanic/handlers/content_range.py
Normal file
@@ -0,0 +1,78 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from sanic.exceptions import (
|
||||||
|
HeaderNotFound,
|
||||||
|
InvalidRangeType,
|
||||||
|
RangeNotSatisfiable,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class ContentRangeHandler:
|
||||||
|
"""
|
||||||
|
A mechanism to parse and process the incoming request headers to
|
||||||
|
extract the content range information.
|
||||||
|
|
||||||
|
:param request: Incoming api request
|
||||||
|
:param stats: Stats related to the content
|
||||||
|
|
||||||
|
:type request: :class:`sanic.request.Request`
|
||||||
|
:type stats: :class:`posix.stat_result`
|
||||||
|
|
||||||
|
:ivar start: Content Range start
|
||||||
|
:ivar end: Content Range end
|
||||||
|
:ivar size: Length of the content
|
||||||
|
:ivar total: Total size identified by the :class:`posix.stat_result`
|
||||||
|
instance
|
||||||
|
:ivar ContentRangeHandler.headers: Content range header ``dict``
|
||||||
|
"""
|
||||||
|
|
||||||
|
__slots__ = ("start", "end", "size", "total", "headers")
|
||||||
|
|
||||||
|
def __init__(self, request, stats):
|
||||||
|
self.total = stats.st_size
|
||||||
|
_range = request.headers.getone("range", None)
|
||||||
|
if _range is None:
|
||||||
|
raise HeaderNotFound("Range Header Not Found")
|
||||||
|
unit, _, value = tuple(map(str.strip, _range.partition("=")))
|
||||||
|
if unit != "bytes":
|
||||||
|
raise InvalidRangeType(
|
||||||
|
"%s is not a valid Range Type" % (unit,), self
|
||||||
|
)
|
||||||
|
start_b, _, end_b = tuple(map(str.strip, value.partition("-")))
|
||||||
|
try:
|
||||||
|
self.start = int(start_b) if start_b else None
|
||||||
|
except ValueError:
|
||||||
|
raise RangeNotSatisfiable(
|
||||||
|
"'%s' is invalid for Content Range" % (start_b,), self
|
||||||
|
)
|
||||||
|
try:
|
||||||
|
self.end = int(end_b) if end_b else None
|
||||||
|
except ValueError:
|
||||||
|
raise RangeNotSatisfiable(
|
||||||
|
"'%s' is invalid for Content Range" % (end_b,), self
|
||||||
|
)
|
||||||
|
if self.end is None:
|
||||||
|
if self.start is None:
|
||||||
|
raise RangeNotSatisfiable(
|
||||||
|
"Invalid for Content Range parameters", self
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
# this case represents `Content-Range: bytes 5-`
|
||||||
|
self.end = self.total - 1
|
||||||
|
else:
|
||||||
|
if self.start is None:
|
||||||
|
# this case represents `Content-Range: bytes -5`
|
||||||
|
self.start = self.total - self.end
|
||||||
|
self.end = self.total - 1
|
||||||
|
if self.start >= self.end:
|
||||||
|
raise RangeNotSatisfiable(
|
||||||
|
"Invalid for Content Range parameters", self
|
||||||
|
)
|
||||||
|
self.size = self.end - self.start + 1
|
||||||
|
self.headers = {
|
||||||
|
"Content-Range": "bytes %s-%s/%s"
|
||||||
|
% (self.start, self.end, self.total)
|
||||||
|
}
|
||||||
|
|
||||||
|
def __bool__(self):
|
||||||
|
return hasattr(self, "size") and self.size > 0
|
||||||
84
sanic/handlers/directory.py
Normal file
84
sanic/handlers/directory.py
Normal file
@@ -0,0 +1,84 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from datetime import datetime
|
||||||
|
from operator import itemgetter
|
||||||
|
from pathlib import Path
|
||||||
|
from stat import S_ISDIR
|
||||||
|
from typing import Dict, Iterable, Optional, Sequence, Union, cast
|
||||||
|
|
||||||
|
from sanic.exceptions import NotFound
|
||||||
|
from sanic.pages.directory_page import DirectoryPage, FileInfo
|
||||||
|
from sanic.request import Request
|
||||||
|
from sanic.response import file, html, redirect
|
||||||
|
|
||||||
|
|
||||||
|
class DirectoryHandler:
|
||||||
|
def __init__(
|
||||||
|
self,
|
||||||
|
uri: str,
|
||||||
|
directory: Path,
|
||||||
|
directory_view: bool = False,
|
||||||
|
index: Optional[Union[str, Sequence[str]]] = None,
|
||||||
|
) -> None:
|
||||||
|
if isinstance(index, str):
|
||||||
|
index = [index]
|
||||||
|
elif index is None:
|
||||||
|
index = []
|
||||||
|
self.base = uri.strip("/")
|
||||||
|
self.directory = directory
|
||||||
|
self.directory_view = directory_view
|
||||||
|
self.index = tuple(index)
|
||||||
|
|
||||||
|
async def handle(self, request: Request, path: str):
|
||||||
|
current = path.strip("/")[len(self.base) :].strip("/") # noqa: E203
|
||||||
|
for file_name in self.index:
|
||||||
|
index_file = self.directory / current / file_name
|
||||||
|
if index_file.is_file():
|
||||||
|
return await file(index_file)
|
||||||
|
|
||||||
|
if self.directory_view:
|
||||||
|
return self._index(
|
||||||
|
self.directory / current, path, request.app.debug
|
||||||
|
)
|
||||||
|
|
||||||
|
if self.index:
|
||||||
|
raise NotFound("File not found")
|
||||||
|
|
||||||
|
raise IsADirectoryError(f"{self.directory.as_posix()} is a directory")
|
||||||
|
|
||||||
|
def _index(self, location: Path, path: str, debug: bool):
|
||||||
|
# Remove empty path elements, append slash
|
||||||
|
if "//" in path or not path.endswith("/"):
|
||||||
|
return redirect(
|
||||||
|
"/" + "".join([f"{p}/" for p in path.split("/") if p])
|
||||||
|
)
|
||||||
|
|
||||||
|
# Render file browser
|
||||||
|
page = DirectoryPage(self._iter_files(location), path, debug)
|
||||||
|
return html(page.render())
|
||||||
|
|
||||||
|
def _prepare_file(self, path: Path) -> Dict[str, Union[int, str]]:
|
||||||
|
stat = path.stat()
|
||||||
|
modified = (
|
||||||
|
datetime.fromtimestamp(stat.st_mtime)
|
||||||
|
.isoformat()[:19]
|
||||||
|
.replace("T", " ")
|
||||||
|
)
|
||||||
|
is_dir = S_ISDIR(stat.st_mode)
|
||||||
|
icon = "📁" if is_dir else "📄"
|
||||||
|
file_name = path.name
|
||||||
|
if is_dir:
|
||||||
|
file_name += "/"
|
||||||
|
return {
|
||||||
|
"priority": is_dir * -1,
|
||||||
|
"file_name": file_name,
|
||||||
|
"icon": icon,
|
||||||
|
"file_access": modified,
|
||||||
|
"file_size": stat.st_size,
|
||||||
|
}
|
||||||
|
|
||||||
|
def _iter_files(self, location: Path) -> Iterable[FileInfo]:
|
||||||
|
prepared = [self._prepare_file(f) for f in location.iterdir()]
|
||||||
|
for item in sorted(prepared, key=itemgetter("priority", "file_name")):
|
||||||
|
del item["priority"]
|
||||||
|
yield cast(FileInfo, item)
|
||||||
190
sanic/handlers/error.py
Normal file
190
sanic/handlers/error.py
Normal file
@@ -0,0 +1,190 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from typing import Dict, List, Optional, Tuple, Type
|
||||||
|
|
||||||
|
from sanic.errorpages import BaseRenderer, TextRenderer, exception_response
|
||||||
|
from sanic.exceptions import ServerError
|
||||||
|
from sanic.log import error_logger
|
||||||
|
from sanic.models.handler_types import RouteHandler
|
||||||
|
from sanic.request.types import Request
|
||||||
|
from sanic.response import text
|
||||||
|
from sanic.response.types import HTTPResponse
|
||||||
|
|
||||||
|
|
||||||
|
class ErrorHandler:
|
||||||
|
"""
|
||||||
|
Provide :class:`sanic.app.Sanic` application with a mechanism to handle
|
||||||
|
and process any and all uncaught exceptions in a way the application
|
||||||
|
developer will set fit.
|
||||||
|
|
||||||
|
This error handling framework is built into the core that can be extended
|
||||||
|
by the developers to perform a wide range of tasks from recording the error
|
||||||
|
stats to reporting them to an external service that can be used for
|
||||||
|
realtime alerting system.
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(
|
||||||
|
self,
|
||||||
|
base: Type[BaseRenderer] = TextRenderer,
|
||||||
|
):
|
||||||
|
self.cached_handlers: Dict[
|
||||||
|
Tuple[Type[BaseException], Optional[str]], Optional[RouteHandler]
|
||||||
|
] = {}
|
||||||
|
self.debug = False
|
||||||
|
self.base = base
|
||||||
|
|
||||||
|
def _full_lookup(self, exception, route_name: Optional[str] = None):
|
||||||
|
return self.lookup(exception, route_name)
|
||||||
|
|
||||||
|
def _add(
|
||||||
|
self,
|
||||||
|
key: Tuple[Type[BaseException], Optional[str]],
|
||||||
|
handler: RouteHandler,
|
||||||
|
) -> None:
|
||||||
|
if key in self.cached_handlers:
|
||||||
|
exc, name = key
|
||||||
|
if name is None:
|
||||||
|
name = "__ALL_ROUTES__"
|
||||||
|
|
||||||
|
message = (
|
||||||
|
f"Duplicate exception handler definition on: route={name} "
|
||||||
|
f"and exception={exc}"
|
||||||
|
)
|
||||||
|
raise ServerError(message)
|
||||||
|
self.cached_handlers[key] = handler
|
||||||
|
|
||||||
|
def add(self, exception, handler, route_names: Optional[List[str]] = None):
|
||||||
|
"""
|
||||||
|
Add a new exception handler to an already existing handler object.
|
||||||
|
|
||||||
|
:param exception: Type of exception that need to be handled
|
||||||
|
:param handler: Reference to the method that will handle the exception
|
||||||
|
|
||||||
|
:type exception: :class:`sanic.exceptions.SanicException` or
|
||||||
|
:class:`Exception`
|
||||||
|
:type handler: ``function``
|
||||||
|
|
||||||
|
:return: None
|
||||||
|
"""
|
||||||
|
if route_names:
|
||||||
|
for route in route_names:
|
||||||
|
self._add((exception, route), handler)
|
||||||
|
else:
|
||||||
|
self._add((exception, None), handler)
|
||||||
|
|
||||||
|
def lookup(self, exception, route_name: Optional[str] = None):
|
||||||
|
"""
|
||||||
|
Lookup the existing instance of :class:`ErrorHandler` and fetch the
|
||||||
|
registered handler for a specific type of exception.
|
||||||
|
|
||||||
|
This method leverages a dict lookup to speedup the retrieval process.
|
||||||
|
|
||||||
|
:param exception: Type of exception
|
||||||
|
|
||||||
|
:type exception: :class:`sanic.exceptions.SanicException` or
|
||||||
|
:class:`Exception`
|
||||||
|
|
||||||
|
:return: Registered function if found ``None`` otherwise
|
||||||
|
"""
|
||||||
|
exception_class = type(exception)
|
||||||
|
|
||||||
|
for name in (route_name, None):
|
||||||
|
exception_key = (exception_class, name)
|
||||||
|
handler = self.cached_handlers.get(exception_key)
|
||||||
|
if handler:
|
||||||
|
return handler
|
||||||
|
|
||||||
|
for name in (route_name, None):
|
||||||
|
for ancestor in type.mro(exception_class):
|
||||||
|
exception_key = (ancestor, name)
|
||||||
|
if exception_key in self.cached_handlers:
|
||||||
|
handler = self.cached_handlers[exception_key]
|
||||||
|
self.cached_handlers[
|
||||||
|
(exception_class, route_name)
|
||||||
|
] = handler
|
||||||
|
return handler
|
||||||
|
|
||||||
|
if ancestor is BaseException:
|
||||||
|
break
|
||||||
|
self.cached_handlers[(exception_class, route_name)] = None
|
||||||
|
handler = None
|
||||||
|
return handler
|
||||||
|
|
||||||
|
_lookup = _full_lookup
|
||||||
|
|
||||||
|
def response(self, request, exception):
|
||||||
|
"""Fetches and executes an exception handler and returns a response
|
||||||
|
object
|
||||||
|
|
||||||
|
:param request: Instance of :class:`sanic.request.Request`
|
||||||
|
:param exception: Exception to handle
|
||||||
|
|
||||||
|
:type request: :class:`sanic.request.Request`
|
||||||
|
:type exception: :class:`sanic.exceptions.SanicException` or
|
||||||
|
:class:`Exception`
|
||||||
|
|
||||||
|
:return: Wrap the return value obtained from :func:`default`
|
||||||
|
or registered handler for that type of exception.
|
||||||
|
"""
|
||||||
|
route_name = request.name if request else None
|
||||||
|
handler = self._lookup(exception, route_name)
|
||||||
|
response = None
|
||||||
|
try:
|
||||||
|
if handler:
|
||||||
|
response = handler(request, exception)
|
||||||
|
if response is None:
|
||||||
|
response = self.default(request, exception)
|
||||||
|
except Exception:
|
||||||
|
try:
|
||||||
|
url = repr(request.url)
|
||||||
|
except AttributeError: # no cov
|
||||||
|
url = "unknown"
|
||||||
|
response_message = (
|
||||||
|
"Exception raised in exception handler " '"%s" for uri: %s'
|
||||||
|
)
|
||||||
|
error_logger.exception(response_message, handler.__name__, url)
|
||||||
|
|
||||||
|
if self.debug:
|
||||||
|
return text(response_message % (handler.__name__, url), 500)
|
||||||
|
else:
|
||||||
|
return text("An error occurred while handling an error", 500)
|
||||||
|
return response
|
||||||
|
|
||||||
|
def default(self, request: Request, exception: Exception) -> HTTPResponse:
|
||||||
|
"""
|
||||||
|
Provide a default behavior for the objects of :class:`ErrorHandler`.
|
||||||
|
If a developer chooses to extent the :class:`ErrorHandler` they can
|
||||||
|
provide a custom implementation for this method to behave in a way
|
||||||
|
they see fit.
|
||||||
|
|
||||||
|
:param request: Incoming request
|
||||||
|
:param exception: Exception object
|
||||||
|
|
||||||
|
:type request: :class:`sanic.request.Request`
|
||||||
|
:type exception: :class:`sanic.exceptions.SanicException` or
|
||||||
|
:class:`Exception`
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
|
self.log(request, exception)
|
||||||
|
fallback = request.app.config.FALLBACK_ERROR_FORMAT
|
||||||
|
return exception_response(
|
||||||
|
request,
|
||||||
|
exception,
|
||||||
|
debug=self.debug,
|
||||||
|
base=self.base,
|
||||||
|
fallback=fallback,
|
||||||
|
)
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def log(request, exception):
|
||||||
|
quiet = getattr(exception, "quiet", False)
|
||||||
|
noisy = getattr(request.app.config, "NOISY_EXCEPTIONS", False)
|
||||||
|
if quiet is False or noisy is True:
|
||||||
|
try:
|
||||||
|
url = repr(request.url)
|
||||||
|
except AttributeError: # no cov
|
||||||
|
url = "unknown"
|
||||||
|
|
||||||
|
error_logger.exception(
|
||||||
|
"Exception occurred while handling uri: %s", url
|
||||||
|
)
|
||||||
392
sanic/headers.py
392
sanic/headers.py
@@ -2,7 +2,7 @@ from __future__ import annotations
|
|||||||
|
|
||||||
import re
|
import re
|
||||||
|
|
||||||
from typing import Any, Dict, Iterable, List, Optional, Tuple, Union
|
from typing import Any, Dict, Iterable, List, Optional, Set, Tuple, Union
|
||||||
from urllib.parse import unquote
|
from urllib.parse import unquote
|
||||||
|
|
||||||
from sanic.exceptions import InvalidHeader
|
from sanic.exceptions import InvalidHeader
|
||||||
@@ -18,8 +18,7 @@ Options = Dict[str, Union[int, str]] # key=value fields in various headers
|
|||||||
OptionsIterable = Iterable[Tuple[str, str]] # May contain duplicate keys
|
OptionsIterable = Iterable[Tuple[str, str]] # May contain duplicate keys
|
||||||
|
|
||||||
_token, _quoted = r"([\w!#$%&'*+\-.^_`|~]+)", r'"([^"]*)"'
|
_token, _quoted = r"([\w!#$%&'*+\-.^_`|~]+)", r'"([^"]*)"'
|
||||||
_param = re.compile(fr";\s*{_token}=(?:{_token}|{_quoted})", re.ASCII)
|
_param = re.compile(rf";\s*{_token}=(?:{_token}|{_quoted})", re.ASCII)
|
||||||
_firefox_quote_escape = re.compile(r'\\"(?!; |\s*$)')
|
|
||||||
_ipv6 = "(?:[0-9A-Fa-f]{0,4}:){2,7}[0-9A-Fa-f]{0,4}"
|
_ipv6 = "(?:[0-9A-Fa-f]{0,4}:){2,7}[0-9A-Fa-f]{0,4}"
|
||||||
_ipv6_re = re.compile(_ipv6)
|
_ipv6_re = re.compile(_ipv6)
|
||||||
_host_re = re.compile(
|
_host_re = re.compile(
|
||||||
@@ -33,143 +32,96 @@ _host_re = re.compile(
|
|||||||
# For more information, consult ../tests/test_requests.py
|
# For more information, consult ../tests/test_requests.py
|
||||||
|
|
||||||
|
|
||||||
def parse_arg_as_accept(f):
|
class MediaType:
|
||||||
def func(self, other, *args, **kwargs):
|
"""A media type, as used in the Accept header."""
|
||||||
if not isinstance(other, Accept) and other:
|
|
||||||
other = Accept.parse(other)
|
|
||||||
return f(self, other, *args, **kwargs)
|
|
||||||
|
|
||||||
return func
|
|
||||||
|
|
||||||
|
|
||||||
class MediaType(str):
|
|
||||||
def __new__(cls, value: str):
|
|
||||||
return str.__new__(cls, value)
|
|
||||||
|
|
||||||
def __init__(self, value: str) -> None:
|
|
||||||
self.value = value
|
|
||||||
self.is_wildcard = self.check_if_wildcard(value)
|
|
||||||
|
|
||||||
def __eq__(self, other):
|
|
||||||
if self.is_wildcard:
|
|
||||||
return True
|
|
||||||
|
|
||||||
if self.match(other):
|
|
||||||
return True
|
|
||||||
|
|
||||||
other_is_wildcard = (
|
|
||||||
other.is_wildcard
|
|
||||||
if isinstance(other, MediaType)
|
|
||||||
else self.check_if_wildcard(other)
|
|
||||||
)
|
|
||||||
|
|
||||||
return other_is_wildcard
|
|
||||||
|
|
||||||
def match(self, other):
|
|
||||||
other_value = other.value if isinstance(other, MediaType) else other
|
|
||||||
return self.value == other_value
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def check_if_wildcard(value):
|
|
||||||
return value == "*"
|
|
||||||
|
|
||||||
|
|
||||||
class Accept(str):
|
|
||||||
def __new__(cls, value: str, *args, **kwargs):
|
|
||||||
return str.__new__(cls, value)
|
|
||||||
|
|
||||||
def __init__(
|
def __init__(
|
||||||
self,
|
self,
|
||||||
value: str,
|
type_: str,
|
||||||
type_: MediaType,
|
subtype: str,
|
||||||
subtype: MediaType,
|
**params: str,
|
||||||
*,
|
|
||||||
q: str = "1.0",
|
|
||||||
**kwargs: str,
|
|
||||||
):
|
):
|
||||||
qvalue = float(q)
|
self.type = type_
|
||||||
if qvalue > 1 or qvalue < 0:
|
|
||||||
raise InvalidHeader(
|
|
||||||
f"Accept header qvalue must be between 0 and 1, not: {qvalue}"
|
|
||||||
)
|
|
||||||
self.value = value
|
|
||||||
self.type_ = type_
|
|
||||||
self.subtype = subtype
|
self.subtype = subtype
|
||||||
self.qvalue = qvalue
|
self.q = float(params.get("q", "1.0"))
|
||||||
self.params = kwargs
|
self.params = params
|
||||||
|
self.mime = f"{type_}/{subtype}"
|
||||||
|
self.key = (
|
||||||
|
-1 * self.q,
|
||||||
|
-1 * len(self.params),
|
||||||
|
self.subtype == "*",
|
||||||
|
self.type == "*",
|
||||||
|
)
|
||||||
|
|
||||||
def _compare(self, other, method):
|
def __repr__(self):
|
||||||
try:
|
return self.mime + "".join(f";{k}={v}" for k, v in self.params.items())
|
||||||
return method(self.qvalue, other.qvalue)
|
|
||||||
except (AttributeError, TypeError):
|
|
||||||
return NotImplemented
|
|
||||||
|
|
||||||
@parse_arg_as_accept
|
def __eq__(self, other):
|
||||||
def __lt__(self, other: Union[str, Accept]):
|
"""Check for mime (str or MediaType) identical type/subtype.
|
||||||
return self._compare(other, lambda s, o: s < o)
|
Parameters such as q are not considered."""
|
||||||
|
if isinstance(other, str):
|
||||||
|
# Give a friendly reminder if str contains parameters
|
||||||
|
if ";" in other:
|
||||||
|
raise ValueError("Use match() to compare with parameters")
|
||||||
|
return self.mime == other
|
||||||
|
if isinstance(other, MediaType):
|
||||||
|
# Ignore parameters silently with MediaType objects
|
||||||
|
return self.mime == other.mime
|
||||||
|
return NotImplemented
|
||||||
|
|
||||||
@parse_arg_as_accept
|
|
||||||
def __le__(self, other: Union[str, Accept]):
|
|
||||||
return self._compare(other, lambda s, o: s <= o)
|
|
||||||
|
|
||||||
@parse_arg_as_accept
|
|
||||||
def __eq__(self, other: Union[str, Accept]): # type: ignore
|
|
||||||
return self._compare(other, lambda s, o: s == o)
|
|
||||||
|
|
||||||
@parse_arg_as_accept
|
|
||||||
def __ge__(self, other: Union[str, Accept]):
|
|
||||||
return self._compare(other, lambda s, o: s >= o)
|
|
||||||
|
|
||||||
@parse_arg_as_accept
|
|
||||||
def __gt__(self, other: Union[str, Accept]):
|
|
||||||
return self._compare(other, lambda s, o: s > o)
|
|
||||||
|
|
||||||
@parse_arg_as_accept
|
|
||||||
def __ne__(self, other: Union[str, Accept]): # type: ignore
|
|
||||||
return self._compare(other, lambda s, o: s != o)
|
|
||||||
|
|
||||||
@parse_arg_as_accept
|
|
||||||
def match(
|
def match(
|
||||||
self,
|
self,
|
||||||
other,
|
mime_with_params: Union[str, MediaType],
|
||||||
*,
|
) -> Optional[MediaType]:
|
||||||
allow_type_wildcard: bool = True,
|
"""Check if this media type matches the given mime type/subtype.
|
||||||
allow_subtype_wildcard: bool = True,
|
Wildcards are supported both ways on both type and subtype.
|
||||||
) -> bool:
|
If mime contains a semicolon, optionally followed by parameters,
|
||||||
type_match = (
|
the parameters of the two media types must match exactly.
|
||||||
self.type_ == other.type_
|
Note: Use the `==` operator instead to check for literal matches
|
||||||
if allow_type_wildcard
|
without expanding wildcards.
|
||||||
else (
|
@param media_type: A type/subtype string to match.
|
||||||
self.type_.match(other.type_)
|
@return `self` if the media types are compatible, else `None`
|
||||||
and not self.type_.is_wildcard
|
"""
|
||||||
and not other.type_.is_wildcard
|
mt = (
|
||||||
)
|
MediaType._parse(mime_with_params)
|
||||||
|
if isinstance(mime_with_params, str)
|
||||||
|
else mime_with_params
|
||||||
)
|
)
|
||||||
subtype_match = (
|
return (
|
||||||
self.subtype == other.subtype
|
self
|
||||||
if allow_subtype_wildcard
|
if (
|
||||||
else (
|
mt
|
||||||
self.subtype.match(other.subtype)
|
# All parameters given in the other media type must match
|
||||||
and not self.subtype.is_wildcard
|
and all(self.params.get(k) == v for k, v in mt.params.items())
|
||||||
and not other.subtype.is_wildcard
|
# Subtype match
|
||||||
|
and (
|
||||||
|
self.subtype == mt.subtype
|
||||||
|
or self.subtype == "*"
|
||||||
|
or mt.subtype == "*"
|
||||||
|
)
|
||||||
|
# Type match
|
||||||
|
and (
|
||||||
|
self.type == mt.type or self.type == "*" or mt.type == "*"
|
||||||
|
)
|
||||||
)
|
)
|
||||||
|
else None
|
||||||
)
|
)
|
||||||
|
|
||||||
return type_match and subtype_match
|
@property
|
||||||
|
def has_wildcard(self) -> bool:
|
||||||
|
"""Return True if this media type has a wildcard in it."""
|
||||||
|
return any(part == "*" for part in (self.subtype, self.type))
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def parse(cls, raw: str) -> Accept:
|
def _parse(cls, mime_with_params: str) -> Optional[MediaType]:
|
||||||
invalid = False
|
mtype = mime_with_params.strip()
|
||||||
mtype = raw.strip()
|
if "/" not in mime_with_params:
|
||||||
|
return None
|
||||||
|
|
||||||
try:
|
mime, *raw_params = mtype.split(";")
|
||||||
media, *raw_params = mtype.split(";")
|
type_, subtype = mime.split("/", 1)
|
||||||
type_, subtype = media.split("/")
|
if not type_ or not subtype:
|
||||||
except ValueError:
|
raise ValueError(f"Invalid media type: {mtype}")
|
||||||
invalid = True
|
|
||||||
|
|
||||||
if invalid or not type_ or not subtype:
|
|
||||||
raise InvalidHeader(f"Header contains invalid Accept value: {raw}")
|
|
||||||
|
|
||||||
params = dict(
|
params = dict(
|
||||||
[
|
[
|
||||||
@@ -178,46 +130,160 @@ class Accept(str):
|
|||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
return cls(mtype, MediaType(type_), MediaType(subtype), **params)
|
return cls(type_.lstrip(), subtype.rstrip(), **params)
|
||||||
|
|
||||||
|
|
||||||
class AcceptContainer(list):
|
class Matched:
|
||||||
def __contains__(self, o: object) -> bool:
|
"""A matching result of a MIME string against a header."""
|
||||||
return any(item.match(o) for item in self)
|
|
||||||
|
|
||||||
def match(
|
def __init__(self, mime: str, header: Optional[MediaType]):
|
||||||
self,
|
self.mime = mime
|
||||||
o: object,
|
self.header = header
|
||||||
*,
|
|
||||||
allow_type_wildcard: bool = True,
|
def __repr__(self):
|
||||||
allow_subtype_wildcard: bool = True,
|
return f"<{self} matched {self.header}>" if self else "<no match>"
|
||||||
) -> bool:
|
|
||||||
return any(
|
def __str__(self):
|
||||||
item.match(
|
return self.mime
|
||||||
o,
|
|
||||||
allow_type_wildcard=allow_type_wildcard,
|
def __bool__(self):
|
||||||
allow_subtype_wildcard=allow_subtype_wildcard,
|
return self.header is not None
|
||||||
|
|
||||||
|
def __eq__(self, other: Any) -> bool:
|
||||||
|
try:
|
||||||
|
comp, other_accept = self._compare(other)
|
||||||
|
except TypeError:
|
||||||
|
return False
|
||||||
|
|
||||||
|
return bool(
|
||||||
|
comp
|
||||||
|
and (
|
||||||
|
(self.header and other_accept.header)
|
||||||
|
or (not self.header and not other_accept.header)
|
||||||
)
|
)
|
||||||
for item in self
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def _compare(self, other) -> Tuple[bool, Matched]:
|
||||||
|
if isinstance(other, str):
|
||||||
|
parsed = Matched.parse(other)
|
||||||
|
if self.mime == other:
|
||||||
|
return True, parsed
|
||||||
|
other = parsed
|
||||||
|
|
||||||
|
if isinstance(other, Matched):
|
||||||
|
return self.header == other.header, other
|
||||||
|
|
||||||
|
raise TypeError(
|
||||||
|
"Comparison not supported between unequal "
|
||||||
|
f"mime types of '{self.mime}' and '{other}'"
|
||||||
|
)
|
||||||
|
|
||||||
|
def match(self, other: Union[str, Matched]) -> Optional[Matched]:
|
||||||
|
accept = Matched.parse(other) if isinstance(other, str) else other
|
||||||
|
if not self.header or not accept.header:
|
||||||
|
return None
|
||||||
|
if self.header.match(accept.header):
|
||||||
|
return accept
|
||||||
|
return None
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def parse(cls, raw: str) -> Matched:
|
||||||
|
media_type = MediaType._parse(raw)
|
||||||
|
return cls(raw, media_type)
|
||||||
|
|
||||||
|
|
||||||
|
class AcceptList(list):
|
||||||
|
"""A list of media types, as used in the Accept header.
|
||||||
|
|
||||||
|
The Accept header entries are listed in order of preference, starting
|
||||||
|
with the most preferred. This class is a list of `MediaType` objects,
|
||||||
|
that encapsulate also the q value or any other parameters.
|
||||||
|
|
||||||
|
Two separate methods are provided for searching the list:
|
||||||
|
- 'match' for finding the most preferred match (wildcards supported)
|
||||||
|
- operator 'in' for checking explicit matches (wildcards as literals)
|
||||||
|
"""
|
||||||
|
|
||||||
|
def match(self, *mimes: str, accept_wildcards=True) -> Matched:
|
||||||
|
"""Find a media type accepted by the client.
|
||||||
|
|
||||||
|
This method can be used to find which of the media types requested by
|
||||||
|
the client is most preferred against the ones given as arguments.
|
||||||
|
|
||||||
|
The ordering of preference is set by:
|
||||||
|
1. The order set by RFC 7231, s. 5.3.2, giving a higher priority
|
||||||
|
to q values and more specific type definitions,
|
||||||
|
2. The order of the arguments (first is most preferred), and
|
||||||
|
3. The first matching entry on the Accept header.
|
||||||
|
|
||||||
|
Wildcards are matched both ways. A match is usually found, as the
|
||||||
|
Accept headers typically include `*/*`, in particular if the header
|
||||||
|
is missing, is not manually set, or if the client is a browser.
|
||||||
|
|
||||||
|
Note: the returned object behaves as a string of the mime argument
|
||||||
|
that matched, and is empty/falsy if no match was found. The matched
|
||||||
|
header entry `MediaType` or `None` is available as the `m` attribute.
|
||||||
|
|
||||||
|
@param mimes: Any MIME types to search for in order of preference.
|
||||||
|
@param accept_wildcards: Match Accept entries with wildcards in them.
|
||||||
|
@return A match object with the mime string and the MediaType object.
|
||||||
|
"""
|
||||||
|
a = sorted(
|
||||||
|
(-acc.q, i, j, mime, acc)
|
||||||
|
for j, acc in enumerate(self)
|
||||||
|
if accept_wildcards or not acc.has_wildcard
|
||||||
|
for i, mime in enumerate(mimes)
|
||||||
|
if acc.match(mime)
|
||||||
|
)
|
||||||
|
return Matched(*(a[0][-2:] if a else ("", None)))
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
"""Format as Accept header value (parsed, not original)."""
|
||||||
|
return ", ".join(str(m) for m in self)
|
||||||
|
|
||||||
|
|
||||||
|
def parse_accept(accept: Optional[str]) -> AcceptList:
|
||||||
|
"""Parse an Accept header and order the acceptable media types in
|
||||||
|
according to RFC 7231, s. 5.3.2
|
||||||
|
https://datatracker.ietf.org/doc/html/rfc7231#section-5.3.2
|
||||||
|
"""
|
||||||
|
if not accept:
|
||||||
|
if accept == "":
|
||||||
|
return AcceptList() # Empty header, accept nothing
|
||||||
|
accept = "*/*" # No header means that all types are accepted
|
||||||
|
try:
|
||||||
|
a = [
|
||||||
|
mt
|
||||||
|
for mt in [MediaType._parse(mtype) for mtype in accept.split(",")]
|
||||||
|
if mt
|
||||||
|
]
|
||||||
|
if not a:
|
||||||
|
raise ValueError
|
||||||
|
return AcceptList(sorted(a, key=lambda x: x.key))
|
||||||
|
except ValueError:
|
||||||
|
raise InvalidHeader(f"Invalid header value in Accept: {accept}")
|
||||||
|
|
||||||
|
|
||||||
def parse_content_header(value: str) -> Tuple[str, Options]:
|
def parse_content_header(value: str) -> Tuple[str, Options]:
|
||||||
"""Parse content-type and content-disposition header values.
|
"""Parse content-type and content-disposition header values.
|
||||||
|
|
||||||
E.g. 'form-data; name=upload; filename=\"file.txt\"' to
|
E.g. `form-data; name=upload; filename="file.txt"` to
|
||||||
('form-data', {'name': 'upload', 'filename': 'file.txt'})
|
('form-data', {'name': 'upload', 'filename': 'file.txt'})
|
||||||
|
|
||||||
Mostly identical to cgi.parse_header and werkzeug.parse_options_header
|
Mostly identical to cgi.parse_header and werkzeug.parse_options_header
|
||||||
but runs faster and handles special characters better. Unescapes quotes.
|
but runs faster and handles special characters better.
|
||||||
|
|
||||||
|
Unescapes %22 to `"` and %0D%0A to `\n` in field values.
|
||||||
"""
|
"""
|
||||||
value = _firefox_quote_escape.sub("%22", value)
|
|
||||||
pos = value.find(";")
|
pos = value.find(";")
|
||||||
if pos == -1:
|
if pos == -1:
|
||||||
options: Dict[str, Union[int, str]] = {}
|
options: Dict[str, Union[int, str]] = {}
|
||||||
else:
|
else:
|
||||||
options = {
|
options = {
|
||||||
m.group(1).lower(): m.group(2) or m.group(3).replace("%22", '"')
|
m.group(1)
|
||||||
|
.lower(): (m.group(2) or m.group(3))
|
||||||
|
.replace("%22", '"')
|
||||||
|
.replace("%0D%0A", "\n")
|
||||||
for m in _param.finditer(value[pos:])
|
for m in _param.finditer(value[pos:])
|
||||||
}
|
}
|
||||||
value = value[:pos]
|
value = value[:pos]
|
||||||
@@ -368,29 +434,15 @@ def format_http1_response(status: int, headers: HeaderBytesIterable) -> bytes:
|
|||||||
return ret
|
return ret
|
||||||
|
|
||||||
|
|
||||||
def _sort_accept_value(accept: Accept):
|
def parse_credentials(
|
||||||
return (
|
header: Optional[str],
|
||||||
accept.qvalue,
|
prefixes: Optional[Union[List, Tuple, Set]] = None,
|
||||||
len(accept.params),
|
) -> Tuple[Optional[str], Optional[str]]:
|
||||||
accept.subtype != "*",
|
"""Parses any header with the aim to retrieve any credentials from it."""
|
||||||
accept.type_ != "*",
|
if not prefixes or not isinstance(prefixes, (list, tuple, set)):
|
||||||
)
|
prefixes = ("Basic", "Bearer", "Token")
|
||||||
|
if header is not None:
|
||||||
|
for prefix in prefixes:
|
||||||
def parse_accept(accept: str) -> AcceptContainer:
|
if prefix in header:
|
||||||
"""Parse an Accept header and order the acceptable media types in
|
return prefix, header.partition(prefix)[-1].strip()
|
||||||
accorsing to RFC 7231, s. 5.3.2
|
return None, header
|
||||||
https://datatracker.ietf.org/doc/html/rfc7231#section-5.3.2
|
|
||||||
"""
|
|
||||||
media_types = accept.split(",")
|
|
||||||
accept_list: List[Accept] = []
|
|
||||||
|
|
||||||
for mtype in media_types:
|
|
||||||
if not mtype:
|
|
||||||
continue
|
|
||||||
|
|
||||||
accept_list.append(Accept.parse(mtype))
|
|
||||||
|
|
||||||
return AcceptContainer(
|
|
||||||
sorted(accept_list, key=_sort_accept_value, reverse=True)
|
|
||||||
)
|
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
"""Defines basics of HTTP standard."""
|
"""Defines basics of HTTP standard."""
|
||||||
|
|
||||||
|
import sys
|
||||||
|
|
||||||
from importlib import import_module
|
from importlib import import_module
|
||||||
from inspect import ismodule
|
from inspect import ismodule
|
||||||
from typing import Dict
|
from typing import Dict
|
||||||
@@ -157,6 +159,10 @@ def import_string(module_name, package=None):
|
|||||||
return obj()
|
return obj()
|
||||||
|
|
||||||
|
|
||||||
|
def is_atty() -> bool:
|
||||||
|
return bool(sys.stdout and sys.stdout.isatty())
|
||||||
|
|
||||||
|
|
||||||
class Default:
|
class Default:
|
||||||
"""
|
"""
|
||||||
It is used to replace `None` or `object()` as a sentinel
|
It is used to replace `None` or `object()` as a sentinel
|
||||||
|
|||||||
6
sanic/http/__init__.py
Normal file
6
sanic/http/__init__.py
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
from .constants import Stage
|
||||||
|
from .http1 import Http
|
||||||
|
from .http3 import Http3
|
||||||
|
|
||||||
|
|
||||||
|
__all__ = ("Http", "Stage", "Http3")
|
||||||
29
sanic/http/constants.py
Normal file
29
sanic/http/constants.py
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
from enum import Enum, IntEnum
|
||||||
|
|
||||||
|
|
||||||
|
class Stage(Enum):
|
||||||
|
"""
|
||||||
|
Enum for representing the stage of the request/response cycle
|
||||||
|
|
||||||
|
| ``IDLE`` Waiting for request
|
||||||
|
| ``REQUEST`` Request headers being received
|
||||||
|
| ``HANDLER`` Headers done, handler running
|
||||||
|
| ``RESPONSE`` Response headers sent, body in progress
|
||||||
|
| ``FAILED`` Unrecoverable state (error while sending response)
|
||||||
|
|
|
||||||
|
"""
|
||||||
|
|
||||||
|
IDLE = 0 # Waiting for request
|
||||||
|
REQUEST = 1 # Request headers being received
|
||||||
|
HANDLER = 3 # Headers done, handler running
|
||||||
|
RESPONSE = 4 # Response headers sent, body in progress
|
||||||
|
FAILED = 100 # Unrecoverable state (error while sending response)
|
||||||
|
|
||||||
|
|
||||||
|
class HTTP(IntEnum):
|
||||||
|
VERSION_1 = 1
|
||||||
|
VERSION_3 = 3
|
||||||
|
|
||||||
|
def display(self) -> str:
|
||||||
|
value = 1.1 if self.value == 1 else self.value
|
||||||
|
return f"HTTP/{value}"
|
||||||
@@ -3,71 +3,53 @@ from __future__ import annotations
|
|||||||
from typing import TYPE_CHECKING, Optional
|
from typing import TYPE_CHECKING, Optional
|
||||||
|
|
||||||
|
|
||||||
if TYPE_CHECKING: # no cov
|
if TYPE_CHECKING:
|
||||||
from sanic.request import Request
|
from sanic.request import Request
|
||||||
from sanic.response import BaseHTTPResponse
|
from sanic.response import BaseHTTPResponse
|
||||||
|
|
||||||
from asyncio import CancelledError, sleep
|
from asyncio import CancelledError, sleep
|
||||||
from enum import Enum
|
|
||||||
|
|
||||||
from sanic.compat import Header
|
from sanic.compat import Header
|
||||||
from sanic.exceptions import (
|
from sanic.exceptions import (
|
||||||
HeaderExpectationFailed,
|
BadRequest,
|
||||||
InvalidUsage,
|
ExpectationFailed,
|
||||||
PayloadTooLarge,
|
PayloadTooLarge,
|
||||||
|
RequestCancelled,
|
||||||
ServerError,
|
ServerError,
|
||||||
ServiceUnavailable,
|
ServiceUnavailable,
|
||||||
)
|
)
|
||||||
from sanic.headers import format_http1_response
|
from sanic.headers import format_http1_response
|
||||||
from sanic.helpers import has_message_body
|
from sanic.helpers import has_message_body
|
||||||
|
from sanic.http.constants import Stage
|
||||||
|
from sanic.http.stream import Stream
|
||||||
from sanic.log import access_logger, error_logger, logger
|
from sanic.log import access_logger, error_logger, logger
|
||||||
from sanic.touchup import TouchUpMeta
|
from sanic.touchup import TouchUpMeta
|
||||||
|
|
||||||
|
|
||||||
class Stage(Enum):
|
|
||||||
"""
|
|
||||||
Enum for representing the stage of the request/response cycle
|
|
||||||
|
|
||||||
| ``IDLE`` Waiting for request
|
|
||||||
| ``REQUEST`` Request headers being received
|
|
||||||
| ``HANDLER`` Headers done, handler running
|
|
||||||
| ``RESPONSE`` Response headers sent, body in progress
|
|
||||||
| ``FAILED`` Unrecoverable state (error while sending response)
|
|
||||||
|
|
|
||||||
"""
|
|
||||||
|
|
||||||
IDLE = 0 # Waiting for request
|
|
||||||
REQUEST = 1 # Request headers being received
|
|
||||||
HANDLER = 3 # Headers done, handler running
|
|
||||||
RESPONSE = 4 # Response headers sent, body in progress
|
|
||||||
FAILED = 100 # Unrecoverable state (error while sending response)
|
|
||||||
|
|
||||||
|
|
||||||
HTTP_CONTINUE = b"HTTP/1.1 100 Continue\r\n\r\n"
|
HTTP_CONTINUE = b"HTTP/1.1 100 Continue\r\n\r\n"
|
||||||
|
|
||||||
|
|
||||||
class Http(metaclass=TouchUpMeta):
|
class Http(Stream, metaclass=TouchUpMeta):
|
||||||
"""
|
"""
|
||||||
Internal helper for managing the HTTP request/response cycle
|
Internal helper for managing the HTTP/1.1 request/response cycle
|
||||||
|
|
||||||
:raises ServerError:
|
:raises ServerError:
|
||||||
:raises PayloadTooLarge:
|
:raises PayloadTooLarge:
|
||||||
:raises Exception:
|
:raises Exception:
|
||||||
:raises InvalidUsage:
|
:raises BadRequest:
|
||||||
:raises HeaderExpectationFailed:
|
:raises ExpectationFailed:
|
||||||
:raises RuntimeError:
|
:raises RuntimeError:
|
||||||
:raises ServerError:
|
:raises ServerError:
|
||||||
:raises ServerError:
|
:raises ServerError:
|
||||||
:raises InvalidUsage:
|
:raises BadRequest:
|
||||||
:raises InvalidUsage:
|
:raises BadRequest:
|
||||||
:raises InvalidUsage:
|
:raises BadRequest:
|
||||||
:raises PayloadTooLarge:
|
:raises PayloadTooLarge:
|
||||||
:raises RuntimeError:
|
:raises RuntimeError:
|
||||||
"""
|
"""
|
||||||
|
|
||||||
HEADER_CEILING = 16_384
|
HEADER_CEILING = 16_384
|
||||||
HEADER_MAX_SIZE = 0
|
HEADER_MAX_SIZE = 0
|
||||||
|
|
||||||
__touchup__ = (
|
__touchup__ = (
|
||||||
"http1_request_header",
|
"http1_request_header",
|
||||||
"http1_response_header",
|
"http1_response_header",
|
||||||
@@ -89,7 +71,6 @@ class Http(metaclass=TouchUpMeta):
|
|||||||
"request_body",
|
"request_body",
|
||||||
"request_bytes",
|
"request_bytes",
|
||||||
"request_bytes_left",
|
"request_bytes_left",
|
||||||
"request_max_size",
|
|
||||||
"response",
|
"response",
|
||||||
"response_func",
|
"response_func",
|
||||||
"response_size",
|
"response_size",
|
||||||
@@ -151,7 +132,7 @@ class Http(metaclass=TouchUpMeta):
|
|||||||
|
|
||||||
if self.stage is Stage.RESPONSE:
|
if self.stage is Stage.RESPONSE:
|
||||||
await self.response.send(end_stream=True)
|
await self.response.send(end_stream=True)
|
||||||
except CancelledError:
|
except CancelledError as exc:
|
||||||
# Write an appropriate response before exiting
|
# Write an appropriate response before exiting
|
||||||
if not self.protocol.transport:
|
if not self.protocol.transport:
|
||||||
logger.info(
|
logger.info(
|
||||||
@@ -159,7 +140,11 @@ class Http(metaclass=TouchUpMeta):
|
|||||||
"stopped. Transport is closed."
|
"stopped. Transport is closed."
|
||||||
)
|
)
|
||||||
return
|
return
|
||||||
e = self.exception or ServiceUnavailable("Cancelled")
|
e = (
|
||||||
|
RequestCancelled()
|
||||||
|
if self.protocol.conn_info.lost
|
||||||
|
else (self.exception or exc)
|
||||||
|
)
|
||||||
self.exception = None
|
self.exception = None
|
||||||
self.keep_alive = False
|
self.keep_alive = False
|
||||||
await self.error_response(e)
|
await self.error_response(e)
|
||||||
@@ -248,16 +233,21 @@ class Http(metaclass=TouchUpMeta):
|
|||||||
|
|
||||||
headers.append(h)
|
headers.append(h)
|
||||||
except Exception:
|
except Exception:
|
||||||
raise InvalidUsage("Bad Request")
|
raise BadRequest("Bad Request")
|
||||||
|
|
||||||
headers_instance = Header(headers)
|
headers_instance = Header(headers)
|
||||||
self.upgrade_websocket = (
|
self.upgrade_websocket = (
|
||||||
headers_instance.getone("upgrade", "").lower() == "websocket"
|
headers_instance.getone("upgrade", "").lower() == "websocket"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
try:
|
||||||
|
url_bytes = self.url.encode("ASCII")
|
||||||
|
except UnicodeEncodeError:
|
||||||
|
raise BadRequest("URL may only contain US-ASCII characters.")
|
||||||
|
|
||||||
# Prepare a Request object
|
# Prepare a Request object
|
||||||
request = self.protocol.request_class(
|
request = self.protocol.request_class(
|
||||||
url_bytes=self.url.encode(),
|
url_bytes=url_bytes,
|
||||||
headers=headers_instance,
|
headers=headers_instance,
|
||||||
head=bytes(head),
|
head=bytes(head),
|
||||||
version=protocol[5:],
|
version=protocol[5:],
|
||||||
@@ -265,6 +255,7 @@ class Http(metaclass=TouchUpMeta):
|
|||||||
transport=self.protocol.transport,
|
transport=self.protocol.transport,
|
||||||
app=self.protocol.app,
|
app=self.protocol.app,
|
||||||
)
|
)
|
||||||
|
self.protocol.request_class._current.set(request)
|
||||||
await self.dispatch(
|
await self.dispatch(
|
||||||
"http.lifecycle.request",
|
"http.lifecycle.request",
|
||||||
inline=True,
|
inline=True,
|
||||||
@@ -281,7 +272,7 @@ class Http(metaclass=TouchUpMeta):
|
|||||||
if expect.lower() == "100-continue":
|
if expect.lower() == "100-continue":
|
||||||
self.expecting_continue = True
|
self.expecting_continue = True
|
||||||
else:
|
else:
|
||||||
raise HeaderExpectationFailed(f"Unknown Expect: {expect}")
|
raise ExpectationFailed(f"Unknown Expect: {expect}")
|
||||||
|
|
||||||
if headers.getone("transfer-encoding", None) == "chunked":
|
if headers.getone("transfer-encoding", None) == "chunked":
|
||||||
self.request_body = "chunked"
|
self.request_body = "chunked"
|
||||||
@@ -352,6 +343,12 @@ class Http(metaclass=TouchUpMeta):
|
|||||||
self.response_func = self.head_response_ignored
|
self.response_func = self.head_response_ignored
|
||||||
|
|
||||||
headers["connection"] = "keep-alive" if self.keep_alive else "close"
|
headers["connection"] = "keep-alive" if self.keep_alive else "close"
|
||||||
|
|
||||||
|
# This header may be removed or modified by the AltSvcCheck Touchup
|
||||||
|
# service. At server start, we either remove this header from ever
|
||||||
|
# being assigned, or we change the value as required.
|
||||||
|
headers["alt-svc"] = ""
|
||||||
|
|
||||||
ret = format_http1_response(status, res.processed_headers)
|
ret = format_http1_response(status, res.processed_headers)
|
||||||
if data:
|
if data:
|
||||||
ret += data
|
ret += data
|
||||||
@@ -436,7 +433,15 @@ class Http(metaclass=TouchUpMeta):
|
|||||||
if self.request is None:
|
if self.request is None:
|
||||||
self.create_empty_request()
|
self.create_empty_request()
|
||||||
|
|
||||||
await app.handle_exception(self.request, exception)
|
request_middleware = not isinstance(
|
||||||
|
exception, (ServiceUnavailable, RequestCancelled)
|
||||||
|
)
|
||||||
|
try:
|
||||||
|
await app.handle_exception(
|
||||||
|
self.request, exception, request_middleware
|
||||||
|
)
|
||||||
|
except Exception as e:
|
||||||
|
await app.handle_exception(self.request, e, False)
|
||||||
|
|
||||||
def create_empty_request(self) -> None:
|
def create_empty_request(self) -> None:
|
||||||
"""
|
"""
|
||||||
@@ -445,9 +450,18 @@ class Http(metaclass=TouchUpMeta):
|
|||||||
bogus response for error handling use.
|
bogus response for error handling use.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
# Reformat any URL already received with \xHH escapes for better logs
|
||||||
|
url_bytes = (
|
||||||
|
self.url.encode(errors="surrogateescape")
|
||||||
|
.decode("ASCII", errors="backslashreplace")
|
||||||
|
.encode("ASCII")
|
||||||
|
if self.url
|
||||||
|
else b"*"
|
||||||
|
)
|
||||||
|
|
||||||
# FIXME: Avoid this by refactoring error handling and response code
|
# FIXME: Avoid this by refactoring error handling and response code
|
||||||
self.request = self.protocol.request_class(
|
self.request = self.protocol.request_class(
|
||||||
url_bytes=self.url.encode() if self.url else b"*",
|
url_bytes=url_bytes,
|
||||||
headers=Header({}),
|
headers=Header({}),
|
||||||
version="1.1",
|
version="1.1",
|
||||||
method="NONE",
|
method="NONE",
|
||||||
@@ -510,7 +524,7 @@ class Http(metaclass=TouchUpMeta):
|
|||||||
|
|
||||||
if len(buf) > 64:
|
if len(buf) > 64:
|
||||||
self.keep_alive = False
|
self.keep_alive = False
|
||||||
raise InvalidUsage("Bad chunked encoding")
|
raise BadRequest("Bad chunked encoding")
|
||||||
|
|
||||||
await self._receive_more()
|
await self._receive_more()
|
||||||
|
|
||||||
@@ -518,14 +532,14 @@ class Http(metaclass=TouchUpMeta):
|
|||||||
size = int(buf[2:pos].split(b";", 1)[0].decode(), 16)
|
size = int(buf[2:pos].split(b";", 1)[0].decode(), 16)
|
||||||
except Exception:
|
except Exception:
|
||||||
self.keep_alive = False
|
self.keep_alive = False
|
||||||
raise InvalidUsage("Bad chunked encoding")
|
raise BadRequest("Bad chunked encoding")
|
||||||
|
|
||||||
if size <= 0:
|
if size <= 0:
|
||||||
self.request_body = None
|
self.request_body = None
|
||||||
|
|
||||||
if size < 0:
|
if size < 0:
|
||||||
self.keep_alive = False
|
self.keep_alive = False
|
||||||
raise InvalidUsage("Bad chunked encoding")
|
raise BadRequest("Bad chunked encoding")
|
||||||
|
|
||||||
# Consume CRLF, chunk size 0 and the two CRLF that follow
|
# Consume CRLF, chunk size 0 and the two CRLF that follow
|
||||||
pos += 4
|
pos += 4
|
||||||
426
sanic/http/http3.py
Normal file
426
sanic/http/http3.py
Normal file
@@ -0,0 +1,426 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import asyncio
|
||||||
|
|
||||||
|
from abc import ABC, abstractmethod
|
||||||
|
from ssl import SSLContext
|
||||||
|
from typing import (
|
||||||
|
TYPE_CHECKING,
|
||||||
|
Any,
|
||||||
|
Callable,
|
||||||
|
Dict,
|
||||||
|
List,
|
||||||
|
Optional,
|
||||||
|
Tuple,
|
||||||
|
Union,
|
||||||
|
cast,
|
||||||
|
)
|
||||||
|
|
||||||
|
from sanic.compat import Header
|
||||||
|
from sanic.constants import LocalCertCreator
|
||||||
|
from sanic.exceptions import (
|
||||||
|
BadRequest,
|
||||||
|
PayloadTooLarge,
|
||||||
|
SanicException,
|
||||||
|
ServerError,
|
||||||
|
)
|
||||||
|
from sanic.helpers import has_message_body
|
||||||
|
from sanic.http.constants import Stage
|
||||||
|
from sanic.http.stream import Stream
|
||||||
|
from sanic.http.tls.context import CertSelector, SanicSSLContext
|
||||||
|
from sanic.log import Colors, logger
|
||||||
|
from sanic.models.protocol_types import TransportProtocol
|
||||||
|
from sanic.models.server_types import ConnInfo
|
||||||
|
|
||||||
|
|
||||||
|
try:
|
||||||
|
from aioquic.h0.connection import H0_ALPN, H0Connection
|
||||||
|
from aioquic.h3.connection import H3_ALPN, H3Connection
|
||||||
|
from aioquic.h3.events import (
|
||||||
|
DatagramReceived,
|
||||||
|
DataReceived,
|
||||||
|
H3Event,
|
||||||
|
HeadersReceived,
|
||||||
|
WebTransportStreamDataReceived,
|
||||||
|
)
|
||||||
|
from aioquic.quic.configuration import QuicConfiguration
|
||||||
|
from aioquic.tls import SessionTicket
|
||||||
|
|
||||||
|
HTTP3_AVAILABLE = True
|
||||||
|
except ModuleNotFoundError: # no cov
|
||||||
|
HTTP3_AVAILABLE = False
|
||||||
|
|
||||||
|
if TYPE_CHECKING:
|
||||||
|
from sanic import Sanic
|
||||||
|
from sanic.request import Request
|
||||||
|
from sanic.response import BaseHTTPResponse
|
||||||
|
from sanic.server.protocols.http_protocol import Http3Protocol
|
||||||
|
|
||||||
|
HttpConnection = Union[H0Connection, H3Connection]
|
||||||
|
|
||||||
|
|
||||||
|
class HTTP3Transport(TransportProtocol):
|
||||||
|
__slots__ = ("_protocol",)
|
||||||
|
|
||||||
|
def __init__(self, protocol: Http3Protocol):
|
||||||
|
self._protocol = protocol
|
||||||
|
|
||||||
|
def get_protocol(self) -> Http3Protocol:
|
||||||
|
return self._protocol
|
||||||
|
|
||||||
|
def get_extra_info(self, info: str, default: Any = None) -> Any:
|
||||||
|
if (
|
||||||
|
info in ("socket", "sockname", "peername")
|
||||||
|
and self._protocol._transport
|
||||||
|
):
|
||||||
|
return self._protocol._transport.get_extra_info(info, default)
|
||||||
|
elif info == "network_paths":
|
||||||
|
return self._protocol._quic._network_paths
|
||||||
|
elif info == "ssl_context":
|
||||||
|
return self._protocol.app.state.ssl
|
||||||
|
return default
|
||||||
|
|
||||||
|
|
||||||
|
class Receiver(ABC):
|
||||||
|
future: asyncio.Future
|
||||||
|
|
||||||
|
def __init__(self, transmit, protocol, request: Request) -> None:
|
||||||
|
self.transmit = transmit
|
||||||
|
self.protocol = protocol
|
||||||
|
self.request = request
|
||||||
|
|
||||||
|
@abstractmethod
|
||||||
|
async def run(self): # no cov
|
||||||
|
...
|
||||||
|
|
||||||
|
|
||||||
|
class HTTPReceiver(Receiver, Stream):
|
||||||
|
stage: Stage
|
||||||
|
request: Request
|
||||||
|
|
||||||
|
def __init__(self, *args, **kwargs) -> None:
|
||||||
|
super().__init__(*args, **kwargs)
|
||||||
|
self.request_body = None
|
||||||
|
self.stage = Stage.IDLE
|
||||||
|
self.headers_sent = False
|
||||||
|
self.response: Optional[BaseHTTPResponse] = None
|
||||||
|
self.request_max_size = self.protocol.request_max_size
|
||||||
|
self.request_bytes = 0
|
||||||
|
|
||||||
|
async def run(self, exception: Optional[Exception] = None):
|
||||||
|
self.stage = Stage.HANDLER
|
||||||
|
self.head_only = self.request.method.upper() == "HEAD"
|
||||||
|
|
||||||
|
if exception:
|
||||||
|
logger.info( # no cov
|
||||||
|
f"{Colors.BLUE}[exception]: "
|
||||||
|
f"{Colors.RED}{exception}{Colors.END}",
|
||||||
|
exc_info=True,
|
||||||
|
extra={"verbosity": 1},
|
||||||
|
)
|
||||||
|
await self.error_response(exception)
|
||||||
|
else:
|
||||||
|
try:
|
||||||
|
logger.info( # no cov
|
||||||
|
f"{Colors.BLUE}[request]:{Colors.END} {self.request}",
|
||||||
|
extra={"verbosity": 1},
|
||||||
|
)
|
||||||
|
await self.protocol.request_handler(self.request)
|
||||||
|
except Exception as e: # no cov
|
||||||
|
# This should largely be handled within the request handler.
|
||||||
|
# But, just in case...
|
||||||
|
await self.run(e)
|
||||||
|
self.stage = Stage.IDLE
|
||||||
|
|
||||||
|
async def error_response(self, exception: Exception) -> None:
|
||||||
|
"""
|
||||||
|
Handle response when exception encountered
|
||||||
|
"""
|
||||||
|
# From request and handler states we can respond, otherwise be silent
|
||||||
|
app = self.protocol.app
|
||||||
|
|
||||||
|
await app.handle_exception(self.request, exception)
|
||||||
|
|
||||||
|
def _prepare_headers(
|
||||||
|
self, response: BaseHTTPResponse
|
||||||
|
) -> List[Tuple[bytes, bytes]]:
|
||||||
|
size = len(response.body) if response.body else 0
|
||||||
|
headers = response.headers
|
||||||
|
status = response.status
|
||||||
|
|
||||||
|
if not has_message_body(status) and (
|
||||||
|
size
|
||||||
|
or "content-length" in headers
|
||||||
|
or "transfer-encoding" in headers
|
||||||
|
):
|
||||||
|
headers.pop("content-length", None)
|
||||||
|
headers.pop("transfer-encoding", None)
|
||||||
|
logger.warning( # no cov
|
||||||
|
f"Message body set in response on {self.request.path}. "
|
||||||
|
f"A {status} response may only have headers, no body."
|
||||||
|
)
|
||||||
|
elif "content-length" not in headers:
|
||||||
|
if size:
|
||||||
|
headers["content-length"] = size
|
||||||
|
else:
|
||||||
|
headers["transfer-encoding"] = "chunked"
|
||||||
|
|
||||||
|
headers = [
|
||||||
|
(b":status", str(response.status).encode()),
|
||||||
|
*response.processed_headers,
|
||||||
|
]
|
||||||
|
return headers
|
||||||
|
|
||||||
|
def send_headers(self) -> None:
|
||||||
|
logger.debug( # no cov
|
||||||
|
f"{Colors.BLUE}[send]: {Colors.GREEN}HEADERS{Colors.END}",
|
||||||
|
extra={"verbosity": 2},
|
||||||
|
)
|
||||||
|
if not self.response:
|
||||||
|
raise RuntimeError("no response")
|
||||||
|
|
||||||
|
response = self.response
|
||||||
|
headers = self._prepare_headers(response)
|
||||||
|
|
||||||
|
self.protocol.connection.send_headers(
|
||||||
|
stream_id=self.request.stream_id,
|
||||||
|
headers=headers,
|
||||||
|
)
|
||||||
|
self.headers_sent = True
|
||||||
|
self.stage = Stage.RESPONSE
|
||||||
|
|
||||||
|
if self.response.body and not self.head_only:
|
||||||
|
self._send(self.response.body, False)
|
||||||
|
elif self.head_only:
|
||||||
|
self.future.cancel()
|
||||||
|
|
||||||
|
def respond(self, response: BaseHTTPResponse) -> BaseHTTPResponse:
|
||||||
|
logger.debug( # no cov
|
||||||
|
f"{Colors.BLUE}[respond]:{Colors.END} {response}",
|
||||||
|
extra={"verbosity": 2},
|
||||||
|
)
|
||||||
|
|
||||||
|
if self.stage is not Stage.HANDLER:
|
||||||
|
self.stage = Stage.FAILED
|
||||||
|
raise RuntimeError("Response already started")
|
||||||
|
|
||||||
|
# Disconnect any earlier but unused response object
|
||||||
|
if self.response is not None:
|
||||||
|
self.response.stream = None
|
||||||
|
|
||||||
|
self.response, response.stream = response, self
|
||||||
|
|
||||||
|
return response
|
||||||
|
|
||||||
|
def receive_body(self, data: bytes) -> None:
|
||||||
|
self.request_bytes += len(data)
|
||||||
|
if self.request_bytes > self.request_max_size:
|
||||||
|
raise PayloadTooLarge("Request body exceeds the size limit")
|
||||||
|
|
||||||
|
self.request.body += data
|
||||||
|
|
||||||
|
async def send(self, data: bytes, end_stream: bool) -> None:
|
||||||
|
logger.debug( # no cov
|
||||||
|
f"{Colors.BLUE}[send]: {Colors.GREEN}data={data.decode()} "
|
||||||
|
f"end_stream={end_stream}{Colors.END}",
|
||||||
|
extra={"verbosity": 2},
|
||||||
|
)
|
||||||
|
self._send(data, end_stream)
|
||||||
|
|
||||||
|
def _send(self, data: bytes, end_stream: bool) -> None:
|
||||||
|
if not self.headers_sent:
|
||||||
|
self.send_headers()
|
||||||
|
if self.stage is not Stage.RESPONSE:
|
||||||
|
raise ServerError(f"not ready to send: {self.stage}")
|
||||||
|
|
||||||
|
# Chunked
|
||||||
|
if (
|
||||||
|
self.response
|
||||||
|
and self.response.headers.get("transfer-encoding") == "chunked"
|
||||||
|
):
|
||||||
|
size = len(data)
|
||||||
|
if end_stream:
|
||||||
|
data = (
|
||||||
|
b"%x\r\n%b\r\n0\r\n\r\n" % (size, data)
|
||||||
|
if size
|
||||||
|
else b"0\r\n\r\n"
|
||||||
|
)
|
||||||
|
elif size:
|
||||||
|
data = b"%x\r\n%b\r\n" % (size, data)
|
||||||
|
|
||||||
|
logger.debug( # no cov
|
||||||
|
f"{Colors.BLUE}[transmitting]{Colors.END}",
|
||||||
|
extra={"verbosity": 2},
|
||||||
|
)
|
||||||
|
self.protocol.connection.send_data(
|
||||||
|
stream_id=self.request.stream_id,
|
||||||
|
data=data,
|
||||||
|
end_stream=end_stream,
|
||||||
|
)
|
||||||
|
self.transmit()
|
||||||
|
|
||||||
|
if end_stream:
|
||||||
|
self.stage = Stage.IDLE
|
||||||
|
|
||||||
|
|
||||||
|
class WebsocketReceiver(Receiver): # noqa
|
||||||
|
async def run(self):
|
||||||
|
...
|
||||||
|
|
||||||
|
|
||||||
|
class WebTransportReceiver(Receiver): # noqa
|
||||||
|
async def run(self):
|
||||||
|
...
|
||||||
|
|
||||||
|
|
||||||
|
class Http3:
|
||||||
|
"""
|
||||||
|
Internal helper for managing the HTTP/3 request/response cycle
|
||||||
|
"""
|
||||||
|
|
||||||
|
if HTTP3_AVAILABLE:
|
||||||
|
HANDLER_PROPERTY_MAPPING = {
|
||||||
|
DataReceived: "stream_id",
|
||||||
|
HeadersReceived: "stream_id",
|
||||||
|
DatagramReceived: "flow_id",
|
||||||
|
WebTransportStreamDataReceived: "session_id",
|
||||||
|
}
|
||||||
|
|
||||||
|
def __init__(
|
||||||
|
self,
|
||||||
|
protocol: Http3Protocol,
|
||||||
|
transmit: Callable[[], None],
|
||||||
|
) -> None:
|
||||||
|
self.protocol = protocol
|
||||||
|
self.transmit = transmit
|
||||||
|
self.receivers: Dict[int, Receiver] = {}
|
||||||
|
|
||||||
|
def http_event_received(self, event: H3Event) -> None:
|
||||||
|
logger.debug( # no cov
|
||||||
|
f"{Colors.BLUE}[http_event_received]: "
|
||||||
|
f"{Colors.YELLOW}{event}{Colors.END}",
|
||||||
|
extra={"verbosity": 2},
|
||||||
|
)
|
||||||
|
receiver, created_new = self.get_or_make_receiver(event)
|
||||||
|
receiver = cast(HTTPReceiver, receiver)
|
||||||
|
|
||||||
|
if isinstance(event, HeadersReceived) and created_new:
|
||||||
|
receiver.future = asyncio.ensure_future(receiver.run())
|
||||||
|
elif isinstance(event, DataReceived):
|
||||||
|
try:
|
||||||
|
receiver.receive_body(event.data)
|
||||||
|
except Exception as e:
|
||||||
|
receiver.future.cancel()
|
||||||
|
receiver.future = asyncio.ensure_future(receiver.run(e))
|
||||||
|
else:
|
||||||
|
... # Intentionally here to help out Touchup
|
||||||
|
logger.debug( # no cov
|
||||||
|
f"{Colors.RED}DOING NOTHING{Colors.END}",
|
||||||
|
extra={"verbosity": 2},
|
||||||
|
)
|
||||||
|
|
||||||
|
def get_or_make_receiver(self, event: H3Event) -> Tuple[Receiver, bool]:
|
||||||
|
if (
|
||||||
|
isinstance(event, HeadersReceived)
|
||||||
|
and event.stream_id not in self.receivers
|
||||||
|
):
|
||||||
|
request = self._make_request(event)
|
||||||
|
receiver = HTTPReceiver(self.transmit, self.protocol, request)
|
||||||
|
request.stream = receiver
|
||||||
|
|
||||||
|
self.receivers[event.stream_id] = receiver
|
||||||
|
return receiver, True
|
||||||
|
else:
|
||||||
|
ident = getattr(event, self.HANDLER_PROPERTY_MAPPING[type(event)])
|
||||||
|
return self.receivers[ident], False
|
||||||
|
|
||||||
|
def get_receiver_by_stream_id(self, stream_id: int) -> Receiver:
|
||||||
|
return self.receivers[stream_id]
|
||||||
|
|
||||||
|
def _make_request(self, event: HeadersReceived) -> Request:
|
||||||
|
try:
|
||||||
|
headers = Header(
|
||||||
|
(
|
||||||
|
(k.decode("ASCII"), v.decode(errors="surrogateescape"))
|
||||||
|
for k, v in event.headers
|
||||||
|
)
|
||||||
|
)
|
||||||
|
except UnicodeDecodeError:
|
||||||
|
raise BadRequest(
|
||||||
|
"Header names may only contain US-ASCII characters."
|
||||||
|
)
|
||||||
|
method = headers[":method"]
|
||||||
|
path = headers[":path"]
|
||||||
|
scheme = headers.pop(":scheme", "")
|
||||||
|
authority = headers.pop(":authority", "")
|
||||||
|
|
||||||
|
if authority:
|
||||||
|
headers["host"] = authority
|
||||||
|
|
||||||
|
try:
|
||||||
|
url_bytes = path.encode("ASCII")
|
||||||
|
except UnicodeEncodeError:
|
||||||
|
raise BadRequest("URL may only contain US-ASCII characters.")
|
||||||
|
|
||||||
|
transport = HTTP3Transport(self.protocol)
|
||||||
|
request = self.protocol.request_class(
|
||||||
|
url_bytes,
|
||||||
|
headers,
|
||||||
|
"3",
|
||||||
|
method,
|
||||||
|
transport,
|
||||||
|
self.protocol.app,
|
||||||
|
b"",
|
||||||
|
)
|
||||||
|
request.conn_info = ConnInfo(transport)
|
||||||
|
request._stream_id = event.stream_id
|
||||||
|
request._scheme = scheme
|
||||||
|
|
||||||
|
return request
|
||||||
|
|
||||||
|
|
||||||
|
class SessionTicketStore:
|
||||||
|
"""
|
||||||
|
Simple in-memory store for session tickets.
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(self) -> None:
|
||||||
|
self.tickets: Dict[bytes, SessionTicket] = {}
|
||||||
|
|
||||||
|
def add(self, ticket: SessionTicket) -> None:
|
||||||
|
self.tickets[ticket.ticket] = ticket
|
||||||
|
|
||||||
|
def pop(self, label: bytes) -> Optional[SessionTicket]:
|
||||||
|
return self.tickets.pop(label, None)
|
||||||
|
|
||||||
|
|
||||||
|
def get_config(
|
||||||
|
app: Sanic, ssl: Union[SanicSSLContext, CertSelector, SSLContext]
|
||||||
|
):
|
||||||
|
# TODO:
|
||||||
|
# - proper selection needed if service with multiple certs insted of
|
||||||
|
# just taking the first
|
||||||
|
if isinstance(ssl, CertSelector):
|
||||||
|
ssl = cast(SanicSSLContext, ssl.sanic_select[0])
|
||||||
|
if app.config.LOCAL_CERT_CREATOR is LocalCertCreator.TRUSTME:
|
||||||
|
raise SanicException(
|
||||||
|
"Sorry, you cannot currently use trustme as a local certificate "
|
||||||
|
"generator for an HTTP/3 server. This is not yet supported. You "
|
||||||
|
"should be able to use mkcert instead. For more information, see: "
|
||||||
|
"https://github.com/aiortc/aioquic/issues/295."
|
||||||
|
)
|
||||||
|
if not isinstance(ssl, SanicSSLContext):
|
||||||
|
raise SanicException("SSLContext is not SanicSSLContext")
|
||||||
|
|
||||||
|
config = QuicConfiguration(
|
||||||
|
alpn_protocols=H3_ALPN + H0_ALPN + ["siduck"],
|
||||||
|
is_client=False,
|
||||||
|
max_datagram_frame_size=65536,
|
||||||
|
)
|
||||||
|
password = app.config.TLS_CERT_PASSWORD or None
|
||||||
|
|
||||||
|
config.load_cert_chain(
|
||||||
|
ssl.sanic["cert"], ssl.sanic["key"], password=password
|
||||||
|
)
|
||||||
|
|
||||||
|
return config
|
||||||
27
sanic/http/stream.py
Normal file
27
sanic/http/stream.py
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from typing import TYPE_CHECKING, Optional, Tuple, Union
|
||||||
|
|
||||||
|
from sanic.http.constants import Stage
|
||||||
|
|
||||||
|
|
||||||
|
if TYPE_CHECKING:
|
||||||
|
from sanic.response import BaseHTTPResponse
|
||||||
|
from sanic.server.protocols.http_protocol import HttpProtocol
|
||||||
|
|
||||||
|
|
||||||
|
class Stream:
|
||||||
|
stage: Stage
|
||||||
|
response: Optional[BaseHTTPResponse]
|
||||||
|
protocol: HttpProtocol
|
||||||
|
url: Optional[str]
|
||||||
|
request_body: Optional[bytes]
|
||||||
|
request_max_size: Union[int, float]
|
||||||
|
|
||||||
|
__touchup__: Tuple[str, ...] = tuple()
|
||||||
|
__slots__ = ("request_max_size",)
|
||||||
|
|
||||||
|
def respond(
|
||||||
|
self, response: BaseHTTPResponse
|
||||||
|
) -> BaseHTTPResponse: # no cov
|
||||||
|
raise NotImplementedError("Not implemented")
|
||||||
5
sanic/http/tls/__init__.py
Normal file
5
sanic/http/tls/__init__.py
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
from .context import process_to_context
|
||||||
|
from .creators import get_ssl_context
|
||||||
|
|
||||||
|
|
||||||
|
__all__ = ("get_ssl_context", "process_to_context")
|
||||||
@@ -1,7 +1,9 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import ssl
|
import ssl
|
||||||
|
|
||||||
from typing import Iterable, Optional, Union
|
from typing import Any, Dict, Iterable, Optional, Union
|
||||||
|
|
||||||
from sanic.log import logger
|
from sanic.log import logger
|
||||||
|
|
||||||
@@ -22,13 +24,15 @@ def create_context(
|
|||||||
certfile: Optional[str] = None,
|
certfile: Optional[str] = None,
|
||||||
keyfile: Optional[str] = None,
|
keyfile: Optional[str] = None,
|
||||||
password: Optional[str] = None,
|
password: Optional[str] = None,
|
||||||
|
purpose: ssl.Purpose = ssl.Purpose.CLIENT_AUTH,
|
||||||
) -> ssl.SSLContext:
|
) -> ssl.SSLContext:
|
||||||
"""Create a context with secure crypto and HTTP/1.1 in protocols."""
|
"""Create a context with secure crypto and HTTP/1.1 in protocols."""
|
||||||
context = ssl.create_default_context(purpose=ssl.Purpose.CLIENT_AUTH)
|
context = ssl.create_default_context(purpose=purpose)
|
||||||
context.minimum_version = ssl.TLSVersion.TLSv1_2
|
context.minimum_version = ssl.TLSVersion.TLSv1_2
|
||||||
context.set_ciphers(":".join(CIPHERS_TLS12))
|
context.set_ciphers(":".join(CIPHERS_TLS12))
|
||||||
context.set_alpn_protocols(["http/1.1"])
|
context.set_alpn_protocols(["http/1.1"])
|
||||||
context.sni_callback = server_name_callback
|
if purpose is ssl.Purpose.CLIENT_AUTH:
|
||||||
|
context.sni_callback = server_name_callback
|
||||||
if certfile and keyfile:
|
if certfile and keyfile:
|
||||||
context.load_cert_chain(certfile, keyfile, password)
|
context.load_cert_chain(certfile, keyfile, password)
|
||||||
return context
|
return context
|
||||||
@@ -77,65 +81,6 @@ def load_cert_dir(p: str) -> ssl.SSLContext:
|
|||||||
return CertSimple(certfile, keyfile)
|
return CertSimple(certfile, keyfile)
|
||||||
|
|
||||||
|
|
||||||
class CertSimple(ssl.SSLContext):
|
|
||||||
"""A wrapper for creating SSLContext with a sanic attribute."""
|
|
||||||
|
|
||||||
def __new__(cls, cert, key, **kw):
|
|
||||||
# try common aliases, rename to cert/key
|
|
||||||
certfile = kw["cert"] = kw.pop("certificate", None) or cert
|
|
||||||
keyfile = kw["key"] = kw.pop("keyfile", None) or key
|
|
||||||
password = kw.pop("password", None)
|
|
||||||
if not certfile or not keyfile:
|
|
||||||
raise ValueError("SSL dict needs filenames for cert and key.")
|
|
||||||
subject = {}
|
|
||||||
if "names" not in kw:
|
|
||||||
cert = ssl._ssl._test_decode_cert(certfile) # type: ignore
|
|
||||||
kw["names"] = [
|
|
||||||
name
|
|
||||||
for t, name in cert["subjectAltName"]
|
|
||||||
if t in ["DNS", "IP Address"]
|
|
||||||
]
|
|
||||||
subject = {k: v for item in cert["subject"] for k, v in item}
|
|
||||||
self = create_context(certfile, keyfile, password)
|
|
||||||
self.__class__ = cls
|
|
||||||
self.sanic = {**subject, **kw}
|
|
||||||
return self
|
|
||||||
|
|
||||||
def __init__(self, cert, key, **kw):
|
|
||||||
pass # Do not call super().__init__ because it is already initialized
|
|
||||||
|
|
||||||
|
|
||||||
class CertSelector(ssl.SSLContext):
|
|
||||||
"""Automatically select SSL certificate based on the hostname that the
|
|
||||||
client is trying to access, via SSL SNI. Paths to certificate folders
|
|
||||||
with privkey.pem and fullchain.pem in them should be provided, and
|
|
||||||
will be matched in the order given whenever there is a new connection.
|
|
||||||
"""
|
|
||||||
|
|
||||||
def __new__(cls, ctxs):
|
|
||||||
return super().__new__(cls)
|
|
||||||
|
|
||||||
def __init__(self, ctxs: Iterable[Optional[ssl.SSLContext]]):
|
|
||||||
super().__init__()
|
|
||||||
self.sni_callback = selector_sni_callback # type: ignore
|
|
||||||
self.sanic_select = []
|
|
||||||
self.sanic_fallback = None
|
|
||||||
all_names = []
|
|
||||||
for i, ctx in enumerate(ctxs):
|
|
||||||
if not ctx:
|
|
||||||
continue
|
|
||||||
names = dict(getattr(ctx, "sanic", {})).get("names", [])
|
|
||||||
all_names += names
|
|
||||||
self.sanic_select.append(ctx)
|
|
||||||
if i == 0:
|
|
||||||
self.sanic_fallback = ctx
|
|
||||||
if not all_names:
|
|
||||||
raise ValueError(
|
|
||||||
"No certificates with SubjectAlternativeNames found."
|
|
||||||
)
|
|
||||||
logger.info(f"Certificate vhosts: {', '.join(all_names)}")
|
|
||||||
|
|
||||||
|
|
||||||
def find_cert(self: CertSelector, server_name: str):
|
def find_cert(self: CertSelector, server_name: str):
|
||||||
"""Find the first certificate that matches the given SNI.
|
"""Find the first certificate that matches the given SNI.
|
||||||
|
|
||||||
@@ -194,3 +139,73 @@ def server_name_callback(
|
|||||||
) -> None:
|
) -> None:
|
||||||
"""Store the received SNI as sslobj.sanic_server_name."""
|
"""Store the received SNI as sslobj.sanic_server_name."""
|
||||||
sslobj.sanic_server_name = server_name # type: ignore
|
sslobj.sanic_server_name = server_name # type: ignore
|
||||||
|
|
||||||
|
|
||||||
|
class SanicSSLContext(ssl.SSLContext):
|
||||||
|
sanic: Dict[str, os.PathLike]
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def create_from_ssl_context(cls, context: ssl.SSLContext):
|
||||||
|
context.__class__ = cls
|
||||||
|
return context
|
||||||
|
|
||||||
|
|
||||||
|
class CertSimple(SanicSSLContext):
|
||||||
|
"""A wrapper for creating SSLContext with a sanic attribute."""
|
||||||
|
|
||||||
|
sanic: Dict[str, Any]
|
||||||
|
|
||||||
|
def __new__(cls, cert, key, **kw):
|
||||||
|
# try common aliases, rename to cert/key
|
||||||
|
certfile = kw["cert"] = kw.pop("certificate", None) or cert
|
||||||
|
keyfile = kw["key"] = kw.pop("keyfile", None) or key
|
||||||
|
password = kw.get("password", None)
|
||||||
|
if not certfile or not keyfile:
|
||||||
|
raise ValueError("SSL dict needs filenames for cert and key.")
|
||||||
|
subject = {}
|
||||||
|
if "names" not in kw:
|
||||||
|
cert = ssl._ssl._test_decode_cert(certfile) # type: ignore
|
||||||
|
kw["names"] = [
|
||||||
|
name
|
||||||
|
for t, name in cert["subjectAltName"]
|
||||||
|
if t in ["DNS", "IP Address"]
|
||||||
|
]
|
||||||
|
subject = {k: v for item in cert["subject"] for k, v in item}
|
||||||
|
self = create_context(certfile, keyfile, password)
|
||||||
|
self.__class__ = cls
|
||||||
|
self.sanic = {**subject, **kw}
|
||||||
|
return self
|
||||||
|
|
||||||
|
def __init__(self, cert, key, **kw):
|
||||||
|
pass # Do not call super().__init__ because it is already initialized
|
||||||
|
|
||||||
|
|
||||||
|
class CertSelector(ssl.SSLContext):
|
||||||
|
"""Automatically select SSL certificate based on the hostname that the
|
||||||
|
client is trying to access, via SSL SNI. Paths to certificate folders
|
||||||
|
with privkey.pem and fullchain.pem in them should be provided, and
|
||||||
|
will be matched in the order given whenever there is a new connection.
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __new__(cls, ctxs):
|
||||||
|
return super().__new__(cls)
|
||||||
|
|
||||||
|
def __init__(self, ctxs: Iterable[Optional[ssl.SSLContext]]):
|
||||||
|
super().__init__()
|
||||||
|
self.sni_callback = selector_sni_callback # type: ignore
|
||||||
|
self.sanic_select = []
|
||||||
|
self.sanic_fallback = None
|
||||||
|
all_names = []
|
||||||
|
for i, ctx in enumerate(ctxs):
|
||||||
|
if not ctx:
|
||||||
|
continue
|
||||||
|
names = dict(getattr(ctx, "sanic", {})).get("names", [])
|
||||||
|
all_names += names
|
||||||
|
self.sanic_select.append(ctx)
|
||||||
|
if i == 0:
|
||||||
|
self.sanic_fallback = ctx
|
||||||
|
if not all_names:
|
||||||
|
raise ValueError(
|
||||||
|
"No certificates with SubjectAlternativeNames found."
|
||||||
|
)
|
||||||
|
logger.info(f"Certificate vhosts: {', '.join(all_names)}")
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user