Compare commits
	
		
			134 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | fc82b2334b | ||
|   | 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 |  | ||||||
| @@ -3,13 +3,12 @@ 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 | ||||||
|  |  | ||||||
| [html] | [html] | ||||||
| directory = coverage | directory = coverage | ||||||
| @@ -21,3 +20,5 @@ exclude_lines = | |||||||
|     noqa |     noqa | ||||||
|     NOQA |     NOQA | ||||||
|     pragma: no cover |     pragma: no cover | ||||||
|  |     TYPE_CHECKING | ||||||
|  | skip_empty = True | ||||||
|   | |||||||
							
								
								
									
										66
									
								
								.github/ISSUE_TEMPLATE/bug-report.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										66
									
								
								.github/ISSUE_TEMPLATE/bug-report.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,66 @@ | |||||||
|  | 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. | ||||||
|  |     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: input | ||||||
|  |     id: os | ||||||
|  |     attributes: | ||||||
|  |       label: Operating System | ||||||
|  |       description: What OS? | ||||||
|  |     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. |  | ||||||
							
								
								
									
										8
									
								
								.github/workflows/codeql-analysis.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										8
									
								
								.github/workflows/codeql-analysis.yml
									
									
									
									
										vendored
									
									
								
							| @@ -2,9 +2,13 @@ name: "CodeQL" | |||||||
|  |  | ||||||
| on: | on: | ||||||
|   push: |   push: | ||||||
|     branches: [ main ] |     branches: | ||||||
|  |       - main | ||||||
|  |       - "*LTS" | ||||||
|   pull_request: |   pull_request: | ||||||
|     branches: [ main ] |     branches: | ||||||
|  |       - main | ||||||
|  |       - "*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' | ||||||
|   | |||||||
							
								
								
									
										18
									
								
								.github/workflows/coverage.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										18
									
								
								.github/workflows/coverage.yml
									
									
									
									
										vendored
									
									
								
							| @@ -3,13 +3,15 @@ on: | |||||||
|   push: |   push: | ||||||
|     branches: |     branches: | ||||||
|       - main |       - main | ||||||
|  |       - "*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 | ||||||
|  |       - "*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 +21,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 +29,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 | ||||||
|   | |||||||
							
								
								
									
										2
									
								
								.github/workflows/pr-bandit.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/pr-bandit.yml
									
									
									
									
										vendored
									
									
								
							| @@ -3,6 +3,7 @@ on: | |||||||
|   pull_request: |   pull_request: | ||||||
|     branches: |     branches: | ||||||
|       - main |       - main | ||||||
|  |       - "*LTS" | ||||||
|     types: [opened, synchronize, reopened, ready_for_review] |     types: [opened, synchronize, reopened, ready_for_review] | ||||||
|  |  | ||||||
| jobs: | jobs: | ||||||
| @@ -19,6 +20,7 @@ jobs: | |||||||
|           - { 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 | ||||||
|   | |||||||
							
								
								
									
										3
									
								
								.github/workflows/pr-docs.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.github/workflows/pr-docs.yml
									
									
									
									
										vendored
									
									
								
							| @@ -3,6 +3,7 @@ on: | |||||||
|   pull_request: |   pull_request: | ||||||
|     branches: |     branches: | ||||||
|       - main |       - main | ||||||
|  |       - "*LTS" | ||||||
|     types: [opened, synchronize, reopened, ready_for_review] |     types: [opened, synchronize, reopened, ready_for_review] | ||||||
|  |  | ||||||
| jobs: | jobs: | ||||||
| @@ -13,7 +14,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 | ||||||
|  |  | ||||||
|  |  | ||||||
|   | |||||||
							
								
								
									
										3
									
								
								.github/workflows/pr-linter.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.github/workflows/pr-linter.yml
									
									
									
									
										vendored
									
									
								
							| @@ -3,6 +3,7 @@ on: | |||||||
|   pull_request: |   pull_request: | ||||||
|     branches: |     branches: | ||||||
|       - main |       - main | ||||||
|  |       - "*LTS" | ||||||
|     types: [opened, synchronize, reopened, ready_for_review] |     types: [opened, synchronize, reopened, ready_for_review] | ||||||
|  |  | ||||||
| jobs: | jobs: | ||||||
| @@ -15,7 +16,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 | ||||||
|   | |||||||
							
								
								
									
										1
									
								
								.github/workflows/pr-python310.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.github/workflows/pr-python310.yml
									
									
									
									
										vendored
									
									
								
							| @@ -3,6 +3,7 @@ on: | |||||||
|   pull_request: |   pull_request: | ||||||
|     branches: |     branches: | ||||||
|       - main |       - main | ||||||
|  |       - "*LTS" | ||||||
|     types: [opened, synchronize, reopened, ready_for_review] |     types: [opened, synchronize, reopened, ready_for_review] | ||||||
|  |  | ||||||
| jobs: | jobs: | ||||||
|   | |||||||
							
								
								
									
										47
									
								
								.github/workflows/pr-python311.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										47
									
								
								.github/workflows/pr-python311.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,47 @@ | |||||||
|  | name: Python 3.11 Tests | ||||||
|  | on: | ||||||
|  |   pull_request: | ||||||
|  |     branches: | ||||||
|  |       - main | ||||||
|  |       - "*LTS" | ||||||
|  |     types: [opened, synchronize, reopened, ready_for_review] | ||||||
|  |  | ||||||
|  | jobs: | ||||||
|  |   testPy311: | ||||||
|  |     if: github.event.pull_request.draft == false | ||||||
|  |     name: ut-${{ matrix.config.tox-env }}-${{ matrix.os }} | ||||||
|  |     runs-on: ${{ matrix.os }} | ||||||
|  |     strategy: | ||||||
|  |       fail-fast: false | ||||||
|  |       matrix: | ||||||
|  |         # os: [ubuntu-latest, macos-latest] | ||||||
|  |         os: [ubuntu-latest] | ||||||
|  |         config: | ||||||
|  |           - { | ||||||
|  |               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: | ||||||
|  |       - name: Checkout the Repository | ||||||
|  |         uses: actions/checkout@v2 | ||||||
|  |         id: checkout-branch | ||||||
|  |  | ||||||
|  |       - name: Run Unit Tests | ||||||
|  |         uses: harshanarayana/custom-actions@main | ||||||
|  |         with: | ||||||
|  |           python-version: ${{ matrix.config.python-version }} | ||||||
|  |           test-infra-tool: tox | ||||||
|  |           test-infra-version: latest | ||||||
|  |           action: tests | ||||||
|  |           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" | ||||||
							
								
								
									
										1
									
								
								.github/workflows/pr-python37.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.github/workflows/pr-python37.yml
									
									
									
									
										vendored
									
									
								
							| @@ -3,6 +3,7 @@ on: | |||||||
|   pull_request: |   pull_request: | ||||||
|     branches: |     branches: | ||||||
|       - main |       - main | ||||||
|  |       - "*LTS" | ||||||
|     types: [opened, synchronize, reopened, ready_for_review] |     types: [opened, synchronize, reopened, ready_for_review] | ||||||
|  |  | ||||||
| jobs: | jobs: | ||||||
|   | |||||||
							
								
								
									
										1
									
								
								.github/workflows/pr-python38.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.github/workflows/pr-python38.yml
									
									
									
									
										vendored
									
									
								
							| @@ -3,6 +3,7 @@ on: | |||||||
|   pull_request: |   pull_request: | ||||||
|     branches: |     branches: | ||||||
|       - main |       - main | ||||||
|  |       - "*LTS" | ||||||
|     types: [opened, synchronize, reopened, ready_for_review] |     types: [opened, synchronize, reopened, ready_for_review] | ||||||
|  |  | ||||||
| jobs: | jobs: | ||||||
|   | |||||||
							
								
								
									
										1
									
								
								.github/workflows/pr-python39.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.github/workflows/pr-python39.yml
									
									
									
									
										vendored
									
									
								
							| @@ -3,6 +3,7 @@ on: | |||||||
|   pull_request: |   pull_request: | ||||||
|     branches: |     branches: | ||||||
|       - main |       - main | ||||||
|  |       - "*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,7 @@ on: | |||||||
|   pull_request: |   pull_request: | ||||||
|     branches: |     branches: | ||||||
|       - main |       - main | ||||||
|  |       - "*LTS" | ||||||
|     types: [opened, synchronize, reopened, ready_for_review] |     types: [opened, synchronize, reopened, ready_for_review] | ||||||
|  |  | ||||||
| jobs: | jobs: | ||||||
| @@ -15,10 +16,11 @@ jobs: | |||||||
|       matrix: |       matrix: | ||||||
|         os: [ubuntu-latest] |         os: [ubuntu-latest] | ||||||
|         config: |         config: | ||||||
|           - { python-version: 3.7, tox-env: type-checking} |           # - { 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 | ||||||
|   | |||||||
							
								
								
									
										2
									
								
								.github/workflows/pr-windows.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/pr-windows.yml
									
									
									
									
										vendored
									
									
								
							| @@ -3,6 +3,7 @@ on: | |||||||
|   pull_request: |   pull_request: | ||||||
|     branches: |     branches: | ||||||
|       - main |       - main | ||||||
|  |       - "*LTS" | ||||||
|     types: [opened, synchronize, reopened, ready_for_review] |     types: [opened, synchronize, reopened, ready_for_review] | ||||||
|  |  | ||||||
| jobs: | jobs: | ||||||
| @@ -18,6 +19,7 @@ jobs: | |||||||
|           - { 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: "3.11", tox-env: py310-no-ext } | ||||||
|           - { python-version: pypy-3.7, tox-env: pypy37-no-ext } |           - { python-version: pypy-3.7, tox-env: pypy37-no-ext } | ||||||
|  |  | ||||||
|     steps: |     steps: | ||||||
|   | |||||||
							
								
								
									
										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.7", "3.8", "3.9", "3.10", "3.11"] | ||||||
|  |  | ||||||
|     steps: |     steps: | ||||||
|       - name: Checkout repository |       - name: Checkout repository | ||||||
|   | |||||||
							
								
								
									
										2
									
								
								.github/workflows/publish-package.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/publish-package.yml
									
									
									
									
										vendored
									
									
								
							| @@ -11,7 +11,7 @@ jobs: | |||||||
|     strategy: |     strategy: | ||||||
|       fail-fast: true |       fail-fast: true | ||||||
|       matrix: |       matrix: | ||||||
|         python-version: ["3.8"] |         python-version: ["3.10"] | ||||||
|  |  | ||||||
|     steps: |     steps: | ||||||
|       - name: Checkout Repository |       - name: Checkout Repository | ||||||
|   | |||||||
| @@ -316,6 +316,8 @@ Version 21.3.0 | |||||||
| Version 20.12.3 | Version 20.12.3 | ||||||
| --------------- | --------------- | ||||||
|  |  | ||||||
|  | `Current LTS version` | ||||||
|  |  | ||||||
| **Bugfixes** | **Bugfixes** | ||||||
|  |  | ||||||
|   * |   * | ||||||
| @@ -357,11 +359,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 | ||||||
|  |  | ||||||
|   | |||||||
| @@ -66,7 +66,7 @@ Sanic | Build fast. Run fast. | |||||||
|  |  | ||||||
| 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.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 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>`_ | ||||||
|  |  | ||||||
| @@ -102,9 +102,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 +111,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): | ||||||
|   | |||||||
							
								
								
									
										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. | ||||||
|   | |||||||
							
								
								
									
										27
									
								
								codecov.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										27
									
								
								codecov.yml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,27 @@ | |||||||
|  | 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" | ||||||
|  |   - ".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,10 @@ | |||||||
| 📜 Changelog | 📜 Changelog | ||||||
| ============ | ============ | ||||||
|  |  | ||||||
|  | .. 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 | ||||||
| @@ -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") | ||||||
|   | |||||||
| @@ -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,27 @@ | |||||||
| [build-system] | [build-system] | ||||||
| requires = ["setuptools", "wheel"] | requires = ["setuptools<60.0", "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.*", | ||||||
|  | ] | ||||||
|  | ignore_missing_imports = true | ||||||
|   | |||||||
| @@ -6,4 +6,4 @@ python: | |||||||
|         path: . |         path: . | ||||||
|         extra_requirements: |         extra_requirements: | ||||||
|             - docs |             - docs | ||||||
|    system_packages: true |    system_packages: true | ||||||
|   | |||||||
| @@ -3,7 +3,16 @@ from sanic.app import Sanic | |||||||
| from sanic.blueprints import Blueprint | from sanic.blueprints import Blueprint | ||||||
| from sanic.constants import HTTPMethod | from sanic.constants import HTTPMethod | ||||||
| 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, | ||||||
|  |     redirect, | ||||||
|  |     text, | ||||||
|  | ) | ||||||
|  | from sanic.server.websockets.impl import WebsocketImplProtocol as Websocket | ||||||
|  |  | ||||||
|  |  | ||||||
| __all__ = ( | __all__ = ( | ||||||
| @@ -13,7 +22,11 @@ __all__ = ( | |||||||
|     "HTTPMethod", |     "HTTPMethod", | ||||||
|     "HTTPResponse", |     "HTTPResponse", | ||||||
|     "Request", |     "Request", | ||||||
|  |     "Websocket", | ||||||
|  |     "empty", | ||||||
|  |     "file", | ||||||
|     "html", |     "html", | ||||||
|     "json", |     "json", | ||||||
|  |     "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__ = "22.12.0" | ||||||
|   | |||||||
							
								
								
									
										1052
									
								
								sanic/app.py
									
									
									
									
									
								
							
							
						
						
									
										1052
									
								
								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.compat import is_atty | ||||||
|  |  | ||||||
|  |  | ||||||
| BASE_LOGO = """ | BASE_LOGO = """ | ||||||
|  |  | ||||||
| @@ -44,7 +46,7 @@ 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.compat 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 | ||||||
|   | |||||||
| @@ -1,14 +1,15 @@ | |||||||
|  | from __future__ import annotations | ||||||
|  |  | ||||||
| import warnings | import warnings | ||||||
|  |  | ||||||
| from typing import Optional | from typing import TYPE_CHECKING, Optional | ||||||
| from urllib.parse import quote | 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 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 +17,35 @@ from sanic.server import ConnInfo | |||||||
| from sanic.server.websockets.connection import WebSocketConnection | from sanic.server.websockets.connection import WebSocketConnection | ||||||
|  |  | ||||||
|  |  | ||||||
|  | if TYPE_CHECKING: | ||||||
|  |     from sanic import Sanic | ||||||
|  |  | ||||||
|  |  | ||||||
| class Lifespan: | class Lifespan: | ||||||
|     def __init__(self, asgi_app: "ASGIApp") -> None: |     def __init__(self, asgi_app: ASGIApp) -> None: | ||||||
|         self.asgi_app = asgi_app |         self.asgi_app = asgi_app | ||||||
|  |  | ||||||
|         if ( |         if ( | ||||||
|             "server.init.before" |             "server.init.before" | ||||||
|             in self.asgi_app.sanic_app.signal_router.name_index |             in self.asgi_app.sanic_app.signal_router.name_index | ||||||
|         ): |         ): | ||||||
|             warnings.warn( |             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" |             "server.shutdown.after" | ||||||
|             in self.asgi_app.sanic_app.signal_router.name_index |             in self.asgi_app.sanic_app.signal_router.name_index | ||||||
|         ): |         ): | ||||||
|             warnings.warn( |             logger.debug( | ||||||
|                 '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: | ||||||
| @@ -54,7 +61,7 @@ class Lifespan: | |||||||
|         await self.asgi_app.sanic_app._server_event("init", "before") |         await self.asgi_app.sanic_app._server_event("init", "before") | ||||||
|         await self.asgi_app.sanic_app._server_event("init", "after") |         await self.asgi_app.sanic_app._server_event("init", "after") | ||||||
|  |  | ||||||
|         if self.asgi_app.sanic_app.config.USE_UVLOOP is not _default: |         if not isinstance(self.asgi_app.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." | ||||||
| @@ -78,17 +85,31 @@ class Lifespan: | |||||||
|     ) -> None: |     ) -> None: | ||||||
|         message = await receive() |         message = await receive() | ||||||
|         if message["type"] == "lifespan.startup": |         if message["type"] == "lifespan.startup": | ||||||
|             await self.startup() |             try: | ||||||
|             await send({"type": "lifespan.startup.complete"}) |                 await self.startup() | ||||||
|  |             except Exception as e: | ||||||
|  |                 error_logger.exception(e) | ||||||
|  |                 await send( | ||||||
|  |                     {"type": "lifespan.startup.failed", "message": str(e)} | ||||||
|  |                 ) | ||||||
|  |             else: | ||||||
|  |                 await send({"type": "lifespan.startup.complete"}) | ||||||
|  |  | ||||||
|         message = await receive() |         message = await receive() | ||||||
|         if message["type"] == "lifespan.shutdown": |         if message["type"] == "lifespan.shutdown": | ||||||
|             await self.shutdown() |             try: | ||||||
|             await send({"type": "lifespan.shutdown.complete"}) |                 await self.shutdown() | ||||||
|  |             except Exception as e: | ||||||
|  |                 error_logger.exception(e) | ||||||
|  |                 await send( | ||||||
|  |                     {"type": "lifespan.shutdown.failed", "message": str(e)} | ||||||
|  |                 ) | ||||||
|  |             else: | ||||||
|  |                 await send({"type": "lifespan.shutdown.complete"}) | ||||||
|  |  | ||||||
|  |  | ||||||
| class ASGIApp: | class ASGIApp: | ||||||
|     sanic_app: "sanic.app.Sanic" |     sanic_app: Sanic | ||||||
|     request: Request |     request: Request | ||||||
|     transport: MockTransport |     transport: MockTransport | ||||||
|     lifespan: Lifespan |     lifespan: Lifespan | ||||||
| @@ -157,6 +178,13 @@ class ASGIApp: | |||||||
|             instance.request_body = True |             instance.request_body = True | ||||||
|             instance.request.conn_info = ConnInfo(instance.transport) |             instance.request.conn_info = ConnInfo(instance.transport) | ||||||
|  |  | ||||||
|  |             await sanic_app.dispatch( | ||||||
|  |                 "http.lifecycle.request", | ||||||
|  |                 inline=True, | ||||||
|  |                 context={"request": instance.request}, | ||||||
|  |                 fail_not_found=False, | ||||||
|  |             ) | ||||||
|  |  | ||||||
|         return instance |         return instance | ||||||
|  |  | ||||||
|     async def read(self) -> Optional[bytes]: |     async def read(self) -> Optional[bytes]: | ||||||
| @@ -220,4 +248,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 | ||||||
| @@ -24,7 +24,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 | ||||||
|  |  | ||||||
|  |  | ||||||
|   | |||||||
| @@ -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 | ||||||
|  |  | ||||||
|  |  | ||||||
| @@ -308,7 +308,7 @@ class Blueprint(BaseSanic): | |||||||
|             # prefixed properly in the router |             # prefixed properly in the router | ||||||
|             future.handler.__blueprintname__ = self.name |             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) | ||||||
|  |  | ||||||
|             version_prefix = self.version_prefix |             version_prefix = self.version_prefix | ||||||
|             for prefix in ( |             for prefix in ( | ||||||
| @@ -333,7 +333,7 @@ class Blueprint(BaseSanic): | |||||||
|  |  | ||||||
|             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, | ||||||
| @@ -363,7 +363,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 +406,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 +442,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 +456,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, ...]] | ||||||
|   | |||||||
							
								
								
									
										209
									
								
								sanic/cli/app.py
									
									
									
									
									
								
							
							
						
						
									
										209
									
								
								sanic/cli/app.py
									
									
									
									
									
								
							| @@ -1,22 +1,21 @@ | |||||||
|  | import logging | ||||||
| import os | 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, cast | ||||||
|  |  | ||||||
| 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.log import error_logger | from sanic.cli.base import SanicArgumentParser, SanicHelpFormatter | ||||||
| from sanic.simple import create_simple_server | from sanic.cli.inspector import make_inspector_parser | ||||||
|  | from sanic.cli.inspector_client import InspectorClient | ||||||
|  | from sanic.log import Colors, error_logger | ||||||
| class SanicArgumentParser(ArgumentParser): | from sanic.worker.loader import AppLoader | ||||||
|     ... |  | ||||||
|  |  | ||||||
|  |  | ||||||
| class SanicCLI: | class SanicCLI: | ||||||
| @@ -45,7 +44,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 +56,128 @@ 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.module, self.args.factory, self.args.simple, self.args | ||||||
|  |         ) | ||||||
|  |  | ||||||
|  |         if self.args.inspect or self.args.inspect_raw or self.args.trigger: | ||||||
|  |             self._inspector_legacy(app_loader) | ||||||
|  |             return | ||||||
|  |  | ||||||
|         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 | ||||||
|  |             elif self.args.legacy: | ||||||
|  |                 serve = Sanic.serve_legacy | ||||||
|  |             else: | ||||||
|  |                 serve = partial(Sanic.serve, app_loader=app_loader) | ||||||
|  |             serve(app) | ||||||
|  |  | ||||||
|  |     def _inspector_legacy(self, app_loader: AppLoader): | ||||||
|  |         host = port = None | ||||||
|  |         module = cast(str, self.args.module) | ||||||
|  |         if ":" in module: | ||||||
|  |             maybe_host, maybe_port = module.rsplit(":", 1) | ||||||
|  |             if maybe_port.isnumeric(): | ||||||
|  |                 host, port = maybe_host, int(maybe_port) | ||||||
|  |         if not host: | ||||||
|  |             app = self._get_app(app_loader) | ||||||
|  |             host, port = app.config.INSPECTOR_HOST, app.config.INSPECTOR_PORT | ||||||
|  |  | ||||||
|  |         action = self.args.trigger or "info" | ||||||
|  |  | ||||||
|  |         InspectorClient( | ||||||
|  |             str(host), int(port or 6457), False, self.args.inspect_raw, "" | ||||||
|  |         ).do(action) | ||||||
|  |         sys.stdout.write( | ||||||
|  |             f"\n{Colors.BOLD}{Colors.YELLOW}WARNING:{Colors.END} " | ||||||
|  |             "You are using the legacy CLI command that will be removed in " | ||||||
|  |             f"{Colors.RED}v23.3{Colors.END}. See " | ||||||
|  |             "https://sanic.dev/en/guide/release-notes/v22.12.html" | ||||||
|  |             "#deprecations-and-removals or checkout the new " | ||||||
|  |             "style commands:\n\n\t" | ||||||
|  |             f"{Colors.YELLOW}sanic inspect --help{Colors.END}\n" | ||||||
|  |         ) | ||||||
|  |  | ||||||
|  |     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) | ||||||
| @@ -106,48 +197,27 @@ 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) | ||||||
|  |         if self.args.inspect or self.args.inspect_raw: | ||||||
|  |             logging.disable(logging.CRITICAL) | ||||||
|  |  | ||||||
|     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" | ||||||
|                 ) |                 ) | ||||||
|  |                 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 +230,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 +244,17 @@ 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, | ||||||
|  |             "legacy": self.args.legacy, | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         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): | ||||||
| @@ -63,7 +70,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 +79,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", | ||||||
| @@ -81,6 +89,70 @@ class ApplicationGroup(Group): | |||||||
|                 "a directory\n(module arg should be a path)" |                 "a directory\n(module arg should be a path)" | ||||||
|             ), |             ), | ||||||
|         ) |         ) | ||||||
|  |         group.add_argument( | ||||||
|  |             "--inspect", | ||||||
|  |             dest="inspect", | ||||||
|  |             action="store_true", | ||||||
|  |             help=("Inspect the state of a running instance, human readable"), | ||||||
|  |         ) | ||||||
|  |         group.add_argument( | ||||||
|  |             "--inspect-raw", | ||||||
|  |             dest="inspect_raw", | ||||||
|  |             action="store_true", | ||||||
|  |             help=("Inspect the state of a running instance, JSON output"), | ||||||
|  |         ) | ||||||
|  |         group.add_argument( | ||||||
|  |             "--trigger-reload", | ||||||
|  |             dest="trigger", | ||||||
|  |             action="store_const", | ||||||
|  |             const="reload", | ||||||
|  |             help=("Trigger worker processes to reload"), | ||||||
|  |         ) | ||||||
|  |         group.add_argument( | ||||||
|  |             "--trigger-shutdown", | ||||||
|  |             dest="trigger", | ||||||
|  |             action="store_const", | ||||||
|  |             const="shutdown", | ||||||
|  |             help=("Trigger all processes to shutdown"), | ||||||
|  |         ) | ||||||
|  |  | ||||||
|  |  | ||||||
|  | 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): | ||||||
| @@ -92,7 +164,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 +171,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 +237,22 @@ 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.container.add_argument( | ||||||
|  |             "--legacy", | ||||||
|  |             action="store_true", | ||||||
|  |             help="Use the legacy server manager", | ||||||
|  |         ) | ||||||
|         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 +266,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 +284,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}" | ||||||
| @@ -1,11 +1,25 @@ | |||||||
| import asyncio | import asyncio | ||||||
| import os | import os | ||||||
| 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 | ||||||
|  |  | ||||||
|  |  | ||||||
|  | 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" | ||||||
| UVLOOP_INSTALLED = False | UVLOOP_INSTALLED = False | ||||||
| @@ -17,6 +31,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 | ||||||
| @@ -47,12 +95,12 @@ 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 | ||||||
| @@ -72,7 +120,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. | ||||||
| @@ -89,3 +137,7 @@ def ctrlc_workaround_for_windows(app): | |||||||
|     die = False |     die = False | ||||||
|     signal.signal(signal.SIGINT, ctrlc_handler) |     signal.signal(signal.SIGINT, ctrlc_handler) | ||||||
|     app.add_task(stay_active) |     app.add_task(stay_active) | ||||||
|  |  | ||||||
|  |  | ||||||
|  | def is_atty() -> bool: | ||||||
|  |     return bool(sys.stdout and sys.stdout.isatty()) | ||||||
|   | |||||||
							
								
								
									
										135
									
								
								sanic/config.py
									
									
									
									
									
								
							
							
						
						
									
										135
									
								
								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,  # 15 sec | ||||||
|  |     "INSPECTOR": False, | ||||||
|  |     "INSPECTOR_HOST": "localhost", | ||||||
|  |     "INSPECTOR_PORT": 6457, | ||||||
|  |     "INSPECTOR_TLS_KEY": _default, | ||||||
|  |     "INSPECTOR_TLS_CERT": _default, | ||||||
|  |     "INSPECTOR_API_KEY": "", | ||||||
|     "KEEP_ALIVE_TIMEOUT": 5,  # 5 seconds |     "KEEP_ALIVE_TIMEOUT": 5,  # 5 seconds | ||||||
|     "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,  # 64 KiB |     "REQUEST_BUFFER_SIZE": 65536,  # 64 KiB | ||||||
|     "REQUEST_MAX_HEADER_SIZE": 8192,  # 8 KiB, but 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": 100000000,  # 100 megabytes | ||||||
|     "REQUEST_TIMEOUT": 60,  # 60 seconds |     "REQUEST_TIMEOUT": 60,  # 60 seconds | ||||||
|     "RESPONSE_TIMEOUT": 60,  # 60 seconds |     "RESPONSE_TIMEOUT": 60,  # 60 seconds | ||||||
|  |     "TLS_CERT_PASSWORD": "", | ||||||
|  |     "TOUCHUP": _default, | ||||||
|     "USE_UVLOOP": _default, |     "USE_UVLOOP": _default, | ||||||
|     "WEBSOCKET_MAX_SIZE": 2 ** 20,  # 1 megabyte |     "WEBSOCKET_MAX_SIZE": 2**20,  # 1 megabyte | ||||||
|     "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" | ||||||
|   | |||||||
| @@ -19,7 +19,7 @@ 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.request import Request | ||||||
| from sanic.response import HTTPResponse, html, json, text | from sanic.response import HTTPResponse, html, json, text | ||||||
| @@ -448,8 +448,8 @@ def exception_response( | |||||||
|             # from the route |             # from the route | ||||||
|             if request.route: |             if request.route: | ||||||
|                 try: |                 try: | ||||||
|                     if request.route.ctx.error_format: |                     if request.route.extra.error_format: | ||||||
|                         render_format = request.route.ctx.error_format |                         render_format = request.route.extra.error_format | ||||||
|                 except AttributeError: |                 except AttributeError: | ||||||
|                     ... |                     ... | ||||||
|  |  | ||||||
| @@ -506,7 +506,7 @@ def exception_response( | |||||||
|                         # $ curl localhost:8000 -d '{"foo": "bar"}' |                         # $ curl localhost:8000 -d '{"foo": "bar"}' | ||||||
|                         # And provide them with JSONRenderer |                         # And provide them with JSONRenderer | ||||||
|                         renderer = JSONRenderer if request.json else base |                         renderer = JSONRenderer if request.json else base | ||||||
|                     except InvalidUsage: |                     except BadRequest: | ||||||
|                         renderer = base |                         renderer = base | ||||||
|             else: |             else: | ||||||
|                 renderer = RENDERERS_BY_CONFIG.get(render_format, renderer) |                 renderer = RENDERERS_BY_CONFIG.get(render_format, renderer) | ||||||
|   | |||||||
| @@ -1,8 +1,17 @@ | |||||||
|  | from asyncio import CancelledError | ||||||
| from typing import Any, Dict, Optional, Union | from typing import Any, Dict, Optional, Union | ||||||
|  |  | ||||||
| from sanic.helpers import STATUS_CODES | from sanic.helpers import STATUS_CODES | ||||||
|  |  | ||||||
|  |  | ||||||
|  | class RequestCancelled(CancelledError): | ||||||
|  |     quiet = True | ||||||
|  |  | ||||||
|  |  | ||||||
|  | class ServerKilled(Exception): | ||||||
|  |     ... | ||||||
|  |  | ||||||
|  |  | ||||||
| class SanicException(Exception): | class SanicException(Exception): | ||||||
|     message: str = "" |     message: str = "" | ||||||
|  |  | ||||||
| @@ -42,7 +51,7 @@ class NotFound(SanicException): | |||||||
|     quiet = True |     quiet = True | ||||||
|  |  | ||||||
|  |  | ||||||
| class InvalidUsage(SanicException): | class BadRequest(SanicException): | ||||||
|     """ |     """ | ||||||
|     **Status**: 400 Bad Request |     **Status**: 400 Bad Request | ||||||
|     """ |     """ | ||||||
| @@ -51,7 +60,14 @@ class InvalidUsage(SanicException): | |||||||
|     quiet = True |     quiet = True | ||||||
|  |  | ||||||
|  |  | ||||||
| class MethodNotSupported(SanicException): | InvalidUsage = BadRequest | ||||||
|  |  | ||||||
|  |  | ||||||
|  | class BadURL(BadRequest): | ||||||
|  |     ... | ||||||
|  |  | ||||||
|  |  | ||||||
|  | class MethodNotAllowed(SanicException): | ||||||
|     """ |     """ | ||||||
|     **Status**: 405 Method Not Allowed |     **Status**: 405 Method Not Allowed | ||||||
|     """ |     """ | ||||||
| @@ -64,6 +80,9 @@ class MethodNotSupported(SanicException): | |||||||
|         self.headers = {"Allow": ", ".join(allowed_methods)} |         self.headers = {"Allow": ", ".join(allowed_methods)} | ||||||
|  |  | ||||||
|  |  | ||||||
|  | MethodNotSupported = MethodNotAllowed | ||||||
|  |  | ||||||
|  |  | ||||||
| class ServerError(SanicException): | class ServerError(SanicException): | ||||||
|     """ |     """ | ||||||
|     **Status**: 500 Internal Server Error |     **Status**: 500 Internal Server Error | ||||||
| @@ -125,19 +144,19 @@ class PayloadTooLarge(SanicException): | |||||||
|     quiet = True |     quiet = True | ||||||
|  |  | ||||||
|  |  | ||||||
| class HeaderNotFound(InvalidUsage): | class HeaderNotFound(BadRequest): | ||||||
|     """ |     """ | ||||||
|     **Status**: 400 Bad Request |     **Status**: 400 Bad Request | ||||||
|     """ |     """ | ||||||
|  |  | ||||||
|  |  | ||||||
| class InvalidHeader(InvalidUsage): | class InvalidHeader(BadRequest): | ||||||
|     """ |     """ | ||||||
|     **Status**: 400 Bad Request |     **Status**: 400 Bad Request | ||||||
|     """ |     """ | ||||||
|  |  | ||||||
|  |  | ||||||
| class ContentRangeError(SanicException): | class RangeNotSatisfiable(SanicException): | ||||||
|     """ |     """ | ||||||
|     **Status**: 416 Range Not Satisfiable |     **Status**: 416 Range Not Satisfiable | ||||||
|     """ |     """ | ||||||
| @@ -150,7 +169,10 @@ class ContentRangeError(SanicException): | |||||||
|         self.headers = {"Content-Range": f"bytes */{content_range.total}"} |         self.headers = {"Content-Range": f"bytes */{content_range.total}"} | ||||||
|  |  | ||||||
|  |  | ||||||
| class HeaderExpectationFailed(SanicException): | ContentRangeError = RangeNotSatisfiable | ||||||
|  |  | ||||||
|  |  | ||||||
|  | class ExpectationFailed(SanicException): | ||||||
|     """ |     """ | ||||||
|     **Status**: 417 Expectation Failed |     **Status**: 417 Expectation Failed | ||||||
|     """ |     """ | ||||||
| @@ -159,6 +181,9 @@ class HeaderExpectationFailed(SanicException): | |||||||
|     quiet = True |     quiet = True | ||||||
|  |  | ||||||
|  |  | ||||||
|  | HeaderExpectationFailed = ExpectationFailed | ||||||
|  |  | ||||||
|  |  | ||||||
| class Forbidden(SanicException): | class Forbidden(SanicException): | ||||||
|     """ |     """ | ||||||
|     **Status**: 403 Forbidden |     **Status**: 403 Forbidden | ||||||
| @@ -168,7 +193,7 @@ class Forbidden(SanicException): | |||||||
|     quiet = True |     quiet = True | ||||||
|  |  | ||||||
|  |  | ||||||
| class InvalidRangeType(ContentRangeError): | class InvalidRangeType(RangeNotSatisfiable): | ||||||
|     """ |     """ | ||||||
|     **Status**: 416 Range Not Satisfiable |     **Status**: 416 Range Not Satisfiable | ||||||
|     """ |     """ | ||||||
|   | |||||||
| @@ -1,22 +1,13 @@ | |||||||
| from __future__ import annotations | from __future__ import annotations | ||||||
|  |  | ||||||
| from inspect import signature | from typing import Dict, List, Optional, Tuple, Type | ||||||
| from typing import Dict, List, Optional, Tuple, Type, Union |  | ||||||
|  |  | ||||||
| from sanic.config import Config | from sanic.errorpages import BaseRenderer, TextRenderer, exception_response | ||||||
| from sanic.errorpages import ( |  | ||||||
|     DEFAULT_FORMAT, |  | ||||||
|     BaseRenderer, |  | ||||||
|     HTMLRenderer, |  | ||||||
|     exception_response, |  | ||||||
| ) |  | ||||||
| from sanic.exceptions import ( | from sanic.exceptions import ( | ||||||
|     ContentRangeError, |  | ||||||
|     HeaderNotFound, |     HeaderNotFound, | ||||||
|     InvalidRangeType, |     InvalidRangeType, | ||||||
|     SanicException, |     RangeNotSatisfiable, | ||||||
| ) | ) | ||||||
| from sanic.helpers import Default, _default |  | ||||||
| from sanic.log import deprecation, error_logger | from sanic.log import deprecation, error_logger | ||||||
| from sanic.models.handler_types import RouteHandler | from sanic.models.handler_types import RouteHandler | ||||||
| from sanic.response import text | from sanic.response import text | ||||||
| @@ -35,119 +26,40 @@ class ErrorHandler: | |||||||
|  |  | ||||||
|     """ |     """ | ||||||
|  |  | ||||||
|     # Beginning in v22.3, the base renderer will be TextRenderer |  | ||||||
|     def __init__( |     def __init__( | ||||||
|         self, |         self, | ||||||
|         fallback: Union[str, Default] = _default, |         base: Type[BaseRenderer] = TextRenderer, | ||||||
|         base: Type[BaseRenderer] = HTMLRenderer, |  | ||||||
|     ): |     ): | ||||||
|         self.handlers: List[Tuple[Type[BaseException], RouteHandler]] = [] |  | ||||||
|         self.cached_handlers: Dict[ |         self.cached_handlers: Dict[ | ||||||
|             Tuple[Type[BaseException], Optional[str]], Optional[RouteHandler] |             Tuple[Type[BaseException], Optional[str]], Optional[RouteHandler] | ||||||
|         ] = {} |         ] = {} | ||||||
|         self.debug = False |         self.debug = False | ||||||
|         self._fallback = fallback |  | ||||||
|         self.base = base |         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): |     def _full_lookup(self, exception, route_name: Optional[str] = None): | ||||||
|         return self.lookup(exception, route_name) |         return self.lookup(exception, route_name) | ||||||
|  |  | ||||||
|     def _legacy_lookup(self, exception, route_name: Optional[str] = None): |     def _add( | ||||||
|         return self.lookup(exception) |         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__" | ||||||
|  |  | ||||||
|  |             error_logger.warning( | ||||||
|  |                 f"Duplicate exception handler definition on: route={name} " | ||||||
|  |                 f"and exception={exc}" | ||||||
|  |             ) | ||||||
|  |             deprecation( | ||||||
|  |                 "A duplicate exception handler definition was discovered. " | ||||||
|  |                 "This may cause unintended consequences. A warning has been " | ||||||
|  |                 "issued now, but it will not be allowed starting in v23.3.", | ||||||
|  |                 23.3, | ||||||
|  |             ) | ||||||
|  |         self.cached_handlers[key] = handler | ||||||
|  |  | ||||||
|     def add(self, exception, handler, route_names: Optional[List[str]] = None): |     def add(self, exception, handler, route_names: Optional[List[str]] = None): | ||||||
|         """ |         """ | ||||||
| @@ -162,14 +74,11 @@ class ErrorHandler: | |||||||
|  |  | ||||||
|         :return: None |         :return: None | ||||||
|         """ |         """ | ||||||
|         # self.handlers is deprecated and will be removed in version 22.3 |  | ||||||
|         self.handlers.append((exception, handler)) |  | ||||||
|  |  | ||||||
|         if route_names: |         if route_names: | ||||||
|             for route in route_names: |             for route in route_names: | ||||||
|                 self.cached_handlers[(exception, route)] = handler |                 self._add((exception, route), handler) | ||||||
|         else: |         else: | ||||||
|             self.cached_handlers[(exception, None)] = handler |             self._add((exception, None), handler) | ||||||
|  |  | ||||||
|     def lookup(self, exception, route_name: Optional[str] = None): |     def lookup(self, exception, route_name: Optional[str] = None): | ||||||
|         """ |         """ | ||||||
| @@ -236,7 +145,7 @@ class ErrorHandler: | |||||||
|         except Exception: |         except Exception: | ||||||
|             try: |             try: | ||||||
|                 url = repr(request.url) |                 url = repr(request.url) | ||||||
|             except AttributeError: |             except AttributeError:  # no cov | ||||||
|                 url = "unknown" |                 url = "unknown" | ||||||
|             response_message = ( |             response_message = ( | ||||||
|                 "Exception raised in exception handler " '"%s" for uri: %s' |                 "Exception raised in exception handler " '"%s" for uri: %s' | ||||||
| @@ -265,7 +174,7 @@ class ErrorHandler: | |||||||
|         :return: |         :return: | ||||||
|         """ |         """ | ||||||
|         self.log(request, exception) |         self.log(request, exception) | ||||||
|         fallback = ErrorHandler._get_fallback_value(self, request.app.config) |         fallback = request.app.config.FALLBACK_ERROR_FORMAT | ||||||
|         return exception_response( |         return exception_response( | ||||||
|             request, |             request, | ||||||
|             exception, |             exception, | ||||||
| @@ -281,7 +190,7 @@ class ErrorHandler: | |||||||
|         if quiet is False or noisy is True: |         if quiet is False or noisy is True: | ||||||
|             try: |             try: | ||||||
|                 url = repr(request.url) |                 url = repr(request.url) | ||||||
|             except AttributeError: |             except AttributeError:  # no cov | ||||||
|                 url = "unknown" |                 url = "unknown" | ||||||
|  |  | ||||||
|             error_logger.exception( |             error_logger.exception( | ||||||
| @@ -324,18 +233,18 @@ class ContentRangeHandler: | |||||||
|         try: |         try: | ||||||
|             self.start = int(start_b) if start_b else None |             self.start = int(start_b) if start_b else None | ||||||
|         except ValueError: |         except ValueError: | ||||||
|             raise ContentRangeError( |             raise RangeNotSatisfiable( | ||||||
|                 "'%s' is invalid for Content Range" % (start_b,), self |                 "'%s' is invalid for Content Range" % (start_b,), self | ||||||
|             ) |             ) | ||||||
|         try: |         try: | ||||||
|             self.end = int(end_b) if end_b else None |             self.end = int(end_b) if end_b else None | ||||||
|         except ValueError: |         except ValueError: | ||||||
|             raise ContentRangeError( |             raise RangeNotSatisfiable( | ||||||
|                 "'%s' is invalid for Content Range" % (end_b,), self |                 "'%s' is invalid for Content Range" % (end_b,), self | ||||||
|             ) |             ) | ||||||
|         if self.end is None: |         if self.end is None: | ||||||
|             if self.start is None: |             if self.start is None: | ||||||
|                 raise ContentRangeError( |                 raise RangeNotSatisfiable( | ||||||
|                     "Invalid for Content Range parameters", self |                     "Invalid for Content Range parameters", self | ||||||
|                 ) |                 ) | ||||||
|             else: |             else: | ||||||
| @@ -347,7 +256,7 @@ class ContentRangeHandler: | |||||||
|                 self.start = self.total - self.end |                 self.start = self.total - self.end | ||||||
|                 self.end = self.total - 1 |                 self.end = self.total - 1 | ||||||
|         if self.start >= self.end: |         if self.start >= self.end: | ||||||
|             raise ContentRangeError( |             raise RangeNotSatisfiable( | ||||||
|                 "Invalid for Content Range parameters", self |                 "Invalid for Content Range parameters", self | ||||||
|             ) |             ) | ||||||
|         self.size = self.end - self.start + 1 |         self.size = self.end - self.start + 1 | ||||||
|   | |||||||
| @@ -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,7 +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*$)') | _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) | ||||||
| @@ -394,3 +394,17 @@ def parse_accept(accept: str) -> AcceptContainer: | |||||||
|     return AcceptContainer( |     return AcceptContainer( | ||||||
|         sorted(accept_list, key=_sort_accept_value, reverse=True) |         sorted(accept_list, key=_sort_accept_value, reverse=True) | ||||||
|     ) |     ) | ||||||
|  |  | ||||||
|  |  | ||||||
|  | def parse_credentials( | ||||||
|  |     header: Optional[str], | ||||||
|  |     prefixes: Union[List, Tuple, Set] = None, | ||||||
|  | ) -> Tuple[Optional[str], Optional[str]]: | ||||||
|  |     """Parses any header with the aim to retrieve any credentials from it.""" | ||||||
|  |     if not prefixes or not isinstance(prefixes, (list, tuple, set)): | ||||||
|  |         prefixes = ("Basic", "Bearer", "Token") | ||||||
|  |     if header is not None: | ||||||
|  |         for prefix in prefixes: | ||||||
|  |             if prefix in header: | ||||||
|  |                 return prefix, header.partition(prefix)[-1].strip() | ||||||
|  |     return None, header | ||||||
|   | |||||||
							
								
								
									
										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,7 +233,7 @@ 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 = ( | ||||||
| @@ -265,6 +250,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 +267,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 +338,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 +428,13 @@ 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) | ||||||
|  |             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: | ||||||
|         """ |         """ | ||||||
| @@ -510,7 +508,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 +516,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 | ||||||
							
								
								
									
										406
									
								
								sanic/http/http3.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										406
									
								
								sanic/http/http3.py
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,406 @@ | |||||||
|  | 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 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: | ||||||
|  |         headers = Header(((k.decode(), v.decode()) for k, v in event.headers)) | ||||||
|  |         method = headers[":method"] | ||||||
|  |         path = headers[":path"] | ||||||
|  |         scheme = headers.pop(":scheme", "") | ||||||
|  |         authority = headers.pop(":authority", "") | ||||||
|  |  | ||||||
|  |         if authority: | ||||||
|  |             headers["host"] = authority | ||||||
|  |  | ||||||
|  |         transport = HTTP3Transport(self.protocol) | ||||||
|  |         request = self.protocol.request_class( | ||||||
|  |             path.encode(), | ||||||
|  |             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.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)}") | ||||||
							
								
								
									
										289
									
								
								sanic/http/tls/creators.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										289
									
								
								sanic/http/tls/creators.py
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,289 @@ | |||||||
|  | from __future__ import annotations | ||||||
|  |  | ||||||
|  | import ssl | ||||||
|  | import subprocess | ||||||
|  | import sys | ||||||
|  |  | ||||||
|  | from abc import ABC, abstractmethod | ||||||
|  | from contextlib import suppress | ||||||
|  | from pathlib import Path | ||||||
|  | from tempfile import mkdtemp | ||||||
|  | from types import ModuleType | ||||||
|  | from typing import TYPE_CHECKING, Optional, Tuple, Type, Union, cast | ||||||
|  |  | ||||||
|  | from sanic.application.constants import Mode | ||||||
|  | from sanic.application.spinner import loading | ||||||
|  | from sanic.constants import ( | ||||||
|  |     DEFAULT_LOCAL_TLS_CERT, | ||||||
|  |     DEFAULT_LOCAL_TLS_KEY, | ||||||
|  |     LocalCertCreator, | ||||||
|  | ) | ||||||
|  | from sanic.exceptions import SanicException | ||||||
|  | from sanic.helpers import Default | ||||||
|  | from sanic.http.tls.context import CertSimple, SanicSSLContext | ||||||
|  |  | ||||||
|  |  | ||||||
|  | try: | ||||||
|  |     import trustme | ||||||
|  |  | ||||||
|  |     TRUSTME_INSTALLED = True | ||||||
|  | except (ImportError, ModuleNotFoundError): | ||||||
|  |     trustme = ModuleType("trustme") | ||||||
|  |     TRUSTME_INSTALLED = False | ||||||
|  |  | ||||||
|  | if TYPE_CHECKING: | ||||||
|  |     from sanic import Sanic | ||||||
|  |  | ||||||
|  |  | ||||||
|  | # Only allow secure ciphers, notably leaving out AES-CBC mode | ||||||
|  | # OpenSSL chooses ECDSA or RSA depending on the cert in use | ||||||
|  | CIPHERS_TLS12 = [ | ||||||
|  |     "ECDHE-ECDSA-CHACHA20-POLY1305", | ||||||
|  |     "ECDHE-ECDSA-AES256-GCM-SHA384", | ||||||
|  |     "ECDHE-ECDSA-AES128-GCM-SHA256", | ||||||
|  |     "ECDHE-RSA-CHACHA20-POLY1305", | ||||||
|  |     "ECDHE-RSA-AES256-GCM-SHA384", | ||||||
|  |     "ECDHE-RSA-AES128-GCM-SHA256", | ||||||
|  | ] | ||||||
|  |  | ||||||
|  |  | ||||||
|  | def _make_path(maybe_path: Union[Path, str], tmpdir: Optional[Path]) -> Path: | ||||||
|  |     if isinstance(maybe_path, Path): | ||||||
|  |         return maybe_path | ||||||
|  |     else: | ||||||
|  |         path = Path(maybe_path) | ||||||
|  |         if not path.exists(): | ||||||
|  |             if not tmpdir: | ||||||
|  |                 raise RuntimeError("Reached an unknown state. No tmpdir.") | ||||||
|  |             return tmpdir / maybe_path | ||||||
|  |  | ||||||
|  |     return path | ||||||
|  |  | ||||||
|  |  | ||||||
|  | def get_ssl_context( | ||||||
|  |     app: Sanic, ssl: Optional[ssl.SSLContext] | ||||||
|  | ) -> ssl.SSLContext: | ||||||
|  |     if ssl: | ||||||
|  |         return ssl | ||||||
|  |  | ||||||
|  |     if app.state.mode is Mode.PRODUCTION: | ||||||
|  |         raise SanicException( | ||||||
|  |             "Cannot run Sanic as an HTTPS server in PRODUCTION mode " | ||||||
|  |             "without passing a TLS certificate. If you are developing " | ||||||
|  |             "locally, please enable DEVELOPMENT mode and Sanic will " | ||||||
|  |             "generate a localhost TLS certificate. For more information " | ||||||
|  |             "please see: https://sanic.dev/en/guide/deployment/development." | ||||||
|  |             "html#automatic-tls-certificate." | ||||||
|  |         ) | ||||||
|  |  | ||||||
|  |     creator = CertCreator.select( | ||||||
|  |         app, | ||||||
|  |         cast(LocalCertCreator, app.config.LOCAL_CERT_CREATOR), | ||||||
|  |         app.config.LOCAL_TLS_KEY, | ||||||
|  |         app.config.LOCAL_TLS_CERT, | ||||||
|  |     ) | ||||||
|  |     context = creator.generate_cert(app.config.LOCALHOST) | ||||||
|  |     return context | ||||||
|  |  | ||||||
|  |  | ||||||
|  | class CertCreator(ABC): | ||||||
|  |     def __init__(self, app, key, cert) -> None: | ||||||
|  |         self.app = app | ||||||
|  |         self.key = key | ||||||
|  |         self.cert = cert | ||||||
|  |         self.tmpdir = None | ||||||
|  |  | ||||||
|  |         if isinstance(self.key, Default) or isinstance(self.cert, Default): | ||||||
|  |             self.tmpdir = Path(mkdtemp()) | ||||||
|  |  | ||||||
|  |         key = ( | ||||||
|  |             DEFAULT_LOCAL_TLS_KEY | ||||||
|  |             if isinstance(self.key, Default) | ||||||
|  |             else self.key | ||||||
|  |         ) | ||||||
|  |         cert = ( | ||||||
|  |             DEFAULT_LOCAL_TLS_CERT | ||||||
|  |             if isinstance(self.cert, Default) | ||||||
|  |             else self.cert | ||||||
|  |         ) | ||||||
|  |  | ||||||
|  |         self.key_path = _make_path(key, self.tmpdir) | ||||||
|  |         self.cert_path = _make_path(cert, self.tmpdir) | ||||||
|  |  | ||||||
|  |     @abstractmethod | ||||||
|  |     def check_supported(self) -> None:  # no cov | ||||||
|  |         ... | ||||||
|  |  | ||||||
|  |     @abstractmethod | ||||||
|  |     def generate_cert(self, localhost: str) -> ssl.SSLContext:  # no cov | ||||||
|  |         ... | ||||||
|  |  | ||||||
|  |     @classmethod | ||||||
|  |     def select( | ||||||
|  |         cls, | ||||||
|  |         app: Sanic, | ||||||
|  |         cert_creator: LocalCertCreator, | ||||||
|  |         local_tls_key, | ||||||
|  |         local_tls_cert, | ||||||
|  |     ) -> CertCreator: | ||||||
|  |         creator: Optional[CertCreator] = None | ||||||
|  |  | ||||||
|  |         cert_creator_options: Tuple[ | ||||||
|  |             Tuple[Type[CertCreator], LocalCertCreator], ... | ||||||
|  |         ] = ( | ||||||
|  |             (MkcertCreator, LocalCertCreator.MKCERT), | ||||||
|  |             (TrustmeCreator, LocalCertCreator.TRUSTME), | ||||||
|  |         ) | ||||||
|  |         for creator_class, local_creator in cert_creator_options: | ||||||
|  |             creator = cls._try_select( | ||||||
|  |                 app, | ||||||
|  |                 creator, | ||||||
|  |                 creator_class, | ||||||
|  |                 local_creator, | ||||||
|  |                 cert_creator, | ||||||
|  |                 local_tls_key, | ||||||
|  |                 local_tls_cert, | ||||||
|  |             ) | ||||||
|  |             if creator: | ||||||
|  |                 break | ||||||
|  |  | ||||||
|  |         if not creator: | ||||||
|  |             raise SanicException( | ||||||
|  |                 "Sanic could not find package to create a TLS certificate. " | ||||||
|  |                 "You must have either mkcert or trustme installed. See " | ||||||
|  |                 "https://sanic.dev/en/guide/deployment/development.html" | ||||||
|  |                 "#automatic-tls-certificate for more details." | ||||||
|  |             ) | ||||||
|  |  | ||||||
|  |         return creator | ||||||
|  |  | ||||||
|  |     @staticmethod | ||||||
|  |     def _try_select( | ||||||
|  |         app: Sanic, | ||||||
|  |         creator: Optional[CertCreator], | ||||||
|  |         creator_class: Type[CertCreator], | ||||||
|  |         creator_requirement: LocalCertCreator, | ||||||
|  |         creator_requested: LocalCertCreator, | ||||||
|  |         local_tls_key, | ||||||
|  |         local_tls_cert, | ||||||
|  |     ): | ||||||
|  |         if creator or ( | ||||||
|  |             creator_requested is not LocalCertCreator.AUTO | ||||||
|  |             and creator_requested is not creator_requirement | ||||||
|  |         ): | ||||||
|  |             return creator | ||||||
|  |  | ||||||
|  |         instance = creator_class(app, local_tls_key, local_tls_cert) | ||||||
|  |         try: | ||||||
|  |             instance.check_supported() | ||||||
|  |         except SanicException: | ||||||
|  |             if creator_requested is creator_requirement: | ||||||
|  |                 raise | ||||||
|  |             else: | ||||||
|  |                 return None | ||||||
|  |  | ||||||
|  |         return instance | ||||||
|  |  | ||||||
|  |  | ||||||
|  | class MkcertCreator(CertCreator): | ||||||
|  |     def check_supported(self) -> None: | ||||||
|  |         try: | ||||||
|  |             subprocess.run(  # nosec B603 B607 | ||||||
|  |                 ["mkcert", "-help"], | ||||||
|  |                 check=True, | ||||||
|  |                 stderr=subprocess.DEVNULL, | ||||||
|  |                 stdout=subprocess.DEVNULL, | ||||||
|  |             ) | ||||||
|  |         except Exception as e: | ||||||
|  |             raise SanicException( | ||||||
|  |                 "Sanic is attempting to use mkcert to generate local TLS " | ||||||
|  |                 "certificates since you did not supply a certificate, but " | ||||||
|  |                 "one is required. Sanic cannot proceed since mkcert does not " | ||||||
|  |                 "appear to be installed. Alternatively, you can use trustme. " | ||||||
|  |                 "Please install mkcert, trustme, or supply TLS certificates " | ||||||
|  |                 "to proceed. Installation instructions can be found here: " | ||||||
|  |                 "https://github.com/FiloSottile/mkcert.\n" | ||||||
|  |                 "Find out more information about your options here: " | ||||||
|  |                 "https://sanic.dev/en/guide/deployment/development.html#" | ||||||
|  |                 "automatic-tls-certificate" | ||||||
|  |             ) from e | ||||||
|  |  | ||||||
|  |     def generate_cert(self, localhost: str) -> ssl.SSLContext: | ||||||
|  |         try: | ||||||
|  |             if not self.cert_path.exists(): | ||||||
|  |                 message = "Generating TLS certificate" | ||||||
|  |                 # TODO: Validate input for security | ||||||
|  |                 with loading(message): | ||||||
|  |                     cmd = [ | ||||||
|  |                         "mkcert", | ||||||
|  |                         "-key-file", | ||||||
|  |                         str(self.key_path), | ||||||
|  |                         "-cert-file", | ||||||
|  |                         str(self.cert_path), | ||||||
|  |                         localhost, | ||||||
|  |                     ] | ||||||
|  |                     resp = subprocess.run(  # nosec B603 | ||||||
|  |                         cmd, | ||||||
|  |                         check=True, | ||||||
|  |                         stdout=subprocess.PIPE, | ||||||
|  |                         stderr=subprocess.STDOUT, | ||||||
|  |                         text=True, | ||||||
|  |                     ) | ||||||
|  |                 sys.stdout.write("\r" + " " * (len(message) + 4)) | ||||||
|  |                 sys.stdout.flush() | ||||||
|  |                 sys.stdout.write(resp.stdout) | ||||||
|  |         finally: | ||||||
|  |  | ||||||
|  |             @self.app.main_process_stop | ||||||
|  |             async def cleanup(*_):  # no cov | ||||||
|  |                 if self.tmpdir: | ||||||
|  |                     with suppress(FileNotFoundError): | ||||||
|  |                         self.key_path.unlink() | ||||||
|  |                         self.cert_path.unlink() | ||||||
|  |                     self.tmpdir.rmdir() | ||||||
|  |  | ||||||
|  |         context = CertSimple(self.cert_path, self.key_path) | ||||||
|  |         context.sanic["creator"] = "mkcert" | ||||||
|  |         context.sanic["localhost"] = localhost | ||||||
|  |         SanicSSLContext.create_from_ssl_context(context) | ||||||
|  |  | ||||||
|  |         return context | ||||||
|  |  | ||||||
|  |  | ||||||
|  | class TrustmeCreator(CertCreator): | ||||||
|  |     def check_supported(self) -> None: | ||||||
|  |         if not TRUSTME_INSTALLED: | ||||||
|  |             raise SanicException( | ||||||
|  |                 "Sanic is attempting to use trustme to generate local TLS " | ||||||
|  |                 "certificates since you did not supply a certificate, but " | ||||||
|  |                 "one is required. Sanic cannot proceed since trustme does not " | ||||||
|  |                 "appear to be installed. Alternatively, you can use mkcert. " | ||||||
|  |                 "Please install mkcert, trustme, or supply TLS certificates " | ||||||
|  |                 "to proceed. Installation instructions can be found here: " | ||||||
|  |                 "https://github.com/python-trio/trustme.\n" | ||||||
|  |                 "Find out more information about your options here: " | ||||||
|  |                 "https://sanic.dev/en/guide/deployment/development.html#" | ||||||
|  |                 "automatic-tls-certificate" | ||||||
|  |             ) | ||||||
|  |  | ||||||
|  |     def generate_cert(self, localhost: str) -> ssl.SSLContext: | ||||||
|  |         context = SanicSSLContext.create_from_ssl_context( | ||||||
|  |             ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER) | ||||||
|  |         ) | ||||||
|  |         context.sanic = { | ||||||
|  |             "cert": self.cert_path.absolute(), | ||||||
|  |             "key": self.key_path.absolute(), | ||||||
|  |         } | ||||||
|  |         ca = trustme.CA() | ||||||
|  |         server_cert = ca.issue_cert(localhost) | ||||||
|  |         server_cert.configure_cert(context) | ||||||
|  |         ca.configure_trust(context) | ||||||
|  |  | ||||||
|  |         ca.cert_pem.write_to_path(str(self.cert_path.absolute())) | ||||||
|  |         server_cert.private_key_and_cert_chain_pem.write_to_path( | ||||||
|  |             str(self.key_path.absolute()) | ||||||
|  |         ) | ||||||
|  |         context.sanic["creator"] = "trustme" | ||||||
|  |         context.sanic["localhost"] = localhost | ||||||
|  |  | ||||||
|  |         return context | ||||||
							
								
								
									
										66
									
								
								sanic/log.py
									
									
									
									
									
								
							
							
						
						
									
										66
									
								
								sanic/log.py
									
									
									
									
									
								
							| @@ -2,11 +2,24 @@ import logging | |||||||
| import sys | import sys | ||||||
|  |  | ||||||
| from enum import Enum | from enum import Enum | ||||||
| from typing import Any, Dict | from typing import TYPE_CHECKING, Any, Dict | ||||||
| from warnings import warn | from warnings import warn | ||||||
|  |  | ||||||
|  | from sanic.compat import is_atty | ||||||
|  |  | ||||||
| LOGGING_CONFIG_DEFAULTS: Dict[str, Any] = dict( |  | ||||||
|  | # 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: | ||||||
|  |     if not TYPE_CHECKING: | ||||||
|  |         from enum import StrEnum | ||||||
|  |  | ||||||
|  |  | ||||||
|  | LOGGING_CONFIG_DEFAULTS: Dict[str, Any] = dict(  # no cov | ||||||
|     version=1, |     version=1, | ||||||
|     disable_existing_loggers=False, |     disable_existing_loggers=False, | ||||||
|     loggers={ |     loggers={ | ||||||
| @@ -23,6 +36,12 @@ LOGGING_CONFIG_DEFAULTS: Dict[str, Any] = dict( | |||||||
|             "propagate": True, |             "propagate": True, | ||||||
|             "qualname": "sanic.access", |             "qualname": "sanic.access", | ||||||
|         }, |         }, | ||||||
|  |         "sanic.server": { | ||||||
|  |             "level": "INFO", | ||||||
|  |             "handlers": ["console"], | ||||||
|  |             "propagate": True, | ||||||
|  |             "qualname": "sanic.server", | ||||||
|  |         }, | ||||||
|     }, |     }, | ||||||
|     handlers={ |     handlers={ | ||||||
|         "console": { |         "console": { | ||||||
| @@ -55,35 +74,60 @@ LOGGING_CONFIG_DEFAULTS: Dict[str, Any] = dict( | |||||||
|         }, |         }, | ||||||
|     }, |     }, | ||||||
| ) | ) | ||||||
|  | """ | ||||||
|  | Defult logging configuration | ||||||
|  | """ | ||||||
|  |  | ||||||
|  |  | ||||||
| class Colors(str, Enum): | class Colors(StrEnum):  # no cov | ||||||
|     END = "\033[0m" |     END = "\033[0m" | ||||||
|     BLUE = "\033[01;34m" |     BOLD = "\033[1m" | ||||||
|     GREEN = "\033[01;32m" |     BLUE = "\033[34m" | ||||||
|  |     GREEN = "\033[32m" | ||||||
|  |     PURPLE = "\033[35m" | ||||||
|  |     RED = "\033[31m" | ||||||
|  |     SANIC = "\033[38;2;255;13;104m" | ||||||
|     YELLOW = "\033[01;33m" |     YELLOW = "\033[01;33m" | ||||||
|     RED = "\033[01;31m" |  | ||||||
|  |  | ||||||
|  |  | ||||||
| logger = logging.getLogger("sanic.root") | class VerbosityFilter(logging.Filter): | ||||||
|  |     verbosity: int = 0 | ||||||
|  |  | ||||||
|  |     def filter(self, record: logging.LogRecord) -> bool: | ||||||
|  |         verbosity = getattr(record, "verbosity", 0) | ||||||
|  |         return verbosity <= self.verbosity | ||||||
|  |  | ||||||
|  |  | ||||||
|  | _verbosity_filter = VerbosityFilter() | ||||||
|  |  | ||||||
|  | logger = logging.getLogger("sanic.root")  # no cov | ||||||
| """ | """ | ||||||
| General Sanic logger | General Sanic logger | ||||||
| """ | """ | ||||||
|  | logger.addFilter(_verbosity_filter) | ||||||
|  |  | ||||||
| error_logger = logging.getLogger("sanic.error") | error_logger = logging.getLogger("sanic.error")  # no cov | ||||||
| """ | """ | ||||||
| Logger used by Sanic for error logging | Logger used by Sanic for error logging | ||||||
| """ | """ | ||||||
|  | error_logger.addFilter(_verbosity_filter) | ||||||
|  |  | ||||||
| access_logger = logging.getLogger("sanic.access") | access_logger = logging.getLogger("sanic.access")  # no cov | ||||||
| """ | """ | ||||||
| Logger used by Sanic for access logging | Logger used by Sanic for access logging | ||||||
| """ | """ | ||||||
|  | access_logger.addFilter(_verbosity_filter) | ||||||
|  |  | ||||||
|  | server_logger = logging.getLogger("sanic.server")  # no cov | ||||||
|  | """ | ||||||
|  | Logger used by Sanic for server related messages | ||||||
|  | """ | ||||||
|  | logger.addFilter(_verbosity_filter) | ||||||
|  |  | ||||||
|  |  | ||||||
| def deprecation(message: str, version: float): | def deprecation(message: str, version: float):  # no cov | ||||||
|     version_info = f"[DEPRECATION v{version}] " |     version_info = f"[DEPRECATION v{version}] " | ||||||
|     if sys.stdout.isatty(): |     if is_atty(): | ||||||
|         version_info = f"{Colors.RED}{version_info}" |         version_info = f"{Colors.RED}{version_info}" | ||||||
|         message = f"{Colors.YELLOW}{message}{Colors.END}" |         message = f"{Colors.YELLOW}{message}{Colors.END}" | ||||||
|     warn(version_info + message, DeprecationWarning) |     warn(version_info + message, DeprecationWarning) | ||||||
|   | |||||||
							
								
								
									
										69
									
								
								sanic/middleware.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										69
									
								
								sanic/middleware.py
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,69 @@ | |||||||
|  | from __future__ import annotations | ||||||
|  |  | ||||||
|  | from collections import deque | ||||||
|  | from enum import IntEnum, auto | ||||||
|  | from itertools import count | ||||||
|  | from typing import Deque, Sequence, Union | ||||||
|  |  | ||||||
|  | from sanic.models.handler_types import MiddlewareType | ||||||
|  |  | ||||||
|  |  | ||||||
|  | class MiddlewareLocation(IntEnum): | ||||||
|  |     REQUEST = auto() | ||||||
|  |     RESPONSE = auto() | ||||||
|  |  | ||||||
|  |  | ||||||
|  | class Middleware: | ||||||
|  |     _counter = count() | ||||||
|  |  | ||||||
|  |     __slots__ = ("func", "priority", "location", "definition") | ||||||
|  |  | ||||||
|  |     def __init__( | ||||||
|  |         self, | ||||||
|  |         func: MiddlewareType, | ||||||
|  |         location: MiddlewareLocation, | ||||||
|  |         priority: int = 0, | ||||||
|  |     ) -> None: | ||||||
|  |         self.func = func | ||||||
|  |         self.priority = priority | ||||||
|  |         self.location = location | ||||||
|  |         self.definition = next(Middleware._counter) | ||||||
|  |  | ||||||
|  |     def __call__(self, *args, **kwargs): | ||||||
|  |         return self.func(*args, **kwargs) | ||||||
|  |  | ||||||
|  |     def __hash__(self) -> int: | ||||||
|  |         return hash(self.func) | ||||||
|  |  | ||||||
|  |     def __repr__(self) -> str: | ||||||
|  |         return ( | ||||||
|  |             f"{self.__class__.__name__}(" | ||||||
|  |             f"func=<function {self.func.__name__}>, " | ||||||
|  |             f"priority={self.priority}, " | ||||||
|  |             f"location={self.location.name})" | ||||||
|  |         ) | ||||||
|  |  | ||||||
|  |     @property | ||||||
|  |     def order(self): | ||||||
|  |         return (self.priority, -self.definition) | ||||||
|  |  | ||||||
|  |     @classmethod | ||||||
|  |     def convert( | ||||||
|  |         cls, | ||||||
|  |         *middleware_collections: Sequence[Union[Middleware, MiddlewareType]], | ||||||
|  |         location: MiddlewareLocation, | ||||||
|  |     ) -> Deque[Middleware]: | ||||||
|  |         return deque( | ||||||
|  |             [ | ||||||
|  |                 middleware | ||||||
|  |                 if isinstance(middleware, Middleware) | ||||||
|  |                 else Middleware(middleware, location) | ||||||
|  |                 for collection in middleware_collections | ||||||
|  |                 for middleware in collection | ||||||
|  |             ] | ||||||
|  |         ) | ||||||
|  |  | ||||||
|  |     @classmethod | ||||||
|  |     def reset_count(cls): | ||||||
|  |         cls._counter = count() | ||||||
|  |         cls.count = next(cls._counter) | ||||||
| @@ -1,8 +1,9 @@ | |||||||
| from enum import Enum, auto | from enum import Enum, auto | ||||||
| from functools import partial | from functools import partial | ||||||
| from typing import List, Optional, Union | from typing import Callable, List, Optional, Union, overload | ||||||
|  |  | ||||||
| from sanic.base.meta import SanicMeta | from sanic.base.meta import SanicMeta | ||||||
|  | from sanic.exceptions import BadRequest | ||||||
| from sanic.models.futures import FutureListener | from sanic.models.futures import FutureListener | ||||||
| from sanic.models.handler_types import ListenerType, Sanic | from sanic.models.handler_types import ListenerType, Sanic | ||||||
|  |  | ||||||
| @@ -16,7 +17,12 @@ class ListenerEvent(str, Enum): | |||||||
|     BEFORE_SERVER_STOP = "server.shutdown.before" |     BEFORE_SERVER_STOP = "server.shutdown.before" | ||||||
|     AFTER_SERVER_STOP = "server.shutdown.after" |     AFTER_SERVER_STOP = "server.shutdown.after" | ||||||
|     MAIN_PROCESS_START = auto() |     MAIN_PROCESS_START = auto() | ||||||
|  |     MAIN_PROCESS_READY = auto() | ||||||
|     MAIN_PROCESS_STOP = auto() |     MAIN_PROCESS_STOP = auto() | ||||||
|  |     RELOAD_PROCESS_START = auto() | ||||||
|  |     RELOAD_PROCESS_STOP = auto() | ||||||
|  |     BEFORE_RELOAD_TRIGGER = auto() | ||||||
|  |     AFTER_RELOAD_TRIGGER = auto() | ||||||
|  |  | ||||||
|  |  | ||||||
| class ListenerMixin(metaclass=SanicMeta): | class ListenerMixin(metaclass=SanicMeta): | ||||||
| @@ -26,12 +32,33 @@ class ListenerMixin(metaclass=SanicMeta): | |||||||
|     def _apply_listener(self, listener: FutureListener): |     def _apply_listener(self, listener: FutureListener): | ||||||
|         raise NotImplementedError  # noqa |         raise NotImplementedError  # noqa | ||||||
|  |  | ||||||
|  |     @overload | ||||||
|  |     def listener( | ||||||
|  |         self, | ||||||
|  |         listener_or_event: ListenerType[Sanic], | ||||||
|  |         event_or_none: str, | ||||||
|  |         apply: bool = ..., | ||||||
|  |     ) -> ListenerType[Sanic]: | ||||||
|  |         ... | ||||||
|  |  | ||||||
|  |     @overload | ||||||
|  |     def listener( | ||||||
|  |         self, | ||||||
|  |         listener_or_event: str, | ||||||
|  |         event_or_none: None = ..., | ||||||
|  |         apply: bool = ..., | ||||||
|  |     ) -> Callable[[ListenerType[Sanic]], ListenerType[Sanic]]: | ||||||
|  |         ... | ||||||
|  |  | ||||||
|     def listener( |     def listener( | ||||||
|         self, |         self, | ||||||
|         listener_or_event: Union[ListenerType[Sanic], str], |         listener_or_event: Union[ListenerType[Sanic], str], | ||||||
|         event_or_none: Optional[str] = None, |         event_or_none: Optional[str] = None, | ||||||
|         apply: bool = True, |         apply: bool = True, | ||||||
|     ) -> ListenerType[Sanic]: |     ) -> Union[ | ||||||
|  |         ListenerType[Sanic], | ||||||
|  |         Callable[[ListenerType[Sanic]], ListenerType[Sanic]], | ||||||
|  |     ]: | ||||||
|         """ |         """ | ||||||
|         Create a listener from a decorated function. |         Create a listener from a decorated function. | ||||||
|  |  | ||||||
| @@ -49,7 +76,9 @@ class ListenerMixin(metaclass=SanicMeta): | |||||||
|         :param event: event to listen to |         :param event: event to listen to | ||||||
|         """ |         """ | ||||||
|  |  | ||||||
|         def register_listener(listener, event): |         def register_listener( | ||||||
|  |             listener: ListenerType[Sanic], event: str | ||||||
|  |         ) -> ListenerType[Sanic]: | ||||||
|             nonlocal apply |             nonlocal apply | ||||||
|  |  | ||||||
|             future_listener = FutureListener(listener, event) |             future_listener = FutureListener(listener, event) | ||||||
| @@ -59,6 +88,10 @@ class ListenerMixin(metaclass=SanicMeta): | |||||||
|             return listener |             return listener | ||||||
|  |  | ||||||
|         if callable(listener_or_event): |         if callable(listener_or_event): | ||||||
|  |             if event_or_none is None: | ||||||
|  |                 raise BadRequest( | ||||||
|  |                     "Invalid event registration: Missing event name." | ||||||
|  |                 ) | ||||||
|             return register_listener(listener_or_event, event_or_none) |             return register_listener(listener_or_event, event_or_none) | ||||||
|         else: |         else: | ||||||
|             return partial(register_listener, event=listener_or_event) |             return partial(register_listener, event=listener_or_event) | ||||||
| @@ -68,11 +101,36 @@ class ListenerMixin(metaclass=SanicMeta): | |||||||
|     ) -> ListenerType[Sanic]: |     ) -> ListenerType[Sanic]: | ||||||
|         return self.listener(listener, "main_process_start") |         return self.listener(listener, "main_process_start") | ||||||
|  |  | ||||||
|  |     def main_process_ready( | ||||||
|  |         self, listener: ListenerType[Sanic] | ||||||
|  |     ) -> ListenerType[Sanic]: | ||||||
|  |         return self.listener(listener, "main_process_ready") | ||||||
|  |  | ||||||
|     def main_process_stop( |     def main_process_stop( | ||||||
|         self, listener: ListenerType[Sanic] |         self, listener: ListenerType[Sanic] | ||||||
|     ) -> ListenerType[Sanic]: |     ) -> ListenerType[Sanic]: | ||||||
|         return self.listener(listener, "main_process_stop") |         return self.listener(listener, "main_process_stop") | ||||||
|  |  | ||||||
|  |     def reload_process_start( | ||||||
|  |         self, listener: ListenerType[Sanic] | ||||||
|  |     ) -> ListenerType[Sanic]: | ||||||
|  |         return self.listener(listener, "reload_process_start") | ||||||
|  |  | ||||||
|  |     def reload_process_stop( | ||||||
|  |         self, listener: ListenerType[Sanic] | ||||||
|  |     ) -> ListenerType[Sanic]: | ||||||
|  |         return self.listener(listener, "reload_process_stop") | ||||||
|  |  | ||||||
|  |     def before_reload_trigger( | ||||||
|  |         self, listener: ListenerType[Sanic] | ||||||
|  |     ) -> ListenerType[Sanic]: | ||||||
|  |         return self.listener(listener, "before_reload_trigger") | ||||||
|  |  | ||||||
|  |     def after_reload_trigger( | ||||||
|  |         self, listener: ListenerType[Sanic] | ||||||
|  |     ) -> ListenerType[Sanic]: | ||||||
|  |         return self.listener(listener, "after_reload_trigger") | ||||||
|  |  | ||||||
|     def before_server_start( |     def before_server_start( | ||||||
|         self, listener: ListenerType[Sanic] |         self, listener: ListenerType[Sanic] | ||||||
|     ) -> ListenerType[Sanic]: |     ) -> ListenerType[Sanic]: | ||||||
|   | |||||||
| @@ -1,11 +1,17 @@ | |||||||
|  | from collections import deque | ||||||
| from functools import partial | from functools import partial | ||||||
|  | from operator import attrgetter | ||||||
| from typing import List | from typing import List | ||||||
|  |  | ||||||
| from sanic.base.meta import SanicMeta | from sanic.base.meta import SanicMeta | ||||||
|  | from sanic.middleware import Middleware, MiddlewareLocation | ||||||
| from sanic.models.futures import FutureMiddleware | from sanic.models.futures import FutureMiddleware | ||||||
|  | from sanic.router import Router | ||||||
|  |  | ||||||
|  |  | ||||||
| class MiddlewareMixin(metaclass=SanicMeta): | class MiddlewareMixin(metaclass=SanicMeta): | ||||||
|  |     router: Router | ||||||
|  |  | ||||||
|     def __init__(self, *args, **kwargs) -> None: |     def __init__(self, *args, **kwargs) -> None: | ||||||
|         self._future_middleware: List[FutureMiddleware] = [] |         self._future_middleware: List[FutureMiddleware] = [] | ||||||
|  |  | ||||||
| @@ -13,12 +19,17 @@ class MiddlewareMixin(metaclass=SanicMeta): | |||||||
|         raise NotImplementedError  # noqa |         raise NotImplementedError  # noqa | ||||||
|  |  | ||||||
|     def middleware( |     def middleware( | ||||||
|         self, middleware_or_request, attach_to="request", apply=True |         self, | ||||||
|  |         middleware_or_request, | ||||||
|  |         attach_to="request", | ||||||
|  |         apply=True, | ||||||
|  |         *, | ||||||
|  |         priority=0 | ||||||
|     ): |     ): | ||||||
|         """ |         """ | ||||||
|         Decorate and register middleware to be called before a request. |         Decorate and register middleware to be called before a request | ||||||
|         Can either be called as *@app.middleware* or |         is handled or after a response is created. Can either be called as | ||||||
|         *@app.middleware('request')* |         *@app.middleware* or *@app.middleware('request')*. | ||||||
|  |  | ||||||
|         `See user guide re: middleware |         `See user guide re: middleware | ||||||
|         <https://sanicframework.org/guide/basics/middleware.html>`__ |         <https://sanicframework.org/guide/basics/middleware.html>`__ | ||||||
| @@ -30,6 +41,12 @@ class MiddlewareMixin(metaclass=SanicMeta): | |||||||
|         def register_middleware(middleware, attach_to="request"): |         def register_middleware(middleware, attach_to="request"): | ||||||
|             nonlocal apply |             nonlocal apply | ||||||
|  |  | ||||||
|  |             location = ( | ||||||
|  |                 MiddlewareLocation.REQUEST | ||||||
|  |                 if attach_to == "request" | ||||||
|  |                 else MiddlewareLocation.RESPONSE | ||||||
|  |             ) | ||||||
|  |             middleware = Middleware(middleware, location, priority=priority) | ||||||
|             future_middleware = FutureMiddleware(middleware, attach_to) |             future_middleware = FutureMiddleware(middleware, attach_to) | ||||||
|             self._future_middleware.append(future_middleware) |             self._future_middleware.append(future_middleware) | ||||||
|             if apply: |             if apply: | ||||||
| @@ -46,14 +63,80 @@ class MiddlewareMixin(metaclass=SanicMeta): | |||||||
|                 register_middleware, attach_to=middleware_or_request |                 register_middleware, attach_to=middleware_or_request | ||||||
|             ) |             ) | ||||||
|  |  | ||||||
|     def on_request(self, middleware=None): |     def on_request(self, middleware=None, *, priority=0): | ||||||
|         if callable(middleware): |         """Register a middleware to be called before a request is handled. | ||||||
|             return self.middleware(middleware, "request") |  | ||||||
|         else: |  | ||||||
|             return partial(self.middleware, attach_to="request") |  | ||||||
|  |  | ||||||
|     def on_response(self, middleware=None): |         This is the same as *@app.middleware('request')*. | ||||||
|  |  | ||||||
|  |         :param: middleware: A callable that takes in request. | ||||||
|  |         """ | ||||||
|         if callable(middleware): |         if callable(middleware): | ||||||
|             return self.middleware(middleware, "response") |             return self.middleware(middleware, "request", priority=priority) | ||||||
|         else: |         else: | ||||||
|             return partial(self.middleware, attach_to="response") |             return partial( | ||||||
|  |                 self.middleware, attach_to="request", priority=priority | ||||||
|  |             ) | ||||||
|  |  | ||||||
|  |     def on_response(self, middleware=None, *, priority=0): | ||||||
|  |         """Register a middleware to be called after a response is created. | ||||||
|  |  | ||||||
|  |         This is the same as *@app.middleware('response')*. | ||||||
|  |  | ||||||
|  |         :param: middleware: | ||||||
|  |             A callable that takes in a request and its response. | ||||||
|  |         """ | ||||||
|  |         if callable(middleware): | ||||||
|  |             return self.middleware(middleware, "response", priority=priority) | ||||||
|  |         else: | ||||||
|  |             return partial( | ||||||
|  |                 self.middleware, attach_to="response", priority=priority | ||||||
|  |             ) | ||||||
|  |  | ||||||
|  |     def finalize_middleware(self): | ||||||
|  |         for route in self.router.routes: | ||||||
|  |             request_middleware = Middleware.convert( | ||||||
|  |                 self.request_middleware, | ||||||
|  |                 self.named_request_middleware.get(route.name, deque()), | ||||||
|  |                 location=MiddlewareLocation.REQUEST, | ||||||
|  |             ) | ||||||
|  |             response_middleware = Middleware.convert( | ||||||
|  |                 self.response_middleware, | ||||||
|  |                 self.named_response_middleware.get(route.name, deque()), | ||||||
|  |                 location=MiddlewareLocation.RESPONSE, | ||||||
|  |             ) | ||||||
|  |             route.extra.request_middleware = deque( | ||||||
|  |                 sorted( | ||||||
|  |                     request_middleware, | ||||||
|  |                     key=attrgetter("order"), | ||||||
|  |                     reverse=True, | ||||||
|  |                 ) | ||||||
|  |             ) | ||||||
|  |             route.extra.response_middleware = deque( | ||||||
|  |                 sorted( | ||||||
|  |                     response_middleware, | ||||||
|  |                     key=attrgetter("order"), | ||||||
|  |                     reverse=True, | ||||||
|  |                 )[::-1] | ||||||
|  |             ) | ||||||
|  |         request_middleware = Middleware.convert( | ||||||
|  |             self.request_middleware, | ||||||
|  |             location=MiddlewareLocation.REQUEST, | ||||||
|  |         ) | ||||||
|  |         response_middleware = Middleware.convert( | ||||||
|  |             self.response_middleware, | ||||||
|  |             location=MiddlewareLocation.RESPONSE, | ||||||
|  |         ) | ||||||
|  |         self.request_middleware = deque( | ||||||
|  |             sorted( | ||||||
|  |                 request_middleware, | ||||||
|  |                 key=attrgetter("order"), | ||||||
|  |                 reverse=True, | ||||||
|  |             ) | ||||||
|  |         ) | ||||||
|  |         self.response_middleware = deque( | ||||||
|  |             sorted( | ||||||
|  |                 response_middleware, | ||||||
|  |                 key=attrgetter("order"), | ||||||
|  |                 reverse=True, | ||||||
|  |             )[::-1] | ||||||
|  |         ) | ||||||
|   | |||||||
| @@ -1,47 +1,44 @@ | |||||||
| from ast import NodeVisitor, Return, parse | from ast import NodeVisitor, Return, parse | ||||||
| from contextlib import suppress | from contextlib import suppress | ||||||
|  | from email.utils import formatdate | ||||||
| from functools import partial, wraps | from functools import partial, wraps | ||||||
| from inspect import getsource, signature | from inspect import getsource, signature | ||||||
| from mimetypes import guess_type | from mimetypes import guess_type | ||||||
| from os import path | from os import path | ||||||
| from pathlib import PurePath | from pathlib import Path, PurePath | ||||||
| from re import sub |  | ||||||
| from textwrap import dedent | from textwrap import dedent | ||||||
| from time import gmtime, strftime | from typing import ( | ||||||
| from typing import Any, Callable, Iterable, List, Optional, Set, Tuple, Union |     Any, | ||||||
|  |     Callable, | ||||||
|  |     Dict, | ||||||
|  |     Iterable, | ||||||
|  |     List, | ||||||
|  |     Optional, | ||||||
|  |     Set, | ||||||
|  |     Tuple, | ||||||
|  |     Union, | ||||||
|  |     cast, | ||||||
|  | ) | ||||||
| from urllib.parse import unquote | from urllib.parse import unquote | ||||||
|  |  | ||||||
| from sanic_routing.route import Route  # type: ignore | from sanic_routing.route import Route | ||||||
|  |  | ||||||
| from sanic.base.meta import SanicMeta | from sanic.base.meta import SanicMeta | ||||||
| from sanic.compat import stat_async | from sanic.compat import stat_async | ||||||
| from sanic.constants import DEFAULT_HTTP_CONTENT_TYPE, HTTP_METHODS | from sanic.constants import DEFAULT_HTTP_CONTENT_TYPE, HTTP_METHODS | ||||||
| from sanic.errorpages import RESPONSE_MAPPING | from sanic.errorpages import RESPONSE_MAPPING | ||||||
| from sanic.exceptions import ( | from sanic.exceptions import FileNotFound, HeaderNotFound, RangeNotSatisfiable | ||||||
|     ContentRangeError, |  | ||||||
|     FileNotFound, |  | ||||||
|     HeaderNotFound, |  | ||||||
|     InvalidUsage, |  | ||||||
| ) |  | ||||||
| from sanic.handlers import ContentRangeHandler | from sanic.handlers import ContentRangeHandler | ||||||
| from sanic.log import deprecation, error_logger | from sanic.log import error_logger | ||||||
| from sanic.models.futures import FutureRoute, FutureStatic | from sanic.models.futures import FutureRoute, FutureStatic | ||||||
| from sanic.models.handler_types import RouteHandler | from sanic.models.handler_types import RouteHandler | ||||||
| from sanic.response import HTTPResponse, file, file_stream | from sanic.response import HTTPResponse, file, file_stream, validate_file | ||||||
| from sanic.types import HashableDict | from sanic.types import HashableDict | ||||||
|  |  | ||||||
|  |  | ||||||
| RouteWrapper = Callable[ | RouteWrapper = Callable[ | ||||||
|     [RouteHandler], Union[RouteHandler, Tuple[Route, RouteHandler]] |     [RouteHandler], Union[RouteHandler, Tuple[Route, RouteHandler]] | ||||||
| ] | ] | ||||||
| RESTRICTED_ROUTE_CONTEXT = ( |  | ||||||
|     "ignore_body", |  | ||||||
|     "stream", |  | ||||||
|     "hosts", |  | ||||||
|     "static", |  | ||||||
|     "error_format", |  | ||||||
|     "websocket", |  | ||||||
| ) |  | ||||||
|  |  | ||||||
|  |  | ||||||
| class RouteMixin(metaclass=SanicMeta): | class RouteMixin(metaclass=SanicMeta): | ||||||
| @@ -221,7 +218,8 @@ class RouteMixin(metaclass=SanicMeta): | |||||||
|         stream: bool = False, |         stream: bool = False, | ||||||
|         version_prefix: str = "/v", |         version_prefix: str = "/v", | ||||||
|         error_format: Optional[str] = None, |         error_format: Optional[str] = None, | ||||||
|         **ctx_kwargs, |         unquote: bool = False, | ||||||
|  |         **ctx_kwargs: Any, | ||||||
|     ) -> RouteHandler: |     ) -> RouteHandler: | ||||||
|         """A helper method to register class instance or |         """A helper method to register class instance or | ||||||
|         functions as a handler to the application url |         functions as a handler to the application url | ||||||
| @@ -267,6 +265,7 @@ class RouteMixin(metaclass=SanicMeta): | |||||||
|             name=name, |             name=name, | ||||||
|             version_prefix=version_prefix, |             version_prefix=version_prefix, | ||||||
|             error_format=error_format, |             error_format=error_format, | ||||||
|  |             unquote=unquote, | ||||||
|             **ctx_kwargs, |             **ctx_kwargs, | ||||||
|         )(handler) |         )(handler) | ||||||
|         return handler |         return handler | ||||||
| @@ -282,8 +281,8 @@ class RouteMixin(metaclass=SanicMeta): | |||||||
|         ignore_body: bool = True, |         ignore_body: bool = True, | ||||||
|         version_prefix: str = "/v", |         version_prefix: str = "/v", | ||||||
|         error_format: Optional[str] = None, |         error_format: Optional[str] = None, | ||||||
|         **ctx_kwargs, |         **ctx_kwargs: Any, | ||||||
|     ) -> RouteWrapper: |     ) -> RouteHandler: | ||||||
|         """ |         """ | ||||||
|         Add an API URL under the **GET** *HTTP* method |         Add an API URL under the **GET** *HTTP* method | ||||||
|  |  | ||||||
| @@ -299,17 +298,20 @@ class RouteMixin(metaclass=SanicMeta): | |||||||
|             will be appended to the route context (``route.ctx``) |             will be appended to the route context (``route.ctx``) | ||||||
|         :return: Object decorated with :func:`route` method |         :return: Object decorated with :func:`route` method | ||||||
|         """ |         """ | ||||||
|         return self.route( |         return cast( | ||||||
|             uri, |             RouteHandler, | ||||||
|             methods=frozenset({"GET"}), |             self.route( | ||||||
|             host=host, |                 uri, | ||||||
|             strict_slashes=strict_slashes, |                 methods=frozenset({"GET"}), | ||||||
|             version=version, |                 host=host, | ||||||
|             name=name, |                 strict_slashes=strict_slashes, | ||||||
|             ignore_body=ignore_body, |                 version=version, | ||||||
|             version_prefix=version_prefix, |                 name=name, | ||||||
|             error_format=error_format, |                 ignore_body=ignore_body, | ||||||
|             **ctx_kwargs, |                 version_prefix=version_prefix, | ||||||
|  |                 error_format=error_format, | ||||||
|  |                 **ctx_kwargs, | ||||||
|  |             ), | ||||||
|         ) |         ) | ||||||
|  |  | ||||||
|     def post( |     def post( | ||||||
| @@ -322,8 +324,8 @@ class RouteMixin(metaclass=SanicMeta): | |||||||
|         name: Optional[str] = None, |         name: Optional[str] = None, | ||||||
|         version_prefix: str = "/v", |         version_prefix: str = "/v", | ||||||
|         error_format: Optional[str] = None, |         error_format: Optional[str] = None, | ||||||
|         **ctx_kwargs, |         **ctx_kwargs: Any, | ||||||
|     ) -> RouteWrapper: |     ) -> RouteHandler: | ||||||
|         """ |         """ | ||||||
|         Add an API URL under the **POST** *HTTP* method |         Add an API URL under the **POST** *HTTP* method | ||||||
|  |  | ||||||
| @@ -339,17 +341,20 @@ class RouteMixin(metaclass=SanicMeta): | |||||||
|             will be appended to the route context (``route.ctx``) |             will be appended to the route context (``route.ctx``) | ||||||
|         :return: Object decorated with :func:`route` method |         :return: Object decorated with :func:`route` method | ||||||
|         """ |         """ | ||||||
|         return self.route( |         return cast( | ||||||
|             uri, |             RouteHandler, | ||||||
|             methods=frozenset({"POST"}), |             self.route( | ||||||
|             host=host, |                 uri, | ||||||
|             strict_slashes=strict_slashes, |                 methods=frozenset({"POST"}), | ||||||
|             stream=stream, |                 host=host, | ||||||
|             version=version, |                 strict_slashes=strict_slashes, | ||||||
|             name=name, |                 stream=stream, | ||||||
|             version_prefix=version_prefix, |                 version=version, | ||||||
|             error_format=error_format, |                 name=name, | ||||||
|             **ctx_kwargs, |                 version_prefix=version_prefix, | ||||||
|  |                 error_format=error_format, | ||||||
|  |                 **ctx_kwargs, | ||||||
|  |             ), | ||||||
|         ) |         ) | ||||||
|  |  | ||||||
|     def put( |     def put( | ||||||
| @@ -362,8 +367,8 @@ class RouteMixin(metaclass=SanicMeta): | |||||||
|         name: Optional[str] = None, |         name: Optional[str] = None, | ||||||
|         version_prefix: str = "/v", |         version_prefix: str = "/v", | ||||||
|         error_format: Optional[str] = None, |         error_format: Optional[str] = None, | ||||||
|         **ctx_kwargs, |         **ctx_kwargs: Any, | ||||||
|     ) -> RouteWrapper: |     ) -> RouteHandler: | ||||||
|         """ |         """ | ||||||
|         Add an API URL under the **PUT** *HTTP* method |         Add an API URL under the **PUT** *HTTP* method | ||||||
|  |  | ||||||
| @@ -379,17 +384,20 @@ class RouteMixin(metaclass=SanicMeta): | |||||||
|             will be appended to the route context (``route.ctx``) |             will be appended to the route context (``route.ctx``) | ||||||
|         :return: Object decorated with :func:`route` method |         :return: Object decorated with :func:`route` method | ||||||
|         """ |         """ | ||||||
|         return self.route( |         return cast( | ||||||
|             uri, |             RouteHandler, | ||||||
|             methods=frozenset({"PUT"}), |             self.route( | ||||||
|             host=host, |                 uri, | ||||||
|             strict_slashes=strict_slashes, |                 methods=frozenset({"PUT"}), | ||||||
|             stream=stream, |                 host=host, | ||||||
|             version=version, |                 strict_slashes=strict_slashes, | ||||||
|             name=name, |                 stream=stream, | ||||||
|             version_prefix=version_prefix, |                 version=version, | ||||||
|             error_format=error_format, |                 name=name, | ||||||
|             **ctx_kwargs, |                 version_prefix=version_prefix, | ||||||
|  |                 error_format=error_format, | ||||||
|  |                 **ctx_kwargs, | ||||||
|  |             ), | ||||||
|         ) |         ) | ||||||
|  |  | ||||||
|     def head( |     def head( | ||||||
| @@ -402,8 +410,8 @@ class RouteMixin(metaclass=SanicMeta): | |||||||
|         ignore_body: bool = True, |         ignore_body: bool = True, | ||||||
|         version_prefix: str = "/v", |         version_prefix: str = "/v", | ||||||
|         error_format: Optional[str] = None, |         error_format: Optional[str] = None, | ||||||
|         **ctx_kwargs, |         **ctx_kwargs: Any, | ||||||
|     ) -> RouteWrapper: |     ) -> RouteHandler: | ||||||
|         """ |         """ | ||||||
|         Add an API URL under the **HEAD** *HTTP* method |         Add an API URL under the **HEAD** *HTTP* method | ||||||
|  |  | ||||||
| @@ -427,17 +435,20 @@ class RouteMixin(metaclass=SanicMeta): | |||||||
|             will be appended to the route context (``route.ctx``) |             will be appended to the route context (``route.ctx``) | ||||||
|         :return: Object decorated with :func:`route` method |         :return: Object decorated with :func:`route` method | ||||||
|         """ |         """ | ||||||
|         return self.route( |         return cast( | ||||||
|             uri, |             RouteHandler, | ||||||
|             methods=frozenset({"HEAD"}), |             self.route( | ||||||
|             host=host, |                 uri, | ||||||
|             strict_slashes=strict_slashes, |                 methods=frozenset({"HEAD"}), | ||||||
|             version=version, |                 host=host, | ||||||
|             name=name, |                 strict_slashes=strict_slashes, | ||||||
|             ignore_body=ignore_body, |                 version=version, | ||||||
|             version_prefix=version_prefix, |                 name=name, | ||||||
|             error_format=error_format, |                 ignore_body=ignore_body, | ||||||
|             **ctx_kwargs, |                 version_prefix=version_prefix, | ||||||
|  |                 error_format=error_format, | ||||||
|  |                 **ctx_kwargs, | ||||||
|  |             ), | ||||||
|         ) |         ) | ||||||
|  |  | ||||||
|     def options( |     def options( | ||||||
| @@ -450,8 +461,8 @@ class RouteMixin(metaclass=SanicMeta): | |||||||
|         ignore_body: bool = True, |         ignore_body: bool = True, | ||||||
|         version_prefix: str = "/v", |         version_prefix: str = "/v", | ||||||
|         error_format: Optional[str] = None, |         error_format: Optional[str] = None, | ||||||
|         **ctx_kwargs, |         **ctx_kwargs: Any, | ||||||
|     ) -> RouteWrapper: |     ) -> RouteHandler: | ||||||
|         """ |         """ | ||||||
|         Add an API URL under the **OPTIONS** *HTTP* method |         Add an API URL under the **OPTIONS** *HTTP* method | ||||||
|  |  | ||||||
| @@ -475,17 +486,20 @@ class RouteMixin(metaclass=SanicMeta): | |||||||
|             will be appended to the route context (``route.ctx``) |             will be appended to the route context (``route.ctx``) | ||||||
|         :return: Object decorated with :func:`route` method |         :return: Object decorated with :func:`route` method | ||||||
|         """ |         """ | ||||||
|         return self.route( |         return cast( | ||||||
|             uri, |             RouteHandler, | ||||||
|             methods=frozenset({"OPTIONS"}), |             self.route( | ||||||
|             host=host, |                 uri, | ||||||
|             strict_slashes=strict_slashes, |                 methods=frozenset({"OPTIONS"}), | ||||||
|             version=version, |                 host=host, | ||||||
|             name=name, |                 strict_slashes=strict_slashes, | ||||||
|             ignore_body=ignore_body, |                 version=version, | ||||||
|             version_prefix=version_prefix, |                 name=name, | ||||||
|             error_format=error_format, |                 ignore_body=ignore_body, | ||||||
|             **ctx_kwargs, |                 version_prefix=version_prefix, | ||||||
|  |                 error_format=error_format, | ||||||
|  |                 **ctx_kwargs, | ||||||
|  |             ), | ||||||
|         ) |         ) | ||||||
|  |  | ||||||
|     def patch( |     def patch( | ||||||
| @@ -498,8 +512,8 @@ class RouteMixin(metaclass=SanicMeta): | |||||||
|         name: Optional[str] = None, |         name: Optional[str] = None, | ||||||
|         version_prefix: str = "/v", |         version_prefix: str = "/v", | ||||||
|         error_format: Optional[str] = None, |         error_format: Optional[str] = None, | ||||||
|         **ctx_kwargs, |         **ctx_kwargs: Any, | ||||||
|     ) -> RouteWrapper: |     ) -> RouteHandler: | ||||||
|         """ |         """ | ||||||
|         Add an API URL under the **PATCH** *HTTP* method |         Add an API URL under the **PATCH** *HTTP* method | ||||||
|  |  | ||||||
| @@ -525,17 +539,20 @@ class RouteMixin(metaclass=SanicMeta): | |||||||
|             will be appended to the route context (``route.ctx``) |             will be appended to the route context (``route.ctx``) | ||||||
|         :return: Object decorated with :func:`route` method |         :return: Object decorated with :func:`route` method | ||||||
|         """ |         """ | ||||||
|         return self.route( |         return cast( | ||||||
|             uri, |             RouteHandler, | ||||||
|             methods=frozenset({"PATCH"}), |             self.route( | ||||||
|             host=host, |                 uri, | ||||||
|             strict_slashes=strict_slashes, |                 methods=frozenset({"PATCH"}), | ||||||
|             stream=stream, |                 host=host, | ||||||
|             version=version, |                 strict_slashes=strict_slashes, | ||||||
|             name=name, |                 stream=stream, | ||||||
|             version_prefix=version_prefix, |                 version=version, | ||||||
|             error_format=error_format, |                 name=name, | ||||||
|             **ctx_kwargs, |                 version_prefix=version_prefix, | ||||||
|  |                 error_format=error_format, | ||||||
|  |                 **ctx_kwargs, | ||||||
|  |             ), | ||||||
|         ) |         ) | ||||||
|  |  | ||||||
|     def delete( |     def delete( | ||||||
| @@ -548,8 +565,8 @@ class RouteMixin(metaclass=SanicMeta): | |||||||
|         ignore_body: bool = True, |         ignore_body: bool = True, | ||||||
|         version_prefix: str = "/v", |         version_prefix: str = "/v", | ||||||
|         error_format: Optional[str] = None, |         error_format: Optional[str] = None, | ||||||
|         **ctx_kwargs, |         **ctx_kwargs: Any, | ||||||
|     ) -> RouteWrapper: |     ) -> RouteHandler: | ||||||
|         """ |         """ | ||||||
|         Add an API URL under the **DELETE** *HTTP* method |         Add an API URL under the **DELETE** *HTTP* method | ||||||
|  |  | ||||||
| @@ -565,17 +582,20 @@ class RouteMixin(metaclass=SanicMeta): | |||||||
|             will be appended to the route context (``route.ctx``) |             will be appended to the route context (``route.ctx``) | ||||||
|         :return: Object decorated with :func:`route` method |         :return: Object decorated with :func:`route` method | ||||||
|         """ |         """ | ||||||
|         return self.route( |         return cast( | ||||||
|             uri, |             RouteHandler, | ||||||
|             methods=frozenset({"DELETE"}), |             self.route( | ||||||
|             host=host, |                 uri, | ||||||
|             strict_slashes=strict_slashes, |                 methods=frozenset({"DELETE"}), | ||||||
|             version=version, |                 host=host, | ||||||
|             name=name, |                 strict_slashes=strict_slashes, | ||||||
|             ignore_body=ignore_body, |                 version=version, | ||||||
|             version_prefix=version_prefix, |                 name=name, | ||||||
|             error_format=error_format, |                 ignore_body=ignore_body, | ||||||
|             **ctx_kwargs, |                 version_prefix=version_prefix, | ||||||
|  |                 error_format=error_format, | ||||||
|  |                 **ctx_kwargs, | ||||||
|  |             ), | ||||||
|         ) |         ) | ||||||
|  |  | ||||||
|     def websocket( |     def websocket( | ||||||
| @@ -589,7 +609,7 @@ class RouteMixin(metaclass=SanicMeta): | |||||||
|         apply: bool = True, |         apply: bool = True, | ||||||
|         version_prefix: str = "/v", |         version_prefix: str = "/v", | ||||||
|         error_format: Optional[str] = None, |         error_format: Optional[str] = None, | ||||||
|         **ctx_kwargs, |         **ctx_kwargs: Any, | ||||||
|     ): |     ): | ||||||
|         """ |         """ | ||||||
|         Decorate a function to be registered as a websocket route |         Decorate a function to be registered as a websocket route | ||||||
| @@ -633,7 +653,7 @@ class RouteMixin(metaclass=SanicMeta): | |||||||
|         name: Optional[str] = None, |         name: Optional[str] = None, | ||||||
|         version_prefix: str = "/v", |         version_prefix: str = "/v", | ||||||
|         error_format: Optional[str] = None, |         error_format: Optional[str] = None, | ||||||
|         **ctx_kwargs, |         **ctx_kwargs: Any, | ||||||
|     ): |     ): | ||||||
|         """ |         """ | ||||||
|         A helper method to register a function as a websocket route. |         A helper method to register a function as a websocket route. | ||||||
| @@ -670,18 +690,18 @@ class RouteMixin(metaclass=SanicMeta): | |||||||
|  |  | ||||||
|     def static( |     def static( | ||||||
|         self, |         self, | ||||||
|         uri, |         uri: str, | ||||||
|         file_or_directory: Union[str, bytes, PurePath], |         file_or_directory: Union[str, bytes, PurePath], | ||||||
|         pattern=r"/?.+", |         pattern: str = r"/?.+", | ||||||
|         use_modified_since=True, |         use_modified_since: bool = True, | ||||||
|         use_content_range=False, |         use_content_range: bool = False, | ||||||
|         stream_large_files=False, |         stream_large_files: bool = False, | ||||||
|         name="static", |         name: str = "static", | ||||||
|         host=None, |         host: Optional[str] = None, | ||||||
|         strict_slashes=None, |         strict_slashes: Optional[bool] = None, | ||||||
|         content_type=None, |         content_type: Optional[bool] = None, | ||||||
|         apply=True, |         apply: bool = True, | ||||||
|         resource_type=None, |         resource_type: Optional[str] = None, | ||||||
|     ): |     ): | ||||||
|         """ |         """ | ||||||
|         Register a root to serve files from. The input can either be a |         Register a root to serve files from. The input can either be a | ||||||
| @@ -765,6 +785,37 @@ class RouteMixin(metaclass=SanicMeta): | |||||||
|  |  | ||||||
|         return name |         return name | ||||||
|  |  | ||||||
|  |     async def _get_file_path(self, file_or_directory, __file_uri__, not_found): | ||||||
|  |         file_path_raw = Path(unquote(file_or_directory)) | ||||||
|  |         root_path = file_path = file_path_raw.resolve() | ||||||
|  |  | ||||||
|  |         if __file_uri__: | ||||||
|  |             # Strip all / that in the beginning of the URL to help prevent | ||||||
|  |             # python from herping a derp and treating the uri as an | ||||||
|  |             # absolute path | ||||||
|  |             unquoted_file_uri = unquote(__file_uri__).lstrip("/") | ||||||
|  |             file_path_raw = Path(file_or_directory, unquoted_file_uri) | ||||||
|  |             file_path = file_path_raw.resolve() | ||||||
|  |             if ( | ||||||
|  |                 file_path < root_path and not file_path_raw.is_symlink() | ||||||
|  |             ) or ".." in file_path_raw.parts: | ||||||
|  |                 error_logger.exception( | ||||||
|  |                     f"File not found: path={file_or_directory}, " | ||||||
|  |                     f"relative_url={__file_uri__}" | ||||||
|  |                 ) | ||||||
|  |                 raise not_found | ||||||
|  |  | ||||||
|  |         try: | ||||||
|  |             file_path.relative_to(root_path) | ||||||
|  |         except ValueError: | ||||||
|  |             if not file_path_raw.is_symlink(): | ||||||
|  |                 error_logger.exception( | ||||||
|  |                     f"File not found: path={file_or_directory}, " | ||||||
|  |                     f"relative_url={__file_uri__}" | ||||||
|  |                 ) | ||||||
|  |                 raise not_found | ||||||
|  |         return file_path | ||||||
|  |  | ||||||
|     async def _static_request_handler( |     async def _static_request_handler( | ||||||
|         self, |         self, | ||||||
|         file_or_directory, |         file_or_directory, | ||||||
| @@ -775,32 +826,17 @@ class RouteMixin(metaclass=SanicMeta): | |||||||
|         content_type=None, |         content_type=None, | ||||||
|         __file_uri__=None, |         __file_uri__=None, | ||||||
|     ): |     ): | ||||||
|         # Using this to determine if the URL is trying to break out of the path |         not_found = FileNotFound( | ||||||
|         # served.  os.path.realpath seems to be very slow |             "File not found", | ||||||
|         if __file_uri__ and "../" in __file_uri__: |             path=file_or_directory, | ||||||
|             raise InvalidUsage("Invalid URL") |             relative_url=__file_uri__, | ||||||
|         # Merge served directory and requested file if provided |         ) | ||||||
|         # Strip all / that in the beginning of the URL to help prevent python |  | ||||||
|         # from herping a derp and treating the uri as an absolute path |         # Merge served directory and requested file if provided | ||||||
|         root_path = file_path = file_or_directory |         file_path = await self._get_file_path( | ||||||
|         if __file_uri__: |             file_or_directory, __file_uri__, not_found | ||||||
|             file_path = path.join( |         ) | ||||||
|                 file_or_directory, sub("^[/]*", "", __file_uri__) |  | ||||||
|             ) |  | ||||||
|  |  | ||||||
|         # URL decode the path sent by the browser otherwise we won't be able to |  | ||||||
|         # match filenames which got encoded (filenames with spaces etc) |  | ||||||
|         file_path = path.abspath(unquote(file_path)) |  | ||||||
|         if not file_path.startswith(path.abspath(unquote(root_path))): |  | ||||||
|             error_logger.exception( |  | ||||||
|                 f"File not found: path={file_or_directory}, " |  | ||||||
|                 f"relative_url={__file_uri__}" |  | ||||||
|             ) |  | ||||||
|             raise FileNotFound( |  | ||||||
|                 "File not found", |  | ||||||
|                 path=file_or_directory, |  | ||||||
|                 relative_url=__file_uri__, |  | ||||||
|             ) |  | ||||||
|         try: |         try: | ||||||
|             headers = {} |             headers = {} | ||||||
|             # Check if the client has been sent this file before |             # Check if the client has been sent this file before | ||||||
| @@ -808,15 +844,13 @@ class RouteMixin(metaclass=SanicMeta): | |||||||
|             stats = None |             stats = None | ||||||
|             if use_modified_since: |             if use_modified_since: | ||||||
|                 stats = await stat_async(file_path) |                 stats = await stat_async(file_path) | ||||||
|                 modified_since = strftime( |                 modified_since = stats.st_mtime | ||||||
|                     "%a, %d %b %Y %H:%M:%S GMT", gmtime(stats.st_mtime) |                 response = await validate_file(request.headers, modified_since) | ||||||
|  |                 if response: | ||||||
|  |                     return response | ||||||
|  |                 headers["Last-Modified"] = formatdate( | ||||||
|  |                     modified_since, usegmt=True | ||||||
|                 ) |                 ) | ||||||
|                 if ( |  | ||||||
|                     request.headers.getone("if-modified-since", None) |  | ||||||
|                     == modified_since |  | ||||||
|                 ): |  | ||||||
|                     return HTTPResponse(status=304) |  | ||||||
|                 headers["Last-Modified"] = modified_since |  | ||||||
|             _range = None |             _range = None | ||||||
|             if use_content_range: |             if use_content_range: | ||||||
|                 _range = None |                 _range = None | ||||||
| @@ -831,8 +865,7 @@ class RouteMixin(metaclass=SanicMeta): | |||||||
|                         pass |                         pass | ||||||
|                     else: |                     else: | ||||||
|                         del headers["Content-Length"] |                         del headers["Content-Length"] | ||||||
|                         for key, value in _range.headers.items(): |                         headers.update(_range.headers) | ||||||
|                             headers[key] = value |  | ||||||
|  |  | ||||||
|             if "content-type" not in headers: |             if "content-type" not in headers: | ||||||
|                 content_type = ( |                 content_type = ( | ||||||
| @@ -865,14 +898,10 @@ class RouteMixin(metaclass=SanicMeta): | |||||||
|                             file_path, headers=headers, _range=_range |                             file_path, headers=headers, _range=_range | ||||||
|                         ) |                         ) | ||||||
|                 return await file(file_path, headers=headers, _range=_range) |                 return await file(file_path, headers=headers, _range=_range) | ||||||
|         except ContentRangeError: |         except RangeNotSatisfiable: | ||||||
|             raise |             raise | ||||||
|         except FileNotFoundError: |         except FileNotFoundError: | ||||||
|             raise FileNotFound( |             raise not_found | ||||||
|                 "File not found", |  | ||||||
|                 path=file_or_directory, |  | ||||||
|                 relative_url=__file_uri__, |  | ||||||
|             ) |  | ||||||
|         except Exception: |         except Exception: | ||||||
|             error_logger.exception( |             error_logger.exception( | ||||||
|                 f"Exception in static request handler: " |                 f"Exception in static request handler: " | ||||||
| @@ -929,6 +958,7 @@ class RouteMixin(metaclass=SanicMeta): | |||||||
|         # serve from the folder |         # serve from the folder | ||||||
|         if not static.resource_type: |         if not static.resource_type: | ||||||
|             if not path.isfile(file_or_directory): |             if not path.isfile(file_or_directory): | ||||||
|  |                 uri = uri.rstrip("/") | ||||||
|                 uri += "/<__file_uri__:path>" |                 uri += "/<__file_uri__:path>" | ||||||
|         elif static.resource_type == "dir": |         elif static.resource_type == "dir": | ||||||
|             if path.isfile(file_or_directory): |             if path.isfile(file_or_directory): | ||||||
| @@ -936,6 +966,7 @@ class RouteMixin(metaclass=SanicMeta): | |||||||
|                     "Resource type improperly identified as directory. " |                     "Resource type improperly identified as directory. " | ||||||
|                     f"'{file_or_directory}'" |                     f"'{file_or_directory}'" | ||||||
|                 ) |                 ) | ||||||
|  |             uri = uri.rstrip("/") | ||||||
|             uri += "/<__file_uri__:path>" |             uri += "/<__file_uri__:path>" | ||||||
|         elif static.resource_type == "file" and not path.isfile( |         elif static.resource_type == "file" and not path.isfile( | ||||||
|             file_or_directory |             file_or_directory | ||||||
| @@ -994,17 +1025,6 @@ class RouteMixin(metaclass=SanicMeta): | |||||||
|                 nonlocal types |                 nonlocal types | ||||||
|  |  | ||||||
|                 with suppress(AttributeError): |                 with suppress(AttributeError): | ||||||
|                     if node.value.func.id == "stream":  # type: ignore |  | ||||||
|                         deprecation( |  | ||||||
|                             "The sanic.response.stream method has been " |  | ||||||
|                             "deprecated and will be removed in v22.6. Please " |  | ||||||
|                             "upgrade your application to use the new style " |  | ||||||
|                             "streaming pattern. See " |  | ||||||
|                             "https://sanicframework.org/en/guide/advanced/" |  | ||||||
|                             "streaming.html#response-streaming for more " |  | ||||||
|                             "information.", |  | ||||||
|                             22.6, |  | ||||||
|                         ) |  | ||||||
|                     checks = [node.value.func.id]  # type: ignore |                     checks = [node.value.func.id]  # type: ignore | ||||||
|                     if node.value.keywords:  # type: ignore |                     if node.value.keywords:  # type: ignore | ||||||
|                         checks += [ |                         checks += [ | ||||||
| @@ -1021,24 +1041,12 @@ class RouteMixin(metaclass=SanicMeta): | |||||||
|  |  | ||||||
|         return types |         return types | ||||||
|  |  | ||||||
|     def _build_route_context(self, raw): |     def _build_route_context(self, raw: Dict[str, Any]) -> HashableDict: | ||||||
|         ctx_kwargs = { |         ctx_kwargs = { | ||||||
|             key.replace("ctx_", ""): raw.pop(key) |             key.replace("ctx_", ""): raw.pop(key) | ||||||
|             for key in {**raw}.keys() |             for key in {**raw}.keys() | ||||||
|             if key.startswith("ctx_") |             if key.startswith("ctx_") | ||||||
|         } |         } | ||||||
|         restricted = [ |  | ||||||
|             key for key in ctx_kwargs.keys() if key in RESTRICTED_ROUTE_CONTEXT |  | ||||||
|         ] |  | ||||||
|         if restricted: |  | ||||||
|             restricted_arguments = ", ".join(restricted) |  | ||||||
|             raise AttributeError( |  | ||||||
|                 "Cannot use restricted route context: " |  | ||||||
|                 f"{restricted_arguments}. This limitation is only in place " |  | ||||||
|                 "until v22.3 when the restricted names will no longer be in" |  | ||||||
|                 "conflict. See https://github.com/sanic-org/sanic/issues/2303 " |  | ||||||
|                 "for more information." |  | ||||||
|             ) |  | ||||||
|         if raw: |         if raw: | ||||||
|             unexpected_arguments = ", ".join(raw.keys()) |             unexpected_arguments = ", ".join(raw.keys()) | ||||||
|             raise TypeError( |             raise TypeError( | ||||||
|   | |||||||
| @@ -20,7 +20,7 @@ class SignalMixin(metaclass=SanicMeta): | |||||||
|         event: Union[str, Enum], |         event: Union[str, Enum], | ||||||
|         *, |         *, | ||||||
|         apply: bool = True, |         apply: bool = True, | ||||||
|         condition: Dict[str, Any] = None, |         condition: Optional[Dict[str, Any]] = None, | ||||||
|         exclusive: bool = True, |         exclusive: bool = True, | ||||||
|     ) -> Callable[[SignalHandler], SignalHandler]: |     ) -> Callable[[SignalHandler], SignalHandler]: | ||||||
|         """ |         """ | ||||||
| @@ -64,7 +64,7 @@ class SignalMixin(metaclass=SanicMeta): | |||||||
|         self, |         self, | ||||||
|         handler: Optional[Callable[..., Any]], |         handler: Optional[Callable[..., Any]], | ||||||
|         event: str, |         event: str, | ||||||
|         condition: Dict[str, Any] = None, |         condition: Optional[Dict[str, Any]] = None, | ||||||
|         exclusive: bool = True, |         exclusive: bool = True, | ||||||
|     ): |     ): | ||||||
|         if not handler: |         if not handler: | ||||||
|   | |||||||
							
								
								
									
										1156
									
								
								sanic/mixins/startup.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1156
									
								
								sanic/mixins/startup.py
									
									
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @@ -3,7 +3,8 @@ import sys | |||||||
|  |  | ||||||
| from typing import Any, Awaitable, Callable, MutableMapping, Optional, Union | from typing import Any, Awaitable, Callable, MutableMapping, Optional, Union | ||||||
|  |  | ||||||
| from sanic.exceptions import InvalidUsage | from sanic.exceptions import BadRequest | ||||||
|  | from sanic.models.protocol_types import TransportProtocol | ||||||
| from sanic.server.websockets.connection import WebSocketConnection | from sanic.server.websockets.connection import WebSocketConnection | ||||||
|  |  | ||||||
|  |  | ||||||
| @@ -13,7 +14,7 @@ ASGISend = Callable[[ASGIMessage], Awaitable[None]] | |||||||
| ASGIReceive = Callable[[], Awaitable[ASGIMessage]] | ASGIReceive = Callable[[], Awaitable[ASGIMessage]] | ||||||
|  |  | ||||||
|  |  | ||||||
| class MockProtocol: | class MockProtocol:  # no cov | ||||||
|     def __init__(self, transport: "MockTransport", loop): |     def __init__(self, transport: "MockTransport", loop): | ||||||
|         # This should be refactored when < 3.8 support is dropped |         # This should be refactored when < 3.8 support is dropped | ||||||
|         self.transport = transport |         self.transport = transport | ||||||
| @@ -56,7 +57,7 @@ class MockProtocol: | |||||||
|         await self._not_paused.wait() |         await self._not_paused.wait() | ||||||
|  |  | ||||||
|  |  | ||||||
| class MockTransport: | class MockTransport(TransportProtocol):  # no cov | ||||||
|     _protocol: Optional[MockProtocol] |     _protocol: Optional[MockProtocol] | ||||||
|  |  | ||||||
|     def __init__( |     def __init__( | ||||||
| @@ -68,23 +69,25 @@ class MockTransport: | |||||||
|         self._protocol = None |         self._protocol = None | ||||||
|         self.loop = None |         self.loop = None | ||||||
|  |  | ||||||
|     def get_protocol(self) -> MockProtocol: |     def get_protocol(self) -> MockProtocol:  # type: ignore | ||||||
|         if not self._protocol: |         if not self._protocol: | ||||||
|             self._protocol = MockProtocol(self, self.loop) |             self._protocol = MockProtocol(self, self.loop) | ||||||
|         return self._protocol |         return self._protocol | ||||||
|  |  | ||||||
|     def get_extra_info(self, info: str) -> Union[str, bool, None]: |     def get_extra_info( | ||||||
|  |         self, info: str, default=None | ||||||
|  |     ) -> Optional[Union[str, bool]]: | ||||||
|         if info == "peername": |         if info == "peername": | ||||||
|             return self.scope.get("client") |             return self.scope.get("client") | ||||||
|         elif info == "sslcontext": |         elif info == "sslcontext": | ||||||
|             return self.scope.get("scheme") in ["https", "wss"] |             return self.scope.get("scheme") in ["https", "wss"] | ||||||
|         return None |         return default | ||||||
|  |  | ||||||
|     def get_websocket_connection(self) -> WebSocketConnection: |     def get_websocket_connection(self) -> WebSocketConnection: | ||||||
|         try: |         try: | ||||||
|             return self._websocket_connection |             return self._websocket_connection | ||||||
|         except AttributeError: |         except AttributeError: | ||||||
|             raise InvalidUsage("Improper websocket connection.") |             raise BadRequest("Improper websocket connection.") | ||||||
|  |  | ||||||
|     def create_websocket_connection( |     def create_websocket_connection( | ||||||
|         self, send: ASGISend, receive: ASGIReceive |         self, send: ASGISend, receive: ASGIReceive | ||||||
|   | |||||||
| @@ -1,11 +1,13 @@ | |||||||
| from asyncio.events import AbstractEventLoop | from asyncio.events import AbstractEventLoop | ||||||
| from typing import Any, Callable, Coroutine, Optional, TypeVar, Union | from typing import Any, Callable, Coroutine, Optional, TypeVar, Union | ||||||
|  |  | ||||||
|  | import sanic | ||||||
|  |  | ||||||
| from sanic.request import Request | from sanic.request import Request | ||||||
| from sanic.response import BaseHTTPResponse, HTTPResponse | from sanic.response import BaseHTTPResponse, HTTPResponse | ||||||
|  |  | ||||||
|  |  | ||||||
| Sanic = TypeVar("Sanic") | Sanic = TypeVar("Sanic", bound="sanic.Sanic") | ||||||
|  |  | ||||||
| MiddlewareResponse = Union[ | MiddlewareResponse = Union[ | ||||||
|     Optional[HTTPResponse], Coroutine[Any, Any, Optional[HTTPResponse]] |     Optional[HTTPResponse], Coroutine[Any, Any, Optional[HTTPResponse]] | ||||||
| @@ -18,8 +20,9 @@ ErrorMiddlewareType = Callable[ | |||||||
|     [Request, BaseException], Optional[Coroutine[Any, Any, None]] |     [Request, BaseException], Optional[Coroutine[Any, Any, None]] | ||||||
| ] | ] | ||||||
| MiddlewareType = Union[RequestMiddlewareType, ResponseMiddlewareType] | MiddlewareType = Union[RequestMiddlewareType, ResponseMiddlewareType] | ||||||
| ListenerType = Callable[ | ListenerType = Union[ | ||||||
|     [Sanic, AbstractEventLoop], Optional[Coroutine[Any, Any, None]] |     Callable[[Sanic], Optional[Coroutine[Any, Any, None]]], | ||||||
|  |     Callable[[Sanic, AbstractEventLoop], Optional[Coroutine[Any, Any, None]]], | ||||||
| ] | ] | ||||||
| RouteHandler = Callable[..., Coroutine[Any, Any, Optional[HTTPResponse]]] | RouteHandler = Callable[..., Coroutine[Any, Any, Optional[HTTPResponse]]] | ||||||
| SignalHandler = Callable[..., Coroutine[Any, Any, None]] | SignalHandler = Callable[..., Coroutine[Any, Any, None]] | ||||||
|   | |||||||
							
								
								
									
										35
									
								
								sanic/models/http_types.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										35
									
								
								sanic/models/http_types.py
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,35 @@ | |||||||
|  | from __future__ import annotations | ||||||
|  |  | ||||||
|  | from base64 import b64decode | ||||||
|  | from dataclasses import dataclass, field | ||||||
|  | from typing import Optional | ||||||
|  |  | ||||||
|  |  | ||||||
|  | @dataclass() | ||||||
|  | class Credentials: | ||||||
|  |     auth_type: Optional[str] | ||||||
|  |     token: Optional[str] | ||||||
|  |     _username: Optional[str] = field(default=None) | ||||||
|  |     _password: Optional[str] = field(default=None) | ||||||
|  |  | ||||||
|  |     def __post_init__(self): | ||||||
|  |         if self._auth_is_basic: | ||||||
|  |             self._username, self._password = ( | ||||||
|  |                 b64decode(self.token.encode("utf-8")).decode().split(":") | ||||||
|  |             ) | ||||||
|  |  | ||||||
|  |     @property | ||||||
|  |     def username(self): | ||||||
|  |         if not self._auth_is_basic: | ||||||
|  |             raise AttributeError("Username is available for Basic Auth only") | ||||||
|  |         return self._username | ||||||
|  |  | ||||||
|  |     @property | ||||||
|  |     def password(self): | ||||||
|  |         if not self._auth_is_basic: | ||||||
|  |             raise AttributeError("Password is available for Basic Auth only") | ||||||
|  |         return self._password | ||||||
|  |  | ||||||
|  |     @property | ||||||
|  |     def _auth_is_basic(self) -> bool: | ||||||
|  |         return self.auth_type == "Basic" | ||||||
| @@ -1,28 +1,22 @@ | |||||||
|  | from __future__ import annotations | ||||||
|  |  | ||||||
| import sys | import sys | ||||||
|  |  | ||||||
| from typing import Any, AnyStr, TypeVar, Union | from asyncio import BaseTransport | ||||||
|  | from typing import TYPE_CHECKING, Any, AnyStr | ||||||
|  |  | ||||||
|  |  | ||||||
|  | if TYPE_CHECKING: | ||||||
|  |     from sanic.models.asgi import ASGIScope | ||||||
|  |  | ||||||
|  |  | ||||||
| if sys.version_info < (3, 8): | if sys.version_info < (3, 8): | ||||||
|     from asyncio import BaseTransport |  | ||||||
|  |  | ||||||
|     # from sanic.models.asgi import MockTransport |  | ||||||
|     MockTransport = TypeVar("MockTransport") |  | ||||||
|  |  | ||||||
|     TransportProtocol = Union[MockTransport, BaseTransport] |  | ||||||
|     Range = Any |     Range = Any | ||||||
|     HTMLProtocol = Any |     HTMLProtocol = Any | ||||||
| else: | else: | ||||||
|     # Protocol is a 3.8+ feature |     # Protocol is a 3.8+ feature | ||||||
|     from typing import Protocol |     from typing import Protocol | ||||||
|  |  | ||||||
|     class TransportProtocol(Protocol): |  | ||||||
|         def get_protocol(self): |  | ||||||
|             ... |  | ||||||
|  |  | ||||||
|         def get_extra_info(self, info: str) -> Union[str, bool, None]: |  | ||||||
|             ... |  | ||||||
|  |  | ||||||
|     class HTMLProtocol(Protocol): |     class HTMLProtocol(Protocol): | ||||||
|         def __html__(self) -> AnyStr: |         def __html__(self) -> AnyStr: | ||||||
|             ... |             ... | ||||||
| @@ -42,3 +36,8 @@ else: | |||||||
|  |  | ||||||
|         def total(self) -> int: |         def total(self) -> int: | ||||||
|             ... |             ... | ||||||
|  |  | ||||||
|  |  | ||||||
|  | class TransportProtocol(BaseTransport): | ||||||
|  |     scope: ASGIScope | ||||||
|  |     __slots__ = () | ||||||
|   | |||||||
| @@ -1,6 +1,8 @@ | |||||||
| from ssl import SSLObject | from __future__ import annotations | ||||||
|  |  | ||||||
|  | from ssl import SSLContext, SSLObject | ||||||
| from types import SimpleNamespace | from types import SimpleNamespace | ||||||
| from typing import Any, Dict, Optional | from typing import Any, Dict, List, Optional | ||||||
|  |  | ||||||
| from sanic.models.protocol_types import TransportProtocol | from sanic.models.protocol_types import TransportProtocol | ||||||
|  |  | ||||||
| @@ -19,6 +21,7 @@ class ConnInfo: | |||||||
|         "client", |         "client", | ||||||
|         "client_ip", |         "client_ip", | ||||||
|         "ctx", |         "ctx", | ||||||
|  |         "lost", | ||||||
|         "peername", |         "peername", | ||||||
|         "server_port", |         "server_port", | ||||||
|         "server", |         "server", | ||||||
| @@ -26,10 +29,12 @@ class ConnInfo: | |||||||
|         "sockname", |         "sockname", | ||||||
|         "ssl", |         "ssl", | ||||||
|         "cert", |         "cert", | ||||||
|  |         "network_paths", | ||||||
|     ) |     ) | ||||||
|  |  | ||||||
|     def __init__(self, transport: TransportProtocol, unix=None): |     def __init__(self, transport: TransportProtocol, unix=None): | ||||||
|         self.ctx = SimpleNamespace() |         self.ctx = SimpleNamespace() | ||||||
|  |         self.lost = False | ||||||
|         self.peername = None |         self.peername = None | ||||||
|         self.server = self.client = "" |         self.server = self.client = "" | ||||||
|         self.server_port = self.client_port = 0 |         self.server_port = self.client_port = 0 | ||||||
| @@ -38,17 +43,22 @@ class ConnInfo: | |||||||
|         self.ssl = False |         self.ssl = False | ||||||
|         self.server_name = "" |         self.server_name = "" | ||||||
|         self.cert: Dict[str, Any] = {} |         self.cert: Dict[str, Any] = {} | ||||||
|  |         self.network_paths: List[Any] = [] | ||||||
|         sslobj: Optional[SSLObject] = transport.get_extra_info( |         sslobj: Optional[SSLObject] = transport.get_extra_info( | ||||||
|             "ssl_object" |             "ssl_object" | ||||||
|         )  # type: ignore |         )  # type: ignore | ||||||
|  |         sslctx: Optional[SSLContext] = transport.get_extra_info( | ||||||
|  |             "ssl_context" | ||||||
|  |         )  # type: ignore | ||||||
|         if sslobj: |         if sslobj: | ||||||
|             self.ssl = True |             self.ssl = True | ||||||
|             self.server_name = getattr(sslobj, "sanic_server_name", None) or "" |             self.server_name = getattr(sslobj, "sanic_server_name", None) or "" | ||||||
|             self.cert = dict(getattr(sslobj.context, "sanic", {})) |             self.cert = dict(getattr(sslobj.context, "sanic", {})) | ||||||
|  |         if sslctx and not self.cert: | ||||||
|  |             self.cert = dict(getattr(sslctx, "sanic", {})) | ||||||
|         if isinstance(addr, str):  # UNIX socket |         if isinstance(addr, str):  # UNIX socket | ||||||
|             self.server = unix or addr |             self.server = unix or addr | ||||||
|             return |             return | ||||||
|  |  | ||||||
|         # IPv4 (ip, port) or IPv6 (ip, port, flowinfo, scopeid) |         # IPv4 (ip, port) or IPv6 (ip, port, flowinfo, scopeid) | ||||||
|         if isinstance(addr, tuple): |         if isinstance(addr, tuple): | ||||||
|             self.server = addr[0] if len(addr) == 2 else f"[{addr[0]}]" |             self.server = addr[0] if len(addr) == 2 else f"[{addr[0]}]" | ||||||
| @@ -57,6 +67,9 @@ class ConnInfo: | |||||||
|             if addr[1] != (443 if self.ssl else 80): |             if addr[1] != (443 if self.ssl else 80): | ||||||
|                 self.server = f"{self.server}:{addr[1]}" |                 self.server = f"{self.server}:{addr[1]}" | ||||||
|         self.peername = addr = transport.get_extra_info("peername") |         self.peername = addr = transport.get_extra_info("peername") | ||||||
|  |         self.network_paths = transport.get_extra_info(  # type: ignore | ||||||
|  |             "network_paths" | ||||||
|  |         ) | ||||||
|  |  | ||||||
|         if isinstance(addr, tuple): |         if isinstance(addr, tuple): | ||||||
|             self.client = addr[0] if len(addr) == 2 else f"[{addr[0]}]" |             self.client = addr[0] if len(addr) == 2 else f"[{addr[0]}]" | ||||||
|   | |||||||
							
								
								
									
										440
									
								
								sanic/request.py
									
									
									
									
									
								
							
							
						
						
									
										440
									
								
								sanic/request.py
									
									
									
									
									
								
							| @@ -1,5 +1,7 @@ | |||||||
| from __future__ import annotations | from __future__ import annotations | ||||||
|  |  | ||||||
|  | from contextvars import ContextVar | ||||||
|  | from inspect import isawaitable | ||||||
| from typing import ( | from typing import ( | ||||||
|     TYPE_CHECKING, |     TYPE_CHECKING, | ||||||
|     Any, |     Any, | ||||||
| @@ -12,14 +14,20 @@ from typing import ( | |||||||
|     Union, |     Union, | ||||||
| ) | ) | ||||||
|  |  | ||||||
| from sanic_routing.route import Route  # type: ignore | from sanic_routing.route import Route | ||||||
|  |  | ||||||
|  | from sanic.http.constants import HTTP  # type: ignore | ||||||
|  | from sanic.http.stream import Stream | ||||||
|  | from sanic.models.asgi import ASGIScope | ||||||
|  | from sanic.models.http_types import Credentials | ||||||
|  |  | ||||||
|  |  | ||||||
| if TYPE_CHECKING:  # no cov | if TYPE_CHECKING: | ||||||
|     from sanic.server import ConnInfo |     from sanic.server import ConnInfo | ||||||
|     from sanic.app import Sanic |     from sanic.app import Sanic | ||||||
|  |  | ||||||
| import email.utils | import email.utils | ||||||
|  | import unicodedata | ||||||
| import uuid | import uuid | ||||||
|  |  | ||||||
| from collections import defaultdict | from collections import defaultdict | ||||||
| @@ -27,22 +35,29 @@ from http.cookies import SimpleCookie | |||||||
| from types import SimpleNamespace | from types import SimpleNamespace | ||||||
| from urllib.parse import parse_qs, parse_qsl, unquote, urlunparse | from urllib.parse import parse_qs, parse_qsl, unquote, urlunparse | ||||||
|  |  | ||||||
| from httptools import parse_url  # type: ignore | from httptools import parse_url | ||||||
|  | from httptools.parser.errors import HttpParserInvalidURLError | ||||||
|  |  | ||||||
| from sanic.compat import CancelledErrors, Header | from sanic.compat import CancelledErrors, Header | ||||||
| from sanic.constants import DEFAULT_HTTP_CONTENT_TYPE | from sanic.constants import ( | ||||||
| from sanic.exceptions import InvalidUsage, ServerError |     CACHEABLE_HTTP_METHODS, | ||||||
|  |     DEFAULT_HTTP_CONTENT_TYPE, | ||||||
|  |     IDEMPOTENT_HTTP_METHODS, | ||||||
|  |     SAFE_HTTP_METHODS, | ||||||
|  | ) | ||||||
|  | from sanic.exceptions import BadRequest, BadURL, ServerError | ||||||
| from sanic.headers import ( | from sanic.headers import ( | ||||||
|     AcceptContainer, |     AcceptContainer, | ||||||
|     Options, |     Options, | ||||||
|     parse_accept, |     parse_accept, | ||||||
|     parse_content_header, |     parse_content_header, | ||||||
|  |     parse_credentials, | ||||||
|     parse_forwarded, |     parse_forwarded, | ||||||
|     parse_host, |     parse_host, | ||||||
|     parse_xforwarded, |     parse_xforwarded, | ||||||
| ) | ) | ||||||
| from sanic.http import Http, Stage | from sanic.http import Stage | ||||||
| from sanic.log import error_logger, logger | from sanic.log import deprecation, error_logger, logger | ||||||
| from sanic.models.protocol_types import TransportProtocol | from sanic.models.protocol_types import TransportProtocol | ||||||
| from sanic.response import BaseHTTPResponse, HTTPResponse | from sanic.response import BaseHTTPResponse, HTTPResponse | ||||||
|  |  | ||||||
| @@ -77,6 +92,9 @@ class Request: | |||||||
|     Properties of an HTTP request such as URL, headers, etc. |     Properties of an HTTP request such as URL, headers, etc. | ||||||
|     """ |     """ | ||||||
|  |  | ||||||
|  |     _current: ContextVar[Request] = ContextVar("request") | ||||||
|  |     _loads = json_loads | ||||||
|  |  | ||||||
|     __slots__ = ( |     __slots__ = ( | ||||||
|         "__weakref__", |         "__weakref__", | ||||||
|         "_cookies", |         "_cookies", | ||||||
| @@ -86,7 +104,11 @@ class Request: | |||||||
|         "_port", |         "_port", | ||||||
|         "_protocol", |         "_protocol", | ||||||
|         "_remote_addr", |         "_remote_addr", | ||||||
|  |         "_request_middleware_started", | ||||||
|  |         "_response_middleware_started", | ||||||
|  |         "_scheme", | ||||||
|         "_socket", |         "_socket", | ||||||
|  |         "_stream_id", | ||||||
|         "_match_info", |         "_match_info", | ||||||
|         "_name", |         "_name", | ||||||
|         "app", |         "app", | ||||||
| @@ -98,14 +120,15 @@ class Request: | |||||||
|         "method", |         "method", | ||||||
|         "parsed_accept", |         "parsed_accept", | ||||||
|         "parsed_args", |         "parsed_args", | ||||||
|         "parsed_not_grouped_args", |         "parsed_credentials", | ||||||
|         "parsed_files", |         "parsed_files", | ||||||
|         "parsed_form", |         "parsed_form", | ||||||
|         "parsed_json", |  | ||||||
|         "parsed_forwarded", |         "parsed_forwarded", | ||||||
|  |         "parsed_json", | ||||||
|  |         "parsed_not_grouped_args", | ||||||
|  |         "parsed_token", | ||||||
|         "raw_url", |         "raw_url", | ||||||
|         "responded", |         "responded", | ||||||
|         "request_middleware_started", |  | ||||||
|         "route", |         "route", | ||||||
|         "stream", |         "stream", | ||||||
|         "transport", |         "transport", | ||||||
| @@ -121,12 +144,16 @@ class Request: | |||||||
|         transport: TransportProtocol, |         transport: TransportProtocol, | ||||||
|         app: Sanic, |         app: Sanic, | ||||||
|         head: bytes = b"", |         head: bytes = b"", | ||||||
|  |         stream_id: int = 0, | ||||||
|     ): |     ): | ||||||
|         self.raw_url = url_bytes |         self.raw_url = url_bytes | ||||||
|         # TODO: Content-Encoding detection |         try: | ||||||
|         self._parsed_url = parse_url(url_bytes) |             self._parsed_url = parse_url(url_bytes) | ||||||
|  |         except HttpParserInvalidURLError: | ||||||
|  |             raise BadURL(f"Bad URL: {url_bytes.decode()}") | ||||||
|         self._id: Optional[Union[uuid.UUID, str, int]] = None |         self._id: Optional[Union[uuid.UUID, str, int]] = None | ||||||
|         self._name: Optional[str] = None |         self._name: Optional[str] = None | ||||||
|  |         self._stream_id = stream_id | ||||||
|         self.app = app |         self.app = app | ||||||
|  |  | ||||||
|         self.headers = Header(headers) |         self.headers = Header(headers) | ||||||
| @@ -141,31 +168,83 @@ class Request: | |||||||
|         self.ctx = SimpleNamespace() |         self.ctx = SimpleNamespace() | ||||||
|         self.parsed_forwarded: Optional[Options] = None |         self.parsed_forwarded: Optional[Options] = None | ||||||
|         self.parsed_accept: Optional[AcceptContainer] = None |         self.parsed_accept: Optional[AcceptContainer] = None | ||||||
|  |         self.parsed_credentials: Optional[Credentials] = None | ||||||
|         self.parsed_json = None |         self.parsed_json = None | ||||||
|         self.parsed_form = None |         self.parsed_form: Optional[RequestParameters] = None | ||||||
|         self.parsed_files = None |         self.parsed_files: Optional[RequestParameters] = None | ||||||
|  |         self.parsed_token: Optional[str] = None | ||||||
|         self.parsed_args: DefaultDict[ |         self.parsed_args: DefaultDict[ | ||||||
|             Tuple[bool, bool, str, str], RequestParameters |             Tuple[bool, bool, str, str], RequestParameters | ||||||
|         ] = defaultdict(RequestParameters) |         ] = defaultdict(RequestParameters) | ||||||
|         self.parsed_not_grouped_args: DefaultDict[ |         self.parsed_not_grouped_args: DefaultDict[ | ||||||
|             Tuple[bool, bool, str, str], List[Tuple[str, str]] |             Tuple[bool, bool, str, str], List[Tuple[str, str]] | ||||||
|         ] = defaultdict(list) |         ] = defaultdict(list) | ||||||
|         self.request_middleware_started = False |         self._request_middleware_started = False | ||||||
|  |         self._response_middleware_started = False | ||||||
|  |         self.responded: bool = False | ||||||
|  |         self.route: Optional[Route] = None | ||||||
|  |         self.stream: Optional[Stream] = None | ||||||
|         self._cookies: Optional[Dict[str, str]] = None |         self._cookies: Optional[Dict[str, str]] = None | ||||||
|         self._match_info: Dict[str, Any] = {} |         self._match_info: Dict[str, Any] = {} | ||||||
|         self.stream: Optional[Http] = None |  | ||||||
|         self.route: Optional[Route] = None |  | ||||||
|         self._protocol = None |         self._protocol = None | ||||||
|         self.responded: bool = False |  | ||||||
|  |  | ||||||
|     def __repr__(self): |     def __repr__(self): | ||||||
|         class_name = self.__class__.__name__ |         class_name = self.__class__.__name__ | ||||||
|         return f"<{class_name}: {self.method} {self.path}>" |         return f"<{class_name}: {self.method} {self.path}>" | ||||||
|  |  | ||||||
|  |     @classmethod | ||||||
|  |     def get_current(cls) -> Request: | ||||||
|  |         """ | ||||||
|  |         Retrieve the current request object | ||||||
|  |  | ||||||
|  |         This implements `Context Variables | ||||||
|  |         <https://docs.python.org/3/library/contextvars.html>`_ | ||||||
|  |         to allow for accessing the current request from anywhere. | ||||||
|  |  | ||||||
|  |         Raises :exc:`sanic.exceptions.ServerError` if it is outside of | ||||||
|  |         a request lifecycle. | ||||||
|  |  | ||||||
|  |         .. code-block:: python | ||||||
|  |  | ||||||
|  |             from sanic import Request | ||||||
|  |  | ||||||
|  |             current_request = Request.get_current() | ||||||
|  |  | ||||||
|  |         :return: the current :class:`sanic.request.Request` | ||||||
|  |         """ | ||||||
|  |         request = cls._current.get(None) | ||||||
|  |         if not request: | ||||||
|  |             raise ServerError("No current request") | ||||||
|  |         return request | ||||||
|  |  | ||||||
|     @classmethod |     @classmethod | ||||||
|     def generate_id(*_): |     def generate_id(*_): | ||||||
|         return uuid.uuid4() |         return uuid.uuid4() | ||||||
|  |  | ||||||
|  |     @property | ||||||
|  |     def request_middleware_started(self): | ||||||
|  |         deprecation( | ||||||
|  |             "Request.request_middleware_started has been deprecated and will" | ||||||
|  |             "be removed. You should set a flag on the request context using" | ||||||
|  |             "either middleware or signals if you need this feature.", | ||||||
|  |             23.3, | ||||||
|  |         ) | ||||||
|  |         return self._request_middleware_started | ||||||
|  |  | ||||||
|  |     @property | ||||||
|  |     def stream_id(self): | ||||||
|  |         """ | ||||||
|  |         Access the HTTP/3 stream ID. | ||||||
|  |  | ||||||
|  |         Raises :exc:`sanic.exceptions.ServerError` if it is not an | ||||||
|  |         HTTP/3 request. | ||||||
|  |         """ | ||||||
|  |         if self.protocol.version is not HTTP.VERSION_3: | ||||||
|  |             raise ServerError( | ||||||
|  |                 "Stream ID is only a property of a HTTP/3 request" | ||||||
|  |             ) | ||||||
|  |         return self._stream_id | ||||||
|  |  | ||||||
|     def reset_response(self): |     def reset_response(self): | ||||||
|         try: |         try: | ||||||
|             if ( |             if ( | ||||||
| @@ -189,6 +268,53 @@ class Request: | |||||||
|         headers: Optional[Union[Header, Dict[str, str]]] = None, |         headers: Optional[Union[Header, Dict[str, str]]] = None, | ||||||
|         content_type: Optional[str] = None, |         content_type: Optional[str] = None, | ||||||
|     ): |     ): | ||||||
|  |         """Respond to the request without returning. | ||||||
|  |  | ||||||
|  |         This method can only be called once, as you can only respond once. | ||||||
|  |         If no ``response`` argument is passed, one will be created from the | ||||||
|  |         ``status``, ``headers`` and ``content_type`` arguments. | ||||||
|  |  | ||||||
|  |         **The first typical usecase** is if you wish to respond to the | ||||||
|  |         request without returning from the handler: | ||||||
|  |  | ||||||
|  |         .. code-block:: python | ||||||
|  |  | ||||||
|  |             @app.get("/") | ||||||
|  |             async def handler(request: Request): | ||||||
|  |                 data = ...  # Process something | ||||||
|  |  | ||||||
|  |                 json_response = json({"data": data}) | ||||||
|  |                 await request.respond(json_response) | ||||||
|  |  | ||||||
|  |                 # You are now free to continue executing other code | ||||||
|  |                 ... | ||||||
|  |  | ||||||
|  |             @app.on_response | ||||||
|  |             async def add_header(_, response: HTTPResponse): | ||||||
|  |                 # Middlewares still get executed as expected | ||||||
|  |                 response.headers["one"] = "two" | ||||||
|  |  | ||||||
|  |         **The second possible usecase** is for when you want to directly | ||||||
|  |         respond to the request: | ||||||
|  |  | ||||||
|  |         .. code-block:: python | ||||||
|  |  | ||||||
|  |             response = await request.respond(content_type="text/csv") | ||||||
|  |             await response.send("foo,") | ||||||
|  |             await response.send("bar") | ||||||
|  |  | ||||||
|  |             # You can control the completion of the response by calling | ||||||
|  |             # the 'eof()' method: | ||||||
|  |             await response.eof() | ||||||
|  |  | ||||||
|  |         :param response: response instance to send | ||||||
|  |         :param status: status code to return in the response | ||||||
|  |         :param headers: headers to return in the response | ||||||
|  |         :param content_type: Content-Type header of the response | ||||||
|  |         :return: final response being sent (may be different from the | ||||||
|  |             ``response`` parameter because of middlewares) which can be | ||||||
|  |             used to manually send data | ||||||
|  |         """ | ||||||
|         try: |         try: | ||||||
|             if self.stream is not None and self.stream.response: |             if self.stream is not None and self.stream.response: | ||||||
|                 raise ServerError("Second respond call is not allowed.") |                 raise ServerError("Second respond call is not allowed.") | ||||||
| @@ -205,11 +331,19 @@ class Request: | |||||||
|         # Connect the response |         # Connect the response | ||||||
|         if isinstance(response, BaseHTTPResponse) and self.stream: |         if isinstance(response, BaseHTTPResponse) and self.stream: | ||||||
|             response = self.stream.respond(response) |             response = self.stream.respond(response) | ||||||
|  |  | ||||||
|  |             if isawaitable(response): | ||||||
|  |                 response = await response  # type: ignore | ||||||
|         # Run response middleware |         # Run response middleware | ||||||
|         try: |         try: | ||||||
|             response = await self.app._run_response_middleware( |             middleware = ( | ||||||
|                 self, response, request_name=self.name |                 self.route and self.route.extra.response_middleware | ||||||
|             ) |             ) or self.app.response_middleware | ||||||
|  |             if middleware and not self._response_middleware_started: | ||||||
|  |                 self._response_middleware_started = True | ||||||
|  |                 response = await self.app._run_response_middleware( | ||||||
|  |                     self, response, middleware | ||||||
|  |                 ) | ||||||
|         except CancelledErrors: |         except CancelledErrors: | ||||||
|             raise |             raise | ||||||
|         except Exception: |         except Exception: | ||||||
| @@ -232,7 +366,19 @@ class Request: | |||||||
|             self.body = b"".join([data async for data in self.stream]) |             self.body = b"".join([data async for data in self.stream]) | ||||||
|  |  | ||||||
|     @property |     @property | ||||||
|     def name(self): |     def name(self) -> Optional[str]: | ||||||
|  |         """ | ||||||
|  |         The route name | ||||||
|  |  | ||||||
|  |         In the following pattern: | ||||||
|  |  | ||||||
|  |         .. code-block:: | ||||||
|  |  | ||||||
|  |             <AppName>.[<BlueprintName>.]<HandlerName> | ||||||
|  |  | ||||||
|  |         :return: Route name | ||||||
|  |         :rtype: Optional[str] | ||||||
|  |         """ | ||||||
|         if self._name: |         if self._name: | ||||||
|             return self._name |             return self._name | ||||||
|         elif self.route: |         elif self.route: | ||||||
| @@ -240,26 +386,47 @@ class Request: | |||||||
|         return None |         return None | ||||||
|  |  | ||||||
|     @property |     @property | ||||||
|     def endpoint(self): |     def endpoint(self) -> Optional[str]: | ||||||
|  |         """ | ||||||
|  |         :return: Alias of :attr:`sanic.request.Request.name` | ||||||
|  |         :rtype: Optional[str] | ||||||
|  |         """ | ||||||
|         return self.name |         return self.name | ||||||
|  |  | ||||||
|     @property |     @property | ||||||
|     def uri_template(self): |     def uri_template(self) -> Optional[str]: | ||||||
|         return f"/{self.route.path}" |         """ | ||||||
|  |         :return: The defined URI template | ||||||
|  |         :rtype: Optional[str] | ||||||
|  |         """ | ||||||
|  |         if self.route: | ||||||
|  |             return f"/{self.route.path}" | ||||||
|  |         return None | ||||||
|  |  | ||||||
|     @property |     @property | ||||||
|     def protocol(self): |     def protocol(self): | ||||||
|  |         """ | ||||||
|  |         :return: The HTTP protocol instance | ||||||
|  |         """ | ||||||
|         if not self._protocol: |         if not self._protocol: | ||||||
|             self._protocol = self.transport.get_protocol() |             self._protocol = self.transport.get_protocol() | ||||||
|         return self._protocol |         return self._protocol | ||||||
|  |  | ||||||
|     @property |     @property | ||||||
|     def raw_headers(self): |     def raw_headers(self) -> bytes: | ||||||
|  |         """ | ||||||
|  |         :return: The unparsed HTTP headers | ||||||
|  |         :rtype: bytes | ||||||
|  |         """ | ||||||
|         _, headers = self.head.split(b"\r\n", 1) |         _, headers = self.head.split(b"\r\n", 1) | ||||||
|         return bytes(headers) |         return bytes(headers) | ||||||
|  |  | ||||||
|     @property |     @property | ||||||
|     def request_line(self): |     def request_line(self) -> bytes: | ||||||
|  |         """ | ||||||
|  |         :return: The first line of a HTTP request | ||||||
|  |         :rtype: bytes | ||||||
|  |         """ | ||||||
|         reqline, _ = self.head.split(b"\r\n", 1) |         reqline, _ = self.head.split(b"\r\n", 1) | ||||||
|         return bytes(reqline) |         return bytes(reqline) | ||||||
|  |  | ||||||
| @@ -308,72 +475,131 @@ class Request: | |||||||
|         return self._id  # type: ignore |         return self._id  # type: ignore | ||||||
|  |  | ||||||
|     @property |     @property | ||||||
|     def json(self): |     def json(self) -> Any: | ||||||
|  |         """ | ||||||
|  |         :return: The request body parsed as JSON | ||||||
|  |         :rtype: Any | ||||||
|  |         """ | ||||||
|         if self.parsed_json is None: |         if self.parsed_json is None: | ||||||
|             self.load_json() |             self.load_json() | ||||||
|  |  | ||||||
|         return self.parsed_json |         return self.parsed_json | ||||||
|  |  | ||||||
|     def load_json(self, loads=json_loads): |     def load_json(self, loads=None): | ||||||
|         try: |         try: | ||||||
|  |             if not loads: | ||||||
|  |                 loads = self.__class__._loads | ||||||
|  |  | ||||||
|             self.parsed_json = loads(self.body) |             self.parsed_json = loads(self.body) | ||||||
|         except Exception: |         except Exception: | ||||||
|             if not self.body: |             if not self.body: | ||||||
|                 return None |                 return None | ||||||
|             raise InvalidUsage("Failed when parsing body as json") |             raise BadRequest("Failed when parsing body as json") | ||||||
|  |  | ||||||
|         return self.parsed_json |         return self.parsed_json | ||||||
|  |  | ||||||
|     @property |     @property | ||||||
|     def accept(self) -> AcceptContainer: |     def accept(self) -> AcceptContainer: | ||||||
|  |         """ | ||||||
|  |         :return: The ``Accept`` header parsed | ||||||
|  |         :rtype: AcceptContainer | ||||||
|  |         """ | ||||||
|         if self.parsed_accept is None: |         if self.parsed_accept is None: | ||||||
|             accept_header = self.headers.getone("accept", "") |             accept_header = self.headers.getone("accept", "") | ||||||
|             self.parsed_accept = parse_accept(accept_header) |             self.parsed_accept = parse_accept(accept_header) | ||||||
|         return self.parsed_accept |         return self.parsed_accept | ||||||
|  |  | ||||||
|     @property |     @property | ||||||
|     def token(self): |     def token(self) -> Optional[str]: | ||||||
|         """Attempt to return the auth header token. |         """Attempt to return the auth header token. | ||||||
|  |  | ||||||
|         :return: token related to request |         :return: token related to request | ||||||
|         """ |         """ | ||||||
|         prefixes = ("Bearer", "Token") |         if self.parsed_token is None: | ||||||
|         auth_header = self.headers.getone("authorization", None) |             prefixes = ("Bearer", "Token") | ||||||
|  |             _, token = parse_credentials( | ||||||
|  |                 self.headers.getone("authorization", None), prefixes | ||||||
|  |             ) | ||||||
|  |             self.parsed_token = token | ||||||
|  |         return self.parsed_token | ||||||
|  |  | ||||||
|         if auth_header is not None: |     @property | ||||||
|             for prefix in prefixes: |     def credentials(self) -> Optional[Credentials]: | ||||||
|                 if prefix in auth_header: |         """Attempt to return the auth header value. | ||||||
|                     return auth_header.partition(prefix)[-1].strip() |  | ||||||
|  |  | ||||||
|         return auth_header |         Covers NoAuth, Basic Auth, Bearer Token, Api Token authentication | ||||||
|  |         schemas. | ||||||
|  |  | ||||||
|  |         :return: A Credentials object with token, or username and password | ||||||
|  |                  related to the request | ||||||
|  |         """ | ||||||
|  |         if self.parsed_credentials is None: | ||||||
|  |             try: | ||||||
|  |                 prefix, credentials = parse_credentials( | ||||||
|  |                     self.headers.getone("authorization", None) | ||||||
|  |                 ) | ||||||
|  |                 if credentials: | ||||||
|  |                     self.parsed_credentials = Credentials( | ||||||
|  |                         auth_type=prefix, token=credentials | ||||||
|  |                     ) | ||||||
|  |             except ValueError: | ||||||
|  |                 pass | ||||||
|  |         return self.parsed_credentials | ||||||
|  |  | ||||||
|  |     def get_form( | ||||||
|  |         self, keep_blank_values: bool = False | ||||||
|  |     ) -> Optional[RequestParameters]: | ||||||
|  |         """ | ||||||
|  |         Method to extract and parse the form data from a request. | ||||||
|  |  | ||||||
|  |         :param keep_blank_values: | ||||||
|  |             Whether to discard blank values from the form data | ||||||
|  |         :type keep_blank_values: bool | ||||||
|  |         :return: the parsed form data | ||||||
|  |         :rtype: Optional[RequestParameters] | ||||||
|  |         """ | ||||||
|  |         self.parsed_form = RequestParameters() | ||||||
|  |         self.parsed_files = RequestParameters() | ||||||
|  |         content_type = self.headers.getone( | ||||||
|  |             "content-type", DEFAULT_HTTP_CONTENT_TYPE | ||||||
|  |         ) | ||||||
|  |         content_type, parameters = parse_content_header(content_type) | ||||||
|  |         try: | ||||||
|  |             if content_type == "application/x-www-form-urlencoded": | ||||||
|  |                 self.parsed_form = RequestParameters( | ||||||
|  |                     parse_qs( | ||||||
|  |                         self.body.decode("utf-8"), | ||||||
|  |                         keep_blank_values=keep_blank_values, | ||||||
|  |                     ) | ||||||
|  |                 ) | ||||||
|  |             elif content_type == "multipart/form-data": | ||||||
|  |                 # TODO: Stream this instead of reading to/from memory | ||||||
|  |                 boundary = parameters["boundary"].encode(  # type: ignore | ||||||
|  |                     "utf-8" | ||||||
|  |                 )  # type: ignore | ||||||
|  |                 self.parsed_form, self.parsed_files = parse_multipart_form( | ||||||
|  |                     self.body, boundary | ||||||
|  |                 ) | ||||||
|  |         except Exception: | ||||||
|  |             error_logger.exception("Failed when parsing form") | ||||||
|  |  | ||||||
|  |         return self.parsed_form | ||||||
|  |  | ||||||
|     @property |     @property | ||||||
|     def form(self): |     def form(self): | ||||||
|  |         """ | ||||||
|  |         :return: The request body parsed as form data | ||||||
|  |         """ | ||||||
|         if self.parsed_form is None: |         if self.parsed_form is None: | ||||||
|             self.parsed_form = RequestParameters() |             self.get_form() | ||||||
|             self.parsed_files = RequestParameters() |  | ||||||
|             content_type = self.headers.getone( |  | ||||||
|                 "content-type", DEFAULT_HTTP_CONTENT_TYPE |  | ||||||
|             ) |  | ||||||
|             content_type, parameters = parse_content_header(content_type) |  | ||||||
|             try: |  | ||||||
|                 if content_type == "application/x-www-form-urlencoded": |  | ||||||
|                     self.parsed_form = RequestParameters( |  | ||||||
|                         parse_qs(self.body.decode("utf-8")) |  | ||||||
|                     ) |  | ||||||
|                 elif content_type == "multipart/form-data": |  | ||||||
|                     # TODO: Stream this instead of reading to/from memory |  | ||||||
|                     boundary = parameters["boundary"].encode("utf-8") |  | ||||||
|                     self.parsed_form, self.parsed_files = parse_multipart_form( |  | ||||||
|                         self.body, boundary |  | ||||||
|                     ) |  | ||||||
|             except Exception: |  | ||||||
|                 error_logger.exception("Failed when parsing form") |  | ||||||
|  |  | ||||||
|         return self.parsed_form |         return self.parsed_form | ||||||
|  |  | ||||||
|     @property |     @property | ||||||
|     def files(self): |     def files(self): | ||||||
|  |         """ | ||||||
|  |         :return: The request body parsed as uploaded files | ||||||
|  |         """ | ||||||
|         if self.parsed_files is None: |         if self.parsed_files is None: | ||||||
|             self.form  # compute form to get files |             self.form  # compute form to get files | ||||||
|  |  | ||||||
| @@ -387,8 +613,8 @@ class Request: | |||||||
|         errors: str = "replace", |         errors: str = "replace", | ||||||
|     ) -> RequestParameters: |     ) -> RequestParameters: | ||||||
|         """ |         """ | ||||||
|         Method to parse `query_string` using `urllib.parse.parse_qs`. |         Method to parse ``query_string`` using ``urllib.parse.parse_qs``. | ||||||
|         This methods is used by `args` property. |         This methods is used by ``args`` property. | ||||||
|         Can be used directly if you need to change default parameters. |         Can be used directly if you need to change default parameters. | ||||||
|  |  | ||||||
|         :param keep_blank_values: |         :param keep_blank_values: | ||||||
| @@ -437,6 +663,10 @@ class Request: | |||||||
|         ] |         ] | ||||||
|  |  | ||||||
|     args = property(get_args) |     args = property(get_args) | ||||||
|  |     """ | ||||||
|  |     Convenience property to access :meth:`Request.get_args` with | ||||||
|  |     default values. | ||||||
|  |     """ | ||||||
|  |  | ||||||
|     def get_query_args( |     def get_query_args( | ||||||
|         self, |         self, | ||||||
| @@ -556,6 +786,9 @@ class Request: | |||||||
|  |  | ||||||
|     @property |     @property | ||||||
|     def socket(self): |     def socket(self): | ||||||
|  |         """ | ||||||
|  |         :return: Information about the connected socket if available | ||||||
|  |         """ | ||||||
|         return self.conn_info.peername if self.conn_info else (None, None) |         return self.conn_info.peername if self.conn_info else (None, None) | ||||||
|  |  | ||||||
|     @property |     @property | ||||||
| @@ -566,6 +799,13 @@ class Request: | |||||||
|         """ |         """ | ||||||
|         return self._parsed_url.path.decode("utf-8") |         return self._parsed_url.path.decode("utf-8") | ||||||
|  |  | ||||||
|  |     @property | ||||||
|  |     def network_paths(self): | ||||||
|  |         """ | ||||||
|  |         Access the network paths if available | ||||||
|  |         """ | ||||||
|  |         return self.conn_info.network_paths | ||||||
|  |  | ||||||
|     # Proxy properties (using SERVER_NAME/forwarded/request/transport info) |     # Proxy properties (using SERVER_NAME/forwarded/request/transport info) | ||||||
|  |  | ||||||
|     @property |     @property | ||||||
| @@ -619,23 +859,25 @@ class Request: | |||||||
|         :return: http|https|ws|wss or arbitrary value given by the headers. |         :return: http|https|ws|wss or arbitrary value given by the headers. | ||||||
|         :rtype: str |         :rtype: str | ||||||
|         """ |         """ | ||||||
|         if "//" in self.app.config.get("SERVER_NAME", ""): |         if not hasattr(self, "_scheme"): | ||||||
|             return self.app.config.SERVER_NAME.split("//")[0] |             if "//" in self.app.config.get("SERVER_NAME", ""): | ||||||
|         if "proto" in self.forwarded: |                 return self.app.config.SERVER_NAME.split("//")[0] | ||||||
|             return str(self.forwarded["proto"]) |             if "proto" in self.forwarded: | ||||||
|  |                 return str(self.forwarded["proto"]) | ||||||
|  |  | ||||||
|         if ( |             if ( | ||||||
|             self.app.websocket_enabled |                 self.app.websocket_enabled | ||||||
|             and self.headers.getone("upgrade", "").lower() == "websocket" |                 and self.headers.getone("upgrade", "").lower() == "websocket" | ||||||
|         ): |             ): | ||||||
|             scheme = "ws" |                 scheme = "ws" | ||||||
|         else: |             else: | ||||||
|             scheme = "http" |                 scheme = "http" | ||||||
|  |  | ||||||
|         if self.transport.get_extra_info("sslcontext"): |             if self.transport.get_extra_info("sslcontext"): | ||||||
|             scheme += "s" |                 scheme += "s" | ||||||
|  |             self._scheme = scheme | ||||||
|  |  | ||||||
|         return scheme |         return self._scheme | ||||||
|  |  | ||||||
|     @property |     @property | ||||||
|     def host(self) -> str: |     def host(self) -> str: | ||||||
| @@ -740,6 +982,48 @@ class Request: | |||||||
|             view_name, _external=True, _scheme=scheme, _server=netloc, **kwargs |             view_name, _external=True, _scheme=scheme, _server=netloc, **kwargs | ||||||
|         ) |         ) | ||||||
|  |  | ||||||
|  |     @property | ||||||
|  |     def scope(self) -> ASGIScope: | ||||||
|  |         """ | ||||||
|  |         :return: The ASGI scope of the request. | ||||||
|  |                  If the app isn't an ASGI app, then raises an exception. | ||||||
|  |         :rtype: Optional[ASGIScope] | ||||||
|  |         """ | ||||||
|  |         if not self.app.asgi: | ||||||
|  |             raise NotImplementedError( | ||||||
|  |                 "App isn't running in ASGI mode. " | ||||||
|  |                 "Scope is only available for ASGI apps." | ||||||
|  |             ) | ||||||
|  |  | ||||||
|  |         return self.transport.scope | ||||||
|  |  | ||||||
|  |     @property | ||||||
|  |     def is_safe(self) -> bool: | ||||||
|  |         """ | ||||||
|  |         :return: Whether the HTTP method is safe. | ||||||
|  |             See https://datatracker.ietf.org/doc/html/rfc7231#section-4.2.1 | ||||||
|  |         :rtype: bool | ||||||
|  |         """ | ||||||
|  |         return self.method in SAFE_HTTP_METHODS | ||||||
|  |  | ||||||
|  |     @property | ||||||
|  |     def is_idempotent(self) -> bool: | ||||||
|  |         """ | ||||||
|  |         :return: Whether the HTTP method is iempotent. | ||||||
|  |             See https://datatracker.ietf.org/doc/html/rfc7231#section-4.2.2 | ||||||
|  |         :rtype: bool | ||||||
|  |         """ | ||||||
|  |         return self.method in IDEMPOTENT_HTTP_METHODS | ||||||
|  |  | ||||||
|  |     @property | ||||||
|  |     def is_cacheable(self) -> bool: | ||||||
|  |         """ | ||||||
|  |         :return: Whether the HTTP method is cacheable. | ||||||
|  |             See https://datatracker.ietf.org/doc/html/rfc7231#section-4.2.3 | ||||||
|  |         :rtype: bool | ||||||
|  |         """ | ||||||
|  |         return self.method in CACHEABLE_HTTP_METHODS | ||||||
|  |  | ||||||
|  |  | ||||||
| class File(NamedTuple): | class File(NamedTuple): | ||||||
|     """ |     """ | ||||||
| @@ -800,6 +1084,16 @@ def parse_multipart_form(body, boundary): | |||||||
|                         form_parameters["filename*"] |                         form_parameters["filename*"] | ||||||
|                     ) |                     ) | ||||||
|                     file_name = unquote(value, encoding=encoding) |                     file_name = unquote(value, encoding=encoding) | ||||||
|  |  | ||||||
|  |                 # Normalize to NFC (Apple MacOS/iOS send NFD) | ||||||
|  |                 # Notes: | ||||||
|  |                 # - No effect for Windows, Linux or Android clients which | ||||||
|  |                 #   already send NFC | ||||||
|  |                 # - Python open() is tricky (creates files in NFC no matter | ||||||
|  |                 #   which form you use) | ||||||
|  |                 if file_name is not None: | ||||||
|  |                     file_name = unicodedata.normalize("NFC", file_name) | ||||||
|  |  | ||||||
|             elif form_header_field == "content-type": |             elif form_header_field == "content-type": | ||||||
|                 content_type = form_header_value |                 content_type = form_header_value | ||||||
|                 content_charset = form_parameters.get("charset", "utf-8") |                 content_charset = form_parameters.get("charset", "utf-8") | ||||||
|   | |||||||
| @@ -1,533 +0,0 @@ | |||||||
| from __future__ import annotations |  | ||||||
|  |  | ||||||
| from functools import partial |  | ||||||
| from mimetypes import guess_type |  | ||||||
| from os import path |  | ||||||
| from pathlib import PurePath |  | ||||||
| from typing import ( |  | ||||||
|     TYPE_CHECKING, |  | ||||||
|     Any, |  | ||||||
|     AnyStr, |  | ||||||
|     Callable, |  | ||||||
|     Coroutine, |  | ||||||
|     Dict, |  | ||||||
|     Iterator, |  | ||||||
|     Optional, |  | ||||||
|     Tuple, |  | ||||||
|     TypeVar, |  | ||||||
|     Union, |  | ||||||
| ) |  | ||||||
| from urllib.parse import quote_plus |  | ||||||
|  |  | ||||||
| from sanic.compat import Header, open_async |  | ||||||
| from sanic.constants import DEFAULT_HTTP_CONTENT_TYPE |  | ||||||
| from sanic.cookies import CookieJar |  | ||||||
| from sanic.exceptions import SanicException, ServerError |  | ||||||
| from sanic.helpers import has_message_body, remove_entity_headers |  | ||||||
| from sanic.http import Http |  | ||||||
| from sanic.models.protocol_types import HTMLProtocol, Range |  | ||||||
|  |  | ||||||
|  |  | ||||||
| if TYPE_CHECKING: |  | ||||||
|     from sanic.asgi import ASGIApp |  | ||||||
|     from sanic.request import Request |  | ||||||
| else: |  | ||||||
|     Request = TypeVar("Request") |  | ||||||
|  |  | ||||||
|  |  | ||||||
| try: |  | ||||||
|     from ujson import dumps as json_dumps |  | ||||||
| except ImportError: |  | ||||||
|     # This is done in order to ensure that the JSON response is |  | ||||||
|     # kept consistent across both ujson and inbuilt json usage. |  | ||||||
|     from json import dumps |  | ||||||
|  |  | ||||||
|     json_dumps = partial(dumps, separators=(",", ":")) |  | ||||||
|  |  | ||||||
|  |  | ||||||
| class BaseHTTPResponse: |  | ||||||
|     """ |  | ||||||
|     The base class for all HTTP Responses |  | ||||||
|     """ |  | ||||||
|  |  | ||||||
|     _dumps = json_dumps |  | ||||||
|  |  | ||||||
|     def __init__(self): |  | ||||||
|         self.asgi: bool = False |  | ||||||
|         self.body: Optional[bytes] = None |  | ||||||
|         self.content_type: Optional[str] = None |  | ||||||
|         self.stream: Optional[Union[Http, ASGIApp]] = None |  | ||||||
|         self.status: int = None |  | ||||||
|         self.headers = Header({}) |  | ||||||
|         self._cookies: Optional[CookieJar] = None |  | ||||||
|  |  | ||||||
|     def _encode_body(self, data: Optional[AnyStr]): |  | ||||||
|         if data is None: |  | ||||||
|             return b"" |  | ||||||
|         return ( |  | ||||||
|             data.encode() if hasattr(data, "encode") else data  # type: ignore |  | ||||||
|         ) |  | ||||||
|  |  | ||||||
|     @property |  | ||||||
|     def cookies(self) -> CookieJar: |  | ||||||
|         """ |  | ||||||
|         The response cookies. Cookies should be set and written as follows: |  | ||||||
|  |  | ||||||
|         .. code-block:: python |  | ||||||
|  |  | ||||||
|                 response.cookies["test"] = "It worked!" |  | ||||||
|                 response.cookies["test"]["domain"] = ".yummy-yummy-cookie.com" |  | ||||||
|                 response.cookies["test"]["httponly"] = True |  | ||||||
|  |  | ||||||
|         `See user guide re: cookies |  | ||||||
|         <https://sanicframework.org/guide/basics/cookies.html>`__ |  | ||||||
|  |  | ||||||
|         :return: the cookie jar |  | ||||||
|         :rtype: CookieJar |  | ||||||
|         """ |  | ||||||
|         if self._cookies is None: |  | ||||||
|             self._cookies = CookieJar(self.headers) |  | ||||||
|         return self._cookies |  | ||||||
|  |  | ||||||
|     @property |  | ||||||
|     def processed_headers(self) -> Iterator[Tuple[bytes, bytes]]: |  | ||||||
|         """ |  | ||||||
|         Obtain a list of header tuples encoded in bytes for sending. |  | ||||||
|  |  | ||||||
|         Add and remove headers based on status and content_type. |  | ||||||
|  |  | ||||||
|         :return: response headers |  | ||||||
|         :rtype: Tuple[Tuple[bytes, bytes], ...] |  | ||||||
|         """ |  | ||||||
|         # TODO: Make a blacklist set of header names and then filter with that |  | ||||||
|         if self.status in (304, 412):  # Not Modified, Precondition Failed |  | ||||||
|             self.headers = remove_entity_headers(self.headers) |  | ||||||
|         if has_message_body(self.status): |  | ||||||
|             self.headers.setdefault("content-type", self.content_type) |  | ||||||
|         # Encode headers into bytes |  | ||||||
|         return ( |  | ||||||
|             (name.encode("ascii"), f"{value}".encode(errors="surrogateescape")) |  | ||||||
|             for name, value in self.headers.items() |  | ||||||
|         ) |  | ||||||
|  |  | ||||||
|     async def send( |  | ||||||
|         self, |  | ||||||
|         data: Optional[AnyStr] = None, |  | ||||||
|         end_stream: Optional[bool] = None, |  | ||||||
|     ) -> None: |  | ||||||
|         """ |  | ||||||
|         Send any pending response headers and the given data as body. |  | ||||||
|  |  | ||||||
|         :param data: str or bytes to be written |  | ||||||
|         :param end_stream: whether to close the stream after this block |  | ||||||
|         """ |  | ||||||
|         if data is None and end_stream is None: |  | ||||||
|             end_stream = True |  | ||||||
|         if self.stream is None: |  | ||||||
|             raise SanicException( |  | ||||||
|                 "No stream is connected to the response object instance." |  | ||||||
|             ) |  | ||||||
|         if self.stream.send is None: |  | ||||||
|             if end_stream and not data: |  | ||||||
|                 return |  | ||||||
|             raise ServerError( |  | ||||||
|                 "Response stream was ended, no more response data is " |  | ||||||
|                 "allowed to be sent." |  | ||||||
|             ) |  | ||||||
|         data = ( |  | ||||||
|             data.encode()  # type: ignore |  | ||||||
|             if hasattr(data, "encode") |  | ||||||
|             else data or b"" |  | ||||||
|         ) |  | ||||||
|         await self.stream.send(data, end_stream=end_stream) |  | ||||||
|  |  | ||||||
|  |  | ||||||
| class HTTPResponse(BaseHTTPResponse): |  | ||||||
|     """ |  | ||||||
|     HTTP response to be sent back to the client. |  | ||||||
|  |  | ||||||
|     :param body: the body content to be returned |  | ||||||
|     :type body: Optional[bytes] |  | ||||||
|     :param status: HTTP response number. **Default=200** |  | ||||||
|     :type status: int |  | ||||||
|     :param headers: headers to be returned |  | ||||||
|     :type headers: Optional; |  | ||||||
|     :param content_type: content type to be returned (as a header) |  | ||||||
|     :type content_type: Optional[str] |  | ||||||
|     """ |  | ||||||
|  |  | ||||||
|     __slots__ = ("body", "status", "content_type", "headers", "_cookies") |  | ||||||
|  |  | ||||||
|     def __init__( |  | ||||||
|         self, |  | ||||||
|         body: Optional[AnyStr] = None, |  | ||||||
|         status: int = 200, |  | ||||||
|         headers: Optional[Union[Header, Dict[str, str]]] = None, |  | ||||||
|         content_type: Optional[str] = None, |  | ||||||
|     ): |  | ||||||
|         super().__init__() |  | ||||||
|  |  | ||||||
|         self.content_type: Optional[str] = content_type |  | ||||||
|         self.body = self._encode_body(body) |  | ||||||
|         self.status = status |  | ||||||
|         self.headers = Header(headers or {}) |  | ||||||
|         self._cookies = None |  | ||||||
|  |  | ||||||
|     async def eof(self): |  | ||||||
|         await self.send("", True) |  | ||||||
|  |  | ||||||
|     async def __aenter__(self): |  | ||||||
|         return self.send |  | ||||||
|  |  | ||||||
|     async def __aexit__(self, *_): |  | ||||||
|         await self.eof() |  | ||||||
|  |  | ||||||
|  |  | ||||||
| def empty( |  | ||||||
|     status=204, headers: Optional[Dict[str, str]] = None |  | ||||||
| ) -> HTTPResponse: |  | ||||||
|     """ |  | ||||||
|     Returns an empty response to the client. |  | ||||||
|  |  | ||||||
|     :param status Response code. |  | ||||||
|     :param headers Custom Headers. |  | ||||||
|     """ |  | ||||||
|     return HTTPResponse(body=b"", status=status, headers=headers) |  | ||||||
|  |  | ||||||
|  |  | ||||||
| def json( |  | ||||||
|     body: Any, |  | ||||||
|     status: int = 200, |  | ||||||
|     headers: Optional[Dict[str, str]] = None, |  | ||||||
|     content_type: str = "application/json", |  | ||||||
|     dumps: Optional[Callable[..., str]] = None, |  | ||||||
|     **kwargs, |  | ||||||
| ) -> HTTPResponse: |  | ||||||
|     """ |  | ||||||
|     Returns response object with body in json format. |  | ||||||
|  |  | ||||||
|     :param body: Response data to be serialized. |  | ||||||
|     :param status: Response code. |  | ||||||
|     :param headers: Custom Headers. |  | ||||||
|     :param kwargs: Remaining arguments that are passed to the json encoder. |  | ||||||
|     """ |  | ||||||
|     if not dumps: |  | ||||||
|         dumps = BaseHTTPResponse._dumps |  | ||||||
|     return HTTPResponse( |  | ||||||
|         dumps(body, **kwargs), |  | ||||||
|         headers=headers, |  | ||||||
|         status=status, |  | ||||||
|         content_type=content_type, |  | ||||||
|     ) |  | ||||||
|  |  | ||||||
|  |  | ||||||
| def text( |  | ||||||
|     body: str, |  | ||||||
|     status: int = 200, |  | ||||||
|     headers: Optional[Dict[str, str]] = None, |  | ||||||
|     content_type: str = "text/plain; charset=utf-8", |  | ||||||
| ) -> HTTPResponse: |  | ||||||
|     """ |  | ||||||
|     Returns response object with body in text format. |  | ||||||
|  |  | ||||||
|     :param body: Response data to be encoded. |  | ||||||
|     :param status: Response code. |  | ||||||
|     :param headers: Custom Headers. |  | ||||||
|     :param content_type: the content type (string) of the response |  | ||||||
|     """ |  | ||||||
|     if not isinstance(body, str): |  | ||||||
|         raise TypeError( |  | ||||||
|             f"Bad body type. Expected str, got {type(body).__name__})" |  | ||||||
|         ) |  | ||||||
|  |  | ||||||
|     return HTTPResponse( |  | ||||||
|         body, status=status, headers=headers, content_type=content_type |  | ||||||
|     ) |  | ||||||
|  |  | ||||||
|  |  | ||||||
| def raw( |  | ||||||
|     body: Optional[AnyStr], |  | ||||||
|     status: int = 200, |  | ||||||
|     headers: Optional[Dict[str, str]] = None, |  | ||||||
|     content_type: str = DEFAULT_HTTP_CONTENT_TYPE, |  | ||||||
| ) -> HTTPResponse: |  | ||||||
|     """ |  | ||||||
|     Returns response object without encoding the body. |  | ||||||
|  |  | ||||||
|     :param body: Response data. |  | ||||||
|     :param status: Response code. |  | ||||||
|     :param headers: Custom Headers. |  | ||||||
|     :param content_type: the content type (string) of the response. |  | ||||||
|     """ |  | ||||||
|     return HTTPResponse( |  | ||||||
|         body=body, |  | ||||||
|         status=status, |  | ||||||
|         headers=headers, |  | ||||||
|         content_type=content_type, |  | ||||||
|     ) |  | ||||||
|  |  | ||||||
|  |  | ||||||
| def html( |  | ||||||
|     body: Union[str, bytes, HTMLProtocol], |  | ||||||
|     status: int = 200, |  | ||||||
|     headers: Optional[Dict[str, str]] = None, |  | ||||||
| ) -> HTTPResponse: |  | ||||||
|     """ |  | ||||||
|     Returns response object with body in html format. |  | ||||||
|  |  | ||||||
|     :param body: str or bytes-ish, or an object with __html__ or _repr_html_. |  | ||||||
|     :param status: Response code. |  | ||||||
|     :param headers: Custom Headers. |  | ||||||
|     """ |  | ||||||
|     if not isinstance(body, (str, bytes)): |  | ||||||
|         if hasattr(body, "__html__"): |  | ||||||
|             body = body.__html__() |  | ||||||
|         elif hasattr(body, "_repr_html_"): |  | ||||||
|             body = body._repr_html_() |  | ||||||
|  |  | ||||||
|     return HTTPResponse(  # type: ignore |  | ||||||
|         body, |  | ||||||
|         status=status, |  | ||||||
|         headers=headers, |  | ||||||
|         content_type="text/html; charset=utf-8", |  | ||||||
|     ) |  | ||||||
|  |  | ||||||
|  |  | ||||||
| async def file( |  | ||||||
|     location: Union[str, PurePath], |  | ||||||
|     status: int = 200, |  | ||||||
|     mime_type: Optional[str] = None, |  | ||||||
|     headers: Optional[Dict[str, str]] = None, |  | ||||||
|     filename: Optional[str] = None, |  | ||||||
|     _range: Optional[Range] = None, |  | ||||||
| ) -> HTTPResponse: |  | ||||||
|     """Return a response object with file data. |  | ||||||
|  |  | ||||||
|     :param location: Location of file on system. |  | ||||||
|     :param mime_type: Specific mime_type. |  | ||||||
|     :param headers: Custom Headers. |  | ||||||
|     :param filename: Override filename. |  | ||||||
|     :param _range: |  | ||||||
|     """ |  | ||||||
|     headers = headers or {} |  | ||||||
|     if filename: |  | ||||||
|         headers.setdefault( |  | ||||||
|             "Content-Disposition", f'attachment; filename="{filename}"' |  | ||||||
|         ) |  | ||||||
|     filename = filename or path.split(location)[-1] |  | ||||||
|  |  | ||||||
|     async with await open_async(location, mode="rb") as f: |  | ||||||
|         if _range: |  | ||||||
|             await f.seek(_range.start) |  | ||||||
|             out_stream = await f.read(_range.size) |  | ||||||
|             headers[ |  | ||||||
|                 "Content-Range" |  | ||||||
|             ] = f"bytes {_range.start}-{_range.end}/{_range.total}" |  | ||||||
|             status = 206 |  | ||||||
|         else: |  | ||||||
|             out_stream = await f.read() |  | ||||||
|  |  | ||||||
|     mime_type = mime_type or guess_type(filename)[0] or "text/plain" |  | ||||||
|     return HTTPResponse( |  | ||||||
|         body=out_stream, |  | ||||||
|         status=status, |  | ||||||
|         headers=headers, |  | ||||||
|         content_type=mime_type, |  | ||||||
|     ) |  | ||||||
|  |  | ||||||
|  |  | ||||||
| def redirect( |  | ||||||
|     to: str, |  | ||||||
|     headers: Optional[Dict[str, str]] = None, |  | ||||||
|     status: int = 302, |  | ||||||
|     content_type: str = "text/html; charset=utf-8", |  | ||||||
| ) -> HTTPResponse: |  | ||||||
|     """ |  | ||||||
|     Abort execution and cause a 302 redirect (by default) by setting a |  | ||||||
|     Location header. |  | ||||||
|  |  | ||||||
|     :param to: path or fully qualified URL to redirect to |  | ||||||
|     :param headers: optional dict of headers to include in the new request |  | ||||||
|     :param status: status code (int) of the new request, defaults to 302 |  | ||||||
|     :param content_type: the content type (string) of the response |  | ||||||
|     """ |  | ||||||
|     headers = headers or {} |  | ||||||
|  |  | ||||||
|     # URL Quote the URL before redirecting |  | ||||||
|     safe_to = quote_plus(to, safe=":/%#?&=@[]!$&'()*+,;") |  | ||||||
|  |  | ||||||
|     # According to RFC 7231, a relative URI is now permitted. |  | ||||||
|     headers["Location"] = safe_to |  | ||||||
|  |  | ||||||
|     return HTTPResponse( |  | ||||||
|         status=status, headers=headers, content_type=content_type |  | ||||||
|     ) |  | ||||||
|  |  | ||||||
|  |  | ||||||
| class ResponseStream: |  | ||||||
|     """ |  | ||||||
|     ResponseStream is a compat layer to bridge the gap after the deprecation |  | ||||||
|     of StreamingHTTPResponse. In v22.6 it will be removed when: |  | ||||||
|     - stream is removed |  | ||||||
|     - file_stream is moved to new style streaming |  | ||||||
|     - file and file_stream are combined into a single API |  | ||||||
|     """ |  | ||||||
|  |  | ||||||
|     __slots__ = ( |  | ||||||
|         "_cookies", |  | ||||||
|         "content_type", |  | ||||||
|         "headers", |  | ||||||
|         "request", |  | ||||||
|         "response", |  | ||||||
|         "status", |  | ||||||
|         "streaming_fn", |  | ||||||
|     ) |  | ||||||
|  |  | ||||||
|     def __init__( |  | ||||||
|         self, |  | ||||||
|         streaming_fn: Callable[ |  | ||||||
|             [Union[BaseHTTPResponse, ResponseStream]], |  | ||||||
|             Coroutine[Any, Any, None], |  | ||||||
|         ], |  | ||||||
|         status: int = 200, |  | ||||||
|         headers: Optional[Union[Header, Dict[str, str]]] = None, |  | ||||||
|         content_type: Optional[str] = None, |  | ||||||
|     ): |  | ||||||
|         self.streaming_fn = streaming_fn |  | ||||||
|         self.status = status |  | ||||||
|         self.headers = headers or Header() |  | ||||||
|         self.content_type = content_type |  | ||||||
|         self.request: Optional[Request] = None |  | ||||||
|         self._cookies: Optional[CookieJar] = None |  | ||||||
|  |  | ||||||
|     async def write(self, message: str): |  | ||||||
|         await self.response.send(message) |  | ||||||
|  |  | ||||||
|     async def stream(self) -> HTTPResponse: |  | ||||||
|         if not self.request: |  | ||||||
|             raise ServerError("Attempted response to unknown request") |  | ||||||
|         self.response = await self.request.respond( |  | ||||||
|             headers=self.headers, |  | ||||||
|             status=self.status, |  | ||||||
|             content_type=self.content_type, |  | ||||||
|         ) |  | ||||||
|         await self.streaming_fn(self) |  | ||||||
|         return self.response |  | ||||||
|  |  | ||||||
|     async def eof(self) -> None: |  | ||||||
|         await self.response.eof() |  | ||||||
|  |  | ||||||
|     @property |  | ||||||
|     def cookies(self) -> CookieJar: |  | ||||||
|         if self._cookies is None: |  | ||||||
|             self._cookies = CookieJar(self.headers) |  | ||||||
|         return self._cookies |  | ||||||
|  |  | ||||||
|     @property |  | ||||||
|     def processed_headers(self): |  | ||||||
|         return self.response.processed_headers |  | ||||||
|  |  | ||||||
|     @property |  | ||||||
|     def body(self): |  | ||||||
|         return self.response.body |  | ||||||
|  |  | ||||||
|     def __call__(self, request: Request) -> ResponseStream: |  | ||||||
|         self.request = request |  | ||||||
|         return self |  | ||||||
|  |  | ||||||
|     def __await__(self): |  | ||||||
|         return self.stream().__await__() |  | ||||||
|  |  | ||||||
|  |  | ||||||
| async def file_stream( |  | ||||||
|     location: Union[str, PurePath], |  | ||||||
|     status: int = 200, |  | ||||||
|     chunk_size: int = 4096, |  | ||||||
|     mime_type: Optional[str] = None, |  | ||||||
|     headers: Optional[Dict[str, str]] = None, |  | ||||||
|     filename: Optional[str] = None, |  | ||||||
|     _range: Optional[Range] = None, |  | ||||||
| ) -> ResponseStream: |  | ||||||
|     """Return a streaming response object with file data. |  | ||||||
|  |  | ||||||
|     :param location: Location of file on system. |  | ||||||
|     :param chunk_size: The size of each chunk in the stream (in bytes) |  | ||||||
|     :param mime_type: Specific mime_type. |  | ||||||
|     :param headers: Custom Headers. |  | ||||||
|     :param filename: Override filename. |  | ||||||
|     :param _range: |  | ||||||
|     """ |  | ||||||
|     headers = headers or {} |  | ||||||
|     if filename: |  | ||||||
|         headers.setdefault( |  | ||||||
|             "Content-Disposition", f'attachment; filename="{filename}"' |  | ||||||
|         ) |  | ||||||
|     filename = filename or path.split(location)[-1] |  | ||||||
|     mime_type = mime_type or guess_type(filename)[0] or "text/plain" |  | ||||||
|     if _range: |  | ||||||
|         start = _range.start |  | ||||||
|         end = _range.end |  | ||||||
|         total = _range.total |  | ||||||
|  |  | ||||||
|         headers["Content-Range"] = f"bytes {start}-{end}/{total}" |  | ||||||
|         status = 206 |  | ||||||
|  |  | ||||||
|     async def _streaming_fn(response): |  | ||||||
|         async with await open_async(location, mode="rb") as f: |  | ||||||
|             if _range: |  | ||||||
|                 await f.seek(_range.start) |  | ||||||
|                 to_send = _range.size |  | ||||||
|                 while to_send > 0: |  | ||||||
|                     content = await f.read(min((_range.size, chunk_size))) |  | ||||||
|                     if len(content) < 1: |  | ||||||
|                         break |  | ||||||
|                     to_send -= len(content) |  | ||||||
|                     await response.write(content) |  | ||||||
|             else: |  | ||||||
|                 while True: |  | ||||||
|                     content = await f.read(chunk_size) |  | ||||||
|                     if len(content) < 1: |  | ||||||
|                         break |  | ||||||
|                     await response.write(content) |  | ||||||
|  |  | ||||||
|     return ResponseStream( |  | ||||||
|         streaming_fn=_streaming_fn, |  | ||||||
|         status=status, |  | ||||||
|         headers=headers, |  | ||||||
|         content_type=mime_type, |  | ||||||
|     ) |  | ||||||
|  |  | ||||||
|  |  | ||||||
| def stream( |  | ||||||
|     streaming_fn: Callable[ |  | ||||||
|         [Union[BaseHTTPResponse, ResponseStream]], Coroutine[Any, Any, None] |  | ||||||
|     ], |  | ||||||
|     status: int = 200, |  | ||||||
|     headers: Optional[Dict[str, str]] = None, |  | ||||||
|     content_type: str = "text/plain; charset=utf-8", |  | ||||||
| ) -> ResponseStream: |  | ||||||
|     """Accepts a coroutine `streaming_fn` which can be used to |  | ||||||
|     write chunks to a streaming response. Returns a `ResponseStream`. |  | ||||||
|  |  | ||||||
|     Example usage:: |  | ||||||
|  |  | ||||||
|         @app.route("/") |  | ||||||
|         async def index(request): |  | ||||||
|             async def streaming_fn(response): |  | ||||||
|                 await response.write('foo') |  | ||||||
|                 await response.write('bar') |  | ||||||
|  |  | ||||||
|             return stream(streaming_fn, content_type='text/plain') |  | ||||||
|  |  | ||||||
|     :param streaming_fn: A coroutine accepts a response and |  | ||||||
|         writes content to that response. |  | ||||||
|     :param status: HTTP status. |  | ||||||
|     :param content_type: Specific content_type. |  | ||||||
|     :param headers: Custom Headers. |  | ||||||
|     """ |  | ||||||
|     return ResponseStream( |  | ||||||
|         streaming_fn, |  | ||||||
|         headers=headers, |  | ||||||
|         content_type=content_type, |  | ||||||
|         status=status, |  | ||||||
|     ) |  | ||||||
							
								
								
									
										36
									
								
								sanic/response/__init__.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										36
									
								
								sanic/response/__init__.py
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,36 @@ | |||||||
|  | from .convenience import ( | ||||||
|  |     empty, | ||||||
|  |     file, | ||||||
|  |     file_stream, | ||||||
|  |     html, | ||||||
|  |     json, | ||||||
|  |     raw, | ||||||
|  |     redirect, | ||||||
|  |     text, | ||||||
|  |     validate_file, | ||||||
|  | ) | ||||||
|  | from .types import ( | ||||||
|  |     BaseHTTPResponse, | ||||||
|  |     HTTPResponse, | ||||||
|  |     JSONResponse, | ||||||
|  |     ResponseStream, | ||||||
|  |     json_dumps, | ||||||
|  | ) | ||||||
|  |  | ||||||
|  |  | ||||||
|  | __all__ = ( | ||||||
|  |     "BaseHTTPResponse", | ||||||
|  |     "HTTPResponse", | ||||||
|  |     "JSONResponse", | ||||||
|  |     "ResponseStream", | ||||||
|  |     "empty", | ||||||
|  |     "json", | ||||||
|  |     "text", | ||||||
|  |     "raw", | ||||||
|  |     "html", | ||||||
|  |     "validate_file", | ||||||
|  |     "file", | ||||||
|  |     "redirect", | ||||||
|  |     "file_stream", | ||||||
|  |     "json_dumps", | ||||||
|  | ) | ||||||
							
								
								
									
										333
									
								
								sanic/response/convenience.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										333
									
								
								sanic/response/convenience.py
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,333 @@ | |||||||
|  | from __future__ import annotations | ||||||
|  |  | ||||||
|  | from datetime import datetime, timezone | ||||||
|  | from email.utils import formatdate, parsedate_to_datetime | ||||||
|  | from mimetypes import guess_type | ||||||
|  | from os import path | ||||||
|  | from pathlib import PurePath | ||||||
|  | from time import time | ||||||
|  | from typing import Any, AnyStr, Callable, Dict, Optional, Union | ||||||
|  | from urllib.parse import quote_plus | ||||||
|  |  | ||||||
|  | from sanic.compat import Header, open_async, stat_async | ||||||
|  | from sanic.constants import DEFAULT_HTTP_CONTENT_TYPE | ||||||
|  | from sanic.helpers import Default, _default | ||||||
|  | from sanic.log import logger | ||||||
|  | from sanic.models.protocol_types import HTMLProtocol, Range | ||||||
|  |  | ||||||
|  | from .types import HTTPResponse, JSONResponse, ResponseStream | ||||||
|  |  | ||||||
|  |  | ||||||
|  | def empty( | ||||||
|  |     status: int = 204, headers: Optional[Dict[str, str]] = None | ||||||
|  | ) -> HTTPResponse: | ||||||
|  |     """ | ||||||
|  |     Returns an empty response to the client. | ||||||
|  |  | ||||||
|  |     :param status Response code. | ||||||
|  |     :param headers Custom Headers. | ||||||
|  |     """ | ||||||
|  |     return HTTPResponse(body=b"", status=status, headers=headers) | ||||||
|  |  | ||||||
|  |  | ||||||
|  | def json( | ||||||
|  |     body: Any, | ||||||
|  |     status: int = 200, | ||||||
|  |     headers: Optional[Dict[str, str]] = None, | ||||||
|  |     content_type: str = "application/json", | ||||||
|  |     dumps: Optional[Callable[..., str]] = None, | ||||||
|  |     **kwargs: Any, | ||||||
|  | ) -> JSONResponse: | ||||||
|  |     """ | ||||||
|  |     Returns response object with body in json format. | ||||||
|  |  | ||||||
|  |     :param body: Response data to be serialized. | ||||||
|  |     :param status: Response code. | ||||||
|  |     :param headers: Custom Headers. | ||||||
|  |     :param kwargs: Remaining arguments that are passed to the json encoder. | ||||||
|  |     """ | ||||||
|  |  | ||||||
|  |     return JSONResponse( | ||||||
|  |         body, | ||||||
|  |         status=status, | ||||||
|  |         headers=headers, | ||||||
|  |         content_type=content_type, | ||||||
|  |         dumps=dumps, | ||||||
|  |         **kwargs, | ||||||
|  |     ) | ||||||
|  |  | ||||||
|  |  | ||||||
|  | def text( | ||||||
|  |     body: str, | ||||||
|  |     status: int = 200, | ||||||
|  |     headers: Optional[Dict[str, str]] = None, | ||||||
|  |     content_type: str = "text/plain; charset=utf-8", | ||||||
|  | ) -> HTTPResponse: | ||||||
|  |     """ | ||||||
|  |     Returns response object with body in text format. | ||||||
|  |  | ||||||
|  |     :param body: Response data to be encoded. | ||||||
|  |     :param status: Response code. | ||||||
|  |     :param headers: Custom Headers. | ||||||
|  |     :param content_type: the content type (string) of the response | ||||||
|  |     """ | ||||||
|  |     if not isinstance(body, str): | ||||||
|  |         raise TypeError( | ||||||
|  |             f"Bad body type. Expected str, got {type(body).__name__})" | ||||||
|  |         ) | ||||||
|  |  | ||||||
|  |     return HTTPResponse( | ||||||
|  |         body, status=status, headers=headers, content_type=content_type | ||||||
|  |     ) | ||||||
|  |  | ||||||
|  |  | ||||||
|  | def raw( | ||||||
|  |     body: Optional[AnyStr], | ||||||
|  |     status: int = 200, | ||||||
|  |     headers: Optional[Dict[str, str]] = None, | ||||||
|  |     content_type: str = DEFAULT_HTTP_CONTENT_TYPE, | ||||||
|  | ) -> HTTPResponse: | ||||||
|  |     """ | ||||||
|  |     Returns response object without encoding the body. | ||||||
|  |  | ||||||
|  |     :param body: Response data. | ||||||
|  |     :param status: Response code. | ||||||
|  |     :param headers: Custom Headers. | ||||||
|  |     :param content_type: the content type (string) of the response. | ||||||
|  |     """ | ||||||
|  |     return HTTPResponse( | ||||||
|  |         body=body, | ||||||
|  |         status=status, | ||||||
|  |         headers=headers, | ||||||
|  |         content_type=content_type, | ||||||
|  |     ) | ||||||
|  |  | ||||||
|  |  | ||||||
|  | def html( | ||||||
|  |     body: Union[str, bytes, HTMLProtocol], | ||||||
|  |     status: int = 200, | ||||||
|  |     headers: Optional[Dict[str, str]] = None, | ||||||
|  | ) -> HTTPResponse: | ||||||
|  |     """ | ||||||
|  |     Returns response object with body in html format. | ||||||
|  |  | ||||||
|  |     :param body: str or bytes-ish, or an object with __html__ or _repr_html_. | ||||||
|  |     :param status: Response code. | ||||||
|  |     :param headers: Custom Headers. | ||||||
|  |     """ | ||||||
|  |     if not isinstance(body, (str, bytes)): | ||||||
|  |         if hasattr(body, "__html__"): | ||||||
|  |             body = body.__html__() | ||||||
|  |         elif hasattr(body, "_repr_html_"): | ||||||
|  |             body = body._repr_html_() | ||||||
|  |  | ||||||
|  |     return HTTPResponse(  # type: ignore | ||||||
|  |         body, | ||||||
|  |         status=status, | ||||||
|  |         headers=headers, | ||||||
|  |         content_type="text/html; charset=utf-8", | ||||||
|  |     ) | ||||||
|  |  | ||||||
|  |  | ||||||
|  | async def validate_file( | ||||||
|  |     request_headers: Header, last_modified: Union[datetime, float, int] | ||||||
|  | ): | ||||||
|  |     try: | ||||||
|  |         if_modified_since = request_headers.getone("If-Modified-Since") | ||||||
|  |     except KeyError: | ||||||
|  |         return | ||||||
|  |     try: | ||||||
|  |         if_modified_since = parsedate_to_datetime(if_modified_since) | ||||||
|  |     except (TypeError, ValueError): | ||||||
|  |         logger.warning( | ||||||
|  |             "Ignorning invalid If-Modified-Since header received: " "'%s'", | ||||||
|  |             if_modified_since, | ||||||
|  |         ) | ||||||
|  |         return | ||||||
|  |     if not isinstance(last_modified, datetime): | ||||||
|  |         last_modified = datetime.fromtimestamp( | ||||||
|  |             float(last_modified), tz=timezone.utc | ||||||
|  |         ).replace(microsecond=0) | ||||||
|  |     if last_modified <= if_modified_since: | ||||||
|  |         return HTTPResponse(status=304) | ||||||
|  |  | ||||||
|  |  | ||||||
|  | async def file( | ||||||
|  |     location: Union[str, PurePath], | ||||||
|  |     status: int = 200, | ||||||
|  |     request_headers: Optional[Header] = None, | ||||||
|  |     validate_when_requested: bool = True, | ||||||
|  |     mime_type: Optional[str] = None, | ||||||
|  |     headers: Optional[Dict[str, str]] = None, | ||||||
|  |     filename: Optional[str] = None, | ||||||
|  |     last_modified: Optional[Union[datetime, float, int, Default]] = _default, | ||||||
|  |     max_age: Optional[Union[float, int]] = None, | ||||||
|  |     no_store: Optional[bool] = None, | ||||||
|  |     _range: Optional[Range] = None, | ||||||
|  | ) -> HTTPResponse: | ||||||
|  |     """Return a response object with file data. | ||||||
|  |     :param status: HTTP response code. Won't enforce the passed in | ||||||
|  |         status if only a part of the content will be sent (206) | ||||||
|  |         or file is being validated (304). | ||||||
|  |     :param request_headers: The request headers. | ||||||
|  |     :param validate_when_requested: If True, will validate the | ||||||
|  |         file when requested. | ||||||
|  |     :param location: Location of file on system. | ||||||
|  |     :param mime_type: Specific mime_type. | ||||||
|  |     :param headers: Custom Headers. | ||||||
|  |     :param filename: Override filename. | ||||||
|  |     :param last_modified: The last modified date and time of the file. | ||||||
|  |     :param max_age: Max age for cache control. | ||||||
|  |     :param no_store: Any cache should not store this response. | ||||||
|  |     :param _range: | ||||||
|  |     """ | ||||||
|  |  | ||||||
|  |     if isinstance(last_modified, datetime): | ||||||
|  |         last_modified = last_modified.replace(microsecond=0).timestamp() | ||||||
|  |     elif isinstance(last_modified, Default): | ||||||
|  |         stat = await stat_async(location) | ||||||
|  |         last_modified = stat.st_mtime | ||||||
|  |  | ||||||
|  |     if ( | ||||||
|  |         validate_when_requested | ||||||
|  |         and request_headers is not None | ||||||
|  |         and last_modified | ||||||
|  |     ): | ||||||
|  |         response = await validate_file(request_headers, last_modified) | ||||||
|  |         if response: | ||||||
|  |             return response | ||||||
|  |  | ||||||
|  |     headers = headers or {} | ||||||
|  |     if last_modified: | ||||||
|  |         headers.setdefault( | ||||||
|  |             "Last-Modified", formatdate(last_modified, usegmt=True) | ||||||
|  |         ) | ||||||
|  |  | ||||||
|  |     if filename: | ||||||
|  |         headers.setdefault( | ||||||
|  |             "Content-Disposition", f'attachment; filename="{filename}"' | ||||||
|  |         ) | ||||||
|  |  | ||||||
|  |     if no_store: | ||||||
|  |         cache_control = "no-store" | ||||||
|  |     elif max_age: | ||||||
|  |         cache_control = f"public, max-age={max_age}" | ||||||
|  |         headers.setdefault( | ||||||
|  |             "expires", | ||||||
|  |             formatdate( | ||||||
|  |                 time() + max_age, | ||||||
|  |                 usegmt=True, | ||||||
|  |             ), | ||||||
|  |         ) | ||||||
|  |     else: | ||||||
|  |         cache_control = "no-cache" | ||||||
|  |  | ||||||
|  |     headers.setdefault("cache-control", cache_control) | ||||||
|  |  | ||||||
|  |     filename = filename or path.split(location)[-1] | ||||||
|  |  | ||||||
|  |     async with await open_async(location, mode="rb") as f: | ||||||
|  |         if _range: | ||||||
|  |             await f.seek(_range.start) | ||||||
|  |             out_stream = await f.read(_range.size) | ||||||
|  |             headers[ | ||||||
|  |                 "Content-Range" | ||||||
|  |             ] = f"bytes {_range.start}-{_range.end}/{_range.total}" | ||||||
|  |             status = 206 | ||||||
|  |         else: | ||||||
|  |             out_stream = await f.read() | ||||||
|  |  | ||||||
|  |     mime_type = mime_type or guess_type(filename)[0] or "text/plain" | ||||||
|  |     return HTTPResponse( | ||||||
|  |         body=out_stream, | ||||||
|  |         status=status, | ||||||
|  |         headers=headers, | ||||||
|  |         content_type=mime_type, | ||||||
|  |     ) | ||||||
|  |  | ||||||
|  |  | ||||||
|  | def redirect( | ||||||
|  |     to: str, | ||||||
|  |     headers: Optional[Dict[str, str]] = None, | ||||||
|  |     status: int = 302, | ||||||
|  |     content_type: str = "text/html; charset=utf-8", | ||||||
|  | ) -> HTTPResponse: | ||||||
|  |     """ | ||||||
|  |     Abort execution and cause a 302 redirect (by default) by setting a | ||||||
|  |     Location header. | ||||||
|  |  | ||||||
|  |     :param to: path or fully qualified URL to redirect to | ||||||
|  |     :param headers: optional dict of headers to include in the new request | ||||||
|  |     :param status: status code (int) of the new request, defaults to 302 | ||||||
|  |     :param content_type: the content type (string) of the response | ||||||
|  |     """ | ||||||
|  |     headers = headers or {} | ||||||
|  |  | ||||||
|  |     # URL Quote the URL before redirecting | ||||||
|  |     safe_to = quote_plus(to, safe=":/%#?&=@[]!$&'()*+,;") | ||||||
|  |  | ||||||
|  |     # According to RFC 7231, a relative URI is now permitted. | ||||||
|  |     headers["Location"] = safe_to | ||||||
|  |  | ||||||
|  |     return HTTPResponse( | ||||||
|  |         status=status, headers=headers, content_type=content_type | ||||||
|  |     ) | ||||||
|  |  | ||||||
|  |  | ||||||
|  | async def file_stream( | ||||||
|  |     location: Union[str, PurePath], | ||||||
|  |     status: int = 200, | ||||||
|  |     chunk_size: int = 4096, | ||||||
|  |     mime_type: Optional[str] = None, | ||||||
|  |     headers: Optional[Dict[str, str]] = None, | ||||||
|  |     filename: Optional[str] = None, | ||||||
|  |     _range: Optional[Range] = None, | ||||||
|  | ) -> ResponseStream: | ||||||
|  |     """Return a streaming response object with file data. | ||||||
|  |  | ||||||
|  |     :param location: Location of file on system. | ||||||
|  |     :param chunk_size: The size of each chunk in the stream (in bytes) | ||||||
|  |     :param mime_type: Specific mime_type. | ||||||
|  |     :param headers: Custom Headers. | ||||||
|  |     :param filename: Override filename. | ||||||
|  |     :param _range: | ||||||
|  |     """ | ||||||
|  |     headers = headers or {} | ||||||
|  |     if filename: | ||||||
|  |         headers.setdefault( | ||||||
|  |             "Content-Disposition", f'attachment; filename="{filename}"' | ||||||
|  |         ) | ||||||
|  |     filename = filename or path.split(location)[-1] | ||||||
|  |     mime_type = mime_type or guess_type(filename)[0] or "text/plain" | ||||||
|  |     if _range: | ||||||
|  |         start = _range.start | ||||||
|  |         end = _range.end | ||||||
|  |         total = _range.total | ||||||
|  |  | ||||||
|  |         headers["Content-Range"] = f"bytes {start}-{end}/{total}" | ||||||
|  |         status = 206 | ||||||
|  |  | ||||||
|  |     async def _streaming_fn(response): | ||||||
|  |         async with await open_async(location, mode="rb") as f: | ||||||
|  |             if _range: | ||||||
|  |                 await f.seek(_range.start) | ||||||
|  |                 to_send = _range.size | ||||||
|  |                 while to_send > 0: | ||||||
|  |                     content = await f.read(min((_range.size, chunk_size))) | ||||||
|  |                     if len(content) < 1: | ||||||
|  |                         break | ||||||
|  |                     to_send -= len(content) | ||||||
|  |                     await response.write(content) | ||||||
|  |             else: | ||||||
|  |                 while True: | ||||||
|  |                     content = await f.read(chunk_size) | ||||||
|  |                     if len(content) < 1: | ||||||
|  |                         break | ||||||
|  |                     await response.write(content) | ||||||
|  |  | ||||||
|  |     return ResponseStream( | ||||||
|  |         streaming_fn=_streaming_fn, | ||||||
|  |         status=status, | ||||||
|  |         headers=headers, | ||||||
|  |         content_type=mime_type, | ||||||
|  |     ) | ||||||
							
								
								
									
										453
									
								
								sanic/response/types.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										453
									
								
								sanic/response/types.py
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,453 @@ | |||||||
|  | from __future__ import annotations | ||||||
|  |  | ||||||
|  | from functools import partial | ||||||
|  | from typing import ( | ||||||
|  |     TYPE_CHECKING, | ||||||
|  |     Any, | ||||||
|  |     AnyStr, | ||||||
|  |     Callable, | ||||||
|  |     Coroutine, | ||||||
|  |     Dict, | ||||||
|  |     Iterator, | ||||||
|  |     Optional, | ||||||
|  |     Tuple, | ||||||
|  |     TypeVar, | ||||||
|  |     Union, | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | from sanic.compat import Header | ||||||
|  | from sanic.cookies import CookieJar | ||||||
|  | from sanic.exceptions import SanicException, ServerError | ||||||
|  | from sanic.helpers import ( | ||||||
|  |     Default, | ||||||
|  |     _default, | ||||||
|  |     has_message_body, | ||||||
|  |     remove_entity_headers, | ||||||
|  | ) | ||||||
|  | from sanic.http import Http | ||||||
|  |  | ||||||
|  |  | ||||||
|  | if TYPE_CHECKING: | ||||||
|  |     from sanic.asgi import ASGIApp | ||||||
|  |     from sanic.http.http3 import HTTPReceiver | ||||||
|  |     from sanic.request import Request | ||||||
|  | else: | ||||||
|  |     Request = TypeVar("Request") | ||||||
|  |  | ||||||
|  |  | ||||||
|  | try: | ||||||
|  |     from ujson import dumps as json_dumps | ||||||
|  | except ImportError: | ||||||
|  |     # This is done in order to ensure that the JSON response is | ||||||
|  |     # kept consistent across both ujson and inbuilt json usage. | ||||||
|  |     from json import dumps | ||||||
|  |  | ||||||
|  |     json_dumps = partial(dumps, separators=(",", ":")) | ||||||
|  |  | ||||||
|  |  | ||||||
|  | class BaseHTTPResponse: | ||||||
|  |     """ | ||||||
|  |     The base class for all HTTP Responses | ||||||
|  |     """ | ||||||
|  |  | ||||||
|  |     __slots__ = ( | ||||||
|  |         "asgi", | ||||||
|  |         "body", | ||||||
|  |         "content_type", | ||||||
|  |         "stream", | ||||||
|  |         "status", | ||||||
|  |         "headers", | ||||||
|  |         "_cookies", | ||||||
|  |     ) | ||||||
|  |  | ||||||
|  |     _dumps = json_dumps | ||||||
|  |  | ||||||
|  |     def __init__(self): | ||||||
|  |         self.asgi: bool = False | ||||||
|  |         self.body: Optional[bytes] = None | ||||||
|  |         self.content_type: Optional[str] = None | ||||||
|  |         self.stream: Optional[Union[Http, ASGIApp, HTTPReceiver]] = None | ||||||
|  |         self.status: int = None | ||||||
|  |         self.headers = Header({}) | ||||||
|  |         self._cookies: Optional[CookieJar] = None | ||||||
|  |  | ||||||
|  |     def __repr__(self): | ||||||
|  |         class_name = self.__class__.__name__ | ||||||
|  |         return f"<{class_name}: {self.status} {self.content_type}>" | ||||||
|  |  | ||||||
|  |     def _encode_body(self, data: Optional[AnyStr]): | ||||||
|  |         if data is None: | ||||||
|  |             return b"" | ||||||
|  |         return ( | ||||||
|  |             data.encode() if hasattr(data, "encode") else data  # type: ignore | ||||||
|  |         ) | ||||||
|  |  | ||||||
|  |     @property | ||||||
|  |     def cookies(self) -> CookieJar: | ||||||
|  |         """ | ||||||
|  |         The response cookies. Cookies should be set and written as follows: | ||||||
|  |  | ||||||
|  |         .. code-block:: python | ||||||
|  |  | ||||||
|  |                 response.cookies["test"] = "It worked!" | ||||||
|  |                 response.cookies["test"]["domain"] = ".yummy-yummy-cookie.com" | ||||||
|  |                 response.cookies["test"]["httponly"] = True | ||||||
|  |  | ||||||
|  |         `See user guide re: cookies | ||||||
|  |         <https://sanic.dev/en/guide/basics/cookies.html>` | ||||||
|  |  | ||||||
|  |         :return: the cookie jar | ||||||
|  |         :rtype: CookieJar | ||||||
|  |         """ | ||||||
|  |         if self._cookies is None: | ||||||
|  |             self._cookies = CookieJar(self.headers) | ||||||
|  |         return self._cookies | ||||||
|  |  | ||||||
|  |     @property | ||||||
|  |     def processed_headers(self) -> Iterator[Tuple[bytes, bytes]]: | ||||||
|  |         """ | ||||||
|  |         Obtain a list of header tuples encoded in bytes for sending. | ||||||
|  |  | ||||||
|  |         Add and remove headers based on status and content_type. | ||||||
|  |  | ||||||
|  |         :return: response headers | ||||||
|  |         :rtype: Tuple[Tuple[bytes, bytes], ...] | ||||||
|  |         """ | ||||||
|  |         # TODO: Make a blacklist set of header names and then filter with that | ||||||
|  |         if self.status in (304, 412):  # Not Modified, Precondition Failed | ||||||
|  |             self.headers = remove_entity_headers(self.headers) | ||||||
|  |         if has_message_body(self.status): | ||||||
|  |             self.headers.setdefault("content-type", self.content_type) | ||||||
|  |         # Encode headers into bytes | ||||||
|  |         return ( | ||||||
|  |             (name.encode("ascii"), f"{value}".encode(errors="surrogateescape")) | ||||||
|  |             for name, value in self.headers.items() | ||||||
|  |         ) | ||||||
|  |  | ||||||
|  |     async def send( | ||||||
|  |         self, | ||||||
|  |         data: Optional[AnyStr] = None, | ||||||
|  |         end_stream: Optional[bool] = None, | ||||||
|  |     ) -> None: | ||||||
|  |         """ | ||||||
|  |         Send any pending response headers and the given data as body. | ||||||
|  |  | ||||||
|  |         :param data: str or bytes to be written | ||||||
|  |         :param end_stream: whether to close the stream after this block | ||||||
|  |         """ | ||||||
|  |         if data is None and end_stream is None: | ||||||
|  |             end_stream = True | ||||||
|  |         if self.stream is None: | ||||||
|  |             raise SanicException( | ||||||
|  |                 "No stream is connected to the response object instance." | ||||||
|  |             ) | ||||||
|  |         if self.stream.send is None: | ||||||
|  |             if end_stream and not data: | ||||||
|  |                 return | ||||||
|  |             raise ServerError( | ||||||
|  |                 "Response stream was ended, no more response data is " | ||||||
|  |                 "allowed to be sent." | ||||||
|  |             ) | ||||||
|  |         data = ( | ||||||
|  |             data.encode()  # type: ignore | ||||||
|  |             if hasattr(data, "encode") | ||||||
|  |             else data or b"" | ||||||
|  |         ) | ||||||
|  |         await self.stream.send( | ||||||
|  |             data,  # type: ignore | ||||||
|  |             end_stream=end_stream or False, | ||||||
|  |         ) | ||||||
|  |  | ||||||
|  |  | ||||||
|  | class HTTPResponse(BaseHTTPResponse): | ||||||
|  |     """ | ||||||
|  |     HTTP response to be sent back to the client. | ||||||
|  |  | ||||||
|  |     :param body: the body content to be returned | ||||||
|  |     :type body: Optional[bytes] | ||||||
|  |     :param status: HTTP response number. **Default=200** | ||||||
|  |     :type status: int | ||||||
|  |     :param headers: headers to be returned | ||||||
|  |     :type headers: Optional; | ||||||
|  |     :param content_type: content type to be returned (as a header) | ||||||
|  |     :type content_type: Optional[str] | ||||||
|  |     """ | ||||||
|  |  | ||||||
|  |     __slots__ = () | ||||||
|  |  | ||||||
|  |     def __init__( | ||||||
|  |         self, | ||||||
|  |         body: Optional[Any] = None, | ||||||
|  |         status: int = 200, | ||||||
|  |         headers: Optional[Union[Header, Dict[str, str]]] = None, | ||||||
|  |         content_type: Optional[str] = None, | ||||||
|  |     ): | ||||||
|  |         super().__init__() | ||||||
|  |  | ||||||
|  |         self.content_type: Optional[str] = content_type | ||||||
|  |         self.body = self._encode_body(body) | ||||||
|  |         self.status = status | ||||||
|  |         self.headers = Header(headers or {}) | ||||||
|  |         self._cookies = None | ||||||
|  |  | ||||||
|  |     async def eof(self): | ||||||
|  |         await self.send("", True) | ||||||
|  |  | ||||||
|  |     async def __aenter__(self): | ||||||
|  |         return self.send | ||||||
|  |  | ||||||
|  |     async def __aexit__(self, *_): | ||||||
|  |         await self.eof() | ||||||
|  |  | ||||||
|  |  | ||||||
|  | class JSONResponse(HTTPResponse): | ||||||
|  |     """ | ||||||
|  |     HTTP response to be sent back to the client, when the response | ||||||
|  |     is of json type. Offers several utilities to manipulate common | ||||||
|  |     json data types. | ||||||
|  |  | ||||||
|  |     :param body: the body content to be returned | ||||||
|  |     :type body: Optional[Any] | ||||||
|  |     :param status: HTTP response number. **Default=200** | ||||||
|  |     :type status: int | ||||||
|  |     :param headers: headers to be returned | ||||||
|  |     :type headers: Optional | ||||||
|  |     :param content_type: content type to be returned (as a header) | ||||||
|  |     :type content_type: Optional[str] | ||||||
|  |     :param dumps: json.dumps function to use | ||||||
|  |     :type dumps: Optional[Callable] | ||||||
|  |     """ | ||||||
|  |  | ||||||
|  |     __slots__ = ( | ||||||
|  |         "_body", | ||||||
|  |         "_body_manually_set", | ||||||
|  |         "_initialized", | ||||||
|  |         "_raw_body", | ||||||
|  |         "_use_dumps", | ||||||
|  |         "_use_dumps_kwargs", | ||||||
|  |     ) | ||||||
|  |  | ||||||
|  |     def __init__( | ||||||
|  |         self, | ||||||
|  |         body: Optional[Any] = None, | ||||||
|  |         status: int = 200, | ||||||
|  |         headers: Optional[Union[Header, Dict[str, str]]] = None, | ||||||
|  |         content_type: str = "application/json", | ||||||
|  |         dumps: Optional[Callable[..., str]] = None, | ||||||
|  |         **kwargs: Any, | ||||||
|  |     ): | ||||||
|  |         self._initialized = False | ||||||
|  |         self._body_manually_set = False | ||||||
|  |  | ||||||
|  |         self._use_dumps = dumps or BaseHTTPResponse._dumps | ||||||
|  |         self._use_dumps_kwargs = kwargs | ||||||
|  |  | ||||||
|  |         self._raw_body = body | ||||||
|  |  | ||||||
|  |         super().__init__( | ||||||
|  |             self._encode_body(self._use_dumps(body, **self._use_dumps_kwargs)), | ||||||
|  |             headers=headers, | ||||||
|  |             status=status, | ||||||
|  |             content_type=content_type, | ||||||
|  |         ) | ||||||
|  |  | ||||||
|  |         self._initialized = True | ||||||
|  |  | ||||||
|  |     def _check_body_not_manually_set(self): | ||||||
|  |         if self._body_manually_set: | ||||||
|  |             raise SanicException( | ||||||
|  |                 "Cannot use raw_body after body has been manually set." | ||||||
|  |             ) | ||||||
|  |  | ||||||
|  |     @property | ||||||
|  |     def raw_body(self) -> Optional[Any]: | ||||||
|  |         """Returns the raw body, as long as body has not been manually | ||||||
|  |         set previously. | ||||||
|  |  | ||||||
|  |         NOTE: This object should not be mutated, as it will not be | ||||||
|  |         reflected in the response body. If you need to mutate the | ||||||
|  |         response body, consider using one of the provided methods in | ||||||
|  |         this class or alternatively call set_body() with the mutated | ||||||
|  |         object afterwards or set the raw_body property to it. | ||||||
|  |         """ | ||||||
|  |  | ||||||
|  |         self._check_body_not_manually_set() | ||||||
|  |         return self._raw_body | ||||||
|  |  | ||||||
|  |     @raw_body.setter | ||||||
|  |     def raw_body(self, value: Any): | ||||||
|  |         self._body_manually_set = False | ||||||
|  |         self._body = self._encode_body( | ||||||
|  |             self._use_dumps(value, **self._use_dumps_kwargs) | ||||||
|  |         ) | ||||||
|  |         self._raw_body = value | ||||||
|  |  | ||||||
|  |     @property  # type: ignore | ||||||
|  |     def body(self) -> Optional[bytes]:  # type: ignore | ||||||
|  |         return self._body | ||||||
|  |  | ||||||
|  |     @body.setter | ||||||
|  |     def body(self, value: Optional[bytes]): | ||||||
|  |         self._body = value | ||||||
|  |         if not self._initialized: | ||||||
|  |             return | ||||||
|  |         self._body_manually_set = True | ||||||
|  |  | ||||||
|  |     def set_body( | ||||||
|  |         self, | ||||||
|  |         body: Any, | ||||||
|  |         dumps: Optional[Callable[..., str]] = None, | ||||||
|  |         **dumps_kwargs: Any, | ||||||
|  |     ) -> None: | ||||||
|  |         """Sets a new response body using the given dumps function | ||||||
|  |         and kwargs, or falling back to the defaults given when | ||||||
|  |         creating the object if none are specified. | ||||||
|  |         """ | ||||||
|  |  | ||||||
|  |         self._body_manually_set = False | ||||||
|  |         self._raw_body = body | ||||||
|  |  | ||||||
|  |         use_dumps = dumps or self._use_dumps | ||||||
|  |         use_dumps_kwargs = dumps_kwargs if dumps else self._use_dumps_kwargs | ||||||
|  |  | ||||||
|  |         self._body = self._encode_body(use_dumps(body, **use_dumps_kwargs)) | ||||||
|  |  | ||||||
|  |     def append(self, value: Any) -> None: | ||||||
|  |         """Appends a value to the response raw_body, ensuring that | ||||||
|  |         body is kept up to date. This can only be used if raw_body | ||||||
|  |         is a list. | ||||||
|  |         """ | ||||||
|  |  | ||||||
|  |         self._check_body_not_manually_set() | ||||||
|  |  | ||||||
|  |         if not isinstance(self._raw_body, list): | ||||||
|  |             raise SanicException("Cannot append to a non-list object.") | ||||||
|  |  | ||||||
|  |         self._raw_body.append(value) | ||||||
|  |         self.raw_body = self._raw_body | ||||||
|  |  | ||||||
|  |     def extend(self, value: Any) -> None: | ||||||
|  |         """Extends the response's raw_body with the given values, ensuring | ||||||
|  |         that body is kept up to date. This can only be used if raw_body is | ||||||
|  |         a list. | ||||||
|  |         """ | ||||||
|  |  | ||||||
|  |         self._check_body_not_manually_set() | ||||||
|  |  | ||||||
|  |         if not isinstance(self._raw_body, list): | ||||||
|  |             raise SanicException("Cannot extend a non-list object.") | ||||||
|  |  | ||||||
|  |         self._raw_body.extend(value) | ||||||
|  |         self.raw_body = self._raw_body | ||||||
|  |  | ||||||
|  |     def update(self, *args, **kwargs) -> None: | ||||||
|  |         """Updates the response's raw_body with the given values, ensuring | ||||||
|  |         that body is kept up to date. This can only be used if raw_body is | ||||||
|  |         a dict. | ||||||
|  |         """ | ||||||
|  |  | ||||||
|  |         self._check_body_not_manually_set() | ||||||
|  |  | ||||||
|  |         if not isinstance(self._raw_body, dict): | ||||||
|  |             raise SanicException("Cannot update a non-dict object.") | ||||||
|  |  | ||||||
|  |         self._raw_body.update(*args, **kwargs) | ||||||
|  |         self.raw_body = self._raw_body | ||||||
|  |  | ||||||
|  |     def pop(self, key: Any, default: Any = _default) -> Any: | ||||||
|  |         """Pops a key from the response's raw_body, ensuring that body is | ||||||
|  |         kept up to date. This can only be used if raw_body is a dict or a | ||||||
|  |         list. | ||||||
|  |         """ | ||||||
|  |  | ||||||
|  |         self._check_body_not_manually_set() | ||||||
|  |  | ||||||
|  |         if not isinstance(self._raw_body, (list, dict)): | ||||||
|  |             raise SanicException( | ||||||
|  |                 "Cannot pop from a non-list and non-dict object." | ||||||
|  |             ) | ||||||
|  |  | ||||||
|  |         if isinstance(default, Default): | ||||||
|  |             value = self._raw_body.pop(key) | ||||||
|  |         elif isinstance(self._raw_body, list): | ||||||
|  |             raise TypeError("pop doesn't accept a default argument for lists") | ||||||
|  |         else: | ||||||
|  |             value = self._raw_body.pop(key, default) | ||||||
|  |  | ||||||
|  |         self.raw_body = self._raw_body | ||||||
|  |  | ||||||
|  |         return value | ||||||
|  |  | ||||||
|  |  | ||||||
|  | class ResponseStream: | ||||||
|  |     """ | ||||||
|  |     ResponseStream is a compat layer to bridge the gap after the deprecation | ||||||
|  |     of StreamingHTTPResponse. It will be removed when: | ||||||
|  |     - file_stream is moved to new style streaming | ||||||
|  |     - file and file_stream are combined into a single API | ||||||
|  |     """ | ||||||
|  |  | ||||||
|  |     __slots__ = ( | ||||||
|  |         "_cookies", | ||||||
|  |         "content_type", | ||||||
|  |         "headers", | ||||||
|  |         "request", | ||||||
|  |         "response", | ||||||
|  |         "status", | ||||||
|  |         "streaming_fn", | ||||||
|  |     ) | ||||||
|  |  | ||||||
|  |     def __init__( | ||||||
|  |         self, | ||||||
|  |         streaming_fn: Callable[ | ||||||
|  |             [Union[BaseHTTPResponse, ResponseStream]], | ||||||
|  |             Coroutine[Any, Any, None], | ||||||
|  |         ], | ||||||
|  |         status: int = 200, | ||||||
|  |         headers: Optional[Union[Header, Dict[str, str]]] = None, | ||||||
|  |         content_type: Optional[str] = None, | ||||||
|  |     ): | ||||||
|  |         self.streaming_fn = streaming_fn | ||||||
|  |         self.status = status | ||||||
|  |         self.headers = headers or Header() | ||||||
|  |         self.content_type = content_type | ||||||
|  |         self.request: Optional[Request] = None | ||||||
|  |         self._cookies: Optional[CookieJar] = None | ||||||
|  |  | ||||||
|  |     async def write(self, message: str): | ||||||
|  |         await self.response.send(message) | ||||||
|  |  | ||||||
|  |     async def stream(self) -> HTTPResponse: | ||||||
|  |         if not self.request: | ||||||
|  |             raise ServerError("Attempted response to unknown request") | ||||||
|  |         self.response = await self.request.respond( | ||||||
|  |             headers=self.headers, | ||||||
|  |             status=self.status, | ||||||
|  |             content_type=self.content_type, | ||||||
|  |         ) | ||||||
|  |         await self.streaming_fn(self) | ||||||
|  |         return self.response | ||||||
|  |  | ||||||
|  |     async def eof(self) -> None: | ||||||
|  |         await self.response.eof() | ||||||
|  |  | ||||||
|  |     @property | ||||||
|  |     def cookies(self) -> CookieJar: | ||||||
|  |         if self._cookies is None: | ||||||
|  |             self._cookies = CookieJar(self.headers) | ||||||
|  |         return self._cookies | ||||||
|  |  | ||||||
|  |     @property | ||||||
|  |     def processed_headers(self): | ||||||
|  |         return self.response.processed_headers | ||||||
|  |  | ||||||
|  |     @property | ||||||
|  |     def body(self): | ||||||
|  |         return self.response.body | ||||||
|  |  | ||||||
|  |     def __call__(self, request: Request) -> ResponseStream: | ||||||
|  |         self.request = request | ||||||
|  |         return self | ||||||
|  |  | ||||||
|  |     def __await__(self): | ||||||
|  |         return self.stream().__await__() | ||||||
| @@ -5,16 +5,14 @@ from inspect import signature | |||||||
| from typing import Any, Dict, Iterable, List, Optional, Tuple, Union | from typing import Any, Dict, Iterable, List, Optional, Tuple, Union | ||||||
| from uuid import UUID | from uuid import UUID | ||||||
|  |  | ||||||
| from sanic_routing import BaseRouter  # type: ignore | from sanic_routing import BaseRouter | ||||||
| from sanic_routing.exceptions import NoMethod  # type: ignore | from sanic_routing.exceptions import NoMethod | ||||||
| from sanic_routing.exceptions import ( | from sanic_routing.exceptions import NotFound as RoutingNotFound | ||||||
|     NotFound as RoutingNotFound,  # type: ignore | from sanic_routing.route import Route | ||||||
| ) |  | ||||||
| from sanic_routing.route import Route  # type: ignore |  | ||||||
|  |  | ||||||
| from sanic.constants import HTTP_METHODS | from sanic.constants import HTTP_METHODS | ||||||
| from sanic.errorpages import check_error_format | from sanic.errorpages import check_error_format | ||||||
| from sanic.exceptions import MethodNotSupported, NotFound, SanicException | from sanic.exceptions import MethodNotAllowed, NotFound, SanicException | ||||||
| from sanic.models.handler_types import RouteHandler | from sanic.models.handler_types import RouteHandler | ||||||
|  |  | ||||||
|  |  | ||||||
| @@ -43,7 +41,7 @@ class Router(BaseRouter): | |||||||
|         except RoutingNotFound as e: |         except RoutingNotFound as e: | ||||||
|             raise NotFound("Requested URL {} not found".format(e.path)) |             raise NotFound("Requested URL {} not found".format(e.path)) | ||||||
|         except NoMethod as e: |         except NoMethod as e: | ||||||
|             raise MethodNotSupported( |             raise MethodNotAllowed( | ||||||
|                 "Method {} not allowed for URL {}".format(method, path), |                 "Method {} not allowed for URL {}".format(method, path), | ||||||
|                 method=method, |                 method=method, | ||||||
|                 allowed_methods=e.allowed_methods, |                 allowed_methods=e.allowed_methods, | ||||||
| @@ -135,14 +133,14 @@ class Router(BaseRouter): | |||||||
|                 params.update({"requirements": {"host": host}}) |                 params.update({"requirements": {"host": host}}) | ||||||
|  |  | ||||||
|             route = super().add(**params)  # type: ignore |             route = super().add(**params)  # type: ignore | ||||||
|             route.ctx.ignore_body = ignore_body |             route.extra.ignore_body = ignore_body | ||||||
|             route.ctx.stream = stream |             route.extra.stream = stream | ||||||
|             route.ctx.hosts = hosts |             route.extra.hosts = hosts | ||||||
|             route.ctx.static = static |             route.extra.static = static | ||||||
|             route.ctx.error_format = error_format |             route.extra.error_format = error_format | ||||||
|  |  | ||||||
|             if error_format: |             if error_format: | ||||||
|                 check_error_format(route.ctx.error_format) |                 check_error_format(route.extra.error_format) | ||||||
|  |  | ||||||
|             routes.append(route) |             routes.append(route) | ||||||
|  |  | ||||||
|   | |||||||
| @@ -5,7 +5,6 @@ import asyncio | |||||||
| from typing import TYPE_CHECKING | from typing import TYPE_CHECKING | ||||||
|  |  | ||||||
| from sanic.exceptions import SanicException | from sanic.exceptions import SanicException | ||||||
| from sanic.log import deprecation |  | ||||||
|  |  | ||||||
|  |  | ||||||
| if TYPE_CHECKING: | if TYPE_CHECKING: | ||||||
| @@ -35,15 +34,6 @@ class AsyncioServer: | |||||||
|         self.serve_coro = serve_coro |         self.serve_coro = serve_coro | ||||||
|         self.server = None |         self.server = None | ||||||
|  |  | ||||||
|     @property |  | ||||||
|     def init(self): |  | ||||||
|         deprecation( |  | ||||||
|             "AsyncioServer.init has been deprecated and will be removed " |  | ||||||
|             "in v22.6. Use Sanic.state.is_started instead.", |  | ||||||
|             22.6, |  | ||||||
|         ) |  | ||||||
|         return self.app.state.is_started |  | ||||||
|  |  | ||||||
|     def startup(self): |     def startup(self): | ||||||
|         """ |         """ | ||||||
|         Trigger "before_server_start" events |         Trigger "before_server_start" events | ||||||
|   | |||||||
| @@ -1,8 +1,18 @@ | |||||||
|  | from __future__ import annotations | ||||||
|  |  | ||||||
| from inspect import isawaitable | from inspect import isawaitable | ||||||
| from typing import Any, Callable, Iterable, Optional | from typing import TYPE_CHECKING, Any, Callable, Iterable, Optional | ||||||
|  |  | ||||||
|  |  | ||||||
| def trigger_events(events: Optional[Iterable[Callable[..., Any]]], loop): | if TYPE_CHECKING: | ||||||
|  |     from sanic import Sanic | ||||||
|  |  | ||||||
|  |  | ||||||
|  | def trigger_events( | ||||||
|  |     events: Optional[Iterable[Callable[..., Any]]], | ||||||
|  |     loop, | ||||||
|  |     app: Optional[Sanic] = None, | ||||||
|  | ): | ||||||
|     """ |     """ | ||||||
|     Trigger event callbacks (functions or async) |     Trigger event callbacks (functions or async) | ||||||
|  |  | ||||||
| @@ -11,6 +21,9 @@ def trigger_events(events: Optional[Iterable[Callable[..., Any]]], loop): | |||||||
|     """ |     """ | ||||||
|     if events: |     if events: | ||||||
|         for event in events: |         for event in events: | ||||||
|             result = event(loop) |             try: | ||||||
|  |                 result = event() if not app else event(app) | ||||||
|  |             except TypeError: | ||||||
|  |                 result = event(loop) if not app else event(app, loop) | ||||||
|             if isawaitable(result): |             if isawaitable(result): | ||||||
|                 loop.run_until_complete(result) |                 loop.run_until_complete(result) | ||||||
|   | |||||||
| @@ -9,7 +9,6 @@ from time import sleep | |||||||
| 
 | 
 | ||||||
| def _iter_module_files(): | def _iter_module_files(): | ||||||
|     """This iterates over all relevant Python files. |     """This iterates over all relevant Python files. | ||||||
| 
 |  | ||||||
|     It goes through all |     It goes through all | ||||||
|     loaded files from modules, all files in folders of already loaded modules |     loaded files from modules, all files in folders of already loaded modules | ||||||
|     as well as all files reachable through a package. |     as well as all files reachable through a package. | ||||||
| @@ -52,7 +51,7 @@ def restart_with_reloader(changed=None): | |||||||
|     this one. |     this one. | ||||||
|     """ |     """ | ||||||
|     reloaded = ",".join(changed) if changed else "" |     reloaded = ",".join(changed) if changed else "" | ||||||
|     return subprocess.Popen( |     return subprocess.Popen(  # nosec B603 | ||||||
|         _get_args_for_reloading(), |         _get_args_for_reloading(), | ||||||
|         env={ |         env={ | ||||||
|             **os.environ, |             **os.environ, | ||||||
| @@ -77,9 +76,8 @@ def _check_file(filename, mtimes): | |||||||
|     return need_reload |     return need_reload | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| def watchdog(sleep_interval, app): | def watchdog(sleep_interval, reload_dirs): | ||||||
|     """Watch project files, restart worker process if a change happened. |     """Watch project files, restart worker process if a change happened. | ||||||
| 
 |  | ||||||
|     :param sleep_interval: interval in second. |     :param sleep_interval: interval in second. | ||||||
|     :return: Nothing |     :return: Nothing | ||||||
|     """ |     """ | ||||||
| @@ -96,11 +94,10 @@ def watchdog(sleep_interval, app): | |||||||
| 
 | 
 | ||||||
|     try: |     try: | ||||||
|         while True: |         while True: | ||||||
| 
 |  | ||||||
|             changed = set() |             changed = set() | ||||||
|             for filename in itertools.chain( |             for filename in itertools.chain( | ||||||
|                 _iter_module_files(), |                 _iter_module_files(), | ||||||
|                 *(d.glob("**/*") for d in app.reload_dirs), |                 *(d.glob("**/*") for d in reload_dirs), | ||||||
|             ): |             ): | ||||||
|                 try: |                 try: | ||||||
|                     if _check_file(filename, mtimes): |                     if _check_file(filename, mtimes): | ||||||
Some files were not shown because too many files have changed in this diff Show More
		Reference in New Issue
	
	Block a user