Compare commits
	
		
			114 Commits
		
	
	
		
			v22.3.1
			...
			breaking-c
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | c695c5250a | ||
|   | 23c1eaab29 | ||
|   | a5d7d03413 | ||
|   | 259e458847 | ||
|   | cb49c2b26d | ||
|   | dfc0704831 | ||
|   | d238995f1b | ||
|   | 6f5303e080 | ||
|   | 5e7f6998bd | ||
|   | c7a71cd00c | ||
|   | 9cb9e88678 | ||
|   | 30c53b6857 | ||
|   | 4ad8168bb0 | ||
|   | 28f5b3c301 | ||
|   | c573019e7f | ||
|   | 029f564032 | ||
|   | 2abe66b670 | ||
|   | 911485d52e | ||
|   | 4744a89c33 | ||
|   | f7040ccec8 | ||
|   | 518152d97e | ||
|   | 0e44e9cacb | ||
|   | bfb54b0969 | ||
|   | 154863d6c6 | ||
|   | a3ff0c13b7 | ||
|   | 95ee518aec | ||
|   | 71d3d87bcc | ||
|   | b276b91c21 | ||
|   | 064168f3c8 | ||
|   | db39e127bf | ||
|   | 13e9ab7ba9 | ||
|   | 92e7463721 | ||
|   | 8e720365c2 | ||
|   | d4041161c7 | ||
|   | f32437bf13 | ||
|   | 0909e94527 | ||
|   | aef2673c38 | ||
|   | 4c14910d5b | ||
|   | beae35f921 | ||
|   | ad4e526c77 | ||
|   | 4422d0c34d | ||
|   | ad9183d21d | ||
|   | d70636ba2e | ||
|   | da23f85675 | ||
|   | 3f4663b9f8 | ||
|   | 65d7447cf6 | ||
|   | 5369291c27 | ||
|   | 1c4925edf7 | ||
|   | 6b9edfd05c | ||
|   | 97f33f42df | ||
|   | 15a588a90c | ||
|   | 82421e7efc | ||
|   | f891995b48 | ||
|   | 5052321801 | ||
|   | 23ce4eaaa4 | ||
|   | 23a430c4ad | ||
|   | ec158ffa69 | ||
|   | 6e32270036 | ||
|   | 43ba381e7b | ||
|   | 16503319e5 | ||
|   | 389363ab71 | ||
|   | 7f894c45b3 | ||
|   | 4726cf1910 | ||
|   | d352a4155e | ||
|   | e5010286b4 | ||
|   | 358498db96 | ||
|   | e4999401ab | ||
|   | c8df0aa2cb | ||
|   | 5fb207176b | ||
|   | a12b560478 | ||
|   | 753ee992a6 | ||
|   | 09089b1bd3 | ||
|   | 7ddbe5e844 | ||
|   | ab5a7038af | ||
|   | 4f3c780dc3 | ||
|   | 71f7765a4c | ||
|   | 0392d1dcfc | ||
|   | 7827b1b41d | ||
|   | 8e9342e188 | ||
|   | 2f6f2bfa76 | ||
|   | dee09d7fff | ||
|   | 9cf38a0a83 | ||
|   | 3def3d3569 | ||
|   | e100a14fd4 | ||
|   | 2fa28f1711 | ||
|   | 9d415e4ec6 | ||
|   | 312ab298fd | ||
|   | 2fc21ad576 | ||
|   | 8f6c87c3d6 | ||
|   | 4429e76532 | ||
|   | e4be70bae8 | ||
|   | 13d5a44278 | ||
|   | aba333bfb6 | ||
|   | b59da498cc | ||
|   | 70382f21ba | ||
|   | 0e1bf89fad | ||
|   | 6c48c8b3ba | ||
|   | d1c5e8003b | ||
|   | ce926a34f2 | ||
|   | a744041e38 | ||
|   | 2f90a85df1 | ||
|   | a411bc06e3 | ||
|   | 1668e1532f | ||
|   | b87982769f | ||
|   | 65b53a5f3f | ||
|   | 49789b7841 | ||
|   | c249004c30 | ||
|   | 4ee2e57ec8 | ||
|   | 86ae5f981c | ||
|   | 2bfa65e0de | ||
|   | 293278bb08 | ||
|   | 5d683c6ea4 | ||
|   | 78b6723149 | ||
|   | 3a6cc7389c | 
| @@ -1,2 +0,0 @@ | |||||||
| [tool.black] |  | ||||||
| line-length = 79 |  | ||||||
							
								
								
									
										12
									
								
								.coveragerc
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								.coveragerc
									
									
									
									
									
								
							| @@ -4,11 +4,12 @@ source = sanic | |||||||
| omit = | omit = | ||||||
|     site-packages |     site-packages | ||||||
|     sanic/__main__.py |     sanic/__main__.py | ||||||
|  |     sanic/server/legacy.py | ||||||
|     sanic/compat.py |     sanic/compat.py | ||||||
|     sanic/reloader_helpers.py |  | ||||||
|     sanic/simple.py |     sanic/simple.py | ||||||
|     sanic/utils.py |     sanic/utils.py | ||||||
|     sanic/cli |     sanic/cli | ||||||
|  |     sanic/pages | ||||||
|  |  | ||||||
| [html] | [html] | ||||||
| directory = coverage | directory = coverage | ||||||
| @@ -20,12 +21,5 @@ exclude_lines = | |||||||
|     noqa |     noqa | ||||||
|     NOQA |     NOQA | ||||||
|     pragma: no cover |     pragma: no cover | ||||||
| omit = |     TYPE_CHECKING | ||||||
|     site-packages |  | ||||||
|     sanic/__main__.py |  | ||||||
|     sanic/compat.py |  | ||||||
|     sanic/reloader_helpers.py |  | ||||||
|     sanic/simple.py |  | ||||||
|     sanic/utils.py |  | ||||||
|     sanic/cli |  | ||||||
| skip_empty = True | 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. |  | ||||||
							
								
								
									
										1
									
								
								.github/workflows/pr-bandit.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.github/workflows/pr-bandit.yml
									
									
									
									
										vendored
									
									
								
							| @@ -20,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 | ||||||
|   | |||||||
							
								
								
									
										2
									
								
								.github/workflows/pr-docs.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/pr-docs.yml
									
									
									
									
										vendored
									
									
								
							| @@ -14,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 | ||||||
|  |  | ||||||
|  |  | ||||||
|   | |||||||
							
								
								
									
										2
									
								
								.github/workflows/pr-linter.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/pr-linter.yml
									
									
									
									
										vendored
									
									
								
							| @@ -16,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 | ||||||
|   | |||||||
							
								
								
									
										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-type-check.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.github/workflows/pr-type-check.yml
									
									
									
									
										vendored
									
									
								
							| @@ -20,6 +20,7 @@ jobs: | |||||||
|           - { 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 | ||||||
|   | |||||||
							
								
								
									
										1
									
								
								.github/workflows/pr-windows.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.github/workflows/pr-windows.yml
									
									
									
									
										vendored
									
									
								
							| @@ -19,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 | ||||||
| --------------- | --------------- | ||||||
|   | |||||||
							
								
								
									
										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 | ||||||
|  |  | ||||||
|   | |||||||
| @@ -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. | ||||||
|   | |||||||
| @@ -4,6 +4,7 @@ coverage: | |||||||
|       default: |       default: | ||||||
|         target: auto |         target: auto | ||||||
|         threshold: 0.75 |         threshold: 0.75 | ||||||
|  |         informational: true | ||||||
|     project: |     project: | ||||||
|       default: |       default: | ||||||
|         target: auto |         target: auto | ||||||
| @@ -14,10 +15,10 @@ codecov: | |||||||
| ignore: | ignore: | ||||||
|   - "sanic/__main__.py" |   - "sanic/__main__.py" | ||||||
|   - "sanic/compat.py" |   - "sanic/compat.py" | ||||||
|   - "sanic/reloader_helpers.py" |  | ||||||
|   - "sanic/simple.py" |   - "sanic/simple.py" | ||||||
|   - "sanic/utils.py" |   - "sanic/utils.py" | ||||||
|   - "sanic/cli" |   - "sanic/cli/" | ||||||
|  |   - "sanic/pages/" | ||||||
|   - ".github/" |   - ".github/" | ||||||
|   - "changelogs/" |   - "changelogs/" | ||||||
|   - "docker/" |   - "docker/" | ||||||
|   | |||||||
							
								
								
									
										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,9 @@ | |||||||
| 📜 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/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 | ||||||
|   | |||||||
| @@ -1,10 +1,12 @@ | |||||||
| ## Version 21.12.1 | ## Version 21.12.1 🔷 | ||||||
|  |  | ||||||
|  | _Current LTS version_ | ||||||
|  |  | ||||||
| - [#2349](https://github.com/sanic-org/sanic/pull/2349) Only display MOTD on startup | - [#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 | - [#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 | - [#2355](https://github.com/sanic-org/sanic/pull/2355) Add config.update support for all config values | ||||||
|  |  | ||||||
| ## Version 21.12.0 | ## 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 | ||||||
|  |  | ||||||
							
								
								
									
										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 | ||||||
| @@ -1,6 +1,3 @@ | |||||||
| import os |  | ||||||
| import socket |  | ||||||
|  |  | ||||||
| from sanic import Sanic, response | from sanic import Sanic, response | ||||||
|  |  | ||||||
|  |  | ||||||
| @@ -13,13 +10,4 @@ async def test(request): | |||||||
|  |  | ||||||
|  |  | ||||||
| if __name__ == "__main__": | if __name__ == "__main__": | ||||||
|     server_address = "./uds_socket" |     app.run(unix="./uds_socket") | ||||||
|     # Make sure the socket does not already exist |  | ||||||
|     try: |  | ||||||
|         os.unlink(server_address) |  | ||||||
|     except OSError: |  | ||||||
|         if os.path.exists(server_address): |  | ||||||
|             raise |  | ||||||
|     sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) |  | ||||||
|     sock.bind(server_address) |  | ||||||
|     app.run(sock=sock) |  | ||||||
|   | |||||||
| @@ -1,3 +1,29 @@ | |||||||
| [build-system] | [build-system] | ||||||
| requires = ["setuptools<60.0", "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.*", | ||||||
|  |     "html5tagger.*", | ||||||
|  |     "tracerite.*", | ||||||
|  | ] | ||||||
|  | ignore_missing_imports = 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,10 @@ | |||||||
| __version__ = "22.3.1" | __version__ = "23.3.0" | ||||||
|  | __compatibility__ = "22.12" | ||||||
|  |  | ||||||
|  | from inspect import currentframe, stack | ||||||
|  |  | ||||||
|  | for frame_info in stack(): | ||||||
|  |     if frame_info.frame is not currentframe(): | ||||||
|  |         value = frame_info.frame.f_globals.get("__SANIC_COMPATIBILITY__") | ||||||
|  |         if value: | ||||||
|  |             __compatibility__ = value | ||||||
|   | |||||||
							
								
								
									
										563
									
								
								sanic/app.py
									
									
									
									
									
								
							
							
						
						
									
										563
									
								
								sanic/app.py
									
									
									
									
									
								
							| @@ -19,6 +19,7 @@ from collections import defaultdict, deque | |||||||
| from contextlib import suppress | from contextlib import suppress | ||||||
| from functools import partial | from functools import partial | ||||||
| from inspect import isawaitable | from inspect import isawaitable | ||||||
|  | from os import environ | ||||||
| from socket import socket | from socket import socket | ||||||
| from traceback import format_exc | from traceback import format_exc | ||||||
| from types import SimpleNamespace | from types import SimpleNamespace | ||||||
| @@ -41,16 +42,12 @@ from typing import ( | |||||||
|     Union, |     Union, | ||||||
| ) | ) | ||||||
| from urllib.parse import urlencode, urlunparse | from urllib.parse import urlencode, urlunparse | ||||||
| from warnings import filterwarnings |  | ||||||
|  |  | ||||||
| from sanic_routing.exceptions import (  # type: ignore | from sanic_routing.exceptions import FinalizationError, NotFound | ||||||
|     FinalizationError, | from sanic_routing.route import Route | ||||||
|     NotFound, |  | ||||||
| ) |  | ||||||
| from sanic_routing.route import Route  # type: ignore |  | ||||||
|  |  | ||||||
| from sanic.application.ext import setup_ext | from sanic.application.ext import setup_ext | ||||||
| from sanic.application.state import ApplicationState, Mode, ServerStage | from sanic.application.state import ApplicationState, ServerStage | ||||||
| from sanic.asgi import ASGIApp | from sanic.asgi import ASGIApp | ||||||
| from sanic.base.root import BaseSanic | from sanic.base.root import BaseSanic | ||||||
| from sanic.blueprint_group import BlueprintGroup | from sanic.blueprint_group import BlueprintGroup | ||||||
| @@ -58,12 +55,13 @@ from sanic.blueprints import Blueprint | |||||||
| from sanic.compat import OS_IS_WINDOWS, enable_windows_color_support | from sanic.compat import OS_IS_WINDOWS, enable_windows_color_support | ||||||
| from sanic.config import SANIC_PREFIX, Config | from sanic.config import SANIC_PREFIX, Config | ||||||
| from sanic.exceptions import ( | from sanic.exceptions import ( | ||||||
|     InvalidUsage, |     BadRequest, | ||||||
|     SanicException, |     SanicException, | ||||||
|     ServerError, |     ServerError, | ||||||
|     URLBuildError, |     URLBuildError, | ||||||
| ) | ) | ||||||
| from sanic.handlers import ErrorHandler | from sanic.handlers import ErrorHandler | ||||||
|  | from sanic.helpers import Default, _default | ||||||
| from sanic.http import Stage | from sanic.http import Stage | ||||||
| from sanic.log import ( | from sanic.log import ( | ||||||
|     LOGGING_CONFIG_DEFAULTS, |     LOGGING_CONFIG_DEFAULTS, | ||||||
| @@ -71,8 +69,10 @@ from sanic.log import ( | |||||||
|     error_logger, |     error_logger, | ||||||
|     logger, |     logger, | ||||||
| ) | ) | ||||||
|  | from sanic.middleware import Middleware, MiddlewareLocation | ||||||
| from sanic.mixins.listeners import ListenerEvent | from sanic.mixins.listeners import ListenerEvent | ||||||
| from sanic.mixins.runner import RunnerMixin | from sanic.mixins.startup import StartupMixin | ||||||
|  | from sanic.mixins.static import StaticHandleMixin | ||||||
| from sanic.models.futures import ( | from sanic.models.futures import ( | ||||||
|     FutureException, |     FutureException, | ||||||
|     FutureListener, |     FutureListener, | ||||||
| @@ -80,7 +80,6 @@ from sanic.models.futures import ( | |||||||
|     FutureRegistry, |     FutureRegistry, | ||||||
|     FutureRoute, |     FutureRoute, | ||||||
|     FutureSignal, |     FutureSignal, | ||||||
|     FutureStatic, |  | ||||||
| ) | ) | ||||||
| from sanic.models.handler_types import ListenerType, MiddlewareType | from sanic.models.handler_types import ListenerType, MiddlewareType | ||||||
| from sanic.models.handler_types import Sanic as SanicVar | from sanic.models.handler_types import Sanic as SanicVar | ||||||
| @@ -90,23 +89,24 @@ from sanic.router import Router | |||||||
| from sanic.server.websockets.impl import ConnectionClosed | from sanic.server.websockets.impl import ConnectionClosed | ||||||
| from sanic.signals import Signal, SignalRouter | from sanic.signals import Signal, SignalRouter | ||||||
| from sanic.touchup import TouchUp, TouchUpMeta | from sanic.touchup import TouchUp, TouchUpMeta | ||||||
|  | from sanic.types.shared_ctx import SharedContext | ||||||
|  | from sanic.worker.inspector import Inspector | ||||||
|  | from sanic.worker.manager import WorkerManager | ||||||
|  |  | ||||||
|  |  | ||||||
| if TYPE_CHECKING:  # no cov | if TYPE_CHECKING: | ||||||
|     try: |     try: | ||||||
|         from sanic_ext import Extend  # type: ignore |         from sanic_ext import Extend  # type: ignore | ||||||
|         from sanic_ext.extensions.base import Extension  # type: ignore |         from sanic_ext.extensions.base import Extension  # type: ignore | ||||||
|     except ImportError: |     except ImportError: | ||||||
|         Extend = TypeVar("Extend")  # type: ignore |         Extend = TypeVar("Extend", Type)  # type: ignore | ||||||
|  |  | ||||||
|  |  | ||||||
| if OS_IS_WINDOWS:  # no cov | if OS_IS_WINDOWS:  # no cov | ||||||
|     enable_windows_color_support() |     enable_windows_color_support() | ||||||
|  |  | ||||||
| filterwarnings("once", category=DeprecationWarning) |  | ||||||
|  |  | ||||||
|  | class Sanic(StaticHandleMixin, BaseSanic, StartupMixin, metaclass=TouchUpMeta): | ||||||
| class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): |  | ||||||
|     """ |     """ | ||||||
|     The main application instance |     The main application instance | ||||||
|     """ |     """ | ||||||
| @@ -130,6 +130,8 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|         "_future_routes", |         "_future_routes", | ||||||
|         "_future_signals", |         "_future_signals", | ||||||
|         "_future_statics", |         "_future_statics", | ||||||
|  |         "_inspector", | ||||||
|  |         "_manager", | ||||||
|         "_state", |         "_state", | ||||||
|         "_task_registry", |         "_task_registry", | ||||||
|         "_test_client", |         "_test_client", | ||||||
| @@ -139,14 +141,17 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|         "configure_logging", |         "configure_logging", | ||||||
|         "ctx", |         "ctx", | ||||||
|         "error_handler", |         "error_handler", | ||||||
|  |         "inspector_class", | ||||||
|         "go_fast", |         "go_fast", | ||||||
|         "listeners", |         "listeners", | ||||||
|  |         "multiplexer", | ||||||
|         "named_request_middleware", |         "named_request_middleware", | ||||||
|         "named_response_middleware", |         "named_response_middleware", | ||||||
|         "request_class", |         "request_class", | ||||||
|         "request_middleware", |         "request_middleware", | ||||||
|         "response_middleware", |         "response_middleware", | ||||||
|         "router", |         "router", | ||||||
|  |         "shared_ctx", | ||||||
|         "signal_router", |         "signal_router", | ||||||
|         "sock", |         "sock", | ||||||
|         "strict_slashes", |         "strict_slashes", | ||||||
| @@ -155,12 +160,11 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|     ) |     ) | ||||||
|  |  | ||||||
|     _app_registry: Dict[str, "Sanic"] = {} |     _app_registry: Dict[str, "Sanic"] = {} | ||||||
|     _uvloop_setting = None  # TODO: Remove in v22.6 |  | ||||||
|     test_mode = False |     test_mode = False | ||||||
|  |  | ||||||
|     def __init__( |     def __init__( | ||||||
|         self, |         self, | ||||||
|         name: str = None, |         name: Optional[str] = None, | ||||||
|         config: Optional[Config] = None, |         config: Optional[Config] = None, | ||||||
|         ctx: Optional[Any] = None, |         ctx: Optional[Any] = None, | ||||||
|         router: Optional[Router] = None, |         router: Optional[Router] = None, | ||||||
| @@ -171,11 +175,12 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|         strict_slashes: bool = False, |         strict_slashes: bool = False, | ||||||
|         log_config: Optional[Dict[str, Any]] = None, |         log_config: Optional[Dict[str, Any]] = None, | ||||||
|         configure_logging: bool = True, |         configure_logging: bool = True, | ||||||
|         register: Optional[bool] = None, |  | ||||||
|         dumps: Optional[Callable[..., AnyStr]] = None, |         dumps: Optional[Callable[..., AnyStr]] = None, | ||||||
|  |         loads: Optional[Callable[..., Any]] = None, | ||||||
|  |         inspector: bool = False, | ||||||
|  |         inspector_class: Optional[Type[Inspector]] = None, | ||||||
|     ) -> None: |     ) -> None: | ||||||
|         super().__init__(name=name) |         super().__init__(name=name) | ||||||
|  |  | ||||||
|         # logging |         # logging | ||||||
|         if configure_logging: |         if configure_logging: | ||||||
|             dict_config = log_config or LOGGING_CONFIG_DEFAULTS |             dict_config = log_config or LOGGING_CONFIG_DEFAULTS | ||||||
| @@ -189,12 +194,16 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|  |  | ||||||
|         # First setup config |         # First setup config | ||||||
|         self.config: Config = config or Config(env_prefix=env_prefix) |         self.config: Config = config or Config(env_prefix=env_prefix) | ||||||
|  |         if inspector: | ||||||
|  |             self.config.INSPECTOR = inspector | ||||||
|  |  | ||||||
|         # Then we can do the rest |         # Then we can do the rest | ||||||
|         self._asgi_client: Any = None |         self._asgi_client: Any = None | ||||||
|         self._blueprint_order: List[Blueprint] = [] |         self._blueprint_order: List[Blueprint] = [] | ||||||
|         self._delayed_tasks: List[str] = [] |         self._delayed_tasks: List[str] = [] | ||||||
|         self._future_registry: FutureRegistry = FutureRegistry() |         self._future_registry: FutureRegistry = FutureRegistry() | ||||||
|  |         self._inspector: Optional[Inspector] = None | ||||||
|  |         self._manager: Optional[WorkerManager] = None | ||||||
|         self._state: ApplicationState = ApplicationState(app=self) |         self._state: ApplicationState = ApplicationState(app=self) | ||||||
|         self._task_registry: Dict[str, Task] = {} |         self._task_registry: Dict[str, Task] = {} | ||||||
|         self._test_client: Any = None |         self._test_client: Any = None | ||||||
| @@ -205,6 +214,7 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|         self.configure_logging: bool = configure_logging |         self.configure_logging: bool = configure_logging | ||||||
|         self.ctx: Any = ctx or SimpleNamespace() |         self.ctx: Any = ctx or SimpleNamespace() | ||||||
|         self.error_handler: ErrorHandler = error_handler or ErrorHandler() |         self.error_handler: ErrorHandler = error_handler or ErrorHandler() | ||||||
|  |         self.inspector_class: Type[Inspector] = inspector_class or Inspector | ||||||
|         self.listeners: Dict[str, List[ListenerType[Any]]] = defaultdict(list) |         self.listeners: Dict[str, List[ListenerType[Any]]] = defaultdict(list) | ||||||
|         self.named_request_middleware: Dict[str, Deque[MiddlewareType]] = {} |         self.named_request_middleware: Dict[str, Deque[MiddlewareType]] = {} | ||||||
|         self.named_response_middleware: Dict[str, Deque[MiddlewareType]] = {} |         self.named_response_middleware: Dict[str, Deque[MiddlewareType]] = {} | ||||||
| @@ -212,6 +222,7 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|         self.request_middleware: Deque[MiddlewareType] = deque() |         self.request_middleware: Deque[MiddlewareType] = deque() | ||||||
|         self.response_middleware: Deque[MiddlewareType] = deque() |         self.response_middleware: Deque[MiddlewareType] = deque() | ||||||
|         self.router: Router = router or Router() |         self.router: Router = router or Router() | ||||||
|  |         self.shared_ctx: SharedContext = SharedContext() | ||||||
|         self.signal_router: SignalRouter = signal_router or SignalRouter() |         self.signal_router: SignalRouter = signal_router or SignalRouter() | ||||||
|         self.sock: Optional[socket] = None |         self.sock: Optional[socket] = None | ||||||
|         self.strict_slashes: bool = strict_slashes |         self.strict_slashes: bool = strict_slashes | ||||||
| @@ -220,23 +231,14 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|  |  | ||||||
|         # Register alternative method names |         # Register alternative method names | ||||||
|         self.go_fast = self.run |         self.go_fast = self.run | ||||||
|  |  | ||||||
|         if register is not None: |  | ||||||
|             deprecation( |  | ||||||
|                 "The register argument is deprecated and will stop working " |  | ||||||
|                 "in v22.6. After v22.6 all apps will be added to the Sanic " |  | ||||||
|                 "app registry.", |  | ||||||
|                 22.6, |  | ||||||
|             ) |  | ||||||
|             self.config.REGISTER = register |  | ||||||
|         if self.config.REGISTER: |  | ||||||
|             self.__class__.register_app(self) |  | ||||||
|  |  | ||||||
|         self.router.ctx.app = self |         self.router.ctx.app = self | ||||||
|         self.signal_router.ctx.app = self |         self.signal_router.ctx.app = self | ||||||
|  |         self.__class__.register_app(self) | ||||||
|  |  | ||||||
|         if dumps: |         if dumps: | ||||||
|             BaseHTTPResponse._dumps = dumps  # type: ignore |             BaseHTTPResponse._dumps = dumps  # type: ignore | ||||||
|  |         if loads: | ||||||
|  |             Request._loads = loads  # type: ignore | ||||||
|  |  | ||||||
|     @property |     @property | ||||||
|     def loop(self): |     def loop(self): | ||||||
| @@ -254,7 +256,7 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|             ) |             ) | ||||||
|         try: |         try: | ||||||
|             return get_running_loop() |             return get_running_loop() | ||||||
|         except RuntimeError: |         except RuntimeError:  # no cov | ||||||
|             if sys.version_info > (3, 10): |             if sys.version_info > (3, 10): | ||||||
|                 return asyncio.get_event_loop_policy().get_event_loop() |                 return asyncio.get_event_loop_policy().get_event_loop() | ||||||
|             else: |             else: | ||||||
| @@ -281,7 +283,7 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|             valid = ", ".join( |             valid = ", ".join( | ||||||
|                 map(lambda x: x.lower(), ListenerEvent.__members__.keys()) |                 map(lambda x: x.lower(), ListenerEvent.__members__.keys()) | ||||||
|             ) |             ) | ||||||
|             raise InvalidUsage(f"Invalid event: {event}. Use one of: {valid}") |             raise BadRequest(f"Invalid event: {event}. Use one of: {valid}") | ||||||
|  |  | ||||||
|         if "." in _event: |         if "." in _event: | ||||||
|             self.signal(_event.value)( |             self.signal(_event.value)( | ||||||
| @@ -293,8 +295,12 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|         return listener |         return listener | ||||||
|  |  | ||||||
|     def register_middleware( |     def register_middleware( | ||||||
|         self, middleware: MiddlewareType, attach_to: str = "request" |         self, | ||||||
|     ) -> MiddlewareType: |         middleware: Union[MiddlewareType, Middleware], | ||||||
|  |         attach_to: str = "request", | ||||||
|  |         *, | ||||||
|  |         priority: Union[Default, int] = _default, | ||||||
|  |     ) -> Union[MiddlewareType, Middleware]: | ||||||
|         """ |         """ | ||||||
|         Register an application level middleware that will be attached |         Register an application level middleware that will be attached | ||||||
|         to all the API URLs registered under this application. |         to all the API URLs registered under this application. | ||||||
| @@ -310,19 +316,37 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|             **response** - Invoke before the response is returned back |             **response** - Invoke before the response is returned back | ||||||
|         :return: decorated method |         :return: decorated method | ||||||
|         """ |         """ | ||||||
|         if attach_to == "request": |         retval = middleware | ||||||
|  |         location = MiddlewareLocation[attach_to.upper()] | ||||||
|  |  | ||||||
|  |         if not isinstance(middleware, Middleware): | ||||||
|  |             middleware = Middleware( | ||||||
|  |                 middleware, | ||||||
|  |                 location=location, | ||||||
|  |                 priority=priority if isinstance(priority, int) else 0, | ||||||
|  |             ) | ||||||
|  |         elif middleware.priority != priority and isinstance(priority, int): | ||||||
|  |             middleware = Middleware( | ||||||
|  |                 middleware.func, | ||||||
|  |                 location=middleware.location, | ||||||
|  |                 priority=priority, | ||||||
|  |             ) | ||||||
|  |  | ||||||
|  |         if location is MiddlewareLocation.REQUEST: | ||||||
|             if middleware not in self.request_middleware: |             if middleware not in self.request_middleware: | ||||||
|                 self.request_middleware.append(middleware) |                 self.request_middleware.append(middleware) | ||||||
|         if attach_to == "response": |         if location is MiddlewareLocation.RESPONSE: | ||||||
|             if middleware not in self.response_middleware: |             if middleware not in self.response_middleware: | ||||||
|                 self.response_middleware.appendleft(middleware) |                 self.response_middleware.appendleft(middleware) | ||||||
|         return middleware |         return retval | ||||||
|  |  | ||||||
|     def register_named_middleware( |     def register_named_middleware( | ||||||
|         self, |         self, | ||||||
|         middleware: MiddlewareType, |         middleware: MiddlewareType, | ||||||
|         route_names: Iterable[str], |         route_names: Iterable[str], | ||||||
|         attach_to: str = "request", |         attach_to: str = "request", | ||||||
|  |         *, | ||||||
|  |         priority: Union[Default, int] = _default, | ||||||
|     ): |     ): | ||||||
|         """ |         """ | ||||||
|         Method for attaching middleware to specific routes. This is mainly an |         Method for attaching middleware to specific routes. This is mainly an | ||||||
| @@ -336,19 +360,35 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|             defaults to "request" |             defaults to "request" | ||||||
|         :type attach_to: str, optional |         :type attach_to: str, optional | ||||||
|         """ |         """ | ||||||
|         if attach_to == "request": |         retval = middleware | ||||||
|  |         location = MiddlewareLocation[attach_to.upper()] | ||||||
|  |  | ||||||
|  |         if not isinstance(middleware, Middleware): | ||||||
|  |             middleware = Middleware( | ||||||
|  |                 middleware, | ||||||
|  |                 location=location, | ||||||
|  |                 priority=priority if isinstance(priority, int) else 0, | ||||||
|  |             ) | ||||||
|  |         elif middleware.priority != priority and isinstance(priority, int): | ||||||
|  |             middleware = Middleware( | ||||||
|  |                 middleware.func, | ||||||
|  |                 location=middleware.location, | ||||||
|  |                 priority=priority, | ||||||
|  |             ) | ||||||
|  |  | ||||||
|  |         if location is MiddlewareLocation.REQUEST: | ||||||
|             for _rn in route_names: |             for _rn in route_names: | ||||||
|                 if _rn not in self.named_request_middleware: |                 if _rn not in self.named_request_middleware: | ||||||
|                     self.named_request_middleware[_rn] = deque() |                     self.named_request_middleware[_rn] = deque() | ||||||
|                 if middleware not in self.named_request_middleware[_rn]: |                 if middleware not in self.named_request_middleware[_rn]: | ||||||
|                     self.named_request_middleware[_rn].append(middleware) |                     self.named_request_middleware[_rn].append(middleware) | ||||||
|         if attach_to == "response": |         if location is MiddlewareLocation.RESPONSE: | ||||||
|             for _rn in route_names: |             for _rn in route_names: | ||||||
|                 if _rn not in self.named_response_middleware: |                 if _rn not in self.named_response_middleware: | ||||||
|                     self.named_response_middleware[_rn] = deque() |                     self.named_response_middleware[_rn] = deque() | ||||||
|                 if middleware not in self.named_response_middleware[_rn]: |                 if middleware not in self.named_response_middleware[_rn]: | ||||||
|                     self.named_response_middleware[_rn].appendleft(middleware) |                     self.named_response_middleware[_rn].appendleft(middleware) | ||||||
|         return middleware |         return retval | ||||||
|  |  | ||||||
|     def _apply_exception_handler( |     def _apply_exception_handler( | ||||||
|         self, |         self, | ||||||
| @@ -395,15 +435,12 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|             routes = [routes] |             routes = [routes] | ||||||
|  |  | ||||||
|         for r in routes: |         for r in routes: | ||||||
|             r.ctx.websocket = websocket |             r.extra.websocket = websocket | ||||||
|             r.ctx.static = params.get("static", False) |             r.extra.static = params.get("static", False) | ||||||
|             r.ctx.__dict__.update(ctx) |             r.ctx.__dict__.update(ctx) | ||||||
|  |  | ||||||
|         return routes |         return routes | ||||||
|  |  | ||||||
|     def _apply_static(self, static: FutureStatic) -> Route: |  | ||||||
|         return self._register_static(static) |  | ||||||
|  |  | ||||||
|     def _apply_middleware( |     def _apply_middleware( | ||||||
|         self, |         self, | ||||||
|         middleware: FutureMiddleware, |         middleware: FutureMiddleware, | ||||||
| @@ -469,9 +506,7 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|  |  | ||||||
|     def blueprint( |     def blueprint( | ||||||
|         self, |         self, | ||||||
|         blueprint: Union[ |         blueprint: Union[Blueprint, Iterable[Blueprint], BlueprintGroup], | ||||||
|             Blueprint, List[Blueprint], Tuple[Blueprint], BlueprintGroup |  | ||||||
|         ], |  | ||||||
|         **options: Any, |         **options: Any, | ||||||
|     ): |     ): | ||||||
|         """Register a blueprint on the application. |         """Register a blueprint on the application. | ||||||
| @@ -480,21 +515,20 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|         :param options: option dictionary with blueprint defaults |         :param options: option dictionary with blueprint defaults | ||||||
|         :return: Nothing |         :return: Nothing | ||||||
|         """ |         """ | ||||||
|         if isinstance(blueprint, (list, tuple, BlueprintGroup)): |         if isinstance(blueprint, (Iterable, BlueprintGroup)): | ||||||
|             for item in blueprint: |             for item in blueprint: | ||||||
|                 params = {**options} |                 params = {**options} | ||||||
|                 if isinstance(blueprint, BlueprintGroup): |                 if isinstance(blueprint, BlueprintGroup): | ||||||
|                     if blueprint.url_prefix: |                     merge_from = [ | ||||||
|                         merge_from = [ |                         options.get("url_prefix", ""), | ||||||
|                             options.get("url_prefix", ""), |                         blueprint.url_prefix or "", | ||||||
|                             blueprint.url_prefix, |                     ] | ||||||
|                         ] |                     if not isinstance(item, BlueprintGroup): | ||||||
|                         if not isinstance(item, BlueprintGroup): |                         merge_from.append(item.url_prefix or "") | ||||||
|                             merge_from.append(item.url_prefix or "") |                     merged_prefix = "/".join( | ||||||
|                         merged_prefix = "/".join( |                         u.strip("/") for u in merge_from if u | ||||||
|                             u.strip("/") for u in merge_from |                     ).rstrip("/") | ||||||
|                         ).rstrip("/") |                     params["url_prefix"] = f"/{merged_prefix}" | ||||||
|                         params["url_prefix"] = f"/{merged_prefix}" |  | ||||||
|  |  | ||||||
|                     for _attr in ["version", "strict_slashes"]: |                     for _attr in ["version", "strict_slashes"]: | ||||||
|                         if getattr(item, _attr) is None: |                         if getattr(item, _attr) is None: | ||||||
| @@ -592,7 +626,7 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|  |  | ||||||
|         uri = route.path |         uri = route.path | ||||||
|  |  | ||||||
|         if getattr(route.ctx, "static", None): |         if getattr(route.extra, "static", None): | ||||||
|             filename = kwargs.pop("filename", "") |             filename = kwargs.pop("filename", "") | ||||||
|             # it's static folder |             # it's static folder | ||||||
|             if "__file_uri__" in uri: |             if "__file_uri__" in uri: | ||||||
| @@ -625,18 +659,18 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|         host = kwargs.pop("_host", None) |         host = kwargs.pop("_host", None) | ||||||
|         external = kwargs.pop("_external", False) or bool(host) |         external = kwargs.pop("_external", False) or bool(host) | ||||||
|         scheme = kwargs.pop("_scheme", "") |         scheme = kwargs.pop("_scheme", "") | ||||||
|         if route.ctx.hosts and external: |         if route.extra.hosts and external: | ||||||
|             if not host and len(route.ctx.hosts) > 1: |             if not host and len(route.extra.hosts) > 1: | ||||||
|                 raise ValueError( |                 raise ValueError( | ||||||
|                     f"Host is ambiguous: {', '.join(route.ctx.hosts)}" |                     f"Host is ambiguous: {', '.join(route.extra.hosts)}" | ||||||
|                 ) |                 ) | ||||||
|             elif host and host not in route.ctx.hosts: |             elif host and host not in route.extra.hosts: | ||||||
|                 raise ValueError( |                 raise ValueError( | ||||||
|                     f"Requested host ({host}) is not available for this " |                     f"Requested host ({host}) is not available for this " | ||||||
|                     f"route: {route.ctx.hosts}" |                     f"route: {route.extra.hosts}" | ||||||
|                 ) |                 ) | ||||||
|             elif not host: |             elif not host: | ||||||
|                 host = list(route.ctx.hosts)[0] |                 host = list(route.extra.hosts)[0] | ||||||
|  |  | ||||||
|         if scheme and not external: |         if scheme and not external: | ||||||
|             raise ValueError("When specifying _scheme, _external must be True") |             raise ValueError("When specifying _scheme, _external must be True") | ||||||
| @@ -712,7 +746,10 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|     # -------------------------------------------------------------------- # |     # -------------------------------------------------------------------- # | ||||||
|  |  | ||||||
|     async def handle_exception( |     async def handle_exception( | ||||||
|         self, request: Request, exception: BaseException |         self, | ||||||
|  |         request: Request, | ||||||
|  |         exception: BaseException, | ||||||
|  |         run_middleware: bool = True, | ||||||
|     ):  # no cov |     ):  # no cov | ||||||
|         """ |         """ | ||||||
|         A handler that catches specific exceptions and outputs a response. |         A handler that catches specific exceptions and outputs a response. | ||||||
| @@ -721,6 +758,7 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|         :param exception: The exception that was raised |         :param exception: The exception that was raised | ||||||
|         :raises ServerError: response 500 |         :raises ServerError: response 500 | ||||||
|         """ |         """ | ||||||
|  |         response = None | ||||||
|         await self.dispatch( |         await self.dispatch( | ||||||
|             "http.lifecycle.exception", |             "http.lifecycle.exception", | ||||||
|             inline=True, |             inline=True, | ||||||
| @@ -738,45 +776,34 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|                 "has at least partially been sent." |                 "has at least partially been sent." | ||||||
|             ) |             ) | ||||||
|  |  | ||||||
|             # ----------------- deprecated ----------------- |  | ||||||
|             handler = self.error_handler._lookup( |             handler = self.error_handler._lookup( | ||||||
|                 exception, request.name if request else None |                 exception, request.name if request else None | ||||||
|             ) |             ) | ||||||
|             if handler: |             if handler: | ||||||
|                 deprecation( |                 logger.warning( | ||||||
|                     "An error occurred while handling the request after at " |                     "An error occurred while handling the request after at " | ||||||
|                     "least some part of the response was sent to the client. " |                     "least some part of the response was sent to the client. " | ||||||
|                     "Therefore, the response from your custom exception " |                     "The response from your custom exception handler " | ||||||
|                     f"handler {handler.__name__} will not be sent to the " |                     f"{handler.__name__} will not be sent to the client." | ||||||
|                     "client. Beginning in v22.6, Sanic will stop executing " |                     "Exception handlers should only be used to generate the " | ||||||
|                     "custom exception handlers in this scenario. Exception " |                     "exception responses. If you would like to perform any " | ||||||
|                     "handlers should only be used to generate the exception " |                     "other action on a raised exception, consider using a " | ||||||
|                     "responses. If you would like to perform any other " |  | ||||||
|                     "action on a raised exception, please consider using a " |  | ||||||
|                     "signal handler like " |                     "signal handler like " | ||||||
|                     '`@app.signal("http.lifecycle.exception")`\n' |                     '`@app.signal("http.lifecycle.exception")`\n' | ||||||
|                     "For further information, please see the docs: " |                     "For further information, please see the docs: " | ||||||
|                     "https://sanicframework.org/en/guide/advanced/" |                     "https://sanicframework.org/en/guide/advanced/" | ||||||
|                     "signals.html", |                     "signals.html", | ||||||
|                     22.6, |  | ||||||
|                 ) |                 ) | ||||||
|                 try: |  | ||||||
|                     response = self.error_handler.response(request, exception) |  | ||||||
|                     if isawaitable(response): |  | ||||||
|                         response = await response |  | ||||||
|                 except BaseException as e: |  | ||||||
|                     logger.error("An error occurred in the exception handler.") |  | ||||||
|                     error_logger.exception(e) |  | ||||||
|             # ---------------------------------------------- |  | ||||||
|  |  | ||||||
|             return |             return | ||||||
|  |  | ||||||
|         # -------------------------------------------- # |         # -------------------------------------------- # | ||||||
|         # Request Middleware |         # Request Middleware | ||||||
|         # -------------------------------------------- # |         # -------------------------------------------- # | ||||||
|         response = await self._run_request_middleware( |         if run_middleware: | ||||||
|             request, request_name=None |             middleware = ( | ||||||
|         ) |                 request.route and request.route.extra.request_middleware | ||||||
|  |             ) or self.request_middleware | ||||||
|  |             response = await self._run_request_middleware(request, middleware) | ||||||
|         # No middleware results |         # No middleware results | ||||||
|         if not response: |         if not response: | ||||||
|             try: |             try: | ||||||
| @@ -848,6 +875,8 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|         :param request: HTTP Request object |         :param request: HTTP Request object | ||||||
|         :return: Nothing |         :return: Nothing | ||||||
|         """ |         """ | ||||||
|  |         __tracebackhide__ = True | ||||||
|  |  | ||||||
|         await self.dispatch( |         await self.dispatch( | ||||||
|             "http.lifecycle.handle", |             "http.lifecycle.handle", | ||||||
|             inline=True, |             inline=True, | ||||||
| @@ -856,9 +885,15 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|  |  | ||||||
|         # Define `response` var here to remove warnings about |         # Define `response` var here to remove warnings about | ||||||
|         # allocation before assignment below. |         # allocation before assignment below. | ||||||
|         response = None |         response: Optional[ | ||||||
|  |             Union[ | ||||||
|  |                 BaseHTTPResponse, | ||||||
|  |                 Coroutine[Any, Any, Optional[BaseHTTPResponse]], | ||||||
|  |                 ResponseStream, | ||||||
|  |             ] | ||||||
|  |         ] = None | ||||||
|  |         run_middleware = True | ||||||
|         try: |         try: | ||||||
|  |  | ||||||
|             await self.dispatch( |             await self.dispatch( | ||||||
|                 "http.routing.before", |                 "http.routing.before", | ||||||
|                 inline=True, |                 inline=True, | ||||||
| @@ -888,9 +923,8 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|             if ( |             if ( | ||||||
|                 request.stream |                 request.stream | ||||||
|                 and request.stream.request_body |                 and request.stream.request_body | ||||||
|                 and not route.ctx.ignore_body |                 and not route.extra.ignore_body | ||||||
|             ): |             ): | ||||||
|  |  | ||||||
|                 if hasattr(handler, "is_stream"): |                 if hasattr(handler, "is_stream"): | ||||||
|                     # Streaming handler: lift the size limit |                     # Streaming handler: lift the size limit | ||||||
|                     request.stream.request_max_size = float("inf") |                     request.stream.request_max_size = float("inf") | ||||||
| @@ -901,9 +935,11 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|             # -------------------------------------------- # |             # -------------------------------------------- # | ||||||
|             # Request Middleware |             # Request Middleware | ||||||
|             # -------------------------------------------- # |             # -------------------------------------------- # | ||||||
|             response = await self._run_request_middleware( |             run_middleware = False | ||||||
|                 request, request_name=route.name |             if request.route.extra.request_middleware: | ||||||
|             ) |                 response = await self._run_request_middleware( | ||||||
|  |                     request, request.route.extra.request_middleware | ||||||
|  |                 ) | ||||||
|  |  | ||||||
|             # No middleware results |             # No middleware results | ||||||
|             if not response: |             if not response: | ||||||
| @@ -920,9 +956,19 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|                     ) |                     ) | ||||||
|  |  | ||||||
|                 # Run response handler |                 # Run response handler | ||||||
|  |                 await self.dispatch( | ||||||
|  |                     "http.handler.before", | ||||||
|  |                     inline=True, | ||||||
|  |                     context={"request": request}, | ||||||
|  |                 ) | ||||||
|                 response = handler(request, **request.match_info) |                 response = handler(request, **request.match_info) | ||||||
|                 if isawaitable(response): |                 if isawaitable(response): | ||||||
|                     response = await response |                     response = await response | ||||||
|  |                 await self.dispatch( | ||||||
|  |                     "http.handler.after", | ||||||
|  |                     inline=True, | ||||||
|  |                     context={"request": request}, | ||||||
|  |                 ) | ||||||
|  |  | ||||||
|             if request.responded: |             if request.responded: | ||||||
|                 if response is not None: |                 if response is not None: | ||||||
| @@ -934,7 +980,7 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|                 if request.stream is not None: |                 if request.stream is not None: | ||||||
|                     response = request.stream.response |                     response = request.stream.response | ||||||
|             elif response is not None: |             elif response is not None: | ||||||
|                 response = await request.respond(response) |                 response = await request.respond(response)  # type: ignore | ||||||
|             elif not hasattr(handler, "is_websocket"): |             elif not hasattr(handler, "is_websocket"): | ||||||
|                 response = request.stream.response  # type: ignore |                 response = request.stream.response  # type: ignore | ||||||
|  |  | ||||||
| @@ -949,6 +995,7 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|                         "response": response, |                         "response": response, | ||||||
|                     }, |                     }, | ||||||
|                 ) |                 ) | ||||||
|  |                 ... | ||||||
|                 await response.send(end_stream=True) |                 await response.send(end_stream=True) | ||||||
|             elif isinstance(response, ResponseStream): |             elif isinstance(response, ResponseStream): | ||||||
|                 resp = await response(request) |                 resp = await response(request) | ||||||
| @@ -972,7 +1019,9 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|             raise |             raise | ||||||
|         except Exception as e: |         except Exception as e: | ||||||
|             # Response Generation Failed |             # Response Generation Failed | ||||||
|             await self.handle_exception(request, e) |             await self.handle_exception( | ||||||
|  |                 request, e, run_middleware=run_middleware | ||||||
|  |             ) | ||||||
|  |  | ||||||
|     async def _websocket_handler( |     async def _websocket_handler( | ||||||
|         self, handler, request, *args, subprotocols=None, **kwargs |         self, handler, request, *args, subprotocols=None, **kwargs | ||||||
| @@ -992,10 +1041,10 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|         cancelled = False |         cancelled = False | ||||||
|         try: |         try: | ||||||
|             await fut |             await fut | ||||||
|         except Exception as e: |  | ||||||
|             self.error_handler.log(request, e) |  | ||||||
|         except (CancelledError, ConnectionClosed): |         except (CancelledError, ConnectionClosed): | ||||||
|             cancelled = True |             cancelled = True | ||||||
|  |         except Exception as e: | ||||||
|  |             self.error_handler.log(request, e) | ||||||
|         finally: |         finally: | ||||||
|             self.websocket_tasks.remove(fut) |             self.websocket_tasks.remove(fut) | ||||||
|             if cancelled: |             if cancelled: | ||||||
| @@ -1022,7 +1071,7 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|     def asgi_client(self):  # noqa |     def asgi_client(self):  # noqa | ||||||
|         """ |         """ | ||||||
|         A testing client that uses ASGI to reach into the application to |         A testing client that uses ASGI to reach into the application to | ||||||
|         execute hanlers. |         execute handlers. | ||||||
|  |  | ||||||
|         :return: testing client |         :return: testing client | ||||||
|         :rtype: :class:`SanicASGITestClient` |         :rtype: :class:`SanicASGITestClient` | ||||||
| @@ -1041,86 +1090,72 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|     # -------------------------------------------------------------------- # |     # -------------------------------------------------------------------- # | ||||||
|  |  | ||||||
|     async def _run_request_middleware( |     async def _run_request_middleware( | ||||||
|         self, request, request_name=None |         self, request, middleware_collection | ||||||
|     ):  # no cov |     ):  # no cov | ||||||
|         # The if improves speed.  I don't know why |         request._request_middleware_started = True | ||||||
|         named_middleware = self.named_request_middleware.get( |  | ||||||
|             request_name, deque() |  | ||||||
|         ) |  | ||||||
|         applicable_middleware = self.request_middleware + named_middleware |  | ||||||
|  |  | ||||||
|         # request.request_middleware_started is meant as a stop-gap solution |         for middleware in middleware_collection: | ||||||
|         # until RFC 1630 is adopted |             await self.dispatch( | ||||||
|         if applicable_middleware and not request.request_middleware_started: |                 "http.middleware.before", | ||||||
|             request.request_middleware_started = True |                 inline=True, | ||||||
|  |                 context={ | ||||||
|  |                     "request": request, | ||||||
|  |                     "response": None, | ||||||
|  |                 }, | ||||||
|  |                 condition={"attach_to": "request"}, | ||||||
|  |             ) | ||||||
|  |  | ||||||
|             for middleware in applicable_middleware: |             response = middleware(request) | ||||||
|                 await self.dispatch( |             if isawaitable(response): | ||||||
|                     "http.middleware.before", |                 response = await response | ||||||
|                     inline=True, |  | ||||||
|                     context={ |  | ||||||
|                         "request": request, |  | ||||||
|                         "response": None, |  | ||||||
|                     }, |  | ||||||
|                     condition={"attach_to": "request"}, |  | ||||||
|                 ) |  | ||||||
|  |  | ||||||
|                 response = middleware(request) |             await self.dispatch( | ||||||
|                 if isawaitable(response): |                 "http.middleware.after", | ||||||
|                     response = await response |                 inline=True, | ||||||
|  |                 context={ | ||||||
|  |                     "request": request, | ||||||
|  |                     "response": None, | ||||||
|  |                 }, | ||||||
|  |                 condition={"attach_to": "request"}, | ||||||
|  |             ) | ||||||
|  |  | ||||||
|                 await self.dispatch( |             if response: | ||||||
|                     "http.middleware.after", |                 return response | ||||||
|                     inline=True, |  | ||||||
|                     context={ |  | ||||||
|                         "request": request, |  | ||||||
|                         "response": None, |  | ||||||
|                     }, |  | ||||||
|                     condition={"attach_to": "request"}, |  | ||||||
|                 ) |  | ||||||
|  |  | ||||||
|                 if response: |  | ||||||
|                     return response |  | ||||||
|         return None |         return None | ||||||
|  |  | ||||||
|     async def _run_response_middleware( |     async def _run_response_middleware( | ||||||
|         self, request, response, request_name=None |         self, request, response, middleware_collection | ||||||
|     ):  # no cov |     ):  # no cov | ||||||
|         named_middleware = self.named_response_middleware.get( |         for middleware in middleware_collection: | ||||||
|             request_name, deque() |             await self.dispatch( | ||||||
|         ) |                 "http.middleware.before", | ||||||
|         applicable_middleware = self.response_middleware + named_middleware |                 inline=True, | ||||||
|         if applicable_middleware: |                 context={ | ||||||
|             for middleware in applicable_middleware: |                     "request": request, | ||||||
|                 await self.dispatch( |                     "response": response, | ||||||
|                     "http.middleware.before", |                 }, | ||||||
|                     inline=True, |                 condition={"attach_to": "response"}, | ||||||
|                     context={ |             ) | ||||||
|                         "request": request, |  | ||||||
|                         "response": response, |  | ||||||
|                     }, |  | ||||||
|                     condition={"attach_to": "response"}, |  | ||||||
|                 ) |  | ||||||
|  |  | ||||||
|                 _response = middleware(request, response) |             _response = middleware(request, response) | ||||||
|                 if isawaitable(_response): |             if isawaitable(_response): | ||||||
|                     _response = await _response |                 _response = await _response | ||||||
|  |  | ||||||
|                 await self.dispatch( |             await self.dispatch( | ||||||
|                     "http.middleware.after", |                 "http.middleware.after", | ||||||
|                     inline=True, |                 inline=True, | ||||||
|                     context={ |                 context={ | ||||||
|                         "request": request, |                     "request": request, | ||||||
|                         "response": _response if _response else response, |                     "response": _response if _response else response, | ||||||
|                     }, |                 }, | ||||||
|                     condition={"attach_to": "response"}, |                 condition={"attach_to": "response"}, | ||||||
|                 ) |             ) | ||||||
|  |  | ||||||
|                 if _response: |             if _response: | ||||||
|                     response = _response |                 response = _response | ||||||
|                     if isinstance(response, BaseHTTPResponse): |                 if isinstance(response, BaseHTTPResponse): | ||||||
|                         response = request.stream.respond(response) |                     response = request.stream.respond(response) | ||||||
|                     break |                 break | ||||||
|         return response |         return response | ||||||
|  |  | ||||||
|     def _build_endpoint_name(self, *parts): |     def _build_endpoint_name(self, *parts): | ||||||
| @@ -1207,7 +1242,7 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|         *, |         *, | ||||||
|         name: Optional[str] = None, |         name: Optional[str] = None, | ||||||
|         register: bool = True, |         register: bool = True, | ||||||
|     ) -> Optional[Task]: |     ) -> Optional[Task[Any]]: | ||||||
|         """ |         """ | ||||||
|         Schedule a task to run later, after the loop has started. |         Schedule a task to run later, after the loop has started. | ||||||
|         Different from asyncio.ensure_future in that it does not |         Different from asyncio.ensure_future in that it does not | ||||||
| @@ -1217,7 +1252,7 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|         `See user guide re: background tasks |         `See user guide re: background tasks | ||||||
|         <https://sanicframework.org/guide/basics/tasks.html#background-tasks>`__ |         <https://sanicframework.org/guide/basics/tasks.html#background-tasks>`__ | ||||||
|  |  | ||||||
|         :param task: future, couroutine or awaitable |         :param task: future, coroutine or awaitable | ||||||
|         """ |         """ | ||||||
|         try: |         try: | ||||||
|             loop = self.loop  # Will raise SanicError if loop is not started |             loop = self.loop  # Will raise SanicError if loop is not started | ||||||
| @@ -1338,7 +1373,7 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|         self.config.update_config(config) |         self.config.update_config(config) | ||||||
|  |  | ||||||
|     @property |     @property | ||||||
|     def asgi(self): |     def asgi(self) -> bool: | ||||||
|         return self.state.asgi |         return self.state.asgi | ||||||
|  |  | ||||||
|     @asgi.setter |     @asgi.setter | ||||||
| @@ -1349,18 +1384,6 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|     def debug(self): |     def debug(self): | ||||||
|         return self.state.is_debug |         return self.state.is_debug | ||||||
|  |  | ||||||
|     @debug.setter |  | ||||||
|     def debug(self, value: bool): |  | ||||||
|         deprecation( |  | ||||||
|             "Setting the value of a Sanic application's debug value directly " |  | ||||||
|             "is deprecated and will be removed in v22.9. Please set it using " |  | ||||||
|             "the CLI, app.run, app.prepare, or directly set " |  | ||||||
|             "app.state.mode to Mode.DEBUG.", |  | ||||||
|             22.9, |  | ||||||
|         ) |  | ||||||
|         mode = Mode.DEBUG if value else Mode.PRODUCTION |  | ||||||
|         self.state.mode = mode |  | ||||||
|  |  | ||||||
|     @property |     @property | ||||||
|     def auto_reload(self): |     def auto_reload(self): | ||||||
|         return self.config.AUTO_RELOAD |         return self.config.AUTO_RELOAD | ||||||
| @@ -1368,63 +1391,15 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|     @auto_reload.setter |     @auto_reload.setter | ||||||
|     def auto_reload(self, value: bool): |     def auto_reload(self, value: bool): | ||||||
|         self.config.AUTO_RELOAD = value |         self.config.AUTO_RELOAD = value | ||||||
|  |         self.state.auto_reload = value | ||||||
|  |  | ||||||
|     @property |     @property | ||||||
|     def state(self): |     def state(self) -> ApplicationState:  # type: ignore | ||||||
|  |         """ | ||||||
|  |         :return: The application state | ||||||
|  |         """ | ||||||
|         return self._state |         return self._state | ||||||
|  |  | ||||||
|     @property |  | ||||||
|     def is_running(self): |  | ||||||
|         deprecation( |  | ||||||
|             "Use of the is_running property is no longer used by Sanic " |  | ||||||
|             "internally. The property is now deprecated and will be removed " |  | ||||||
|             "in version 22.9. You may continue to set the property for your " |  | ||||||
|             "own needs until that time. If you would like to check whether " |  | ||||||
|             "the application is operational, please use app.state.stage. More " |  | ||||||
|             "information is available at ___.", |  | ||||||
|             22.9, |  | ||||||
|         ) |  | ||||||
|         return self.state.is_running |  | ||||||
|  |  | ||||||
|     @is_running.setter |  | ||||||
|     def is_running(self, value: bool): |  | ||||||
|         deprecation( |  | ||||||
|             "Use of the is_running property is no longer used by Sanic " |  | ||||||
|             "internally. The property is now deprecated and will be removed " |  | ||||||
|             "in version 22.9. You may continue to set the property for your " |  | ||||||
|             "own needs until that time. If you would like to check whether " |  | ||||||
|             "the application is operational, please use app.state.stage. More " |  | ||||||
|             "information is available at ___.", |  | ||||||
|             22.9, |  | ||||||
|         ) |  | ||||||
|         self.state.is_running = value |  | ||||||
|  |  | ||||||
|     @property |  | ||||||
|     def is_stopping(self): |  | ||||||
|         deprecation( |  | ||||||
|             "Use of the is_stopping property is no longer used by Sanic " |  | ||||||
|             "internally. The property is now deprecated and will be removed " |  | ||||||
|             "in version 22.9. You may continue to set the property for your " |  | ||||||
|             "own needs until that time. If you would like to check whether " |  | ||||||
|             "the application is operational, please use app.state.stage. More " |  | ||||||
|             "information is available at ___.", |  | ||||||
|             22.9, |  | ||||||
|         ) |  | ||||||
|         return self.state.is_stopping |  | ||||||
|  |  | ||||||
|     @is_stopping.setter |  | ||||||
|     def is_stopping(self, value: bool): |  | ||||||
|         deprecation( |  | ||||||
|             "Use of the is_stopping property is no longer used by Sanic " |  | ||||||
|             "internally. The property is now deprecated and will be removed " |  | ||||||
|             "in version 22.9. You may continue to set the property for your " |  | ||||||
|             "own needs until that time. If you would like to check whether " |  | ||||||
|             "the application is operational, please use app.state.stage. More " |  | ||||||
|             "information is available at ___.", |  | ||||||
|             22.9, |  | ||||||
|         ) |  | ||||||
|         self.state.is_stopping = value |  | ||||||
|  |  | ||||||
|     @property |     @property | ||||||
|     def reload_dirs(self): |     def reload_dirs(self): | ||||||
|         return self.state.reload_dirs |         return self.state.reload_dirs | ||||||
| @@ -1482,6 +1457,18 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|  |  | ||||||
|         cls._app_registry[name] = app |         cls._app_registry[name] = app | ||||||
|  |  | ||||||
|  |     @classmethod | ||||||
|  |     def unregister_app(cls, app: "Sanic") -> None: | ||||||
|  |         """ | ||||||
|  |         Unregister a Sanic instance | ||||||
|  |         """ | ||||||
|  |         if not isinstance(app, cls): | ||||||
|  |             raise SanicException("Registered app must be an instance of Sanic") | ||||||
|  |  | ||||||
|  |         name = app.name | ||||||
|  |         if name in cls._app_registry: | ||||||
|  |             del cls._app_registry[name] | ||||||
|  |  | ||||||
|     @classmethod |     @classmethod | ||||||
|     def get_app( |     def get_app( | ||||||
|         cls, name: Optional[str] = None, *, force_create: bool = False |         cls, name: Optional[str] = None, *, force_create: bool = False | ||||||
| @@ -1501,9 +1488,28 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|         try: |         try: | ||||||
|             return cls._app_registry[name] |             return cls._app_registry[name] | ||||||
|         except KeyError: |         except KeyError: | ||||||
|  |             if name == "__main__": | ||||||
|  |                 return cls.get_app("__mp_main__", force_create=force_create) | ||||||
|             if force_create: |             if force_create: | ||||||
|                 return cls(name) |                 return cls(name) | ||||||
|             raise SanicException(f'Sanic app name "{name}" not found.') |             raise SanicException( | ||||||
|  |                 f"Sanic app name '{name}' not found.\n" | ||||||
|  |                 "App instantiation must occur outside " | ||||||
|  |                 "if __name__ == '__main__' " | ||||||
|  |                 "block or by using an AppLoader.\nSee " | ||||||
|  |                 "https://sanic.dev/en/guide/deployment/app-loader.html" | ||||||
|  |                 " for more details." | ||||||
|  |             ) | ||||||
|  |  | ||||||
|  |     @classmethod | ||||||
|  |     def _check_uvloop_conflict(cls) -> None: | ||||||
|  |         values = {app.config.USE_UVLOOP for app in cls._app_registry.values()} | ||||||
|  |         if len(values) > 1: | ||||||
|  |             error_logger.warning( | ||||||
|  |                 "It looks like you're running several apps with different " | ||||||
|  |                 "uvloop settings. This is not supported and may lead to " | ||||||
|  |                 "unintended behaviour." | ||||||
|  |             ) | ||||||
|  |  | ||||||
|     # -------------------------------------------------------------------- # |     # -------------------------------------------------------------------- # | ||||||
|     # Lifecycle |     # Lifecycle | ||||||
| @@ -1515,6 +1521,7 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|         except FinalizationError as e: |         except FinalizationError as e: | ||||||
|             if not Sanic.test_mode: |             if not Sanic.test_mode: | ||||||
|                 raise e |                 raise e | ||||||
|  |         self.finalize_middleware() | ||||||
|  |  | ||||||
|     def signalize(self, allow_fail_builtin=True): |     def signalize(self, allow_fail_builtin=True): | ||||||
|         self.signal_router.allow_fail_builtin = allow_fail_builtin |         self.signal_router.allow_fail_builtin = allow_fail_builtin | ||||||
| @@ -1532,35 +1539,42 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|         if hasattr(self, "_ext"): |         if hasattr(self, "_ext"): | ||||||
|             self.ext._display() |             self.ext._display() | ||||||
|  |  | ||||||
|         if self.state.is_debug: |         if self.state.is_debug and self.config.TOUCHUP is not True: | ||||||
|             self.config.TOUCHUP = False |             self.config.TOUCHUP = False | ||||||
|  |         elif isinstance(self.config.TOUCHUP, Default): | ||||||
|  |             self.config.TOUCHUP = True | ||||||
|  |  | ||||||
|         # Setup routers |         # Setup routers | ||||||
|         self.signalize(self.config.TOUCHUP) |         self.signalize(self.config.TOUCHUP) | ||||||
|         self.finalize() |         self.finalize() | ||||||
|  |  | ||||||
|         # TODO: Replace in v22.6 to check against apps in app registry |         route_names = [route.name for route in self.router.routes] | ||||||
|         if ( |         duplicates = { | ||||||
|             self.__class__._uvloop_setting is not None |             name for name in route_names if route_names.count(name) > 1 | ||||||
|             and self.__class__._uvloop_setting != self.config.USE_UVLOOP |         } | ||||||
|         ): |         if duplicates: | ||||||
|             error_logger.warning( |             names = ", ".join(duplicates) | ||||||
|                 "It looks like you're running several apps with different " |             deprecation( | ||||||
|                 "uvloop settings. This is not supported and may lead to " |                 f"Duplicate route names detected: {names}. In the future, " | ||||||
|                 "unintended behaviour." |                 "Sanic will enforce uniqueness in route naming.", | ||||||
|  |                 23.3, | ||||||
|             ) |             ) | ||||||
|         self.__class__._uvloop_setting = self.config.USE_UVLOOP |  | ||||||
|  |         Sanic._check_uvloop_conflict() | ||||||
|  |  | ||||||
|         # Startup time optimizations |         # Startup time optimizations | ||||||
|         if self.state.primary: |         if self.state.primary: | ||||||
|             # TODO: |             # TODO: | ||||||
|             # - Raise warning if secondary apps have error handler config |             # - Raise warning if secondary apps have error handler config | ||||||
|             ErrorHandler.finalize(self.error_handler, config=self.config) |  | ||||||
|             if self.config.TOUCHUP: |             if self.config.TOUCHUP: | ||||||
|                 TouchUp.run(self) |                 TouchUp.run(self) | ||||||
|  |  | ||||||
|         self.state.is_started = True |         self.state.is_started = True | ||||||
|  |  | ||||||
|  |     def ack(self): | ||||||
|  |         if hasattr(self, "multiplexer"): | ||||||
|  |             self.multiplexer.ack() | ||||||
|  |  | ||||||
|     async def _server_event( |     async def _server_event( | ||||||
|         self, |         self, | ||||||
|         concern: str, |         concern: str, | ||||||
| @@ -1573,8 +1587,9 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|             "shutdown", |             "shutdown", | ||||||
|         ): |         ): | ||||||
|             raise SanicException(f"Invalid server event: {event}") |             raise SanicException(f"Invalid server event: {event}") | ||||||
|         if self.state.verbosity >= 1: |         logger.debug( | ||||||
|             logger.debug(f"Triggering server events: {event}") |             f"Triggering server events: {event}", extra={"verbosity": 1} | ||||||
|  |         ) | ||||||
|         reverse = concern == "shutdown" |         reverse = concern == "shutdown" | ||||||
|         if loop is None: |         if loop is None: | ||||||
|             loop = self.loop |             loop = self.loop | ||||||
| @@ -1588,3 +1603,43 @@ class Sanic(BaseSanic, RunnerMixin, metaclass=TouchUpMeta): | |||||||
|                 "loop": loop, |                 "loop": loop, | ||||||
|             }, |             }, | ||||||
|         ) |         ) | ||||||
|  |  | ||||||
|  |     # -------------------------------------------------------------------- # | ||||||
|  |     # Process Management | ||||||
|  |     # -------------------------------------------------------------------- # | ||||||
|  |  | ||||||
|  |     def refresh( | ||||||
|  |         self, | ||||||
|  |         passthru: Optional[Dict[str, Any]] = None, | ||||||
|  |     ): | ||||||
|  |         registered = self.__class__.get_app(self.name) | ||||||
|  |         if self is not registered: | ||||||
|  |             if not registered.state.server_info: | ||||||
|  |                 registered.state.server_info = self.state.server_info | ||||||
|  |             self = registered | ||||||
|  |         if passthru: | ||||||
|  |             for attr, info in passthru.items(): | ||||||
|  |                 if isinstance(info, dict): | ||||||
|  |                     for key, value in info.items(): | ||||||
|  |                         setattr(getattr(self, attr), key, value) | ||||||
|  |                 else: | ||||||
|  |                     setattr(self, attr, info) | ||||||
|  |         if hasattr(self, "multiplexer"): | ||||||
|  |             self.shared_ctx.lock() | ||||||
|  |         return self | ||||||
|  |  | ||||||
|  |     @property | ||||||
|  |     def inspector(self): | ||||||
|  |         if environ.get("SANIC_WORKER_PROCESS") or not self._inspector: | ||||||
|  |             raise SanicException( | ||||||
|  |                 "Can only access the inspector from the main process" | ||||||
|  |             ) | ||||||
|  |         return self._inspector | ||||||
|  |  | ||||||
|  |     @property | ||||||
|  |     def manager(self): | ||||||
|  |         if environ.get("SANIC_WORKER_PROCESS") or not self._manager: | ||||||
|  |             raise SanicException( | ||||||
|  |                 "Can only access the manager from the main process" | ||||||
|  |             ) | ||||||
|  |         return self._manager | ||||||
|   | |||||||
							
								
								
									
										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 = """ | ||||||
|  |  | ||||||
| @@ -38,13 +40,15 @@ FULL_COLOR_LOGO = """ | |||||||
|  |  | ||||||
| """  # noqa | """  # noqa | ||||||
|  |  | ||||||
|  | SVG_LOGO_SIMPLE = """<svg id=logo-simple viewBox="0 0 964 279"><desc>Sanic</desc><path d="M107 222c9-2 10-20 1-22s-20-2-30-2-17 7-16 14 6 10 15 10h30zm115-1c16-2 30-11 35-23s6-24 2-33-6-14-15-20-24-11-38-10c-7 3-10 13-5 19s17-1 24 4 15 14 13 24-5 15-14 18-50 0-74 0h-17c-6 4-10 15-4 20s16 2 23 3zM251 83q9-1 9-7 0-15-10-16h-13c-10 6-10 20 0 22zM147 60c-4 0-10 3-11 11s5 13 10 12 42 0 67 0c5-3 7-10 6-15s-4-8-9-8zm-33 1c-8 0-16 0-24 3s-20 10-25 20-6 24-4 36 15 22 26 27 78 8 94 3c4-4 4-12 0-18s-69 8-93-10c-8-7-9-23 0-30s12-10 20-10 12 2 16-3 1-15-5-18z" fill="#ff0d68"/><path d="M676 74c0-14-18-9-20 0s0 30 0 39 20 9 20 2zm-297-10c-12 2-15 12-23 23l-41 58H340l22-30c8-12 23-13 30-4s20 24 24 38-10 10-17 10l-68 2q-17 1-48 30c-7 6-10 20 0 24s15-8 20-13 20 -20 58-21h50 c20 2 33 9 52 30 8 10 24-4 16-13L384 65q-3-2-5-1zm131 0c-10 1-12 12-11 20v96c1 10-3 23 5 32s20-5 17-15c0-23-3-46 2-67 5-12 22-14 32-5l103 87c7 5 19 1 18-9v-64c-3-10-20-9-21 2s-20 22-30 13l-97-80c-5-4-10-10-18-10zM701 76v128c2 10 15 12 20 4s0-102 0-124s-20-18-20-7z M850 63c-35 0-69-2-86 15s-20 60-13 66 13 8 16 0 1-10 1-27 12-26 20-32 66-5 85-5 31 4 31-10-18-7-54-7M764 159c-6-2-15-2-16 12s19 37 33 43 23 8 25-4-4-11-11-14q-9-3-22-18c-4-7-3-16-10-19zM828 196c-4 0-8 1-10 5s-4 12 0 15 8 2 12 2h60c5 0 10-2 12-6 3-7-1-16-8-16z" fill="#1f1f1f"/></svg>"""  # noqa | ||||||
|  |  | ||||||
| ansi_pattern = re.compile(r"\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])") | ansi_pattern = re.compile(r"\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])") | ||||||
|  |  | ||||||
|  |  | ||||||
| def get_logo(full=False, coffee=False): | def get_logo(full=False, coffee=False): | ||||||
|     logo = ( |     logo = ( | ||||||
|         (FULL_COLOR_LOGO if full else (COFFEE_LOGO if coffee else COLOR_LOGO)) |         (FULL_COLOR_LOGO if full else (COFFEE_LOGO if coffee else COLOR_LOGO)) | ||||||
|         if sys.stdout.isatty() |         if is_atty() | ||||||
|         else BASE_LOGO |         else BASE_LOGO | ||||||
|     ) |     ) | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1,11 +1,10 @@ | |||||||
| import sys |  | ||||||
|  |  | ||||||
| from abc import ABC, abstractmethod | from abc import ABC, abstractmethod | ||||||
| from shutil import get_terminal_size | from shutil import get_terminal_size | ||||||
| from textwrap import indent, wrap | from textwrap import indent, wrap | ||||||
| from typing import Dict, Optional | from typing import Dict, Optional | ||||||
|  |  | ||||||
| from sanic import __version__ | from sanic import __version__ | ||||||
|  | from sanic.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,42 +3,20 @@ from __future__ import annotations | |||||||
| import logging | import logging | ||||||
|  |  | ||||||
| from dataclasses import dataclass, field | from dataclasses import dataclass, field | ||||||
| from enum import Enum, IntEnum, 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, Dict, List, 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 | from sanic.server.async_server import AsyncioServer | ||||||
|  |  | ||||||
|  |  | ||||||
| if TYPE_CHECKING:  # no cov | if TYPE_CHECKING: | ||||||
|     from sanic import Sanic |     from sanic import Sanic | ||||||
|  |  | ||||||
|  |  | ||||||
| class StrEnum(str, Enum): |  | ||||||
|     def _generate_next_value_(name: str, *args) -> str:  # type: ignore |  | ||||||
|         return name.lower() |  | ||||||
|  |  | ||||||
|  |  | ||||||
| class Server(StrEnum): |  | ||||||
|     SANIC = auto() |  | ||||||
|     ASGI = auto() |  | ||||||
|     GUNICORN = auto() |  | ||||||
|  |  | ||||||
|  |  | ||||||
| class Mode(StrEnum): |  | ||||||
|     PRODUCTION = auto() |  | ||||||
|     DEBUG = auto() |  | ||||||
|  |  | ||||||
|  |  | ||||||
| class ServerStage(IntEnum): |  | ||||||
|     STOPPED = auto() |  | ||||||
|     PARTIAL = auto() |  | ||||||
|     SERVING = auto() |  | ||||||
|  |  | ||||||
|  |  | ||||||
| @dataclass | @dataclass | ||||||
| class ApplicationServerInfo: | class ApplicationServerInfo: | ||||||
|     settings: Dict[str, Any] |     settings: Dict[str, Any] | ||||||
| @@ -91,6 +69,9 @@ 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 | ||||||
|   | |||||||
| @@ -7,9 +7,9 @@ from urllib.parse import quote | |||||||
|  |  | ||||||
| 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 logger | 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 | ||||||
| @@ -17,7 +17,7 @@ from sanic.server import ConnInfo | |||||||
| from sanic.server.websockets.connection import WebSocketConnection | from sanic.server.websockets.connection import WebSocketConnection | ||||||
|  |  | ||||||
|  |  | ||||||
| if TYPE_CHECKING:  # no cov | if TYPE_CHECKING: | ||||||
|     from sanic import Sanic |     from sanic import Sanic | ||||||
|  |  | ||||||
|  |  | ||||||
| @@ -25,27 +25,28 @@ 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 self.asgi_app.sanic_app.state.verbosity > 0: |         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 |         ): | ||||||
|             ): |             logger.debug( | ||||||
|                 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 | ||||||
|             ): |         ): | ||||||
|                 logger.debug( |             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: | ||||||
|         """ |         """ | ||||||
| @@ -60,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." | ||||||
| @@ -84,13 +85,27 @@ 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: | ||||||
| @@ -163,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]: | ||||||
| @@ -226,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 | ||||||
| @@ -9,6 +9,7 @@ from sanic.mixins.listeners import ListenerMixin | |||||||
| from sanic.mixins.middleware import MiddlewareMixin | from sanic.mixins.middleware import MiddlewareMixin | ||||||
| from sanic.mixins.routes import RouteMixin | from sanic.mixins.routes import RouteMixin | ||||||
| from sanic.mixins.signals import SignalMixin | from sanic.mixins.signals import SignalMixin | ||||||
|  | from sanic.mixins.static import StaticMixin | ||||||
|  |  | ||||||
|  |  | ||||||
| VALID_NAME = re.compile(r"^[a-zA-Z_][a-zA-Z0-9_\-]*$") | VALID_NAME = re.compile(r"^[a-zA-Z_][a-zA-Z0-9_\-]*$") | ||||||
| @@ -16,6 +17,7 @@ VALID_NAME = re.compile(r"^[a-zA-Z_][a-zA-Z0-9_\-]*$") | |||||||
|  |  | ||||||
| class BaseSanic( | class BaseSanic( | ||||||
|     RouteMixin, |     RouteMixin, | ||||||
|  |     StaticMixin, | ||||||
|     MiddlewareMixin, |     MiddlewareMixin, | ||||||
|     ListenerMixin, |     ListenerMixin, | ||||||
|     ExceptionMixin, |     ExceptionMixin, | ||||||
| @@ -24,7 +26,9 @@ class BaseSanic( | |||||||
| ): | ): | ||||||
|     __slots__ = ("name",) |     __slots__ = ("name",) | ||||||
|  |  | ||||||
|     def __init__(self, name: str = None, *args: Any, **kwargs: Any) -> None: |     def __init__( | ||||||
|  |         self, name: Optional[str] = None, *args: Any, **kwargs: Any | ||||||
|  |     ) -> None: | ||||||
|         class_name = self.__class__.__name__ |         class_name = self.__class__.__name__ | ||||||
|  |  | ||||||
|         if name is None: |         if name is None: | ||||||
|   | |||||||
| @@ -5,7 +5,7 @@ from functools import partial | |||||||
| from typing import TYPE_CHECKING, List, Optional, Union | from typing import TYPE_CHECKING, List, Optional, Union | ||||||
|  |  | ||||||
|  |  | ||||||
| if TYPE_CHECKING:  # no cov | if TYPE_CHECKING: | ||||||
|     from sanic.blueprints import Blueprint |     from sanic.blueprints import Blueprint | ||||||
|  |  | ||||||
|  |  | ||||||
|   | |||||||
| @@ -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 | ||||||
|  |  | ||||||
|  |  | ||||||
| @@ -304,11 +304,8 @@ class Blueprint(BaseSanic): | |||||||
|  |  | ||||||
|         # Routes |         # Routes | ||||||
|         for future in self._future_routes: |         for future in self._future_routes: | ||||||
|             # attach the blueprint name to the handler so that it can be |  | ||||||
|             # prefixed properly in the router |  | ||||||
|             future.handler.__blueprintname__ = self.name |  | ||||||
|             # Prepend the blueprint URI prefix if available |             # Prepend the blueprint URI prefix if available | ||||||
|             uri = url_prefix + future.uri if url_prefix else future.uri |             uri = self._setup_uri(future.uri, url_prefix) | ||||||
|  |  | ||||||
|             version_prefix = self.version_prefix |             version_prefix = self.version_prefix | ||||||
|             for prefix in ( |             for prefix in ( | ||||||
| @@ -333,7 +330,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 +360,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 +403,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 +439,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 +453,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, ...]] | ||||||
|   | |||||||
							
								
								
									
										18
									
								
								sanic/breaking/__init__.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										18
									
								
								sanic/breaking/__init__.py
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,18 @@ | |||||||
|  | from sanic.__version__ import __compatibility__ | ||||||
|  |  | ||||||
|  | if __compatibility__ == "22.12": | ||||||
|  |     from .v22_12.request import ( | ||||||
|  |         File, | ||||||
|  |         Request, | ||||||
|  |         RequestParameters, | ||||||
|  |         parse_multipart_form, | ||||||
|  |     ) | ||||||
|  | elif __compatibility__ == "23.3": | ||||||
|  |     from .v23_3.request import ( | ||||||
|  |         File, | ||||||
|  |         Request, | ||||||
|  |         RequestParameters, | ||||||
|  |         parse_multipart_form, | ||||||
|  |     ) | ||||||
|  | else: | ||||||
|  |     raise RuntimeError(f"Unknown compatibility value: {__compatibility__}") | ||||||
							
								
								
									
										0
									
								
								sanic/breaking/v22_12/__init__.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								sanic/breaking/v22_12/__init__.py
									
									
									
									
									
										Normal file
									
								
							
							
								
								
									
										1123
									
								
								sanic/breaking/v22_12/request.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1123
									
								
								sanic/breaking/v22_12/request.py
									
									
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										0
									
								
								sanic/breaking/v23_3/__init__.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								sanic/breaking/v23_3/__init__.py
									
									
									
									
									
										Normal file
									
								
							
							
								
								
									
										9
									
								
								sanic/breaking/v23_3/request.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								sanic/breaking/v23_3/request.py
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,9 @@ | |||||||
|  | from ..v22_12.request import File | ||||||
|  | from ..v22_12.request import Request as LegacyRequest | ||||||
|  | from ..v22_12.request import RequestParameters, parse_multipart_form | ||||||
|  |  | ||||||
|  |  | ||||||
|  | class Request(LegacyRequest): | ||||||
|  |     @property | ||||||
|  |     def something_new(self): | ||||||
|  |         return 123 | ||||||
							
								
								
									
										200
									
								
								sanic/cli/app.py
									
									
									
									
									
								
							
							
						
						
									
										200
									
								
								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,19 +56,37 @@ 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): | ||||||
|  |         if len(sys.argv) > 1 and sys.argv[1] == "inspect": | ||||||
|  |             self.inspecting = True | ||||||
|  |             self.parser.description = get_logo(True) | ||||||
|  |             make_inspector_parser(self.parser) | ||||||
|  |             return | ||||||
|  |  | ||||||
|         for group in Group._registry: |         for group in Group._registry: | ||||||
|             group.create(self.parser).attach() |             instance = group.create(self.parser) | ||||||
|  |             instance.attach() | ||||||
|  |             self.groups.append(instance) | ||||||
|  |  | ||||||
|     def run(self): |     def run(self, parse_args=None): | ||||||
|         # This is to provide backwards compat -v to display version |         if self.inspecting: | ||||||
|         legacy_version = len(sys.argv) == 2 and sys.argv[-1] == "-v" |             self._inspector() | ||||||
|         parse_args = ["--version"] if legacy_version else None |             return | ||||||
|  |  | ||||||
|  |         legacy_version = False | ||||||
|         if not parse_args: |         if not parse_args: | ||||||
|             parsed, unknown = self.parser.parse_known_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: |             if unknown and parsed.factory: | ||||||
|                 for arg in unknown: |                 for arg in unknown: | ||||||
|                     if arg.startswith("--"): |                     if arg.startswith("--"): | ||||||
| @@ -77,16 +94,90 @@ Or, a path to a directory to run as a simple HTTP server: | |||||||
|  |  | ||||||
|         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): | ||||||
|         # # Custom TLS mismatch handling for better diagnostics |         # 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,68 +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 module_name == "" and os.path.isdir(self.args.module): |  | ||||||
|                     raise ValueError( |  | ||||||
|                         "App not found.\n" |  | ||||||
|                         "   Please use --simple if you are passing a " |  | ||||||
|                         "directory to sanic.\n" |  | ||||||
|                         f"   eg. sanic {self.args.module} --simple" |  | ||||||
|                     ) |  | ||||||
|  |  | ||||||
|                 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: |  | ||||||
|                     try: |  | ||||||
|                         app = app(self.args) |  | ||||||
|                     except TypeError: |  | ||||||
|                         app = app() |  | ||||||
|  |  | ||||||
|                 app_type_name = type(app).__name__ |  | ||||||
|  |  | ||||||
|                 if not isinstance(app, Sanic): |  | ||||||
|                     if callable(app): |  | ||||||
|                         solution = f"sanic {self.args.module} --factory" |  | ||||||
|                         raise ValueError( |  | ||||||
|                             "Module is not a Sanic app, it is a" |  | ||||||
|                             f"{app_type_name}\n" |  | ||||||
|                             "  If this callable returns a" |  | ||||||
|                             f"Sanic instance try: \n{solution}" |  | ||||||
|                         ) |  | ||||||
|  |  | ||||||
|                     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) | ||||||
| @@ -180,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, | ||||||
| @@ -192,6 +244,9 @@ 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, | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         for maybe_arg in ("auto_reload", "dev"): |         for maybe_arg in ("auto_reload", "dev"): | ||||||
| @@ -201,4 +256,5 @@ Or, a path to a directory to run as a simple HTTP server: | |||||||
|         if self.args.path: |         if self.args.path: | ||||||
|             kwargs["auto_reload"] = True |             kwargs["auto_reload"] = True | ||||||
|             kwargs["reload_dir"] = self.args.path |             kwargs["reload_dir"] = self.args.path | ||||||
|  |  | ||||||
|         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, | ||||||
|         ) |         ) | ||||||
|  |  | ||||||
|  |  | ||||||
| @@ -180,11 +264,7 @@ class DevelopmentGroup(Group): | |||||||
|             "--debug", |             "--debug", | ||||||
|             dest="debug", |             dest="debug", | ||||||
|             action="store_true", |             action="store_true", | ||||||
|             help=( |             help="Run the server in debug mode", | ||||||
|                 "Run the server in DEBUG mode. It includes DEBUG logging,\n" |  | ||||||
|                 "additional context on exceptions, and other settings\n" |  | ||||||
|                 "not-safe for PRODUCTION, but helpful for debugging problems." |  | ||||||
|             ), |  | ||||||
|         ) |         ) | ||||||
|         self.container.add_argument( |         self.container.add_argument( | ||||||
|             "-r", |             "-r", | ||||||
| @@ -209,7 +289,16 @@ class DevelopmentGroup(Group): | |||||||
|             "--dev", |             "--dev", | ||||||
|             dest="dev", |             dest="dev", | ||||||
|             action="store_true", |             action="store_true", | ||||||
|             help=("debug + auto reload."), |             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)" | ||||||
|  |             ), | ||||||
|         ) |         ) | ||||||
|  |  | ||||||
|  |  | ||||||
| @@ -217,6 +306,12 @@ 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 | ||||||
| @@ -40,6 +88,12 @@ class Header(CIMultiDict): | |||||||
|     very similar to a regular dictionary. |     very similar to a regular dictionary. | ||||||
|     """ |     """ | ||||||
|  |  | ||||||
|  |     def __getattr__(self, key: str) -> str: | ||||||
|  |         if key.startswith("_"): | ||||||
|  |             return self.__getattribute__(key) | ||||||
|  |         key = key.rstrip("_").replace("_", "-") | ||||||
|  |         return ",".join(self.getall(key, default=[])) | ||||||
|  |  | ||||||
|     def get_all(self, key: str): |     def get_all(self, key: str): | ||||||
|         """ |         """ | ||||||
|         Convenience method mapped to ``getall()``. |         Convenience method mapped to ``getall()``. | ||||||
| @@ -47,12 +101,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 | ||||||
| @@ -89,3 +143,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()) | ||||||
|   | |||||||
							
								
								
									
										119
									
								
								sanic/config.py
									
									
									
									
									
								
							
							
						
						
									
										119
									
								
								sanic/config.py
									
									
									
									
									
								
							| @@ -1,56 +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 | ||||||
|     "TOUCHUP": True, |     "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)} | ||||||
|  |  | ||||||
| @@ -64,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 | ||||||
| @@ -82,7 +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 | ||||||
|     TOUCHUP: bool |     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 | ||||||
| @@ -90,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, | ||||||
|         *, |         *, | ||||||
| @@ -98,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: | ||||||
| @@ -119,19 +158,19 @@ 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: | ||||||
|         self.update({attr: value}) |         self.update({attr: value}) | ||||||
|  |  | ||||||
|     def __setitem__(self, attr, value) -> None: |     def __setitem__(self, attr: str, value: Any) -> None: | ||||||
|         self.update({attr: value}) |         self.update({attr: value}) | ||||||
|  |  | ||||||
|     def update(self, *other, **kwargs) -> None: |     def update(self, *other: Any, **kwargs: Any) -> None: | ||||||
|         kwargs.update({k: v for item in other for k, v in dict(item).items()}) |         kwargs.update({k: v for item in other for k, v in dict(item).items()}) | ||||||
|         setters: Dict[str, Any] = { |         setters: Dict[str, Any] = { | ||||||
|             k: kwargs.pop(k) |             k: kwargs.pop(k) | ||||||
| @@ -157,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 | ||||||
|  |  | ||||||
| @@ -179,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( | ||||||
| @@ -195,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) | ||||||
|  |  | ||||||
| @@ -202,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: | ||||||
|  |  | ||||||
| @@ -228,12 +274,9 @@ class Config(dict, metaclass=DescriptorMeta): | |||||||
|         `See user guide re: config |         `See user guide re: config | ||||||
|         <https://sanicframework.org/guide/deployment/configuration.html>`__ |         <https://sanicframework.org/guide/deployment/configuration.html>`__ | ||||||
|         """ |         """ | ||||||
|         lower_case_var_found = False |  | ||||||
|         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 | ||||||
|             if not key.isupper(): |  | ||||||
|                 lower_case_var_found = True |  | ||||||
|  |  | ||||||
|             _, config_key = key.split(prefix, 1) |             _, config_key = key.split(prefix, 1) | ||||||
|  |  | ||||||
| @@ -243,12 +286,6 @@ class Config(dict, metaclass=DescriptorMeta): | |||||||
|                     break |                     break | ||||||
|                 except ValueError: |                 except ValueError: | ||||||
|                     pass |                     pass | ||||||
|         if lower_case_var_found: |  | ||||||
|             deprecation( |  | ||||||
|                 "Lowercase environment variables will not be " |  | ||||||
|                 "loaded into Sanic config beginning in v22.9.", |  | ||||||
|                 22.9, |  | ||||||
|             ) |  | ||||||
|  |  | ||||||
|     def update_config(self, config: Union[bytes, str, dict, Any]): |     def update_config(self, config: Union[bytes, str, dict, Any]): | ||||||
|         """ |         """ | ||||||
|   | |||||||
| @@ -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" | ||||||
|   | |||||||
| @@ -12,6 +12,7 @@ Setting ``app.config.FALLBACK_ERROR_FORMAT = "auto"`` will enable a switch that | |||||||
| will attempt to provide an appropriate response format based upon the | will attempt to provide an appropriate response format based upon the | ||||||
| request type. | request type. | ||||||
| """ | """ | ||||||
|  | from __future__ import annotations | ||||||
|  |  | ||||||
| import sys | import sys | ||||||
| import typing as t | import typing as t | ||||||
| @@ -19,10 +20,11 @@ import typing as t | |||||||
| from functools import partial | from functools import partial | ||||||
| from traceback import extract_tb | from traceback import extract_tb | ||||||
|  |  | ||||||
| from sanic.exceptions import InvalidUsage, SanicException | from sanic.exceptions import BadRequest, SanicException | ||||||
| from sanic.helpers import STATUS_CODES | from sanic.helpers import STATUS_CODES | ||||||
| from sanic.request import Request | from sanic.log import deprecation, logger | ||||||
| from sanic.response import HTTPResponse, html, json, text | from sanic.pages.error import ErrorPage | ||||||
|  | from sanic.response import html, json, text | ||||||
|  |  | ||||||
|  |  | ||||||
| dumps: t.Callable[..., str] | dumps: t.Callable[..., str] | ||||||
| @@ -33,13 +35,15 @@ try: | |||||||
| except ImportError:  # noqa | except ImportError:  # noqa | ||||||
|     from json import dumps |     from json import dumps | ||||||
|  |  | ||||||
|  | if t.TYPE_CHECKING: | ||||||
|  |     from sanic import HTTPResponse, Request | ||||||
|  |  | ||||||
| DEFAULT_FORMAT = "auto" | DEFAULT_FORMAT = "auto" | ||||||
| FALLBACK_TEXT = ( | FALLBACK_TEXT = """\ | ||||||
|     "The server encountered an internal error and " | The application encountered an unexpected error and could not continue.\ | ||||||
|     "cannot complete your request." | """ | ||||||
| ) |  | ||||||
| FALLBACK_STATUS = 500 | FALLBACK_STATUS = 500 | ||||||
|  | JSON = "application/json" | ||||||
|  |  | ||||||
|  |  | ||||||
| class BaseRenderer: | class BaseRenderer: | ||||||
| @@ -113,134 +117,18 @@ class HTMLRenderer(BaseRenderer): | |||||||
|     The default fallback type. |     The default fallback type. | ||||||
|     """ |     """ | ||||||
|  |  | ||||||
|     TRACEBACK_STYLE = """ |  | ||||||
|         html { font-family: sans-serif } |  | ||||||
|         h2 { color: #888; } |  | ||||||
|         .tb-wrapper p, dl, dd { margin: 0 } |  | ||||||
|         .frame-border { margin: 1rem } |  | ||||||
|         .frame-line > *, dt, dd { padding: 0.3rem 0.6rem } |  | ||||||
|         .frame-line, dl { margin-bottom: 0.3rem } |  | ||||||
|         .frame-code, dd { font-size: 16px; padding-left: 4ch } |  | ||||||
|         .tb-wrapper, dl { border: 1px solid #eee } |  | ||||||
|         .tb-header,.obj-header { |  | ||||||
|             background: #eee; padding: 0.3rem; font-weight: bold |  | ||||||
|         } |  | ||||||
|         .frame-descriptor, dt { background: #e2eafb; font-size: 14px } |  | ||||||
|     """ |  | ||||||
|     TRACEBACK_WRAPPER_HTML = ( |  | ||||||
|         "<div class=tb-header>{exc_name}: {exc_value}</div>" |  | ||||||
|         "<div class=tb-wrapper>{frame_html}</div>" |  | ||||||
|     ) |  | ||||||
|     TRACEBACK_BORDER = ( |  | ||||||
|         "<div class=frame-border>" |  | ||||||
|         "The above exception was the direct cause of the following exception:" |  | ||||||
|         "</div>" |  | ||||||
|     ) |  | ||||||
|     TRACEBACK_LINE_HTML = ( |  | ||||||
|         "<div class=frame-line>" |  | ||||||
|         "<p class=frame-descriptor>" |  | ||||||
|         "File {0.filename}, line <i>{0.lineno}</i>, " |  | ||||||
|         "in <code><b>{0.name}</b></code>" |  | ||||||
|         "<p class=frame-code><code>{0.line}</code>" |  | ||||||
|         "</div>" |  | ||||||
|     ) |  | ||||||
|     OBJECT_WRAPPER_HTML = ( |  | ||||||
|         "<div class=obj-header>{title}</div>" |  | ||||||
|         "<dl class={obj_type}>{display_html}</dl>" |  | ||||||
|     ) |  | ||||||
|     OBJECT_DISPLAY_HTML = "<dt>{key}</dt><dd><code>{value}</code></dd>" |  | ||||||
|     OUTPUT_HTML = ( |  | ||||||
|         "<!DOCTYPE html><html lang=en>" |  | ||||||
|         "<meta charset=UTF-8><title>{title}</title>\n" |  | ||||||
|         "<style>{style}</style>\n" |  | ||||||
|         "<h1>{title}</h1><p>{text}\n" |  | ||||||
|         "{body}" |  | ||||||
|     ) |  | ||||||
|  |  | ||||||
|     def full(self) -> HTTPResponse: |     def full(self) -> HTTPResponse: | ||||||
|         return html( |         page = ErrorPage( | ||||||
|             self.OUTPUT_HTML.format( |             debug=self.debug, | ||||||
|                 title=self.title, |             title=super().title, | ||||||
|                 text=self.text, |             text=super().text, | ||||||
|                 style=self.TRACEBACK_STYLE, |             request=self.request, | ||||||
|                 body=self._generate_body(full=True), |             exc=self.exception, | ||||||
|             ), |  | ||||||
|             status=self.status, |  | ||||||
|         ) |         ) | ||||||
|  |         return html(page.render(), status=self.status, headers=self.headers) | ||||||
|  |  | ||||||
|     def minimal(self) -> HTTPResponse: |     def minimal(self) -> HTTPResponse: | ||||||
|         return html( |         return self.full() | ||||||
|             self.OUTPUT_HTML.format( |  | ||||||
|                 title=self.title, |  | ||||||
|                 text=self.text, |  | ||||||
|                 style=self.TRACEBACK_STYLE, |  | ||||||
|                 body=self._generate_body(full=False), |  | ||||||
|             ), |  | ||||||
|             status=self.status, |  | ||||||
|             headers=self.headers, |  | ||||||
|         ) |  | ||||||
|  |  | ||||||
|     @property |  | ||||||
|     def text(self): |  | ||||||
|         return escape(super().text) |  | ||||||
|  |  | ||||||
|     @property |  | ||||||
|     def title(self): |  | ||||||
|         return escape(f"⚠️ {super().title}") |  | ||||||
|  |  | ||||||
|     def _generate_body(self, *, full): |  | ||||||
|         lines = [] |  | ||||||
|         if full: |  | ||||||
|             _, exc_value, __ = sys.exc_info() |  | ||||||
|             exceptions = [] |  | ||||||
|             while exc_value: |  | ||||||
|                 exceptions.append(self._format_exc(exc_value)) |  | ||||||
|                 exc_value = exc_value.__cause__ |  | ||||||
|  |  | ||||||
|             traceback_html = self.TRACEBACK_BORDER.join(reversed(exceptions)) |  | ||||||
|             appname = escape(self.request.app.name) |  | ||||||
|             name = escape(self.exception.__class__.__name__) |  | ||||||
|             value = escape(self.exception) |  | ||||||
|             path = escape(self.request.path) |  | ||||||
|             lines += [ |  | ||||||
|                 f"<h2>Traceback of {appname} " "(most recent call last):</h2>", |  | ||||||
|                 f"{traceback_html}", |  | ||||||
|                 "<div class=summary><p>", |  | ||||||
|                 f"<b>{name}: {value}</b> " |  | ||||||
|                 f"while handling path <code>{path}</code>", |  | ||||||
|                 "</div>", |  | ||||||
|             ] |  | ||||||
|  |  | ||||||
|         for attr, display in (("context", True), ("extra", bool(full))): |  | ||||||
|             info = getattr(self.exception, attr, None) |  | ||||||
|             if info and display: |  | ||||||
|                 lines.append(self._generate_object_display(info, attr)) |  | ||||||
|  |  | ||||||
|         return "\n".join(lines) |  | ||||||
|  |  | ||||||
|     def _generate_object_display( |  | ||||||
|         self, obj: t.Dict[str, t.Any], descriptor: str |  | ||||||
|     ) -> str: |  | ||||||
|         display = "".join( |  | ||||||
|             self.OBJECT_DISPLAY_HTML.format(key=key, value=value) |  | ||||||
|             for key, value in obj.items() |  | ||||||
|         ) |  | ||||||
|         return self.OBJECT_WRAPPER_HTML.format( |  | ||||||
|             title=descriptor.title(), |  | ||||||
|             display_html=display, |  | ||||||
|             obj_type=descriptor.lower(), |  | ||||||
|         ) |  | ||||||
|  |  | ||||||
|     def _format_exc(self, exc): |  | ||||||
|         frames = extract_tb(exc.__traceback__) |  | ||||||
|         frame_html = "".join( |  | ||||||
|             self.TRACEBACK_LINE_HTML.format(frame) for frame in frames |  | ||||||
|         ) |  | ||||||
|         return self.TRACEBACK_WRAPPER_HTML.format( |  | ||||||
|             exc_name=escape(exc.__class__.__name__), |  | ||||||
|             exc_value=escape(exc), |  | ||||||
|             frame_html=frame_html, |  | ||||||
|         ) |  | ||||||
|  |  | ||||||
|  |  | ||||||
| class TextRenderer(BaseRenderer): | class TextRenderer(BaseRenderer): | ||||||
| @@ -388,32 +276,26 @@ def escape(text): | |||||||
|     return f"{text}".replace("&", "&").replace("<", "<") |     return f"{text}".replace("&", "&").replace("<", "<") | ||||||
|  |  | ||||||
|  |  | ||||||
| RENDERERS_BY_CONFIG = { | MIME_BY_CONFIG = { | ||||||
|     "html": HTMLRenderer, |     "text": "text/plain", | ||||||
|     "json": JSONRenderer, |     "json": "application/json", | ||||||
|     "text": TextRenderer, |     "html": "text/html", | ||||||
| } | } | ||||||
|  | CONFIG_BY_MIME = {v: k for k, v in MIME_BY_CONFIG.items()} | ||||||
| RENDERERS_BY_CONTENT_TYPE = { | RENDERERS_BY_CONTENT_TYPE = { | ||||||
|     "text/plain": TextRenderer, |     "text/plain": TextRenderer, | ||||||
|     "application/json": JSONRenderer, |     "application/json": JSONRenderer, | ||||||
|     "multipart/form-data": HTMLRenderer, |     "multipart/form-data": HTMLRenderer, | ||||||
|     "text/html": HTMLRenderer, |     "text/html": HTMLRenderer, | ||||||
| } | } | ||||||
| CONTENT_TYPE_BY_RENDERERS = { |  | ||||||
|     v: k for k, v in RENDERERS_BY_CONTENT_TYPE.items() |  | ||||||
| } |  | ||||||
|  |  | ||||||
|  | # Handler source code is checked for which response types it returns with the | ||||||
|  | # route error_format="auto" (default) to determine which format to use. | ||||||
| RESPONSE_MAPPING = { | RESPONSE_MAPPING = { | ||||||
|     "empty": "html", |  | ||||||
|     "json": "json", |     "json": "json", | ||||||
|     "text": "text", |     "text": "text", | ||||||
|     "raw": "text", |  | ||||||
|     "html": "html", |     "html": "html", | ||||||
|     "file": "html", |     "JSONResponse": "json", | ||||||
|     "file_stream": "text", |  | ||||||
|     "stream": "text", |  | ||||||
|     "redirect": "html", |  | ||||||
|     "text/plain": "text", |     "text/plain": "text", | ||||||
|     "text/html": "html", |     "text/html": "html", | ||||||
|     "application/json": "json", |     "application/json": "json", | ||||||
| @@ -421,7 +303,7 @@ RESPONSE_MAPPING = { | |||||||
|  |  | ||||||
|  |  | ||||||
| def check_error_format(format): | def check_error_format(format): | ||||||
|     if format not in RENDERERS_BY_CONFIG and format != "auto": |     if format not in MIME_BY_CONFIG and format != "auto": | ||||||
|         raise SanicException(f"Unknown format: {format}") |         raise SanicException(f"Unknown format: {format}") | ||||||
|  |  | ||||||
|  |  | ||||||
| @@ -436,98 +318,68 @@ def exception_response( | |||||||
|     """ |     """ | ||||||
|     Render a response for the default FALLBACK exception handler. |     Render a response for the default FALLBACK exception handler. | ||||||
|     """ |     """ | ||||||
|     content_type = None |  | ||||||
|  |  | ||||||
|     if not renderer: |     if not renderer: | ||||||
|         # Make sure we have something set |         mt = guess_mime(request, fallback) | ||||||
|         renderer = base |         renderer = RENDERERS_BY_CONTENT_TYPE.get(mt, base) | ||||||
|         render_format = fallback |  | ||||||
|  |  | ||||||
|         if request: |  | ||||||
|             # If there is a request, try and get the format |  | ||||||
|             # from the route |  | ||||||
|             if request.route: |  | ||||||
|                 try: |  | ||||||
|                     if request.route.ctx.error_format: |  | ||||||
|                         render_format = request.route.ctx.error_format |  | ||||||
|                 except AttributeError: |  | ||||||
|                     ... |  | ||||||
|  |  | ||||||
|             content_type = request.headers.getone("content-type", "").split( |  | ||||||
|                 ";" |  | ||||||
|             )[0] |  | ||||||
|  |  | ||||||
|             acceptable = request.accept |  | ||||||
|  |  | ||||||
|             # If the format is auto still, make a guess |  | ||||||
|             if render_format == "auto": |  | ||||||
|                 # First, if there is an Accept header, check if text/html |  | ||||||
|                 # is the first option |  | ||||||
|                 # According to MDN Web Docs, all major browsers use text/html |  | ||||||
|                 # as the primary value in Accept (with the exception of IE 8, |  | ||||||
|                 # and, well, if you are supporting IE 8, then you have bigger |  | ||||||
|                 # problems to concern yourself with than what default exception |  | ||||||
|                 # renderer is used) |  | ||||||
|                 # Source: |  | ||||||
|                 # https://developer.mozilla.org/en-US/docs/Web/HTTP/Content_negotiation/List_of_default_Accept_values |  | ||||||
|  |  | ||||||
|                 if acceptable and acceptable[0].match( |  | ||||||
|                     "text/html", |  | ||||||
|                     allow_type_wildcard=False, |  | ||||||
|                     allow_subtype_wildcard=False, |  | ||||||
|                 ): |  | ||||||
|                     renderer = HTMLRenderer |  | ||||||
|  |  | ||||||
|                 # Second, if there is an Accept header, check if |  | ||||||
|                 # application/json is an option, or if the content-type |  | ||||||
|                 # is application/json |  | ||||||
|                 elif ( |  | ||||||
|                     acceptable |  | ||||||
|                     and acceptable.match( |  | ||||||
|                         "application/json", |  | ||||||
|                         allow_type_wildcard=False, |  | ||||||
|                         allow_subtype_wildcard=False, |  | ||||||
|                     ) |  | ||||||
|                     or content_type == "application/json" |  | ||||||
|                 ): |  | ||||||
|                     renderer = JSONRenderer |  | ||||||
|  |  | ||||||
|                 # Third, if there is no Accept header, assume we want text. |  | ||||||
|                 # The likely use case here is a raw socket. |  | ||||||
|                 elif not acceptable: |  | ||||||
|                     renderer = TextRenderer |  | ||||||
|                 else: |  | ||||||
|                     # Fourth, look to see if there was a JSON body |  | ||||||
|                     # When in this situation, the request is probably coming |  | ||||||
|                     # from curl, an API client like Postman or Insomnia, or a |  | ||||||
|                     # package like requests or httpx |  | ||||||
|                     try: |  | ||||||
|                         # Give them the benefit of the doubt if they did: |  | ||||||
|                         # $ curl localhost:8000 -d '{"foo": "bar"}' |  | ||||||
|                         # And provide them with JSONRenderer |  | ||||||
|                         renderer = JSONRenderer if request.json else base |  | ||||||
|                     except InvalidUsage: |  | ||||||
|                         renderer = base |  | ||||||
|             else: |  | ||||||
|                 renderer = RENDERERS_BY_CONFIG.get(render_format, renderer) |  | ||||||
|  |  | ||||||
|             # Lastly, if there is an Accept header, make sure |  | ||||||
|             # our choice is okay |  | ||||||
|             if acceptable: |  | ||||||
|                 type_ = CONTENT_TYPE_BY_RENDERERS.get(renderer)  # type: ignore |  | ||||||
|                 if type_ and type_ not in acceptable: |  | ||||||
|                     # If the renderer selected is not in the Accept header |  | ||||||
|                     # look through what is in the Accept header, and select |  | ||||||
|                     # the first option that matches. Otherwise, just drop back |  | ||||||
|                     # to the original default |  | ||||||
|                     for accept in acceptable: |  | ||||||
|                         mtype = f"{accept.type_}/{accept.subtype}" |  | ||||||
|                         maybe = RENDERERS_BY_CONTENT_TYPE.get(mtype) |  | ||||||
|                         if maybe: |  | ||||||
|                             renderer = maybe |  | ||||||
|                             break |  | ||||||
|                     else: |  | ||||||
|                         renderer = base |  | ||||||
|  |  | ||||||
|     renderer = t.cast(t.Type[BaseRenderer], renderer) |     renderer = t.cast(t.Type[BaseRenderer], renderer) | ||||||
|     return renderer(request, exception, debug).render() |     return renderer(request, exception, debug).render() | ||||||
|  |  | ||||||
|  |  | ||||||
|  | def guess_mime(req: Request, fallback: str) -> str: | ||||||
|  |     # Attempt to find a suitable MIME format for the response. | ||||||
|  |     # Insertion-ordered map of formats["html"] = "source of that suggestion" | ||||||
|  |     formats = {} | ||||||
|  |     name = "" | ||||||
|  |     # Route error_format (by magic from handler code if auto, the default) | ||||||
|  |     if req.route: | ||||||
|  |         name = req.route.name | ||||||
|  |         f = req.route.extra.error_format | ||||||
|  |         if f in MIME_BY_CONFIG: | ||||||
|  |             formats[f] = name | ||||||
|  |  | ||||||
|  |     if not formats and fallback in MIME_BY_CONFIG: | ||||||
|  |         formats[fallback] = "FALLBACK_ERROR_FORMAT" | ||||||
|  |  | ||||||
|  |     # If still not known, check for the request for clues of JSON | ||||||
|  |     if not formats and fallback == "auto" and req.accept.match(JSON): | ||||||
|  |         if JSON in req.accept:  # Literally, not wildcard | ||||||
|  |             formats["json"] = "request.accept" | ||||||
|  |         elif JSON in req.headers.getone("content-type", ""): | ||||||
|  |             formats["json"] = "content-type" | ||||||
|  |         # DEPRECATION: Remove this block in 24.3 | ||||||
|  |         else: | ||||||
|  |             c = None | ||||||
|  |             try: | ||||||
|  |                 c = req.json | ||||||
|  |             except BadRequest: | ||||||
|  |                 pass | ||||||
|  |             if c: | ||||||
|  |                 formats["json"] = "request.json" | ||||||
|  |                 deprecation( | ||||||
|  |                     "Response type was determined by the JSON content of " | ||||||
|  |                     "the request. This behavior is deprecated and will be " | ||||||
|  |                     "removed in v24.3. Please specify the format either by\n" | ||||||
|  |                     f'  error_format="json" on route {name}, by\n' | ||||||
|  |                     '  FALLBACK_ERROR_FORMAT = "json", or by adding header\n' | ||||||
|  |                     "  accept: application/json to your requests.", | ||||||
|  |                     24.3, | ||||||
|  |                 ) | ||||||
|  |  | ||||||
|  |     # Any other supported formats | ||||||
|  |     if fallback == "auto": | ||||||
|  |         for k in MIME_BY_CONFIG: | ||||||
|  |             if k not in formats: | ||||||
|  |                 formats[k] = "any" | ||||||
|  |  | ||||||
|  |     mimes = [MIME_BY_CONFIG[k] for k in formats] | ||||||
|  |     m = req.accept.match(*mimes) | ||||||
|  |     if m: | ||||||
|  |         format = CONFIG_BY_MIME[m.mime] | ||||||
|  |         source = formats[format] | ||||||
|  |         logger.debug( | ||||||
|  |             f"The client accepts {m.header}, using '{format}' from {source}" | ||||||
|  |         ) | ||||||
|  |     else: | ||||||
|  |         logger.debug(f"No format found, the client accepts {req.accept!r}") | ||||||
|  |     return m.mime | ||||||
|   | |||||||
| @@ -1,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,11 +60,14 @@ class InvalidUsage(SanicException): | |||||||
|     quiet = True |     quiet = True | ||||||
|  |  | ||||||
|  |  | ||||||
| class BadURL(InvalidUsage): | InvalidUsage = BadRequest | ||||||
|  |  | ||||||
|  |  | ||||||
|  | class BadURL(BadRequest): | ||||||
|     ... |     ... | ||||||
|  |  | ||||||
|  |  | ||||||
| class MethodNotSupported(SanicException): | class MethodNotAllowed(SanicException): | ||||||
|     """ |     """ | ||||||
|     **Status**: 405 Method Not Allowed |     **Status**: 405 Method Not Allowed | ||||||
|     """ |     """ | ||||||
| @@ -68,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 | ||||||
| @@ -129,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 | ||||||
|     """ |     """ | ||||||
| @@ -154,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 | ||||||
|     """ |     """ | ||||||
| @@ -163,6 +181,9 @@ class HeaderExpectationFailed(SanicException): | |||||||
|     quiet = True |     quiet = True | ||||||
|  |  | ||||||
|  |  | ||||||
|  | HeaderExpectationFailed = ExpectationFailed | ||||||
|  |  | ||||||
|  |  | ||||||
| class Forbidden(SanicException): | class Forbidden(SanicException): | ||||||
|     """ |     """ | ||||||
|     **Status**: 403 Forbidden |     **Status**: 403 Forbidden | ||||||
| @@ -172,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 | ||||||
|     """ |     """ | ||||||
|   | |||||||
							
								
								
									
										10
									
								
								sanic/handlers/__init__.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										10
									
								
								sanic/handlers/__init__.py
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,10 @@ | |||||||
|  | from .content_range import ContentRangeHandler | ||||||
|  | from .directory import DirectoryHandler | ||||||
|  | from .error import ErrorHandler | ||||||
|  |  | ||||||
|  |  | ||||||
|  | __all__ = ( | ||||||
|  |     "ContentRangeHandler", | ||||||
|  |     "DirectoryHandler", | ||||||
|  |     "ErrorHandler", | ||||||
|  | ) | ||||||
							
								
								
									
										78
									
								
								sanic/handlers/content_range.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										78
									
								
								sanic/handlers/content_range.py
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,78 @@ | |||||||
|  | from __future__ import annotations | ||||||
|  |  | ||||||
|  | from sanic.exceptions import ( | ||||||
|  |     HeaderNotFound, | ||||||
|  |     InvalidRangeType, | ||||||
|  |     RangeNotSatisfiable, | ||||||
|  | ) | ||||||
|  |  | ||||||
|  |  | ||||||
|  | class ContentRangeHandler: | ||||||
|  |     """ | ||||||
|  |     A mechanism to parse and process the incoming request headers to | ||||||
|  |     extract the content range information. | ||||||
|  |  | ||||||
|  |     :param request: Incoming api request | ||||||
|  |     :param stats: Stats related to the content | ||||||
|  |  | ||||||
|  |     :type request: :class:`sanic.request.Request` | ||||||
|  |     :type stats: :class:`posix.stat_result` | ||||||
|  |  | ||||||
|  |     :ivar start: Content Range start | ||||||
|  |     :ivar end: Content Range end | ||||||
|  |     :ivar size: Length of the content | ||||||
|  |     :ivar total: Total size identified by the :class:`posix.stat_result` | ||||||
|  |         instance | ||||||
|  |     :ivar ContentRangeHandler.headers: Content range header ``dict`` | ||||||
|  |     """ | ||||||
|  |  | ||||||
|  |     __slots__ = ("start", "end", "size", "total", "headers") | ||||||
|  |  | ||||||
|  |     def __init__(self, request, stats): | ||||||
|  |         self.total = stats.st_size | ||||||
|  |         _range = request.headers.getone("range", None) | ||||||
|  |         if _range is None: | ||||||
|  |             raise HeaderNotFound("Range Header Not Found") | ||||||
|  |         unit, _, value = tuple(map(str.strip, _range.partition("="))) | ||||||
|  |         if unit != "bytes": | ||||||
|  |             raise InvalidRangeType( | ||||||
|  |                 "%s is not a valid Range Type" % (unit,), self | ||||||
|  |             ) | ||||||
|  |         start_b, _, end_b = tuple(map(str.strip, value.partition("-"))) | ||||||
|  |         try: | ||||||
|  |             self.start = int(start_b) if start_b else None | ||||||
|  |         except ValueError: | ||||||
|  |             raise RangeNotSatisfiable( | ||||||
|  |                 "'%s' is invalid for Content Range" % (start_b,), self | ||||||
|  |             ) | ||||||
|  |         try: | ||||||
|  |             self.end = int(end_b) if end_b else None | ||||||
|  |         except ValueError: | ||||||
|  |             raise RangeNotSatisfiable( | ||||||
|  |                 "'%s' is invalid for Content Range" % (end_b,), self | ||||||
|  |             ) | ||||||
|  |         if self.end is None: | ||||||
|  |             if self.start is None: | ||||||
|  |                 raise RangeNotSatisfiable( | ||||||
|  |                     "Invalid for Content Range parameters", self | ||||||
|  |                 ) | ||||||
|  |             else: | ||||||
|  |                 # this case represents `Content-Range: bytes 5-` | ||||||
|  |                 self.end = self.total - 1 | ||||||
|  |         else: | ||||||
|  |             if self.start is None: | ||||||
|  |                 # this case represents `Content-Range: bytes -5` | ||||||
|  |                 self.start = self.total - self.end | ||||||
|  |                 self.end = self.total - 1 | ||||||
|  |         if self.start >= self.end: | ||||||
|  |             raise RangeNotSatisfiable( | ||||||
|  |                 "Invalid for Content Range parameters", self | ||||||
|  |             ) | ||||||
|  |         self.size = self.end - self.start + 1 | ||||||
|  |         self.headers = { | ||||||
|  |             "Content-Range": "bytes %s-%s/%s" | ||||||
|  |             % (self.start, self.end, self.total) | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |     def __bool__(self): | ||||||
|  |         return self.size > 0 | ||||||
							
								
								
									
										84
									
								
								sanic/handlers/directory.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										84
									
								
								sanic/handlers/directory.py
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,84 @@ | |||||||
|  | from __future__ import annotations | ||||||
|  |  | ||||||
|  | from datetime import datetime | ||||||
|  | from operator import itemgetter | ||||||
|  | from pathlib import Path | ||||||
|  | from stat import S_ISDIR | ||||||
|  | from typing import Dict, Iterable, Optional, Sequence, Union, cast | ||||||
|  |  | ||||||
|  | from sanic.exceptions import NotFound | ||||||
|  | from sanic.pages.directory_page import DirectoryPage, FileInfo | ||||||
|  | from sanic.request import Request | ||||||
|  | from sanic.response import file, html, redirect | ||||||
|  |  | ||||||
|  |  | ||||||
|  | class DirectoryHandler: | ||||||
|  |     def __init__( | ||||||
|  |         self, | ||||||
|  |         uri: str, | ||||||
|  |         directory: Path, | ||||||
|  |         directory_view: bool = False, | ||||||
|  |         index: Optional[Union[str, Sequence[str]]] = None, | ||||||
|  |     ) -> None: | ||||||
|  |         if isinstance(index, str): | ||||||
|  |             index = [index] | ||||||
|  |         elif index is None: | ||||||
|  |             index = [] | ||||||
|  |         self.base = uri.strip("/") | ||||||
|  |         self.directory = directory | ||||||
|  |         self.directory_view = directory_view | ||||||
|  |         self.index = tuple(index) | ||||||
|  |  | ||||||
|  |     async def handle(self, request: Request, path: str): | ||||||
|  |         current = path.strip("/")[len(self.base) :].strip("/")  # noqa: E203 | ||||||
|  |         for file_name in self.index: | ||||||
|  |             index_file = self.directory / current / file_name | ||||||
|  |             if index_file.is_file(): | ||||||
|  |                 return await file(index_file) | ||||||
|  |  | ||||||
|  |         if self.directory_view: | ||||||
|  |             return self._index( | ||||||
|  |                 self.directory / current, path, request.app.debug | ||||||
|  |             ) | ||||||
|  |  | ||||||
|  |         if self.index: | ||||||
|  |             raise NotFound("File not found") | ||||||
|  |  | ||||||
|  |         raise IsADirectoryError(f"{self.directory.as_posix()} is a directory") | ||||||
|  |  | ||||||
|  |     def _index(self, location: Path, path: str, debug: bool): | ||||||
|  |         # Remove empty path elements, append slash | ||||||
|  |         if "//" in path or not path.endswith("/"): | ||||||
|  |             return redirect( | ||||||
|  |                 "/" + "".join([f"{p}/" for p in path.split("/") if p]) | ||||||
|  |             ) | ||||||
|  |  | ||||||
|  |         # Render file browser | ||||||
|  |         page = DirectoryPage(self._iter_files(location), path, debug) | ||||||
|  |         return html(page.render()) | ||||||
|  |  | ||||||
|  |     def _prepare_file(self, path: Path) -> Dict[str, Union[int, str]]: | ||||||
|  |         stat = path.stat() | ||||||
|  |         modified = ( | ||||||
|  |             datetime.fromtimestamp(stat.st_mtime) | ||||||
|  |             .isoformat()[:19] | ||||||
|  |             .replace("T", " ") | ||||||
|  |         ) | ||||||
|  |         is_dir = S_ISDIR(stat.st_mode) | ||||||
|  |         icon = "📁" if is_dir else "📄" | ||||||
|  |         file_name = path.name | ||||||
|  |         if is_dir: | ||||||
|  |             file_name += "/" | ||||||
|  |         return { | ||||||
|  |             "priority": is_dir * -1, | ||||||
|  |             "file_name": file_name, | ||||||
|  |             "icon": icon, | ||||||
|  |             "file_access": modified, | ||||||
|  |             "file_size": stat.st_size, | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |     def _iter_files(self, location: Path) -> Iterable[FileInfo]: | ||||||
|  |         prepared = [self._prepare_file(f) for f in location.iterdir()] | ||||||
|  |         for item in sorted(prepared, key=itemgetter("priority", "file_name")): | ||||||
|  |             del item["priority"] | ||||||
|  |             yield cast(FileInfo, item) | ||||||
| @@ -1,21 +1,8 @@ | |||||||
| from __future__ import annotations | from __future__ import annotations | ||||||
| 
 | 
 | ||||||
| from typing import Dict, List, Optional, Tuple, Type, Union | from typing import Dict, List, Optional, Tuple, Type | ||||||
| 
 | 
 | ||||||
| from sanic.config import Config | from sanic.errorpages import BaseRenderer, TextRenderer, exception_response | ||||||
| from sanic.errorpages import ( |  | ||||||
|     DEFAULT_FORMAT, |  | ||||||
|     BaseRenderer, |  | ||||||
|     TextRenderer, |  | ||||||
|     exception_response, |  | ||||||
| ) |  | ||||||
| from sanic.exceptions import ( |  | ||||||
|     ContentRangeError, |  | ||||||
|     HeaderNotFound, |  | ||||||
|     InvalidRangeType, |  | ||||||
|     SanicException, |  | ||||||
| ) |  | ||||||
| from sanic.helpers import Default, _default |  | ||||||
| from sanic.log import deprecation, error_logger | from sanic.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 | ||||||
| @@ -31,99 +18,43 @@ class ErrorHandler: | |||||||
|     by the developers to perform a wide range of tasks from recording the error |     by the developers to perform a wide range of tasks from recording the error | ||||||
|     stats to reporting them to an external service that can be used for |     stats to reporting them to an external service that can be used for | ||||||
|     realtime alerting system. |     realtime alerting system. | ||||||
| 
 |  | ||||||
|     """ |     """ | ||||||
| 
 | 
 | ||||||
|     def __init__( |     def __init__( | ||||||
|         self, |         self, | ||||||
|         fallback: Union[str, Default] = _default, |  | ||||||
|         base: Type[BaseRenderer] = TextRenderer, |         base: Type[BaseRenderer] = TextRenderer, | ||||||
|     ): |     ): | ||||||
|         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):  # no cov |  | ||||||
|         # 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):  # no cov |  | ||||||
|         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, |  | ||||||
|         config: Config, |  | ||||||
|         fallback: Optional[str] = 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 not fallback: |  | ||||||
|             fallback = config.FALLBACK_ERROR_FORMAT |  | ||||||
| 
 |  | ||||||
|         if 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)}" |  | ||||||
|             ) |  | ||||||
| 
 |  | ||||||
|     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 _add( | ||||||
|  |         self, | ||||||
|  |         key: Tuple[Type[BaseException], Optional[str]], | ||||||
|  |         handler: RouteHandler, | ||||||
|  |     ) -> None: | ||||||
|  |         if key in self.cached_handlers: | ||||||
|  |             exc, name = key | ||||||
|  |             if name is None: | ||||||
|  |                 name = "__ALL_ROUTES__" | ||||||
|  | 
 | ||||||
|  |             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): | ||||||
|         """ |         """ | ||||||
|         Add a new exception handler to an already existing handler object. |         Add a new exception handler to an already existing handler object. | ||||||
| @@ -139,9 +70,9 @@ class ErrorHandler: | |||||||
|         """ |         """ | ||||||
|         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): | ||||||
|         """ |         """ | ||||||
| @@ -237,7 +168,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, | ||||||
| @@ -259,74 +190,3 @@ class ErrorHandler: | |||||||
|             error_logger.exception( |             error_logger.exception( | ||||||
|                 "Exception occurred while handling uri: %s", url |                 "Exception occurred while handling uri: %s", url | ||||||
|             ) |             ) | ||||||
| 
 |  | ||||||
| 
 |  | ||||||
| class ContentRangeHandler: |  | ||||||
|     """ |  | ||||||
|     A mechanism to parse and process the incoming request headers to |  | ||||||
|     extract the content range information. |  | ||||||
| 
 |  | ||||||
|     :param request: Incoming api request |  | ||||||
|     :param stats: Stats related to the content |  | ||||||
| 
 |  | ||||||
|     :type request: :class:`sanic.request.Request` |  | ||||||
|     :type stats: :class:`posix.stat_result` |  | ||||||
| 
 |  | ||||||
|     :ivar start: Content Range start |  | ||||||
|     :ivar end: Content Range end |  | ||||||
|     :ivar size: Length of the content |  | ||||||
|     :ivar total: Total size identified by the :class:`posix.stat_result` |  | ||||||
|         instance |  | ||||||
|     :ivar ContentRangeHandler.headers: Content range header ``dict`` |  | ||||||
|     """ |  | ||||||
| 
 |  | ||||||
|     __slots__ = ("start", "end", "size", "total", "headers") |  | ||||||
| 
 |  | ||||||
|     def __init__(self, request, stats): |  | ||||||
|         self.total = stats.st_size |  | ||||||
|         _range = request.headers.getone("range", None) |  | ||||||
|         if _range is None: |  | ||||||
|             raise HeaderNotFound("Range Header Not Found") |  | ||||||
|         unit, _, value = tuple(map(str.strip, _range.partition("="))) |  | ||||||
|         if unit != "bytes": |  | ||||||
|             raise InvalidRangeType( |  | ||||||
|                 "%s is not a valid Range Type" % (unit,), self |  | ||||||
|             ) |  | ||||||
|         start_b, _, end_b = tuple(map(str.strip, value.partition("-"))) |  | ||||||
|         try: |  | ||||||
|             self.start = int(start_b) if start_b else None |  | ||||||
|         except ValueError: |  | ||||||
|             raise ContentRangeError( |  | ||||||
|                 "'%s' is invalid for Content Range" % (start_b,), self |  | ||||||
|             ) |  | ||||||
|         try: |  | ||||||
|             self.end = int(end_b) if end_b else None |  | ||||||
|         except ValueError: |  | ||||||
|             raise ContentRangeError( |  | ||||||
|                 "'%s' is invalid for Content Range" % (end_b,), self |  | ||||||
|             ) |  | ||||||
|         if self.end is None: |  | ||||||
|             if self.start is None: |  | ||||||
|                 raise ContentRangeError( |  | ||||||
|                     "Invalid for Content Range parameters", self |  | ||||||
|                 ) |  | ||||||
|             else: |  | ||||||
|                 # this case represents `Content-Range: bytes 5-` |  | ||||||
|                 self.end = self.total - 1 |  | ||||||
|         else: |  | ||||||
|             if self.start is None: |  | ||||||
|                 # this case represents `Content-Range: bytes -5` |  | ||||||
|                 self.start = self.total - self.end |  | ||||||
|                 self.end = self.total - 1 |  | ||||||
|         if self.start >= self.end: |  | ||||||
|             raise ContentRangeError( |  | ||||||
|                 "Invalid for Content Range parameters", self |  | ||||||
|             ) |  | ||||||
|         self.size = self.end - self.start + 1 |  | ||||||
|         self.headers = { |  | ||||||
|             "Content-Range": "bytes %s-%s/%s" |  | ||||||
|             % (self.start, self.end, self.total) |  | ||||||
|         } |  | ||||||
| 
 |  | ||||||
|     def __bool__(self): |  | ||||||
|         return self.size > 0 |  | ||||||
							
								
								
									
										378
									
								
								sanic/headers.py
									
									
									
									
									
								
							
							
						
						
									
										378
									
								
								sanic/headers.py
									
									
									
									
									
								
							| @@ -19,7 +19,6 @@ OptionsIterable = Iterable[Tuple[str, str]]  # May contain duplicate keys | |||||||
|  |  | ||||||
| _token, _quoted = r"([\w!#$%&'*+\-.^_`|~]+)", r'"([^"]*)"' | _token, _quoted = r"([\w!#$%&'*+\-.^_`|~]+)", r'"([^"]*)"' | ||||||
| _param = re.compile(rf";\s*{_token}=(?:{_token}|{_quoted})", re.ASCII) | _param = re.compile(rf";\s*{_token}=(?:{_token}|{_quoted})", re.ASCII) | ||||||
| _firefox_quote_escape = re.compile(r'\\"(?!; |\s*$)') |  | ||||||
| _ipv6 = "(?:[0-9A-Fa-f]{0,4}:){2,7}[0-9A-Fa-f]{0,4}" | _ipv6 = "(?:[0-9A-Fa-f]{0,4}:){2,7}[0-9A-Fa-f]{0,4}" | ||||||
| _ipv6_re = re.compile(_ipv6) | _ipv6_re = re.compile(_ipv6) | ||||||
| _host_re = re.compile( | _host_re = re.compile( | ||||||
| @@ -33,143 +32,96 @@ _host_re = re.compile( | |||||||
| # For more information, consult ../tests/test_requests.py | # For more information, consult ../tests/test_requests.py | ||||||
|  |  | ||||||
|  |  | ||||||
| def parse_arg_as_accept(f): | class MediaType: | ||||||
|     def func(self, other, *args, **kwargs): |     """A media type, as used in the Accept header.""" | ||||||
|         if not isinstance(other, Accept) and other: |  | ||||||
|             other = Accept.parse(other) |  | ||||||
|         return f(self, other, *args, **kwargs) |  | ||||||
|  |  | ||||||
|     return func |  | ||||||
|  |  | ||||||
|  |  | ||||||
| class MediaType(str): |  | ||||||
|     def __new__(cls, value: str): |  | ||||||
|         return str.__new__(cls, value) |  | ||||||
|  |  | ||||||
|     def __init__(self, value: str) -> None: |  | ||||||
|         self.value = value |  | ||||||
|         self.is_wildcard = self.check_if_wildcard(value) |  | ||||||
|  |  | ||||||
|     def __eq__(self, other): |  | ||||||
|         if self.is_wildcard: |  | ||||||
|             return True |  | ||||||
|  |  | ||||||
|         if self.match(other): |  | ||||||
|             return True |  | ||||||
|  |  | ||||||
|         other_is_wildcard = ( |  | ||||||
|             other.is_wildcard |  | ||||||
|             if isinstance(other, MediaType) |  | ||||||
|             else self.check_if_wildcard(other) |  | ||||||
|         ) |  | ||||||
|  |  | ||||||
|         return other_is_wildcard |  | ||||||
|  |  | ||||||
|     def match(self, other): |  | ||||||
|         other_value = other.value if isinstance(other, MediaType) else other |  | ||||||
|         return self.value == other_value |  | ||||||
|  |  | ||||||
|     @staticmethod |  | ||||||
|     def check_if_wildcard(value): |  | ||||||
|         return value == "*" |  | ||||||
|  |  | ||||||
|  |  | ||||||
| class Accept(str): |  | ||||||
|     def __new__(cls, value: str, *args, **kwargs): |  | ||||||
|         return str.__new__(cls, value) |  | ||||||
|  |  | ||||||
|     def __init__( |     def __init__( | ||||||
|         self, |         self, | ||||||
|         value: str, |         type_: str, | ||||||
|         type_: MediaType, |         subtype: str, | ||||||
|         subtype: MediaType, |         **params: str, | ||||||
|         *, |  | ||||||
|         q: str = "1.0", |  | ||||||
|         **kwargs: str, |  | ||||||
|     ): |     ): | ||||||
|         qvalue = float(q) |         self.type = type_ | ||||||
|         if qvalue > 1 or qvalue < 0: |  | ||||||
|             raise InvalidHeader( |  | ||||||
|                 f"Accept header qvalue must be between 0 and 1, not: {qvalue}" |  | ||||||
|             ) |  | ||||||
|         self.value = value |  | ||||||
|         self.type_ = type_ |  | ||||||
|         self.subtype = subtype |         self.subtype = subtype | ||||||
|         self.qvalue = qvalue |         self.q = float(params.get("q", "1.0")) | ||||||
|         self.params = kwargs |         self.params = params | ||||||
|  |         self.mime = f"{type_}/{subtype}" | ||||||
|  |         self.key = ( | ||||||
|  |             -1 * self.q, | ||||||
|  |             -1 * len(self.params), | ||||||
|  |             self.subtype == "*", | ||||||
|  |             self.type == "*", | ||||||
|  |         ) | ||||||
|  |  | ||||||
|     def _compare(self, other, method): |     def __repr__(self): | ||||||
|         try: |         return self.mime + "".join(f";{k}={v}" for k, v in self.params.items()) | ||||||
|             return method(self.qvalue, other.qvalue) |  | ||||||
|         except (AttributeError, TypeError): |  | ||||||
|             return NotImplemented |  | ||||||
|  |  | ||||||
|     @parse_arg_as_accept |     def __eq__(self, other): | ||||||
|     def __lt__(self, other: Union[str, Accept]): |         """Check for mime (str or MediaType) identical type/subtype. | ||||||
|         return self._compare(other, lambda s, o: s < o) |         Parameters such as q are not considered.""" | ||||||
|  |         if isinstance(other, str): | ||||||
|  |             # Give a friendly reminder if str contains parameters | ||||||
|  |             if ";" in other: | ||||||
|  |                 raise ValueError("Use match() to compare with parameters") | ||||||
|  |             return self.mime == other | ||||||
|  |         if isinstance(other, MediaType): | ||||||
|  |             # Ignore parameters silently with MediaType objects | ||||||
|  |             return self.mime == other.mime | ||||||
|  |         return NotImplemented | ||||||
|  |  | ||||||
|     @parse_arg_as_accept |  | ||||||
|     def __le__(self, other: Union[str, Accept]): |  | ||||||
|         return self._compare(other, lambda s, o: s <= o) |  | ||||||
|  |  | ||||||
|     @parse_arg_as_accept |  | ||||||
|     def __eq__(self, other: Union[str, Accept]):  # type: ignore |  | ||||||
|         return self._compare(other, lambda s, o: s == o) |  | ||||||
|  |  | ||||||
|     @parse_arg_as_accept |  | ||||||
|     def __ge__(self, other: Union[str, Accept]): |  | ||||||
|         return self._compare(other, lambda s, o: s >= o) |  | ||||||
|  |  | ||||||
|     @parse_arg_as_accept |  | ||||||
|     def __gt__(self, other: Union[str, Accept]): |  | ||||||
|         return self._compare(other, lambda s, o: s > o) |  | ||||||
|  |  | ||||||
|     @parse_arg_as_accept |  | ||||||
|     def __ne__(self, other: Union[str, Accept]):  # type: ignore |  | ||||||
|         return self._compare(other, lambda s, o: s != o) |  | ||||||
|  |  | ||||||
|     @parse_arg_as_accept |  | ||||||
|     def match( |     def match( | ||||||
|         self, |         self, | ||||||
|         other, |         mime_with_params: Union[str, MediaType], | ||||||
|         *, |     ) -> Optional[MediaType]: | ||||||
|         allow_type_wildcard: bool = True, |         """Check if this media type matches the given mime type/subtype. | ||||||
|         allow_subtype_wildcard: bool = True, |         Wildcards are supported both ways on both type and subtype. | ||||||
|     ) -> bool: |         If mime contains a semicolon, optionally followed by parameters, | ||||||
|         type_match = ( |         the parameters of the two media types must match exactly. | ||||||
|             self.type_ == other.type_ |         Note:  Use the `==` operator instead to check for literal matches | ||||||
|             if allow_type_wildcard |         without expanding wildcards. | ||||||
|             else ( |         @param media_type: A type/subtype string to match. | ||||||
|                 self.type_.match(other.type_) |         @return `self` if the media types are compatible, else `None` | ||||||
|                 and not self.type_.is_wildcard |         """ | ||||||
|                 and not other.type_.is_wildcard |         mt = ( | ||||||
|             ) |             MediaType._parse(mime_with_params) | ||||||
|  |             if isinstance(mime_with_params, str) | ||||||
|  |             else mime_with_params | ||||||
|         ) |         ) | ||||||
|         subtype_match = ( |         return ( | ||||||
|             self.subtype == other.subtype |             self | ||||||
|             if allow_subtype_wildcard |             if ( | ||||||
|             else ( |                 mt | ||||||
|                 self.subtype.match(other.subtype) |                 # All parameters given in the other media type must match | ||||||
|                 and not self.subtype.is_wildcard |                 and all(self.params.get(k) == v for k, v in mt.params.items()) | ||||||
|                 and not other.subtype.is_wildcard |                 # Subtype match | ||||||
|  |                 and ( | ||||||
|  |                     self.subtype == mt.subtype | ||||||
|  |                     or self.subtype == "*" | ||||||
|  |                     or mt.subtype == "*" | ||||||
|  |                 ) | ||||||
|  |                 # Type match | ||||||
|  |                 and ( | ||||||
|  |                     self.type == mt.type or self.type == "*" or mt.type == "*" | ||||||
|  |                 ) | ||||||
|             ) |             ) | ||||||
|  |             else None | ||||||
|         ) |         ) | ||||||
|  |  | ||||||
|         return type_match and subtype_match |     @property | ||||||
|  |     def has_wildcard(self) -> bool: | ||||||
|  |         """Return True if this media type has a wildcard in it.""" | ||||||
|  |         return any(part == "*" for part in (self.subtype, self.type)) | ||||||
|  |  | ||||||
|     @classmethod |     @classmethod | ||||||
|     def parse(cls, raw: str) -> Accept: |     def _parse(cls, mime_with_params: str) -> Optional[MediaType]: | ||||||
|         invalid = False |         mtype = mime_with_params.strip() | ||||||
|         mtype = raw.strip() |         if "/" not in mime_with_params: | ||||||
|  |             return None | ||||||
|  |  | ||||||
|         try: |         mime, *raw_params = mtype.split(";") | ||||||
|             media, *raw_params = mtype.split(";") |         type_, subtype = mime.split("/", 1) | ||||||
|             type_, subtype = media.split("/") |         if not type_ or not subtype: | ||||||
|         except ValueError: |             raise ValueError(f"Invalid media type: {mtype}") | ||||||
|             invalid = True |  | ||||||
|  |  | ||||||
|         if invalid or not type_ or not subtype: |  | ||||||
|             raise InvalidHeader(f"Header contains invalid Accept value: {raw}") |  | ||||||
|  |  | ||||||
|         params = dict( |         params = dict( | ||||||
|             [ |             [ | ||||||
| @@ -178,46 +130,160 @@ class Accept(str): | |||||||
|             ] |             ] | ||||||
|         ) |         ) | ||||||
|  |  | ||||||
|         return cls(mtype, MediaType(type_), MediaType(subtype), **params) |         return cls(type_.lstrip(), subtype.rstrip(), **params) | ||||||
|  |  | ||||||
|  |  | ||||||
| class AcceptContainer(list): | class Matched: | ||||||
|     def __contains__(self, o: object) -> bool: |     """A matching result of a MIME string against a header.""" | ||||||
|         return any(item.match(o) for item in self) |  | ||||||
|  |  | ||||||
|     def match( |     def __init__(self, mime: str, header: Optional[MediaType]): | ||||||
|         self, |         self.mime = mime | ||||||
|         o: object, |         self.header = header | ||||||
|         *, |  | ||||||
|         allow_type_wildcard: bool = True, |     def __repr__(self): | ||||||
|         allow_subtype_wildcard: bool = True, |         return f"<{self} matched {self.header}>" if self else "<no match>" | ||||||
|     ) -> bool: |  | ||||||
|         return any( |     def __str__(self): | ||||||
|             item.match( |         return self.mime | ||||||
|                 o, |  | ||||||
|                 allow_type_wildcard=allow_type_wildcard, |     def __bool__(self): | ||||||
|                 allow_subtype_wildcard=allow_subtype_wildcard, |         return self.header is not None | ||||||
|  |  | ||||||
|  |     def __eq__(self, other: Any) -> bool: | ||||||
|  |         try: | ||||||
|  |             comp, other_accept = self._compare(other) | ||||||
|  |         except TypeError: | ||||||
|  |             return False | ||||||
|  |  | ||||||
|  |         return bool( | ||||||
|  |             comp | ||||||
|  |             and ( | ||||||
|  |                 (self.header and other_accept.header) | ||||||
|  |                 or (not self.header and not other_accept.header) | ||||||
|             ) |             ) | ||||||
|             for item in self |  | ||||||
|         ) |         ) | ||||||
|  |  | ||||||
|  |     def _compare(self, other) -> Tuple[bool, Matched]: | ||||||
|  |         if isinstance(other, str): | ||||||
|  |             parsed = Matched.parse(other) | ||||||
|  |             if self.mime == other: | ||||||
|  |                 return True, parsed | ||||||
|  |             other = parsed | ||||||
|  |  | ||||||
|  |         if isinstance(other, Matched): | ||||||
|  |             return self.header == other.header, other | ||||||
|  |  | ||||||
|  |         raise TypeError( | ||||||
|  |             "Comparison not supported between unequal " | ||||||
|  |             f"mime types of '{self.mime}' and '{other}'" | ||||||
|  |         ) | ||||||
|  |  | ||||||
|  |     def match(self, other: Union[str, Matched]) -> Optional[Matched]: | ||||||
|  |         accept = Matched.parse(other) if isinstance(other, str) else other | ||||||
|  |         if not self.header or not accept.header: | ||||||
|  |             return None | ||||||
|  |         if self.header.match(accept.header): | ||||||
|  |             return accept | ||||||
|  |         return None | ||||||
|  |  | ||||||
|  |     @classmethod | ||||||
|  |     def parse(cls, raw: str) -> Matched: | ||||||
|  |         media_type = MediaType._parse(raw) | ||||||
|  |         return cls(raw, media_type) | ||||||
|  |  | ||||||
|  |  | ||||||
|  | class AcceptList(list): | ||||||
|  |     """A list of media types, as used in the Accept header. | ||||||
|  |  | ||||||
|  |     The Accept header entries are listed in order of preference, starting | ||||||
|  |     with the most preferred. This class is a list of `MediaType` objects, | ||||||
|  |     that encapsulate also the q value or any other parameters. | ||||||
|  |  | ||||||
|  |     Two separate methods are provided for searching the list: | ||||||
|  |     - 'match' for finding the most preferred match (wildcards supported) | ||||||
|  |     -  operator 'in' for checking explicit matches (wildcards as literals) | ||||||
|  |     """ | ||||||
|  |  | ||||||
|  |     def match(self, *mimes: str, accept_wildcards=True) -> Matched: | ||||||
|  |         """Find a media type accepted by the client. | ||||||
|  |  | ||||||
|  |         This method can be used to find which of the media types requested by | ||||||
|  |         the client is most preferred against the ones given as arguments. | ||||||
|  |  | ||||||
|  |         The ordering of preference is set by: | ||||||
|  |         1. The order set by RFC 7231, s. 5.3.2, giving a higher priority | ||||||
|  |             to q values and more specific type definitions, | ||||||
|  |         2. The order of the arguments (first is most preferred), and | ||||||
|  |         3. The first matching entry on the Accept header. | ||||||
|  |  | ||||||
|  |         Wildcards are matched both ways. A match is usually found, as the | ||||||
|  |         Accept headers typically include `*/*`, in particular if the header | ||||||
|  |         is missing, is not manually set, or if the client is a browser. | ||||||
|  |  | ||||||
|  |         Note: the returned object behaves as a string of the mime argument | ||||||
|  |         that matched, and is empty/falsy if no match was found. The matched | ||||||
|  |         header entry `MediaType` or `None` is available as the `m` attribute. | ||||||
|  |  | ||||||
|  |         @param mimes: Any MIME types to search for in order of preference. | ||||||
|  |         @param accept_wildcards: Match Accept entries with wildcards in them. | ||||||
|  |         @return A match object with the mime string and the MediaType object. | ||||||
|  |         """ | ||||||
|  |         a = sorted( | ||||||
|  |             (-acc.q, i, j, mime, acc) | ||||||
|  |             for j, acc in enumerate(self) | ||||||
|  |             if accept_wildcards or not acc.has_wildcard | ||||||
|  |             for i, mime in enumerate(mimes) | ||||||
|  |             if acc.match(mime) | ||||||
|  |         ) | ||||||
|  |         return Matched(*(a[0][-2:] if a else ("", None))) | ||||||
|  |  | ||||||
|  |     def __str__(self): | ||||||
|  |         """Format as Accept header value (parsed, not original).""" | ||||||
|  |         return ", ".join(str(m) for m in self) | ||||||
|  |  | ||||||
|  |  | ||||||
|  | def parse_accept(accept: Optional[str]) -> AcceptList: | ||||||
|  |     """Parse an Accept header and order the acceptable media types in | ||||||
|  |     according to RFC 7231, s. 5.3.2 | ||||||
|  |     https://datatracker.ietf.org/doc/html/rfc7231#section-5.3.2 | ||||||
|  |     """ | ||||||
|  |     if not accept: | ||||||
|  |         if accept == "": | ||||||
|  |             return AcceptList()  # Empty header, accept nothing | ||||||
|  |         accept = "*/*"  # No header means that all types are accepted | ||||||
|  |     try: | ||||||
|  |         a = [ | ||||||
|  |             mt | ||||||
|  |             for mt in [MediaType._parse(mtype) for mtype in accept.split(",")] | ||||||
|  |             if mt | ||||||
|  |         ] | ||||||
|  |         if not a: | ||||||
|  |             raise ValueError | ||||||
|  |         return AcceptList(sorted(a, key=lambda x: x.key)) | ||||||
|  |     except ValueError: | ||||||
|  |         raise InvalidHeader(f"Invalid header value in Accept: {accept}") | ||||||
|  |  | ||||||
|  |  | ||||||
| def parse_content_header(value: str) -> Tuple[str, Options]: | def parse_content_header(value: str) -> Tuple[str, Options]: | ||||||
|     """Parse content-type and content-disposition header values. |     """Parse content-type and content-disposition header values. | ||||||
|  |  | ||||||
|     E.g. 'form-data; name=upload; filename=\"file.txt\"' to |     E.g. `form-data; name=upload; filename="file.txt"` to | ||||||
|     ('form-data', {'name': 'upload', 'filename': 'file.txt'}) |     ('form-data', {'name': 'upload', 'filename': 'file.txt'}) | ||||||
|  |  | ||||||
|     Mostly identical to cgi.parse_header and werkzeug.parse_options_header |     Mostly identical to cgi.parse_header and werkzeug.parse_options_header | ||||||
|     but runs faster and handles special characters better. Unescapes quotes. |     but runs faster and handles special characters better. | ||||||
|  |  | ||||||
|  |     Unescapes %22 to `"` and %0D%0A to `\n` in field values. | ||||||
|     """ |     """ | ||||||
|     value = _firefox_quote_escape.sub("%22", value) |  | ||||||
|     pos = value.find(";") |     pos = value.find(";") | ||||||
|     if pos == -1: |     if pos == -1: | ||||||
|         options: Dict[str, Union[int, str]] = {} |         options: Dict[str, Union[int, str]] = {} | ||||||
|     else: |     else: | ||||||
|         options = { |         options = { | ||||||
|             m.group(1).lower(): m.group(2) or m.group(3).replace("%22", '"') |             m.group(1) | ||||||
|  |             .lower(): (m.group(2) or m.group(3)) | ||||||
|  |             .replace("%22", '"') | ||||||
|  |             .replace("%0D%0A", "\n") | ||||||
|             for m in _param.finditer(value[pos:]) |             for m in _param.finditer(value[pos:]) | ||||||
|         } |         } | ||||||
|         value = value[:pos] |         value = value[:pos] | ||||||
| @@ -368,34 +434,6 @@ def format_http1_response(status: int, headers: HeaderBytesIterable) -> bytes: | |||||||
|     return ret |     return ret | ||||||
|  |  | ||||||
|  |  | ||||||
| def _sort_accept_value(accept: Accept): |  | ||||||
|     return ( |  | ||||||
|         accept.qvalue, |  | ||||||
|         len(accept.params), |  | ||||||
|         accept.subtype != "*", |  | ||||||
|         accept.type_ != "*", |  | ||||||
|     ) |  | ||||||
|  |  | ||||||
|  |  | ||||||
| def parse_accept(accept: str) -> AcceptContainer: |  | ||||||
|     """Parse an Accept header and order the acceptable media types in |  | ||||||
|     accorsing to RFC 7231, s. 5.3.2 |  | ||||||
|     https://datatracker.ietf.org/doc/html/rfc7231#section-5.3.2 |  | ||||||
|     """ |  | ||||||
|     media_types = accept.split(",") |  | ||||||
|     accept_list: List[Accept] = [] |  | ||||||
|  |  | ||||||
|     for mtype in media_types: |  | ||||||
|         if not mtype: |  | ||||||
|             continue |  | ||||||
|  |  | ||||||
|         accept_list.append(Accept.parse(mtype)) |  | ||||||
|  |  | ||||||
|     return AcceptContainer( |  | ||||||
|         sorted(accept_list, key=_sort_accept_value, reverse=True) |  | ||||||
|     ) |  | ||||||
|  |  | ||||||
|  |  | ||||||
| def parse_credentials( | def parse_credentials( | ||||||
|     header: Optional[str], |     header: Optional[str], | ||||||
|     prefixes: Union[List, Tuple, Set] = None, |     prefixes: Union[List, Tuple, Set] = None, | ||||||
|   | |||||||
							
								
								
									
										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 | ||||||
							
								
								
									
										56
									
								
								sanic/log.py
									
									
									
									
									
								
							
							
						
						
									
										56
									
								
								sanic/log.py
									
									
									
									
									
								
							| @@ -2,9 +2,22 @@ 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 | ||||||
|  |  | ||||||
|  |  | ||||||
|  | # 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 | LOGGING_CONFIG_DEFAULTS: Dict[str, Any] = dict(  # no cov | ||||||
|     version=1, |     version=1, | ||||||
| @@ -23,6 +36,12 @@ LOGGING_CONFIG_DEFAULTS: Dict[str, Any] = dict(  # no cov | |||||||
|             "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(  # no cov | |||||||
|         }, |         }, | ||||||
|     }, |     }, | ||||||
| ) | ) | ||||||
|  | """ | ||||||
|  | Defult logging configuration | ||||||
|  | """ | ||||||
|  |  | ||||||
|  |  | ||||||
| class Colors(str, Enum):  # no cov | 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" |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  | 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 | logger = logging.getLogger("sanic.root")  # no cov | ||||||
| """ | """ | ||||||
| General Sanic logger | General Sanic logger | ||||||
| """ | """ | ||||||
|  | logger.addFilter(_verbosity_filter) | ||||||
|  |  | ||||||
| error_logger = logging.getLogger("sanic.error")  # no cov | 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")  # no cov | 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):  # no cov | 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) | ||||||
							
								
								
									
										35
									
								
								sanic/mixins/base.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										35
									
								
								sanic/mixins/base.py
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,35 @@ | |||||||
|  | from typing import Optional | ||||||
|  |  | ||||||
|  | from sanic.base.meta import SanicMeta | ||||||
|  |  | ||||||
|  |  | ||||||
|  | class BaseMixin(metaclass=SanicMeta): | ||||||
|  |     name: str | ||||||
|  |     strict_slashes: Optional[bool] | ||||||
|  |  | ||||||
|  |     def _generate_name(self, *objects) -> str: | ||||||
|  |         name = None | ||||||
|  |  | ||||||
|  |         for obj in objects: | ||||||
|  |             if obj: | ||||||
|  |                 if isinstance(obj, str): | ||||||
|  |                     name = obj | ||||||
|  |                     break | ||||||
|  |  | ||||||
|  |                 try: | ||||||
|  |                     name = obj.name | ||||||
|  |                 except AttributeError: | ||||||
|  |                     try: | ||||||
|  |                         name = obj.__name__ | ||||||
|  |                     except AttributeError: | ||||||
|  |                         continue | ||||||
|  |                 else: | ||||||
|  |                     break | ||||||
|  |  | ||||||
|  |         if not name:  # noqa | ||||||
|  |             raise ValueError("Could not generate a name for handler") | ||||||
|  |  | ||||||
|  |         if not name.startswith(f"{self.name}."): | ||||||
|  |             name = f"{self.name}.{name}" | ||||||
|  |  | ||||||
|  |         return name | ||||||
| @@ -3,7 +3,7 @@ from functools import partial | |||||||
| from typing import Callable, List, Optional, Union, overload | from typing import Callable, List, Optional, Union, overload | ||||||
|  |  | ||||||
| from sanic.base.meta import SanicMeta | from sanic.base.meta import SanicMeta | ||||||
| from sanic.exceptions import InvalidUsage | 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 | ||||||
|  |  | ||||||
| @@ -17,9 +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_START = auto() | ||||||
|     RELOAD_PROCESS_STOP = auto() |     RELOAD_PROCESS_STOP = auto() | ||||||
|  |     BEFORE_RELOAD_TRIGGER = auto() | ||||||
|  |     AFTER_RELOAD_TRIGGER = auto() | ||||||
|  |  | ||||||
|  |  | ||||||
| class ListenerMixin(metaclass=SanicMeta): | class ListenerMixin(metaclass=SanicMeta): | ||||||
| @@ -86,7 +89,7 @@ class ListenerMixin(metaclass=SanicMeta): | |||||||
|  |  | ||||||
|         if callable(listener_or_event): |         if callable(listener_or_event): | ||||||
|             if event_or_none is None: |             if event_or_none is None: | ||||||
|                 raise InvalidUsage( |                 raise BadRequest( | ||||||
|                     "Invalid event registration: Missing event name." |                     "Invalid event registration: Missing event name." | ||||||
|                 ) |                 ) | ||||||
|             return register_listener(listener_or_event, event_or_none) |             return register_listener(listener_or_event, event_or_none) | ||||||
| @@ -98,6 +101,11 @@ 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]: | ||||||
| @@ -113,6 +121,16 @@ class ListenerMixin(metaclass=SanicMeta): | |||||||
|     ) -> ListenerType[Sanic]: |     ) -> ListenerType[Sanic]: | ||||||
|         return self.listener(listener, "reload_process_stop") |         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,7 +19,12 @@ 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 | ||||||
| @@ -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,7 +63,7 @@ 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): | ||||||
|         """Register a middleware to be called before a request is handled. |         """Register a middleware to be called before a request is handled. | ||||||
|  |  | ||||||
|         This is the same as *@app.middleware('request')*. |         This is the same as *@app.middleware('request')*. | ||||||
| @@ -54,11 +71,13 @@ class MiddlewareMixin(metaclass=SanicMeta): | |||||||
|         :param: middleware: A callable that takes in request. |         :param: middleware: A callable that takes in request. | ||||||
|         """ |         """ | ||||||
|         if callable(middleware): |         if callable(middleware): | ||||||
|             return self.middleware(middleware, "request") |             return self.middleware(middleware, "request", priority=priority) | ||||||
|         else: |         else: | ||||||
|             return partial(self.middleware, attach_to="request") |             return partial( | ||||||
|  |                 self.middleware, attach_to="request", priority=priority | ||||||
|  |             ) | ||||||
|  |  | ||||||
|     def on_response(self, middleware=None): |     def on_response(self, middleware=None, *, priority=0): | ||||||
|         """Register a middleware to be called after a response is created. |         """Register a middleware to be called after a response is created. | ||||||
|  |  | ||||||
|         This is the same as *@app.middleware('response')*. |         This is the same as *@app.middleware('response')*. | ||||||
| @@ -67,6 +86,57 @@ class MiddlewareMixin(metaclass=SanicMeta): | |||||||
|             A callable that takes in a request and its response. |             A callable that takes in a request and its response. | ||||||
|         """ |         """ | ||||||
|         if callable(middleware): |         if callable(middleware): | ||||||
|             return self.middleware(middleware, "response") |             return self.middleware(middleware, "response", priority=priority) | ||||||
|         else: |         else: | ||||||
|             return partial(self.middleware, attach_to="response") |             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,63 +1,44 @@ | |||||||
| from ast import NodeVisitor, Return, parse | from ast import NodeVisitor, Return, parse | ||||||
| from contextlib import suppress | from contextlib import suppress | ||||||
| from functools import partial, wraps |  | ||||||
| from inspect import getsource, signature | from inspect import getsource, signature | ||||||
| from mimetypes import guess_type |  | ||||||
| from os import path |  | ||||||
| from pathlib import 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, | ||||||
| from urllib.parse import unquote |     Callable, | ||||||
|  |     Dict, | ||||||
|  |     Iterable, | ||||||
|  |     List, | ||||||
|  |     Optional, | ||||||
|  |     Set, | ||||||
|  |     Tuple, | ||||||
|  |     Union, | ||||||
|  |     cast, | ||||||
|  | ) | ||||||
|  |  | ||||||
| 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.constants import 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.mixins.base import BaseMixin | ||||||
|     ContentRangeError, |  | ||||||
|     FileNotFound, |  | ||||||
|     HeaderNotFound, |  | ||||||
|     InvalidUsage, |  | ||||||
| ) |  | ||||||
| from sanic.handlers import ContentRangeHandler |  | ||||||
| from sanic.log import deprecation, 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.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(BaseMixin, metaclass=SanicMeta): | ||||||
|     name: str |  | ||||||
|  |  | ||||||
|     def __init__(self, *args, **kwargs) -> None: |     def __init__(self, *args, **kwargs) -> None: | ||||||
|         self._future_routes: Set[FutureRoute] = set() |         self._future_routes: Set[FutureRoute] = set() | ||||||
|         self._future_statics: Set[FutureStatic] = set() |         self._future_statics: Set[FutureStatic] = set() | ||||||
|         self.strict_slashes: Optional[bool] = False |  | ||||||
|  |  | ||||||
|     def _apply_route(self, route: FutureRoute) -> List[Route]: |     def _apply_route(self, route: FutureRoute) -> List[Route]: | ||||||
|         raise NotImplementedError  # noqa |         raise NotImplementedError  # noqa | ||||||
|  |  | ||||||
|     def _apply_static(self, static: FutureStatic) -> Route: |  | ||||||
|         raise NotImplementedError  # noqa |  | ||||||
|  |  | ||||||
|     def route( |     def route( | ||||||
|         self, |         self, | ||||||
|         uri: str, |         uri: str, | ||||||
| @@ -221,7 +202,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 +249,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 +265,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 +282,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 +308,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 +325,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 +351,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 +368,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 +394,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 +419,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 +445,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 +470,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 +496,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 +523,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 +549,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 +566,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 +593,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 +637,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. | ||||||
| @@ -668,313 +672,6 @@ class RouteMixin(metaclass=SanicMeta): | |||||||
|             **ctx_kwargs, |             **ctx_kwargs, | ||||||
|         )(handler) |         )(handler) | ||||||
|  |  | ||||||
|     def static( |  | ||||||
|         self, |  | ||||||
|         uri, |  | ||||||
|         file_or_directory: Union[str, bytes, PurePath], |  | ||||||
|         pattern=r"/?.+", |  | ||||||
|         use_modified_since=True, |  | ||||||
|         use_content_range=False, |  | ||||||
|         stream_large_files=False, |  | ||||||
|         name="static", |  | ||||||
|         host=None, |  | ||||||
|         strict_slashes=None, |  | ||||||
|         content_type=None, |  | ||||||
|         apply=True, |  | ||||||
|         resource_type=None, |  | ||||||
|     ): |  | ||||||
|         """ |  | ||||||
|         Register a root to serve files from. The input can either be a |  | ||||||
|         file or a directory. This method will enable an easy and simple way |  | ||||||
|         to setup the :class:`Route` necessary to serve the static files. |  | ||||||
|  |  | ||||||
|         :param uri: URL path to be used for serving static content |  | ||||||
|         :param file_or_directory: Path for the Static file/directory with |  | ||||||
|             static files |  | ||||||
|         :param pattern: Regex Pattern identifying the valid static files |  | ||||||
|         :param use_modified_since: If true, send file modified time, and return |  | ||||||
|             not modified if the browser's matches the server's |  | ||||||
|         :param use_content_range: If true, process header for range requests |  | ||||||
|             and sends the file part that is requested |  | ||||||
|         :param stream_large_files: If true, use the |  | ||||||
|             :func:`StreamingHTTPResponse.file_stream` handler rather |  | ||||||
|             than the :func:`HTTPResponse.file` handler to send the file. |  | ||||||
|             If this is an integer, this represents the threshold size to |  | ||||||
|             switch to :func:`StreamingHTTPResponse.file_stream` |  | ||||||
|         :param name: user defined name used for url_for |  | ||||||
|         :param host: Host IP or FQDN for the service to use |  | ||||||
|         :param strict_slashes: Instruct :class:`Sanic` to check if the request |  | ||||||
|             URLs need to terminate with a */* |  | ||||||
|         :param content_type: user defined content type for header |  | ||||||
|         :return: routes registered on the router |  | ||||||
|         :rtype: List[sanic.router.Route] |  | ||||||
|         """ |  | ||||||
|  |  | ||||||
|         name = self._generate_name(name) |  | ||||||
|  |  | ||||||
|         if strict_slashes is None and self.strict_slashes is not None: |  | ||||||
|             strict_slashes = self.strict_slashes |  | ||||||
|  |  | ||||||
|         if not isinstance(file_or_directory, (str, bytes, PurePath)): |  | ||||||
|             raise ValueError( |  | ||||||
|                 f"Static route must be a valid path, not {file_or_directory}" |  | ||||||
|             ) |  | ||||||
|  |  | ||||||
|         static = FutureStatic( |  | ||||||
|             uri, |  | ||||||
|             file_or_directory, |  | ||||||
|             pattern, |  | ||||||
|             use_modified_since, |  | ||||||
|             use_content_range, |  | ||||||
|             stream_large_files, |  | ||||||
|             name, |  | ||||||
|             host, |  | ||||||
|             strict_slashes, |  | ||||||
|             content_type, |  | ||||||
|             resource_type, |  | ||||||
|         ) |  | ||||||
|         self._future_statics.add(static) |  | ||||||
|  |  | ||||||
|         if apply: |  | ||||||
|             self._apply_static(static) |  | ||||||
|  |  | ||||||
|     def _generate_name(self, *objects) -> str: |  | ||||||
|         name = None |  | ||||||
|  |  | ||||||
|         for obj in objects: |  | ||||||
|             if obj: |  | ||||||
|                 if isinstance(obj, str): |  | ||||||
|                     name = obj |  | ||||||
|                     break |  | ||||||
|  |  | ||||||
|                 try: |  | ||||||
|                     name = obj.name |  | ||||||
|                 except AttributeError: |  | ||||||
|                     try: |  | ||||||
|                         name = obj.__name__ |  | ||||||
|                     except AttributeError: |  | ||||||
|                         continue |  | ||||||
|                 else: |  | ||||||
|                     break |  | ||||||
|  |  | ||||||
|         if not name:  # noqa |  | ||||||
|             raise ValueError("Could not generate a name for handler") |  | ||||||
|  |  | ||||||
|         if not name.startswith(f"{self.name}."): |  | ||||||
|             name = f"{self.name}.{name}" |  | ||||||
|  |  | ||||||
|         return name |  | ||||||
|  |  | ||||||
|     async def _static_request_handler( |  | ||||||
|         self, |  | ||||||
|         file_or_directory, |  | ||||||
|         use_modified_since, |  | ||||||
|         use_content_range, |  | ||||||
|         stream_large_files, |  | ||||||
|         request, |  | ||||||
|         content_type=None, |  | ||||||
|         __file_uri__=None, |  | ||||||
|     ): |  | ||||||
|         # Using this to determine if the URL is trying to break out of the path |  | ||||||
|         # served.  os.path.realpath seems to be very slow |  | ||||||
|         if __file_uri__ and "../" in __file_uri__: |  | ||||||
|             raise InvalidUsage("Invalid URL") |  | ||||||
|         # 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 |  | ||||||
|         root_path = file_path = file_or_directory |  | ||||||
|         if __file_uri__: |  | ||||||
|             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: |  | ||||||
|             headers = {} |  | ||||||
|             # Check if the client has been sent this file before |  | ||||||
|             # and it has not been modified since |  | ||||||
|             stats = None |  | ||||||
|             if use_modified_since: |  | ||||||
|                 stats = await stat_async(file_path) |  | ||||||
|                 modified_since = strftime( |  | ||||||
|                     "%a, %d %b %Y %H:%M:%S GMT", gmtime(stats.st_mtime) |  | ||||||
|                 ) |  | ||||||
|                 if ( |  | ||||||
|                     request.headers.getone("if-modified-since", None) |  | ||||||
|                     == modified_since |  | ||||||
|                 ): |  | ||||||
|                     return HTTPResponse(status=304) |  | ||||||
|                 headers["Last-Modified"] = modified_since |  | ||||||
|             _range = None |  | ||||||
|             if use_content_range: |  | ||||||
|                 _range = None |  | ||||||
|                 if not stats: |  | ||||||
|                     stats = await stat_async(file_path) |  | ||||||
|                 headers["Accept-Ranges"] = "bytes" |  | ||||||
|                 headers["Content-Length"] = str(stats.st_size) |  | ||||||
|                 if request.method != "HEAD": |  | ||||||
|                     try: |  | ||||||
|                         _range = ContentRangeHandler(request, stats) |  | ||||||
|                     except HeaderNotFound: |  | ||||||
|                         pass |  | ||||||
|                     else: |  | ||||||
|                         del headers["Content-Length"] |  | ||||||
|                         for key, value in _range.headers.items(): |  | ||||||
|                             headers[key] = value |  | ||||||
|  |  | ||||||
|             if "content-type" not in headers: |  | ||||||
|                 content_type = ( |  | ||||||
|                     content_type |  | ||||||
|                     or guess_type(file_path)[0] |  | ||||||
|                     or DEFAULT_HTTP_CONTENT_TYPE |  | ||||||
|                 ) |  | ||||||
|  |  | ||||||
|                 if "charset=" not in content_type and ( |  | ||||||
|                     content_type.startswith("text/") |  | ||||||
|                     or content_type == "application/javascript" |  | ||||||
|                 ): |  | ||||||
|                     content_type += "; charset=utf-8" |  | ||||||
|  |  | ||||||
|                 headers["Content-Type"] = content_type |  | ||||||
|  |  | ||||||
|             if request.method == "HEAD": |  | ||||||
|                 return HTTPResponse(headers=headers) |  | ||||||
|             else: |  | ||||||
|                 if stream_large_files: |  | ||||||
|                     if type(stream_large_files) == int: |  | ||||||
|                         threshold = stream_large_files |  | ||||||
|                     else: |  | ||||||
|                         threshold = 1024 * 1024 |  | ||||||
|  |  | ||||||
|                     if not stats: |  | ||||||
|                         stats = await stat_async(file_path) |  | ||||||
|                     if stats.st_size >= threshold: |  | ||||||
|                         return await file_stream( |  | ||||||
|                             file_path, headers=headers, _range=_range |  | ||||||
|                         ) |  | ||||||
|                 return await file(file_path, headers=headers, _range=_range) |  | ||||||
|         except ContentRangeError: |  | ||||||
|             raise |  | ||||||
|         except FileNotFoundError: |  | ||||||
|             raise FileNotFound( |  | ||||||
|                 "File not found", |  | ||||||
|                 path=file_or_directory, |  | ||||||
|                 relative_url=__file_uri__, |  | ||||||
|             ) |  | ||||||
|         except Exception: |  | ||||||
|             error_logger.exception( |  | ||||||
|                 f"Exception in static request handler: " |  | ||||||
|                 f"path={file_or_directory}, " |  | ||||||
|                 f"relative_url={__file_uri__}" |  | ||||||
|             ) |  | ||||||
|             raise |  | ||||||
|  |  | ||||||
|     def _register_static( |  | ||||||
|         self, |  | ||||||
|         static: FutureStatic, |  | ||||||
|     ): |  | ||||||
|         # TODO: Though sanic is not a file server, I feel like we should |  | ||||||
|         # at least make a good effort here.  Modified-since is nice, but |  | ||||||
|         # we could also look into etags, expires, and caching |  | ||||||
|         """ |  | ||||||
|         Register a static directory handler with Sanic by adding a route to the |  | ||||||
|         router and registering a handler. |  | ||||||
|  |  | ||||||
|         :param app: Sanic |  | ||||||
|         :param file_or_directory: File or directory path to serve from |  | ||||||
|         :type file_or_directory: Union[str,bytes,Path] |  | ||||||
|         :param uri: URL to serve from |  | ||||||
|         :type uri: str |  | ||||||
|         :param pattern: regular expression used to match files in the URL |  | ||||||
|         :param use_modified_since: If true, send file modified time, and return |  | ||||||
|                                 not modified if the browser's matches the |  | ||||||
|                                 server's |  | ||||||
|         :param use_content_range: If true, process header for range requests |  | ||||||
|                                 and sends the file part that is requested |  | ||||||
|         :param stream_large_files: If true, use the file_stream() handler |  | ||||||
|                                 rather than the file() handler to send the file |  | ||||||
|                                 If this is an integer, this represents the |  | ||||||
|                                 threshold size to switch to file_stream() |  | ||||||
|         :param name: user defined name used for url_for |  | ||||||
|         :type name: str |  | ||||||
|         :param content_type: user defined content type for header |  | ||||||
|         :return: registered static routes |  | ||||||
|         :rtype: List[sanic.router.Route] |  | ||||||
|         """ |  | ||||||
|  |  | ||||||
|         if isinstance(static.file_or_directory, bytes): |  | ||||||
|             file_or_directory = static.file_or_directory.decode("utf-8") |  | ||||||
|         elif isinstance(static.file_or_directory, PurePath): |  | ||||||
|             file_or_directory = str(static.file_or_directory) |  | ||||||
|         elif not isinstance(static.file_or_directory, str): |  | ||||||
|             raise ValueError("Invalid file path string.") |  | ||||||
|         else: |  | ||||||
|             file_or_directory = static.file_or_directory |  | ||||||
|  |  | ||||||
|         uri = static.uri |  | ||||||
|         name = static.name |  | ||||||
|         # If we're not trying to match a file directly, |  | ||||||
|         # serve from the folder |  | ||||||
|         if not static.resource_type: |  | ||||||
|             if not path.isfile(file_or_directory): |  | ||||||
|                 uri += "/<__file_uri__:path>" |  | ||||||
|         elif static.resource_type == "dir": |  | ||||||
|             if path.isfile(file_or_directory): |  | ||||||
|                 raise TypeError( |  | ||||||
|                     "Resource type improperly identified as directory. " |  | ||||||
|                     f"'{file_or_directory}'" |  | ||||||
|                 ) |  | ||||||
|             uri += "/<__file_uri__:path>" |  | ||||||
|         elif static.resource_type == "file" and not path.isfile( |  | ||||||
|             file_or_directory |  | ||||||
|         ): |  | ||||||
|             raise TypeError( |  | ||||||
|                 "Resource type improperly identified as file. " |  | ||||||
|                 f"'{file_or_directory}'" |  | ||||||
|             ) |  | ||||||
|         elif static.resource_type != "file": |  | ||||||
|             raise ValueError( |  | ||||||
|                 "The resource_type should be set to 'file' or 'dir'" |  | ||||||
|             ) |  | ||||||
|  |  | ||||||
|         # special prefix for static files |  | ||||||
|         # if not static.name.startswith("_static_"): |  | ||||||
|         #     name = f"_static_{static.name}" |  | ||||||
|  |  | ||||||
|         _handler = wraps(self._static_request_handler)( |  | ||||||
|             partial( |  | ||||||
|                 self._static_request_handler, |  | ||||||
|                 file_or_directory, |  | ||||||
|                 static.use_modified_since, |  | ||||||
|                 static.use_content_range, |  | ||||||
|                 static.stream_large_files, |  | ||||||
|                 content_type=static.content_type, |  | ||||||
|             ) |  | ||||||
|         ) |  | ||||||
|  |  | ||||||
|         route, _ = self.route(  # type: ignore |  | ||||||
|             uri=uri, |  | ||||||
|             methods=["GET", "HEAD"], |  | ||||||
|             name=name, |  | ||||||
|             host=static.host, |  | ||||||
|             strict_slashes=static.strict_slashes, |  | ||||||
|             static=True, |  | ||||||
|         )(_handler) |  | ||||||
|  |  | ||||||
|         return route |  | ||||||
|  |  | ||||||
|     def _determine_error_format(self, handler) -> str: |     def _determine_error_format(self, handler) -> str: | ||||||
|         with suppress(OSError, TypeError): |         with suppress(OSError, TypeError): | ||||||
|             src = dedent(getsource(handler)) |             src = dedent(getsource(handler)) | ||||||
| @@ -994,17 +691,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 +707,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: | ||||||
|   | |||||||
| @@ -16,44 +16,94 @@ from asyncio import ( | |||||||
| from contextlib import suppress | from contextlib import suppress | ||||||
| from functools import partial | from functools import partial | ||||||
| from importlib import import_module | from importlib import import_module | ||||||
|  | from multiprocessing import Manager, Pipe, get_context | ||||||
|  | from multiprocessing.context import BaseContext | ||||||
| from pathlib import Path | from pathlib import Path | ||||||
| from socket import socket | from socket import SHUT_RDWR, socket | ||||||
| from ssl import SSLContext | from ssl import SSLContext | ||||||
| from typing import TYPE_CHECKING, Any, Dict, List, Optional, Set, Type, Union | from typing import ( | ||||||
|  |     TYPE_CHECKING, | ||||||
|  |     Any, | ||||||
|  |     Callable, | ||||||
|  |     Dict, | ||||||
|  |     List, | ||||||
|  |     Mapping, | ||||||
|  |     Optional, | ||||||
|  |     Set, | ||||||
|  |     Tuple, | ||||||
|  |     Type, | ||||||
|  |     Union, | ||||||
|  |     cast, | ||||||
|  | ) | ||||||
| 
 | 
 | ||||||
| from sanic import reloader_helpers | from sanic.application.ext import setup_ext | ||||||
| from sanic.application.logo import get_logo | from sanic.application.logo import get_logo | ||||||
| from sanic.application.motd import MOTD | from sanic.application.motd import MOTD | ||||||
| from sanic.application.state import ApplicationServerInfo, Mode, ServerStage | from sanic.application.state import ApplicationServerInfo, Mode, ServerStage | ||||||
| from sanic.base.meta import SanicMeta | from sanic.base.meta import SanicMeta | ||||||
| from sanic.compat import OS_IS_WINDOWS | from sanic.compat import OS_IS_WINDOWS, StartMethod, is_atty | ||||||
| from sanic.helpers import _default | from sanic.exceptions import ServerKilled | ||||||
| from sanic.log import Colors, error_logger, logger | from sanic.helpers import Default, _default | ||||||
|  | from sanic.http.constants import HTTP | ||||||
|  | from sanic.http.tls import get_ssl_context, process_to_context | ||||||
|  | from sanic.http.tls.context import SanicSSLContext | ||||||
|  | from sanic.log import Colors, deprecation, error_logger, logger | ||||||
| from sanic.models.handler_types import ListenerType | from sanic.models.handler_types import ListenerType | ||||||
| from sanic.server import Signal as ServerSignal | from sanic.server import Signal as ServerSignal | ||||||
| from sanic.server import try_use_uvloop | from sanic.server import try_use_uvloop | ||||||
| from sanic.server.async_server import AsyncioServer | from sanic.server.async_server import AsyncioServer | ||||||
| from sanic.server.events import trigger_events | from sanic.server.events import trigger_events | ||||||
|  | from sanic.server.legacy import watchdog | ||||||
|  | from sanic.server.loop import try_windows_loop | ||||||
| from sanic.server.protocols.http_protocol import HttpProtocol | from sanic.server.protocols.http_protocol import HttpProtocol | ||||||
| from sanic.server.protocols.websocket_protocol import WebSocketProtocol | from sanic.server.protocols.websocket_protocol import WebSocketProtocol | ||||||
| from sanic.server.runners import serve, serve_multiple, serve_single | from sanic.server.runners import serve, serve_multiple, serve_single | ||||||
| from sanic.tls import process_to_context | from sanic.server.socket import configure_socket, remove_unix_socket | ||||||
|  | from sanic.worker.loader import AppLoader | ||||||
|  | from sanic.worker.manager import WorkerManager | ||||||
|  | from sanic.worker.multiplexer import WorkerMultiplexer | ||||||
|  | from sanic.worker.reloader import Reloader | ||||||
|  | from sanic.worker.serve import worker_serve | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| if TYPE_CHECKING:  # no cov | if TYPE_CHECKING: | ||||||
|     from sanic import Sanic |     from sanic import Sanic | ||||||
|     from sanic.application.state import ApplicationState |     from sanic.application.state import ApplicationState | ||||||
|     from sanic.config import Config |     from sanic.config import Config | ||||||
| 
 | 
 | ||||||
| SANIC_PACKAGES = ("sanic-routing", "sanic-testing", "sanic-ext") | SANIC_PACKAGES = ("sanic-routing", "sanic-testing", "sanic-ext") | ||||||
| 
 | 
 | ||||||
|  | if sys.version_info < (3, 8):  # no cov | ||||||
|  |     HTTPVersion = Union[HTTP, int] | ||||||
|  | else:  # no cov | ||||||
|  |     from typing import Literal | ||||||
| 
 | 
 | ||||||
| class RunnerMixin(metaclass=SanicMeta): |     HTTPVersion = Union[HTTP, Literal[1], Literal[3]] | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | class StartupMixin(metaclass=SanicMeta): | ||||||
|     _app_registry: Dict[str, Sanic] |     _app_registry: Dict[str, Sanic] | ||||||
|     config: Config |     config: Config | ||||||
|     listeners: Dict[str, List[ListenerType[Any]]] |     listeners: Dict[str, List[ListenerType[Any]]] | ||||||
|     state: ApplicationState |     state: ApplicationState | ||||||
|     websocket_enabled: bool |     websocket_enabled: bool | ||||||
|  |     multiplexer: WorkerMultiplexer | ||||||
|  |     start_method: StartMethod = _default | ||||||
|  | 
 | ||||||
|  |     def setup_loop(self): | ||||||
|  |         if not self.asgi: | ||||||
|  |             if self.config.USE_UVLOOP is True or ( | ||||||
|  |                 isinstance(self.config.USE_UVLOOP, Default) | ||||||
|  |                 and not OS_IS_WINDOWS | ||||||
|  |             ): | ||||||
|  |                 try_use_uvloop() | ||||||
|  |             elif OS_IS_WINDOWS: | ||||||
|  |                 try_windows_loop() | ||||||
|  | 
 | ||||||
|  |     @property | ||||||
|  |     def m(self) -> WorkerMultiplexer: | ||||||
|  |         """Interface for interacting with the worker processes""" | ||||||
|  |         return self.multiplexer | ||||||
| 
 | 
 | ||||||
|     def make_coffee(self, *args, **kwargs): |     def make_coffee(self, *args, **kwargs): | ||||||
|         self.state.coffee = True |         self.state.coffee = True | ||||||
| @@ -67,6 +117,7 @@ class RunnerMixin(metaclass=SanicMeta): | |||||||
|         dev: bool = False, |         dev: bool = False, | ||||||
|         debug: bool = False, |         debug: bool = False, | ||||||
|         auto_reload: Optional[bool] = None, |         auto_reload: Optional[bool] = None, | ||||||
|  |         version: HTTPVersion = HTTP.VERSION_1, | ||||||
|         ssl: Union[None, SSLContext, dict, str, list, tuple] = None, |         ssl: Union[None, SSLContext, dict, str, list, tuple] = None, | ||||||
|         sock: Optional[socket] = None, |         sock: Optional[socket] = None, | ||||||
|         workers: int = 1, |         workers: int = 1, | ||||||
| @@ -75,13 +126,16 @@ class RunnerMixin(metaclass=SanicMeta): | |||||||
|         register_sys_signals: bool = True, |         register_sys_signals: bool = True, | ||||||
|         access_log: Optional[bool] = None, |         access_log: Optional[bool] = None, | ||||||
|         unix: Optional[str] = None, |         unix: Optional[str] = None, | ||||||
|         loop: AbstractEventLoop = None, |         loop: Optional[AbstractEventLoop] = None, | ||||||
|         reload_dir: Optional[Union[List[str], str]] = None, |         reload_dir: Optional[Union[List[str], str]] = None, | ||||||
|         noisy_exceptions: Optional[bool] = None, |         noisy_exceptions: Optional[bool] = None, | ||||||
|         motd: bool = True, |         motd: bool = True, | ||||||
|         fast: bool = False, |         fast: bool = False, | ||||||
|         verbosity: int = 0, |         verbosity: int = 0, | ||||||
|         motd_display: Optional[Dict[str, str]] = None, |         motd_display: Optional[Dict[str, str]] = None, | ||||||
|  |         auto_tls: bool = False, | ||||||
|  |         single_process: bool = False, | ||||||
|  |         legacy: bool = False, | ||||||
|     ) -> None: |     ) -> None: | ||||||
|         """ |         """ | ||||||
|         Run the HTTP Server and listen until keyboard interrupt or term |         Run the HTTP Server and listen until keyboard interrupt or term | ||||||
| @@ -125,6 +179,7 @@ class RunnerMixin(metaclass=SanicMeta): | |||||||
|             dev=dev, |             dev=dev, | ||||||
|             debug=debug, |             debug=debug, | ||||||
|             auto_reload=auto_reload, |             auto_reload=auto_reload, | ||||||
|  |             version=version, | ||||||
|             ssl=ssl, |             ssl=ssl, | ||||||
|             sock=sock, |             sock=sock, | ||||||
|             workers=workers, |             workers=workers, | ||||||
| @@ -140,9 +195,18 @@ class RunnerMixin(metaclass=SanicMeta): | |||||||
|             fast=fast, |             fast=fast, | ||||||
|             verbosity=verbosity, |             verbosity=verbosity, | ||||||
|             motd_display=motd_display, |             motd_display=motd_display, | ||||||
|  |             auto_tls=auto_tls, | ||||||
|  |             single_process=single_process, | ||||||
|  |             legacy=legacy, | ||||||
|         ) |         ) | ||||||
| 
 | 
 | ||||||
|         self.__class__.serve(primary=self)  # type: ignore |         if single_process: | ||||||
|  |             serve = self.__class__.serve_single | ||||||
|  |         elif legacy: | ||||||
|  |             serve = self.__class__.serve_legacy | ||||||
|  |         else: | ||||||
|  |             serve = self.__class__.serve | ||||||
|  |         serve(primary=self)  # type: ignore | ||||||
| 
 | 
 | ||||||
|     def prepare( |     def prepare( | ||||||
|         self, |         self, | ||||||
| @@ -152,6 +216,7 @@ class RunnerMixin(metaclass=SanicMeta): | |||||||
|         dev: bool = False, |         dev: bool = False, | ||||||
|         debug: bool = False, |         debug: bool = False, | ||||||
|         auto_reload: Optional[bool] = None, |         auto_reload: Optional[bool] = None, | ||||||
|  |         version: HTTPVersion = HTTP.VERSION_1, | ||||||
|         ssl: Union[None, SSLContext, dict, str, list, tuple] = None, |         ssl: Union[None, SSLContext, dict, str, list, tuple] = None, | ||||||
|         sock: Optional[socket] = None, |         sock: Optional[socket] = None, | ||||||
|         workers: int = 1, |         workers: int = 1, | ||||||
| @@ -160,18 +225,32 @@ class RunnerMixin(metaclass=SanicMeta): | |||||||
|         register_sys_signals: bool = True, |         register_sys_signals: bool = True, | ||||||
|         access_log: Optional[bool] = None, |         access_log: Optional[bool] = None, | ||||||
|         unix: Optional[str] = None, |         unix: Optional[str] = None, | ||||||
|         loop: AbstractEventLoop = None, |         loop: Optional[AbstractEventLoop] = None, | ||||||
|         reload_dir: Optional[Union[List[str], str]] = None, |         reload_dir: Optional[Union[List[str], str]] = None, | ||||||
|         noisy_exceptions: Optional[bool] = None, |         noisy_exceptions: Optional[bool] = None, | ||||||
|         motd: bool = True, |         motd: bool = True, | ||||||
|         fast: bool = False, |         fast: bool = False, | ||||||
|         verbosity: int = 0, |         verbosity: int = 0, | ||||||
|         motd_display: Optional[Dict[str, str]] = None, |         motd_display: Optional[Dict[str, str]] = None, | ||||||
|  |         coffee: bool = False, | ||||||
|  |         auto_tls: bool = False, | ||||||
|  |         single_process: bool = False, | ||||||
|  |         legacy: bool = False, | ||||||
|     ) -> None: |     ) -> None: | ||||||
|  |         if version == 3 and self.state.server_info: | ||||||
|  |             raise RuntimeError( | ||||||
|  |                 "Serving HTTP/3 instances as a secondary server is " | ||||||
|  |                 "not supported. There can only be a single HTTP/3 worker " | ||||||
|  |                 "and it must be the first instance prepared." | ||||||
|  |             ) | ||||||
|  | 
 | ||||||
|         if dev: |         if dev: | ||||||
|             debug = True |             debug = True | ||||||
|             auto_reload = True |             auto_reload = True | ||||||
| 
 | 
 | ||||||
|  |         if debug and access_log is None: | ||||||
|  |             access_log = True | ||||||
|  | 
 | ||||||
|         self.state.verbosity = verbosity |         self.state.verbosity = verbosity | ||||||
|         if not self.state.auto_reload: |         if not self.state.auto_reload: | ||||||
|             self.state.auto_reload = bool(auto_reload) |             self.state.auto_reload = bool(auto_reload) | ||||||
| @@ -179,6 +258,21 @@ class RunnerMixin(metaclass=SanicMeta): | |||||||
|         if fast and workers != 1: |         if fast and workers != 1: | ||||||
|             raise RuntimeError("You cannot use both fast=True and workers=X") |             raise RuntimeError("You cannot use both fast=True and workers=X") | ||||||
| 
 | 
 | ||||||
|  |         if single_process and (fast or (workers > 1) or auto_reload): | ||||||
|  |             raise RuntimeError( | ||||||
|  |                 "Single process cannot be run with multiple workers " | ||||||
|  |                 "or auto-reload" | ||||||
|  |             ) | ||||||
|  | 
 | ||||||
|  |         if single_process and legacy: | ||||||
|  |             raise RuntimeError("Cannot run single process and legacy mode") | ||||||
|  | 
 | ||||||
|  |         if register_sys_signals is False and not (single_process or legacy): | ||||||
|  |             raise RuntimeError( | ||||||
|  |                 "Cannot run Sanic.serve with register_sys_signals=False. " | ||||||
|  |                 "Use either Sanic.serve_single or Sanic.serve_legacy." | ||||||
|  |             ) | ||||||
|  | 
 | ||||||
|         if motd_display: |         if motd_display: | ||||||
|             self.config.MOTD_DISPLAY.update(motd_display) |             self.config.MOTD_DISPLAY.update(motd_display) | ||||||
| 
 | 
 | ||||||
| @@ -202,14 +296,8 @@ class RunnerMixin(metaclass=SanicMeta): | |||||||
|                 "#asynchronous-support" |                 "#asynchronous-support" | ||||||
|             ) |             ) | ||||||
| 
 | 
 | ||||||
|         if ( |  | ||||||
|             self.__class__.should_auto_reload() |  | ||||||
|             and os.environ.get("SANIC_SERVER_RUNNING") != "true" |  | ||||||
|         ):  # no cov |  | ||||||
|             return |  | ||||||
| 
 |  | ||||||
|         if sock is None: |         if sock is None: | ||||||
|             host, port = host or "127.0.0.1", port or 8000 |             host, port = self.get_address(host, port, version, auto_tls) | ||||||
| 
 | 
 | ||||||
|         if protocol is None: |         if protocol is None: | ||||||
|             protocol = ( |             protocol = ( | ||||||
| @@ -233,10 +321,14 @@ class RunnerMixin(metaclass=SanicMeta): | |||||||
|             except AttributeError:  # no cov |             except AttributeError:  # no cov | ||||||
|                 workers = os.cpu_count() or 1 |                 workers = os.cpu_count() or 1 | ||||||
| 
 | 
 | ||||||
|  |         if coffee: | ||||||
|  |             self.state.coffee = True | ||||||
|  | 
 | ||||||
|         server_settings = self._helper( |         server_settings = self._helper( | ||||||
|             host=host, |             host=host, | ||||||
|             port=port, |             port=port, | ||||||
|             debug=debug, |             debug=debug, | ||||||
|  |             version=version, | ||||||
|             ssl=ssl, |             ssl=ssl, | ||||||
|             sock=sock, |             sock=sock, | ||||||
|             unix=unix, |             unix=unix, | ||||||
| @@ -244,15 +336,16 @@ class RunnerMixin(metaclass=SanicMeta): | |||||||
|             protocol=protocol, |             protocol=protocol, | ||||||
|             backlog=backlog, |             backlog=backlog, | ||||||
|             register_sys_signals=register_sys_signals, |             register_sys_signals=register_sys_signals, | ||||||
|  |             auto_tls=auto_tls, | ||||||
|         ) |         ) | ||||||
|         self.state.server_info.append( |         self.state.server_info.append( | ||||||
|             ApplicationServerInfo(settings=server_settings) |             ApplicationServerInfo(settings=server_settings) | ||||||
|         ) |         ) | ||||||
| 
 | 
 | ||||||
|         if self.config.USE_UVLOOP is True or ( |         # if self.config.USE_UVLOOP is True or ( | ||||||
|             self.config.USE_UVLOOP is _default and not OS_IS_WINDOWS |         #     self.config.USE_UVLOOP is _default and not OS_IS_WINDOWS | ||||||
|         ): |         # ): | ||||||
|             try_use_uvloop() |         #     try_use_uvloop() | ||||||
| 
 | 
 | ||||||
|     async def create_server( |     async def create_server( | ||||||
|         self, |         self, | ||||||
| @@ -262,12 +355,12 @@ class RunnerMixin(metaclass=SanicMeta): | |||||||
|         debug: bool = False, |         debug: bool = False, | ||||||
|         ssl: Union[None, SSLContext, dict, str, list, tuple] = None, |         ssl: Union[None, SSLContext, dict, str, list, tuple] = None, | ||||||
|         sock: Optional[socket] = None, |         sock: Optional[socket] = None, | ||||||
|         protocol: Type[Protocol] = None, |         protocol: Optional[Type[Protocol]] = None, | ||||||
|         backlog: int = 100, |         backlog: int = 100, | ||||||
|         access_log: Optional[bool] = None, |         access_log: Optional[bool] = None, | ||||||
|         unix: Optional[str] = None, |         unix: Optional[str] = None, | ||||||
|         return_asyncio_server: bool = False, |         return_asyncio_server: bool = False, | ||||||
|         asyncio_server_kwargs: Dict[str, Any] = None, |         asyncio_server_kwargs: Optional[Dict[str, Any]] = None, | ||||||
|         noisy_exceptions: Optional[bool] = None, |         noisy_exceptions: Optional[bool] = None, | ||||||
|     ) -> Optional[AsyncioServer]: |     ) -> Optional[AsyncioServer]: | ||||||
|         """ |         """ | ||||||
| @@ -313,7 +406,7 @@ class RunnerMixin(metaclass=SanicMeta): | |||||||
|         """ |         """ | ||||||
| 
 | 
 | ||||||
|         if sock is None: |         if sock is None: | ||||||
|             host, port = host or "127.0.0.1", port or 8000 |             host, port = host, port = self.get_address(host, port) | ||||||
| 
 | 
 | ||||||
|         if protocol is None: |         if protocol is None: | ||||||
|             protocol = ( |             protocol = ( | ||||||
| @@ -341,7 +434,7 @@ class RunnerMixin(metaclass=SanicMeta): | |||||||
|             run_async=return_asyncio_server, |             run_async=return_asyncio_server, | ||||||
|         ) |         ) | ||||||
| 
 | 
 | ||||||
|         if self.config.USE_UVLOOP is not _default: |         if not isinstance(self.config.USE_UVLOOP, Default): | ||||||
|             error_logger.warning( |             error_logger.warning( | ||||||
|                 "You are trying to change the uvloop configuration, but " |                 "You are trying to change the uvloop configuration, but " | ||||||
|                 "this is only effective when using the run(...) method. " |                 "this is only effective when using the run(...) method. " | ||||||
| @@ -361,32 +454,39 @@ class RunnerMixin(metaclass=SanicMeta): | |||||||
|             asyncio_server_kwargs=asyncio_server_kwargs, **server_settings |             asyncio_server_kwargs=asyncio_server_kwargs, **server_settings | ||||||
|         ) |         ) | ||||||
| 
 | 
 | ||||||
|     def stop(self): |     def stop(self, terminate: bool = True, unregister: bool = False): | ||||||
|         """ |         """ | ||||||
|         This kills the Sanic |         This kills the Sanic | ||||||
|         """ |         """ | ||||||
|  |         if terminate and hasattr(self, "multiplexer"): | ||||||
|  |             self.multiplexer.terminate() | ||||||
|         if self.state.stage is not ServerStage.STOPPED: |         if self.state.stage is not ServerStage.STOPPED: | ||||||
|             self.shutdown_tasks(timeout=0) |             self.shutdown_tasks(timeout=0)  # type: ignore | ||||||
|             for task in all_tasks(): |             for task in all_tasks(): | ||||||
|                 with suppress(AttributeError): |                 with suppress(AttributeError): | ||||||
|                     if task.get_name() == "RunServer": |                     if task.get_name() == "RunServer": | ||||||
|                         task.cancel() |                         task.cancel() | ||||||
|             get_event_loop().stop() |             get_event_loop().stop() | ||||||
| 
 | 
 | ||||||
|  |         if unregister: | ||||||
|  |             self.__class__.unregister_app(self)  # type: ignore | ||||||
|  | 
 | ||||||
|     def _helper( |     def _helper( | ||||||
|         self, |         self, | ||||||
|         host: Optional[str] = None, |         host: Optional[str] = None, | ||||||
|         port: Optional[int] = None, |         port: Optional[int] = None, | ||||||
|         debug: bool = False, |         debug: bool = False, | ||||||
|  |         version: HTTPVersion = HTTP.VERSION_1, | ||||||
|         ssl: Union[None, SSLContext, dict, str, list, tuple] = None, |         ssl: Union[None, SSLContext, dict, str, list, tuple] = None, | ||||||
|         sock: Optional[socket] = None, |         sock: Optional[socket] = None, | ||||||
|         unix: Optional[str] = None, |         unix: Optional[str] = None, | ||||||
|         workers: int = 1, |         workers: int = 1, | ||||||
|         loop: AbstractEventLoop = None, |         loop: Optional[AbstractEventLoop] = None, | ||||||
|         protocol: Type[Protocol] = HttpProtocol, |         protocol: Type[Protocol] = HttpProtocol, | ||||||
|         backlog: int = 100, |         backlog: int = 100, | ||||||
|         register_sys_signals: bool = True, |         register_sys_signals: bool = True, | ||||||
|         run_async: bool = False, |         run_async: bool = False, | ||||||
|  |         auto_tls: bool = False, | ||||||
|     ) -> Dict[str, Any]: |     ) -> Dict[str, Any]: | ||||||
|         """Helper function used by `run` and `create_server`.""" |         """Helper function used by `run` and `create_server`.""" | ||||||
|         if self.config.PROXIES_COUNT and self.config.PROXIES_COUNT < 0: |         if self.config.PROXIES_COUNT and self.config.PROXIES_COUNT < 0: | ||||||
| @@ -396,11 +496,18 @@ class RunnerMixin(metaclass=SanicMeta): | |||||||
|                 "#proxy-configuration" |                 "#proxy-configuration" | ||||||
|             ) |             ) | ||||||
| 
 | 
 | ||||||
|         ssl = process_to_context(ssl) |  | ||||||
| 
 |  | ||||||
|         if not self.state.is_debug: |         if not self.state.is_debug: | ||||||
|             self.state.mode = Mode.DEBUG if debug else Mode.PRODUCTION |             self.state.mode = Mode.DEBUG if debug else Mode.PRODUCTION | ||||||
| 
 | 
 | ||||||
|  |         if isinstance(version, int): | ||||||
|  |             version = HTTP(version) | ||||||
|  | 
 | ||||||
|  |         ssl = process_to_context(ssl) | ||||||
|  |         if version is HTTP.VERSION_3 or auto_tls: | ||||||
|  |             if TYPE_CHECKING: | ||||||
|  |                 self = cast(Sanic, self) | ||||||
|  |             ssl = get_ssl_context(self, ssl) | ||||||
|  | 
 | ||||||
|         self.state.host = host or "" |         self.state.host = host or "" | ||||||
|         self.state.port = port or 0 |         self.state.port = port or 0 | ||||||
|         self.state.workers = workers |         self.state.workers = workers | ||||||
| @@ -412,6 +519,7 @@ class RunnerMixin(metaclass=SanicMeta): | |||||||
|             "protocol": protocol, |             "protocol": protocol, | ||||||
|             "host": host, |             "host": host, | ||||||
|             "port": port, |             "port": port, | ||||||
|  |             "version": version, | ||||||
|             "sock": sock, |             "sock": sock, | ||||||
|             "unix": unix, |             "unix": unix, | ||||||
|             "ssl": ssl, |             "ssl": ssl, | ||||||
| @@ -422,9 +530,13 @@ class RunnerMixin(metaclass=SanicMeta): | |||||||
|             "backlog": backlog, |             "backlog": backlog, | ||||||
|         } |         } | ||||||
| 
 | 
 | ||||||
|         self.motd(self.serve_location) |         self.motd(server_settings=server_settings) | ||||||
| 
 | 
 | ||||||
|         if sys.stdout.isatty() and not self.state.is_debug: |         if ( | ||||||
|  |             is_atty() | ||||||
|  |             and not self.state.is_debug | ||||||
|  |             and not os.environ.get("SANIC_IGNORE_PRODUCTION_WARNING") | ||||||
|  |         ): | ||||||
|             error_logger.warning( |             error_logger.warning( | ||||||
|                 f"{Colors.YELLOW}Sanic is running in PRODUCTION mode. " |                 f"{Colors.YELLOW}Sanic is running in PRODUCTION mode. " | ||||||
|                 "Consider using '--debug' or '--dev' while actively " |                 "Consider using '--debug' or '--dev' while actively " | ||||||
| @@ -448,90 +560,404 @@ class RunnerMixin(metaclass=SanicMeta): | |||||||
| 
 | 
 | ||||||
|         return server_settings |         return server_settings | ||||||
| 
 | 
 | ||||||
|     def motd(self, serve_location): |     def motd( | ||||||
|  |         self, | ||||||
|  |         server_settings: Optional[Dict[str, Any]] = None, | ||||||
|  |     ): | ||||||
|  |         if ( | ||||||
|  |             os.environ.get("SANIC_WORKER_NAME") | ||||||
|  |             or os.environ.get("SANIC_MOTD_OUTPUT") | ||||||
|  |             or os.environ.get("SANIC_WORKER_PROCESS") | ||||||
|  |             or os.environ.get("SANIC_SERVER_RUNNING") | ||||||
|  |         ): | ||||||
|  |             return | ||||||
|  |         serve_location = self.get_server_location(server_settings) | ||||||
|         if self.config.MOTD: |         if self.config.MOTD: | ||||||
|             mode = [f"{self.state.mode},"] |             logo = get_logo(coffee=self.state.coffee) | ||||||
|             if self.state.fast: |             display, extra = self.get_motd_data(server_settings) | ||||||
|                 mode.append("goin' fast") |  | ||||||
|             if self.state.asgi: |  | ||||||
|                 mode.append("ASGI") |  | ||||||
|             else: |  | ||||||
|                 if self.state.workers == 1: |  | ||||||
|                     mode.append("single worker") |  | ||||||
|                 else: |  | ||||||
|                     mode.append(f"w/ {self.state.workers} workers") |  | ||||||
| 
 |  | ||||||
|             display = { |  | ||||||
|                 "mode": " ".join(mode), |  | ||||||
|                 "server": self.state.server, |  | ||||||
|                 "python": platform.python_version(), |  | ||||||
|                 "platform": platform.platform(), |  | ||||||
|             } |  | ||||||
|             extra = {} |  | ||||||
|             if self.config.AUTO_RELOAD: |  | ||||||
|                 reload_display = "enabled" |  | ||||||
|                 if self.state.reload_dirs: |  | ||||||
|                     reload_display += ", ".join( |  | ||||||
|                         [ |  | ||||||
|                             "", |  | ||||||
|                             *( |  | ||||||
|                                 str(path.absolute()) |  | ||||||
|                                 for path in self.state.reload_dirs |  | ||||||
|                             ), |  | ||||||
|                         ] |  | ||||||
|                     ) |  | ||||||
|                 display["auto-reload"] = reload_display |  | ||||||
| 
 |  | ||||||
|             packages = [] |  | ||||||
|             for package_name in SANIC_PACKAGES: |  | ||||||
|                 module_name = package_name.replace("-", "_") |  | ||||||
|                 try: |  | ||||||
|                     module = import_module(module_name) |  | ||||||
|                     packages.append(f"{package_name}=={module.__version__}") |  | ||||||
|                 except ImportError: |  | ||||||
|                     ... |  | ||||||
| 
 |  | ||||||
|             if packages: |  | ||||||
|                 display["packages"] = ", ".join(packages) |  | ||||||
| 
 |  | ||||||
|             if self.config.MOTD_DISPLAY: |  | ||||||
|                 extra.update(self.config.MOTD_DISPLAY) |  | ||||||
| 
 |  | ||||||
|             logo = ( |  | ||||||
|                 get_logo(coffee=self.state.coffee) |  | ||||||
|                 if self.config.LOGO == "" or self.config.LOGO is True |  | ||||||
|                 else self.config.LOGO |  | ||||||
|             ) |  | ||||||
| 
 | 
 | ||||||
|             MOTD.output(logo, serve_location, display, extra) |             MOTD.output(logo, serve_location, display, extra) | ||||||
| 
 | 
 | ||||||
|  |     def get_motd_data( | ||||||
|  |         self, server_settings: Optional[Dict[str, Any]] = None | ||||||
|  |     ) -> Tuple[Dict[str, Any], Dict[str, Any]]: | ||||||
|  |         mode = [f"{self.state.mode},"] | ||||||
|  |         if self.state.fast: | ||||||
|  |             mode.append("goin' fast") | ||||||
|  |         if self.state.asgi: | ||||||
|  |             mode.append("ASGI") | ||||||
|  |         else: | ||||||
|  |             if self.state.workers == 1: | ||||||
|  |                 mode.append("single worker") | ||||||
|  |             else: | ||||||
|  |                 mode.append(f"w/ {self.state.workers} workers") | ||||||
|  | 
 | ||||||
|  |         if server_settings: | ||||||
|  |             server = ", ".join( | ||||||
|  |                 ( | ||||||
|  |                     self.state.server, | ||||||
|  |                     server_settings["version"].display(),  # type: ignore | ||||||
|  |                 ) | ||||||
|  |             ) | ||||||
|  |         else: | ||||||
|  |             server = "ASGI" if self.asgi else "unknown"  # type: ignore | ||||||
|  | 
 | ||||||
|  |         display = { | ||||||
|  |             "mode": " ".join(mode), | ||||||
|  |             "server": server, | ||||||
|  |             "python": platform.python_version(), | ||||||
|  |             "platform": platform.platform(), | ||||||
|  |         } | ||||||
|  |         extra = {} | ||||||
|  |         if self.config.AUTO_RELOAD: | ||||||
|  |             reload_display = "enabled" | ||||||
|  |             if self.state.reload_dirs: | ||||||
|  |                 reload_display += ", ".join( | ||||||
|  |                     [ | ||||||
|  |                         "", | ||||||
|  |                         *( | ||||||
|  |                             str(path.absolute()) | ||||||
|  |                             for path in self.state.reload_dirs | ||||||
|  |                         ), | ||||||
|  |                     ] | ||||||
|  |                 ) | ||||||
|  |             display["auto-reload"] = reload_display | ||||||
|  | 
 | ||||||
|  |         packages = [] | ||||||
|  |         for package_name in SANIC_PACKAGES: | ||||||
|  |             module_name = package_name.replace("-", "_") | ||||||
|  |             try: | ||||||
|  |                 module = import_module(module_name) | ||||||
|  |                 packages.append( | ||||||
|  |                     f"{package_name}=={module.__version__}"  # type: ignore | ||||||
|  |                 ) | ||||||
|  |             except ImportError:  # no cov | ||||||
|  |                 ... | ||||||
|  | 
 | ||||||
|  |         if packages: | ||||||
|  |             display["packages"] = ", ".join(packages) | ||||||
|  | 
 | ||||||
|  |         if self.config.MOTD_DISPLAY: | ||||||
|  |             extra.update(self.config.MOTD_DISPLAY) | ||||||
|  | 
 | ||||||
|  |         return display, extra | ||||||
|  | 
 | ||||||
|     @property |     @property | ||||||
|     def serve_location(self) -> str: |     def serve_location(self) -> str: | ||||||
|  |         try: | ||||||
|  |             server_settings = self.state.server_info[0].settings | ||||||
|  |             return self.get_server_location(server_settings) | ||||||
|  |         except IndexError: | ||||||
|  |             location = "ASGI" if self.asgi else "unknown"  # type: ignore | ||||||
|  |             return f"http://<{location}>" | ||||||
|  | 
 | ||||||
|  |     @staticmethod | ||||||
|  |     def get_server_location( | ||||||
|  |         server_settings: Optional[Dict[str, Any]] = None | ||||||
|  |     ) -> str: | ||||||
|         serve_location = "" |         serve_location = "" | ||||||
|         proto = "http" |         proto = "http" | ||||||
|         if self.state.ssl is not None: |         if not server_settings: | ||||||
|  |             return serve_location | ||||||
|  | 
 | ||||||
|  |         host = server_settings["host"] | ||||||
|  |         port = server_settings["port"] | ||||||
|  | 
 | ||||||
|  |         if server_settings.get("ssl") is not None: | ||||||
|             proto = "https" |             proto = "https" | ||||||
|         if self.state.unix: |         if server_settings.get("unix"): | ||||||
|             serve_location = f"{self.state.unix} {proto}://..." |             serve_location = f'{server_settings["unix"]} {proto}://...' | ||||||
|         elif self.state.sock: |         elif server_settings.get("sock"): | ||||||
|             serve_location = f"{self.state.sock.getsockname()} {proto}://..." |             host, port, *_ = server_settings["sock"].getsockname() | ||||||
|         elif self.state.host and self.state.port: | 
 | ||||||
|  |         if not serve_location and host and port: | ||||||
|             # colon(:) is legal for a host only in an ipv6 address |             # colon(:) is legal for a host only in an ipv6 address | ||||||
|             display_host = ( |             display_host = f"[{host}]" if ":" in host else host | ||||||
|                 f"[{self.state.host}]" |             serve_location = f"{proto}://{display_host}:{port}" | ||||||
|                 if ":" in self.state.host |  | ||||||
|                 else self.state.host |  | ||||||
|             ) |  | ||||||
|             serve_location = f"{proto}://{display_host}:{self.state.port}" |  | ||||||
| 
 | 
 | ||||||
|         return serve_location |         return serve_location | ||||||
| 
 | 
 | ||||||
|  |     @staticmethod | ||||||
|  |     def get_address( | ||||||
|  |         host: Optional[str], | ||||||
|  |         port: Optional[int], | ||||||
|  |         version: HTTPVersion = HTTP.VERSION_1, | ||||||
|  |         auto_tls: bool = False, | ||||||
|  |     ) -> Tuple[str, int]: | ||||||
|  |         host = host or "127.0.0.1" | ||||||
|  |         port = port or (8443 if (version == 3 or auto_tls) else 8000) | ||||||
|  |         return host, port | ||||||
|  | 
 | ||||||
|     @classmethod |     @classmethod | ||||||
|     def should_auto_reload(cls) -> bool: |     def should_auto_reload(cls) -> bool: | ||||||
|         return any(app.state.auto_reload for app in cls._app_registry.values()) |         return any(app.state.auto_reload for app in cls._app_registry.values()) | ||||||
| 
 | 
 | ||||||
|     @classmethod |     @classmethod | ||||||
|     def serve(cls, primary: Optional[Sanic] = None) -> None: |     def _get_startup_method(cls) -> str: | ||||||
|  |         return ( | ||||||
|  |             cls.start_method | ||||||
|  |             if not isinstance(cls.start_method, Default) | ||||||
|  |             else "spawn" | ||||||
|  |         ) | ||||||
|  | 
 | ||||||
|  |     @classmethod | ||||||
|  |     def _get_context(cls) -> BaseContext: | ||||||
|  |         method = cls._get_startup_method() | ||||||
|  |         logger.debug("Creating multiprocessing context using '%s'", method) | ||||||
|  |         return get_context(method) | ||||||
|  | 
 | ||||||
|  |     @classmethod | ||||||
|  |     def serve( | ||||||
|  |         cls, | ||||||
|  |         primary: Optional[Sanic] = None, | ||||||
|  |         *, | ||||||
|  |         app_loader: Optional[AppLoader] = None, | ||||||
|  |         factory: Optional[Callable[[], Sanic]] = None, | ||||||
|  |     ) -> None: | ||||||
|  |         os.environ["SANIC_MOTD_OUTPUT"] = "true" | ||||||
|  |         apps = list(cls._app_registry.values()) | ||||||
|  |         if factory: | ||||||
|  |             primary = factory() | ||||||
|  |         else: | ||||||
|  |             if not primary: | ||||||
|  |                 if app_loader: | ||||||
|  |                     primary = app_loader.load() | ||||||
|  |                 if not primary: | ||||||
|  |                     try: | ||||||
|  |                         primary = apps[0] | ||||||
|  |                     except IndexError: | ||||||
|  |                         raise RuntimeError( | ||||||
|  |                             "Did not find any applications." | ||||||
|  |                         ) from None | ||||||
|  | 
 | ||||||
|  |             # This exists primarily for unit testing | ||||||
|  |             if not primary.state.server_info:  # no cov | ||||||
|  |                 for app in apps: | ||||||
|  |                     app.state.server_info.clear() | ||||||
|  |                 return | ||||||
|  | 
 | ||||||
|  |         try: | ||||||
|  |             primary_server_info = primary.state.server_info[0] | ||||||
|  |         except IndexError: | ||||||
|  |             raise RuntimeError( | ||||||
|  |                 f"No server information found for {primary.name}. Perhaps you " | ||||||
|  |                 "need to run app.prepare(...)?" | ||||||
|  |             ) from None | ||||||
|  | 
 | ||||||
|  |         socks = [] | ||||||
|  |         sync_manager = Manager() | ||||||
|  |         setup_ext(primary) | ||||||
|  |         exit_code = 0 | ||||||
|  |         try: | ||||||
|  |             primary_server_info.settings.pop("main_start", None) | ||||||
|  |             primary_server_info.settings.pop("main_stop", None) | ||||||
|  |             main_start = primary.listeners.get("main_process_start") | ||||||
|  |             main_stop = primary.listeners.get("main_process_stop") | ||||||
|  |             app = primary_server_info.settings.pop("app") | ||||||
|  |             app.setup_loop() | ||||||
|  |             loop = new_event_loop() | ||||||
|  |             trigger_events(main_start, loop, primary) | ||||||
|  | 
 | ||||||
|  |             socks = [ | ||||||
|  |                 sock | ||||||
|  |                 for sock in [ | ||||||
|  |                     configure_socket(server_info.settings) | ||||||
|  |                     for app in apps | ||||||
|  |                     for server_info in app.state.server_info | ||||||
|  |                 ] | ||||||
|  |                 if sock | ||||||
|  |             ] | ||||||
|  |             primary_server_info.settings["run_multiple"] = True | ||||||
|  |             monitor_sub, monitor_pub = Pipe(True) | ||||||
|  |             worker_state: Mapping[str, Any] = sync_manager.dict() | ||||||
|  |             kwargs: Dict[str, Any] = { | ||||||
|  |                 **primary_server_info.settings, | ||||||
|  |                 "monitor_publisher": monitor_pub, | ||||||
|  |                 "worker_state": worker_state, | ||||||
|  |             } | ||||||
|  | 
 | ||||||
|  |             if not app_loader: | ||||||
|  |                 if factory: | ||||||
|  |                     app_loader = AppLoader(factory=factory) | ||||||
|  |                 else: | ||||||
|  |                     app_loader = AppLoader( | ||||||
|  |                         factory=partial(cls.get_app, app.name)  # type: ignore | ||||||
|  |                     ) | ||||||
|  |             kwargs["app_name"] = app.name | ||||||
|  |             kwargs["app_loader"] = app_loader | ||||||
|  |             kwargs["server_info"] = {} | ||||||
|  |             kwargs["passthru"] = { | ||||||
|  |                 "auto_reload": app.auto_reload, | ||||||
|  |                 "state": { | ||||||
|  |                     "verbosity": app.state.verbosity, | ||||||
|  |                     "mode": app.state.mode, | ||||||
|  |                 }, | ||||||
|  |                 "config": { | ||||||
|  |                     "ACCESS_LOG": app.config.ACCESS_LOG, | ||||||
|  |                     "NOISY_EXCEPTIONS": app.config.NOISY_EXCEPTIONS, | ||||||
|  |                 }, | ||||||
|  |                 "shared_ctx": app.shared_ctx.__dict__, | ||||||
|  |             } | ||||||
|  |             for app in apps: | ||||||
|  |                 kwargs["server_info"][app.name] = [] | ||||||
|  |                 for server_info in app.state.server_info: | ||||||
|  |                     server_info.settings = { | ||||||
|  |                         k: v | ||||||
|  |                         for k, v in server_info.settings.items() | ||||||
|  |                         if k not in ("main_start", "main_stop", "app", "ssl") | ||||||
|  |                     } | ||||||
|  |                     kwargs["server_info"][app.name].append(server_info) | ||||||
|  | 
 | ||||||
|  |             ssl = kwargs.get("ssl") | ||||||
|  | 
 | ||||||
|  |             if isinstance(ssl, SanicSSLContext): | ||||||
|  |                 kwargs["ssl"] = kwargs["ssl"].sanic | ||||||
|  | 
 | ||||||
|  |             manager = WorkerManager( | ||||||
|  |                 primary.state.workers, | ||||||
|  |                 worker_serve, | ||||||
|  |                 kwargs, | ||||||
|  |                 cls._get_context(), | ||||||
|  |                 (monitor_pub, monitor_sub), | ||||||
|  |                 worker_state, | ||||||
|  |             ) | ||||||
|  |             if cls.should_auto_reload(): | ||||||
|  |                 reload_dirs: Set[Path] = primary.state.reload_dirs.union( | ||||||
|  |                     *(app.state.reload_dirs for app in apps) | ||||||
|  |                 ) | ||||||
|  |                 reloader = Reloader(monitor_pub, 0, reload_dirs, app_loader) | ||||||
|  |                 manager.manage("Reloader", reloader, {}, transient=False) | ||||||
|  | 
 | ||||||
|  |             inspector = None | ||||||
|  |             if primary.config.INSPECTOR: | ||||||
|  |                 display, extra = primary.get_motd_data() | ||||||
|  |                 packages = [ | ||||||
|  |                     pkg.strip() for pkg in display["packages"].split(",") | ||||||
|  |                 ] | ||||||
|  |                 module = import_module("sanic") | ||||||
|  |                 sanic_version = f"sanic=={module.__version__}"  # type: ignore | ||||||
|  |                 app_info = { | ||||||
|  |                     **display, | ||||||
|  |                     "packages": [sanic_version, *packages], | ||||||
|  |                     "extra": extra, | ||||||
|  |                 } | ||||||
|  |                 inspector = primary.inspector_class( | ||||||
|  |                     monitor_pub, | ||||||
|  |                     app_info, | ||||||
|  |                     worker_state, | ||||||
|  |                     primary.config.INSPECTOR_HOST, | ||||||
|  |                     primary.config.INSPECTOR_PORT, | ||||||
|  |                     primary.config.INSPECTOR_API_KEY, | ||||||
|  |                     primary.config.INSPECTOR_TLS_KEY, | ||||||
|  |                     primary.config.INSPECTOR_TLS_CERT, | ||||||
|  |                 ) | ||||||
|  |                 manager.manage("Inspector", inspector, {}, transient=False) | ||||||
|  | 
 | ||||||
|  |             primary._inspector = inspector | ||||||
|  |             primary._manager = manager | ||||||
|  | 
 | ||||||
|  |             ready = primary.listeners["main_process_ready"] | ||||||
|  |             trigger_events(ready, loop, primary) | ||||||
|  | 
 | ||||||
|  |             manager.run() | ||||||
|  |         except ServerKilled: | ||||||
|  |             exit_code = 1 | ||||||
|  |         except BaseException: | ||||||
|  |             kwargs = primary_server_info.settings | ||||||
|  |             error_logger.exception( | ||||||
|  |                 "Experienced exception while trying to serve" | ||||||
|  |             ) | ||||||
|  |             raise | ||||||
|  |         finally: | ||||||
|  |             logger.info("Server Stopped") | ||||||
|  |             for app in apps: | ||||||
|  |                 app.state.server_info.clear() | ||||||
|  |                 app.router.reset() | ||||||
|  |                 app.signal_router.reset() | ||||||
|  | 
 | ||||||
|  |             sync_manager.shutdown() | ||||||
|  |             for sock in socks: | ||||||
|  |                 try: | ||||||
|  |                     sock.shutdown(SHUT_RDWR) | ||||||
|  |                 except OSError: | ||||||
|  |                     ... | ||||||
|  |                 sock.close() | ||||||
|  |             socks = [] | ||||||
|  |             trigger_events(main_stop, loop, primary) | ||||||
|  |             loop.close() | ||||||
|  |             cls._cleanup_env_vars() | ||||||
|  |             cls._cleanup_apps() | ||||||
|  |             unix = kwargs.get("unix") | ||||||
|  |             if unix: | ||||||
|  |                 remove_unix_socket(unix) | ||||||
|  |         if exit_code: | ||||||
|  |             os._exit(exit_code) | ||||||
|  | 
 | ||||||
|  |     @classmethod | ||||||
|  |     def serve_single(cls, primary: Optional[Sanic] = None) -> None: | ||||||
|  |         os.environ["SANIC_MOTD_OUTPUT"] = "true" | ||||||
|  |         apps = list(cls._app_registry.values()) | ||||||
|  | 
 | ||||||
|  |         if not primary: | ||||||
|  |             try: | ||||||
|  |                 primary = apps[0] | ||||||
|  |             except IndexError: | ||||||
|  |                 raise RuntimeError("Did not find any applications.") | ||||||
|  | 
 | ||||||
|  |         # This exists primarily for unit testing | ||||||
|  |         if not primary.state.server_info:  # no cov | ||||||
|  |             for app in apps: | ||||||
|  |                 app.state.server_info.clear() | ||||||
|  |             return | ||||||
|  | 
 | ||||||
|  |         primary_server_info = primary.state.server_info[0] | ||||||
|  |         primary.before_server_start(partial(primary._start_servers, apps=apps)) | ||||||
|  |         kwargs = { | ||||||
|  |             k: v | ||||||
|  |             for k, v in primary_server_info.settings.items() | ||||||
|  |             if k | ||||||
|  |             not in ( | ||||||
|  |                 "main_start", | ||||||
|  |                 "main_stop", | ||||||
|  |                 "app", | ||||||
|  |             ) | ||||||
|  |         } | ||||||
|  |         kwargs["app_name"] = primary.name | ||||||
|  |         kwargs["app_loader"] = None | ||||||
|  |         sock = configure_socket(kwargs) | ||||||
|  | 
 | ||||||
|  |         kwargs["server_info"] = {} | ||||||
|  |         kwargs["server_info"][primary.name] = [] | ||||||
|  |         for server_info in primary.state.server_info: | ||||||
|  |             server_info.settings = { | ||||||
|  |                 k: v | ||||||
|  |                 for k, v in server_info.settings.items() | ||||||
|  |                 if k not in ("main_start", "main_stop", "app") | ||||||
|  |             } | ||||||
|  |             kwargs["server_info"][primary.name].append(server_info) | ||||||
|  | 
 | ||||||
|  |         try: | ||||||
|  |             worker_serve(monitor_publisher=None, **kwargs) | ||||||
|  |         except BaseException: | ||||||
|  |             error_logger.exception( | ||||||
|  |                 "Experienced exception while trying to serve" | ||||||
|  |             ) | ||||||
|  |             raise | ||||||
|  |         finally: | ||||||
|  |             logger.info("Server Stopped") | ||||||
|  |             for app in apps: | ||||||
|  |                 app.state.server_info.clear() | ||||||
|  |                 app.router.reset() | ||||||
|  |                 app.signal_router.reset() | ||||||
|  | 
 | ||||||
|  |             if sock: | ||||||
|  |                 sock.close() | ||||||
|  | 
 | ||||||
|  |             cls._cleanup_env_vars() | ||||||
|  |             cls._cleanup_apps() | ||||||
|  | 
 | ||||||
|  |     @classmethod | ||||||
|  |     def serve_legacy(cls, primary: Optional[Sanic] = None) -> None: | ||||||
|         apps = list(cls._app_registry.values()) |         apps = list(cls._app_registry.values()) | ||||||
| 
 | 
 | ||||||
|         if not primary: |         if not primary: | ||||||
| @@ -552,7 +978,7 @@ class RunnerMixin(metaclass=SanicMeta): | |||||||
|             reload_dirs: Set[Path] = primary.state.reload_dirs.union( |             reload_dirs: Set[Path] = primary.state.reload_dirs.union( | ||||||
|                 *(app.state.reload_dirs for app in apps) |                 *(app.state.reload_dirs for app in apps) | ||||||
|             ) |             ) | ||||||
|             reloader_helpers.watchdog(1.0, reload_dirs) |             watchdog(1.0, reload_dirs) | ||||||
|             trigger_events(reloader_stop, loop, primary) |             trigger_events(reloader_stop, loop, primary) | ||||||
|             return |             return | ||||||
| 
 | 
 | ||||||
| @@ -565,11 +991,17 @@ class RunnerMixin(metaclass=SanicMeta): | |||||||
|         primary_server_info = primary.state.server_info[0] |         primary_server_info = primary.state.server_info[0] | ||||||
|         primary.before_server_start(partial(primary._start_servers, apps=apps)) |         primary.before_server_start(partial(primary._start_servers, apps=apps)) | ||||||
| 
 | 
 | ||||||
|  |         deprecation( | ||||||
|  |             f"{Colors.YELLOW}Running {Colors.SANIC}Sanic {Colors.YELLOW}w/ " | ||||||
|  |             f"LEGACY manager.{Colors.END} Support for will be dropped in " | ||||||
|  |             "version 23.3.", | ||||||
|  |             23.3, | ||||||
|  |         ) | ||||||
|         try: |         try: | ||||||
|             primary_server_info.stage = ServerStage.SERVING |             primary_server_info.stage = ServerStage.SERVING | ||||||
| 
 | 
 | ||||||
|             if primary.state.workers > 1 and os.name != "posix":  # no cov |             if primary.state.workers > 1 and os.name != "posix":  # no cov | ||||||
|                 logger.warn( |                 logger.warning( | ||||||
|                     f"Multiprocessing is currently not supported on {os.name}," |                     f"Multiprocessing is currently not supported on {os.name}," | ||||||
|                     " using workers=1 instead" |                     " using workers=1 instead" | ||||||
|                 ) |                 ) | ||||||
| @@ -590,10 +1022,9 @@ class RunnerMixin(metaclass=SanicMeta): | |||||||
|         finally: |         finally: | ||||||
|             primary_server_info.stage = ServerStage.STOPPED |             primary_server_info.stage = ServerStage.STOPPED | ||||||
|         logger.info("Server Stopped") |         logger.info("Server Stopped") | ||||||
|         for app in apps: | 
 | ||||||
|             app.state.server_info.clear() |         cls._cleanup_env_vars() | ||||||
|             app.router.reset() |         cls._cleanup_apps() | ||||||
|             app.signal_router.reset() |  | ||||||
| 
 | 
 | ||||||
|     async def _start_servers( |     async def _start_servers( | ||||||
|         self, |         self, | ||||||
| @@ -615,7 +1046,7 @@ class RunnerMixin(metaclass=SanicMeta): | |||||||
|                     f"{app.state.workers} worker(s), which will be ignored " |                     f"{app.state.workers} worker(s), which will be ignored " | ||||||
|                     "in favor of the primary application." |                     "in favor of the primary application." | ||||||
|                 ) |                 ) | ||||||
|                 if sys.stdout.isatty(): |                 if is_atty(): | ||||||
|                     message = "".join( |                     message = "".join( | ||||||
|                         [ |                         [ | ||||||
|                             Colors.YELLOW, |                             Colors.YELLOW, | ||||||
| @@ -631,7 +1062,7 @@ class RunnerMixin(metaclass=SanicMeta): | |||||||
|                         *server_info.settings.pop("main_start", []), |                         *server_info.settings.pop("main_start", []), | ||||||
|                         *server_info.settings.pop("main_stop", []), |                         *server_info.settings.pop("main_stop", []), | ||||||
|                     ] |                     ] | ||||||
|                     if handlers: |                     if handlers:  # no cov | ||||||
|                         error_logger.warning( |                         error_logger.warning( | ||||||
|                             f"Sanic found {len(handlers)} listener(s) on " |                             f"Sanic found {len(handlers)} listener(s) on " | ||||||
|                             "secondary applications attached to the main " |                             "secondary applications attached to the main " | ||||||
| @@ -644,19 +1075,22 @@ class RunnerMixin(metaclass=SanicMeta): | |||||||
|                     if not server_info.settings["loop"]: |                     if not server_info.settings["loop"]: | ||||||
|                         server_info.settings["loop"] = get_running_loop() |                         server_info.settings["loop"] = get_running_loop() | ||||||
| 
 | 
 | ||||||
|  |                     serve_args: Dict[str, Any] = { | ||||||
|  |                         **server_info.settings, | ||||||
|  |                         "run_async": True, | ||||||
|  |                         "reuse_port": bool(primary.state.workers - 1), | ||||||
|  |                     } | ||||||
|  |                     if "app" not in serve_args: | ||||||
|  |                         serve_args["app"] = app | ||||||
|                     try: |                     try: | ||||||
|                         server_info.server = await serve( |                         server_info.server = await serve(**serve_args) | ||||||
|                             **server_info.settings, |  | ||||||
|                             run_async=True, |  | ||||||
|                             reuse_port=bool(primary.state.workers - 1), |  | ||||||
|                         ) |  | ||||||
|                     except OSError as e:  # no cov |                     except OSError as e:  # no cov | ||||||
|                         first_message = ( |                         first_message = ( | ||||||
|                             "An OSError was detected on startup. " |                             "An OSError was detected on startup. " | ||||||
|                             "The encountered error was: " |                             "The encountered error was: " | ||||||
|                         ) |                         ) | ||||||
|                         second_message = str(e) |                         second_message = str(e) | ||||||
|                         if sys.stdout.isatty(): |                         if is_atty(): | ||||||
|                             message_parts = [ |                             message_parts = [ | ||||||
|                                 Colors.YELLOW, |                                 Colors.YELLOW, | ||||||
|                                 first_message, |                                 first_message, | ||||||
| @@ -675,10 +1109,9 @@ class RunnerMixin(metaclass=SanicMeta): | |||||||
| 
 | 
 | ||||||
|     async def _run_server( |     async def _run_server( | ||||||
|         self, |         self, | ||||||
|         app: RunnerMixin, |         app: StartupMixin, | ||||||
|         server_info: ApplicationServerInfo, |         server_info: ApplicationServerInfo, | ||||||
|     ) -> None: |     ) -> None:  # no cov | ||||||
| 
 |  | ||||||
|         try: |         try: | ||||||
|             # We should never get to this point without a server |             # We should never get to this point without a server | ||||||
|             # This is primarily to keep mypy happy |             # This is primarily to keep mypy happy | ||||||
| @@ -701,3 +1134,26 @@ class RunnerMixin(metaclass=SanicMeta): | |||||||
|         finally: |         finally: | ||||||
|             server_info.stage = ServerStage.STOPPED |             server_info.stage = ServerStage.STOPPED | ||||||
|             server_info.server = None |             server_info.server = None | ||||||
|  | 
 | ||||||
|  |     @staticmethod | ||||||
|  |     def _cleanup_env_vars(): | ||||||
|  |         variables = ( | ||||||
|  |             "SANIC_RELOADER_PROCESS", | ||||||
|  |             "SANIC_IGNORE_PRODUCTION_WARNING", | ||||||
|  |             "SANIC_WORKER_NAME", | ||||||
|  |             "SANIC_MOTD_OUTPUT", | ||||||
|  |             "SANIC_WORKER_PROCESS", | ||||||
|  |             "SANIC_SERVER_RUNNING", | ||||||
|  |         ) | ||||||
|  |         for var in variables: | ||||||
|  |             try: | ||||||
|  |                 del os.environ[var] | ||||||
|  |             except KeyError: | ||||||
|  |                 ... | ||||||
|  | 
 | ||||||
|  |     @classmethod | ||||||
|  |     def _cleanup_apps(cls): | ||||||
|  |         for app in cls._app_registry.values(): | ||||||
|  |             app.state.server_info.clear() | ||||||
|  |             app.router.reset() | ||||||
|  |             app.signal_router.reset() | ||||||
							
								
								
									
										348
									
								
								sanic/mixins/static.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										348
									
								
								sanic/mixins/static.py
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,348 @@ | |||||||
|  | from email.utils import formatdate | ||||||
|  | from functools import partial, wraps | ||||||
|  | from mimetypes import guess_type | ||||||
|  | from os import PathLike, path | ||||||
|  | from pathlib import Path, PurePath | ||||||
|  | from typing import Optional, Sequence, Set, Union, cast | ||||||
|  | from urllib.parse import unquote | ||||||
|  |  | ||||||
|  | from sanic_routing.route import Route | ||||||
|  |  | ||||||
|  | from sanic.base.meta import SanicMeta | ||||||
|  | from sanic.compat import stat_async | ||||||
|  | from sanic.constants import DEFAULT_HTTP_CONTENT_TYPE | ||||||
|  | from sanic.exceptions import FileNotFound, HeaderNotFound, RangeNotSatisfiable | ||||||
|  | from sanic.handlers import ContentRangeHandler | ||||||
|  | from sanic.handlers.directory import DirectoryHandler | ||||||
|  | from sanic.log import deprecation, error_logger | ||||||
|  | from sanic.mixins.base import BaseMixin | ||||||
|  | from sanic.models.futures import FutureStatic | ||||||
|  | from sanic.request import Request | ||||||
|  | from sanic.response import HTTPResponse, file, file_stream, validate_file | ||||||
|  |  | ||||||
|  |  | ||||||
|  | class StaticMixin(BaseMixin, metaclass=SanicMeta): | ||||||
|  |     def __init__(self, *args, **kwargs) -> None: | ||||||
|  |         self._future_statics: Set[FutureStatic] = set() | ||||||
|  |  | ||||||
|  |     def _apply_static(self, static: FutureStatic) -> Route: | ||||||
|  |         raise NotImplementedError  # noqa | ||||||
|  |  | ||||||
|  |     def static( | ||||||
|  |         self, | ||||||
|  |         uri: str, | ||||||
|  |         file_or_directory: Union[PathLike, str, bytes], | ||||||
|  |         pattern: str = r"/?.+", | ||||||
|  |         use_modified_since: bool = True, | ||||||
|  |         use_content_range: bool = False, | ||||||
|  |         stream_large_files: Union[bool, int] = False, | ||||||
|  |         name: str = "static", | ||||||
|  |         host: Optional[str] = None, | ||||||
|  |         strict_slashes: Optional[bool] = None, | ||||||
|  |         content_type: Optional[str] = None, | ||||||
|  |         apply: bool = True, | ||||||
|  |         resource_type: Optional[str] = None, | ||||||
|  |         index: Optional[Union[str, Sequence[str]]] = None, | ||||||
|  |         directory_view: bool = False, | ||||||
|  |         directory_handler: Optional[DirectoryHandler] = None, | ||||||
|  |     ): | ||||||
|  |         """ | ||||||
|  |         Register a root to serve files from. The input can either be a | ||||||
|  |         file or a directory. This method will enable an easy and simple way | ||||||
|  |         to setup the :class:`Route` necessary to serve the static files. | ||||||
|  |  | ||||||
|  |         :param uri: URL path to be used for serving static content | ||||||
|  |         :param file_or_directory: Path for the Static file/directory with | ||||||
|  |             static files | ||||||
|  |         :param pattern: Regex Pattern identifying the valid static files | ||||||
|  |         :param use_modified_since: If true, send file modified time, and return | ||||||
|  |             not modified if the browser's matches the server's | ||||||
|  |         :param use_content_range: If true, process header for range requests | ||||||
|  |             and sends the file part that is requested | ||||||
|  |         :param stream_large_files: If true, use the | ||||||
|  |             :func:`StreamingHTTPResponse.file_stream` handler rather | ||||||
|  |             than the :func:`HTTPResponse.file` handler to send the file. | ||||||
|  |             If this is an integer, this represents the threshold size to | ||||||
|  |             switch to :func:`StreamingHTTPResponse.file_stream` | ||||||
|  |         :param name: user defined name used for url_for | ||||||
|  |         :param host: Host IP or FQDN for the service to use | ||||||
|  |         :param strict_slashes: Instruct :class:`Sanic` to check if the request | ||||||
|  |             URLs need to terminate with a */* | ||||||
|  |         :param content_type: user defined content type for header | ||||||
|  |         :param apply: If true, will register the route immediately | ||||||
|  |         :param resource_type: Explicitly declare a resource to be a " | ||||||
|  |             file" or a "dir" | ||||||
|  |         :param index: When exposing against a directory, index is the name that | ||||||
|  |             will be served as the default file. When multiple files names are | ||||||
|  |             passed, then they will be tried in order. | ||||||
|  |         :param directory_view: Whether to fallback to showing the directory | ||||||
|  |             viewer when exposing a directory | ||||||
|  |         :param directory_handler: An instance of :class:`DirectoryHandler` | ||||||
|  |             that can be used for explicitly controlling and subclassing the | ||||||
|  |             behavior of the default directory handler | ||||||
|  |         :return: routes registered on the router | ||||||
|  |         :rtype: List[sanic.router.Route] | ||||||
|  |         """ | ||||||
|  |  | ||||||
|  |         name = self._generate_name(name) | ||||||
|  |  | ||||||
|  |         if strict_slashes is None and self.strict_slashes is not None: | ||||||
|  |             strict_slashes = self.strict_slashes | ||||||
|  |  | ||||||
|  |         if not isinstance(file_or_directory, (str, bytes, PurePath)): | ||||||
|  |             raise ValueError( | ||||||
|  |                 f"Static route must be a valid path, not {file_or_directory}" | ||||||
|  |             ) | ||||||
|  |  | ||||||
|  |         if isinstance(file_or_directory, bytes): | ||||||
|  |             deprecation( | ||||||
|  |                 "Serving a static directory with a bytes string is " | ||||||
|  |                 "deprecated and will be removed in v22.9.", | ||||||
|  |                 22.9, | ||||||
|  |             ) | ||||||
|  |             file_or_directory = cast(str, file_or_directory.decode()) | ||||||
|  |         file_or_directory = Path(file_or_directory) | ||||||
|  |  | ||||||
|  |         if directory_handler and (directory_view or index): | ||||||
|  |             raise ValueError( | ||||||
|  |                 "When explicitly setting directory_handler, you cannot " | ||||||
|  |                 "set either directory_view or index. Instead, pass " | ||||||
|  |                 "these arguments to your DirectoryHandler instance." | ||||||
|  |             ) | ||||||
|  |  | ||||||
|  |         if not directory_handler: | ||||||
|  |             directory_handler = DirectoryHandler( | ||||||
|  |                 uri=uri, | ||||||
|  |                 directory=file_or_directory, | ||||||
|  |                 directory_view=directory_view, | ||||||
|  |                 index=index, | ||||||
|  |             ) | ||||||
|  |  | ||||||
|  |         static = FutureStatic( | ||||||
|  |             uri, | ||||||
|  |             file_or_directory, | ||||||
|  |             pattern, | ||||||
|  |             use_modified_since, | ||||||
|  |             use_content_range, | ||||||
|  |             stream_large_files, | ||||||
|  |             name, | ||||||
|  |             host, | ||||||
|  |             strict_slashes, | ||||||
|  |             content_type, | ||||||
|  |             resource_type, | ||||||
|  |             directory_handler, | ||||||
|  |         ) | ||||||
|  |         self._future_statics.add(static) | ||||||
|  |  | ||||||
|  |         if apply: | ||||||
|  |             self._apply_static(static) | ||||||
|  |  | ||||||
|  |  | ||||||
|  | class StaticHandleMixin(metaclass=SanicMeta): | ||||||
|  |     def _apply_static(self, static: FutureStatic) -> Route: | ||||||
|  |         return self._register_static(static) | ||||||
|  |  | ||||||
|  |     def _register_static( | ||||||
|  |         self, | ||||||
|  |         static: FutureStatic, | ||||||
|  |     ): | ||||||
|  |         # TODO: Though sanic is not a file server, I feel like we should | ||||||
|  |         # at least make a good effort here.  Modified-since is nice, but | ||||||
|  |         # we could also look into etags, expires, and caching | ||||||
|  |         """ | ||||||
|  |         Register a static directory handler with Sanic by adding a route to the | ||||||
|  |         router and registering a handler. | ||||||
|  |         """ | ||||||
|  |  | ||||||
|  |         if isinstance(static.file_or_directory, bytes): | ||||||
|  |             file_or_directory = static.file_or_directory.decode("utf-8") | ||||||
|  |         elif isinstance(static.file_or_directory, PurePath): | ||||||
|  |             file_or_directory = str(static.file_or_directory) | ||||||
|  |         elif not isinstance(static.file_or_directory, str): | ||||||
|  |             raise ValueError("Invalid file path string.") | ||||||
|  |         else: | ||||||
|  |             file_or_directory = static.file_or_directory | ||||||
|  |  | ||||||
|  |         uri = static.uri | ||||||
|  |         name = static.name | ||||||
|  |         # If we're not trying to match a file directly, | ||||||
|  |         # serve from the folder | ||||||
|  |         if not static.resource_type: | ||||||
|  |             if not path.isfile(file_or_directory): | ||||||
|  |                 uri = uri.rstrip("/") | ||||||
|  |                 uri += "/<__file_uri__:path>" | ||||||
|  |         elif static.resource_type == "dir": | ||||||
|  |             if path.isfile(file_or_directory): | ||||||
|  |                 raise TypeError( | ||||||
|  |                     "Resource type improperly identified as directory. " | ||||||
|  |                     f"'{file_or_directory}'" | ||||||
|  |                 ) | ||||||
|  |             uri = uri.rstrip("/") | ||||||
|  |             uri += "/<__file_uri__:path>" | ||||||
|  |         elif static.resource_type == "file" and not path.isfile( | ||||||
|  |             file_or_directory | ||||||
|  |         ): | ||||||
|  |             raise TypeError( | ||||||
|  |                 "Resource type improperly identified as file. " | ||||||
|  |                 f"'{file_or_directory}'" | ||||||
|  |             ) | ||||||
|  |         elif static.resource_type != "file": | ||||||
|  |             raise ValueError( | ||||||
|  |                 "The resource_type should be set to 'file' or 'dir'" | ||||||
|  |             ) | ||||||
|  |  | ||||||
|  |         # special prefix for static files | ||||||
|  |         # if not static.name.startswith("_static_"): | ||||||
|  |         #     name = f"_static_{static.name}" | ||||||
|  |  | ||||||
|  |         _handler = wraps(self._static_request_handler)( | ||||||
|  |             partial( | ||||||
|  |                 self._static_request_handler, | ||||||
|  |                 file_or_directory=file_or_directory, | ||||||
|  |                 use_modified_since=static.use_modified_since, | ||||||
|  |                 use_content_range=static.use_content_range, | ||||||
|  |                 stream_large_files=static.stream_large_files, | ||||||
|  |                 content_type=static.content_type, | ||||||
|  |                 directory_handler=static.directory_handler, | ||||||
|  |             ) | ||||||
|  |         ) | ||||||
|  |  | ||||||
|  |         route, _ = self.route(  # type: ignore | ||||||
|  |             uri=uri, | ||||||
|  |             methods=["GET", "HEAD"], | ||||||
|  |             name=name, | ||||||
|  |             host=static.host, | ||||||
|  |             strict_slashes=static.strict_slashes, | ||||||
|  |             static=True, | ||||||
|  |         )(_handler) | ||||||
|  |  | ||||||
|  |         return route | ||||||
|  |  | ||||||
|  |     async def _static_request_handler( | ||||||
|  |         self, | ||||||
|  |         request: Request, | ||||||
|  |         *, | ||||||
|  |         file_or_directory: PathLike, | ||||||
|  |         use_modified_since: bool, | ||||||
|  |         use_content_range: bool, | ||||||
|  |         stream_large_files: Union[bool, int], | ||||||
|  |         directory_handler: DirectoryHandler, | ||||||
|  |         content_type: Optional[str] = None, | ||||||
|  |         __file_uri__: Optional[str] = None, | ||||||
|  |     ): | ||||||
|  |         not_found = FileNotFound( | ||||||
|  |             "File not found", | ||||||
|  |             path=file_or_directory, | ||||||
|  |             relative_url=__file_uri__, | ||||||
|  |         ) | ||||||
|  |  | ||||||
|  |         # Merge served directory and requested file if provided | ||||||
|  |         file_path = await self._get_file_path( | ||||||
|  |             file_or_directory, __file_uri__, not_found | ||||||
|  |         ) | ||||||
|  |  | ||||||
|  |         try: | ||||||
|  |             headers = {} | ||||||
|  |             # Check if the client has been sent this file before | ||||||
|  |             # and it has not been modified since | ||||||
|  |             stats = None | ||||||
|  |             if use_modified_since: | ||||||
|  |                 stats = await stat_async(file_path) | ||||||
|  |                 modified_since = stats.st_mtime | ||||||
|  |                 response = await validate_file(request.headers, modified_since) | ||||||
|  |                 if response: | ||||||
|  |                     return response | ||||||
|  |                 headers["Last-Modified"] = formatdate( | ||||||
|  |                     modified_since, usegmt=True | ||||||
|  |                 ) | ||||||
|  |             _range = None | ||||||
|  |             if use_content_range: | ||||||
|  |                 _range = None | ||||||
|  |                 if not stats: | ||||||
|  |                     stats = await stat_async(file_path) | ||||||
|  |                 headers["Accept-Ranges"] = "bytes" | ||||||
|  |                 headers["Content-Length"] = str(stats.st_size) | ||||||
|  |                 if request.method != "HEAD": | ||||||
|  |                     try: | ||||||
|  |                         _range = ContentRangeHandler(request, stats) | ||||||
|  |                     except HeaderNotFound: | ||||||
|  |                         pass | ||||||
|  |                     else: | ||||||
|  |                         del headers["Content-Length"] | ||||||
|  |                         headers.update(_range.headers) | ||||||
|  |  | ||||||
|  |             if "content-type" not in headers: | ||||||
|  |                 content_type = ( | ||||||
|  |                     content_type | ||||||
|  |                     or guess_type(file_path)[0] | ||||||
|  |                     or DEFAULT_HTTP_CONTENT_TYPE | ||||||
|  |                 ) | ||||||
|  |  | ||||||
|  |                 if "charset=" not in content_type and ( | ||||||
|  |                     content_type.startswith("text/") | ||||||
|  |                     or content_type == "application/javascript" | ||||||
|  |                 ): | ||||||
|  |                     content_type += "; charset=utf-8" | ||||||
|  |  | ||||||
|  |                 headers["Content-Type"] = content_type | ||||||
|  |  | ||||||
|  |             if request.method == "HEAD": | ||||||
|  |                 return HTTPResponse(headers=headers) | ||||||
|  |             else: | ||||||
|  |                 if stream_large_files: | ||||||
|  |                     if isinstance(stream_large_files, bool): | ||||||
|  |                         threshold = 1024 * 1024 | ||||||
|  |                     else: | ||||||
|  |                         threshold = stream_large_files | ||||||
|  |  | ||||||
|  |                     if not stats: | ||||||
|  |                         stats = await stat_async(file_path) | ||||||
|  |                     if stats.st_size >= threshold: | ||||||
|  |                         return await file_stream( | ||||||
|  |                             file_path, headers=headers, _range=_range | ||||||
|  |                         ) | ||||||
|  |                 return await file(file_path, headers=headers, _range=_range) | ||||||
|  |         except (IsADirectoryError, PermissionError): | ||||||
|  |             return await directory_handler.handle(request, request.path) | ||||||
|  |         except RangeNotSatisfiable: | ||||||
|  |             raise | ||||||
|  |         except FileNotFoundError: | ||||||
|  |             raise not_found | ||||||
|  |         except Exception: | ||||||
|  |             error_logger.exception( | ||||||
|  |                 "Exception in static request handler: " | ||||||
|  |                 f"path={file_or_directory}, " | ||||||
|  |                 f"relative_url={__file_uri__}" | ||||||
|  |             ) | ||||||
|  |             raise | ||||||
|  |  | ||||||
|  |     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 | ||||||
| @@ -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 | ||||||
|  |  | ||||||
|  |  | ||||||
| @@ -56,7 +57,7 @@ class MockProtocol:  # no cov | |||||||
|         await self._not_paused.wait() |         await self._not_paused.wait() | ||||||
|  |  | ||||||
|  |  | ||||||
| class MockTransport:  # no cov | class MockTransport(TransportProtocol):  # no cov | ||||||
|     _protocol: Optional[MockProtocol] |     _protocol: Optional[MockProtocol] | ||||||
|  |  | ||||||
|     def __init__( |     def __init__( | ||||||
| @@ -68,23 +69,25 @@ class MockTransport:  # no cov | |||||||
|         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,6 +1,7 @@ | |||||||
| from pathlib import PurePath | from pathlib import Path | ||||||
| from typing import Dict, Iterable, List, NamedTuple, Optional, Union | from typing import Dict, Iterable, List, NamedTuple, Optional, Union | ||||||
|  |  | ||||||
|  | from sanic.handlers.directory import DirectoryHandler | ||||||
| from sanic.models.handler_types import ( | from sanic.models.handler_types import ( | ||||||
|     ErrorMiddlewareType, |     ErrorMiddlewareType, | ||||||
|     ListenerType, |     ListenerType, | ||||||
| @@ -46,16 +47,17 @@ class FutureException(NamedTuple): | |||||||
|  |  | ||||||
| class FutureStatic(NamedTuple): | class FutureStatic(NamedTuple): | ||||||
|     uri: str |     uri: str | ||||||
|     file_or_directory: Union[str, bytes, PurePath] |     file_or_directory: Path | ||||||
|     pattern: str |     pattern: str | ||||||
|     use_modified_since: bool |     use_modified_since: bool | ||||||
|     use_content_range: bool |     use_content_range: bool | ||||||
|     stream_large_files: bool |     stream_large_files: Union[bool, int] | ||||||
|     name: str |     name: str | ||||||
|     host: Optional[str] |     host: Optional[str] | ||||||
|     strict_slashes: Optional[bool] |     strict_slashes: Optional[bool] | ||||||
|     content_type: Optional[bool] |     content_type: Optional[str] | ||||||
|     resource_type: Optional[str] |     resource_type: Optional[str] | ||||||
|  |     directory_handler: DirectoryHandler | ||||||
|  |  | ||||||
|  |  | ||||||
| class FutureSignal(NamedTuple): | class FutureSignal(NamedTuple): | ||||||
|   | |||||||
| @@ -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,8 +1,8 @@ | |||||||
| from __future__ import annotations | from __future__ import annotations | ||||||
|  |  | ||||||
| from ssl import SSLObject | 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 | ||||||
|  |  | ||||||
| @@ -21,6 +21,7 @@ class ConnInfo: | |||||||
|         "client", |         "client", | ||||||
|         "client_ip", |         "client_ip", | ||||||
|         "ctx", |         "ctx", | ||||||
|  |         "lost", | ||||||
|         "peername", |         "peername", | ||||||
|         "server_port", |         "server_port", | ||||||
|         "server", |         "server", | ||||||
| @@ -28,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 | ||||||
| @@ -40,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]}]" | ||||||
| @@ -59,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]}]" | ||||||
|   | |||||||
							
								
								
									
										0
									
								
								sanic/pages/__init__.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								sanic/pages/__init__.py
									
									
									
									
									
										Normal file
									
								
							
							
								
								
									
										70
									
								
								sanic/pages/base.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										70
									
								
								sanic/pages/base.py
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,70 @@ | |||||||
|  | from abc import ABC, abstractmethod | ||||||
|  |  | ||||||
|  | from html5tagger import HTML, Builder, Document | ||||||
|  |  | ||||||
|  | from sanic import __version__ as VERSION | ||||||
|  | from sanic.application.logo import SVG_LOGO_SIMPLE | ||||||
|  | from sanic.pages.css import CSS | ||||||
|  |  | ||||||
|  |  | ||||||
|  | class BasePage(ABC, metaclass=CSS):  # no cov | ||||||
|  |     TITLE = "Sanic" | ||||||
|  |     HEADING = None | ||||||
|  |     CSS: str | ||||||
|  |     doc: Builder | ||||||
|  |  | ||||||
|  |     def __init__(self, debug: bool = True) -> None: | ||||||
|  |         self.debug = debug | ||||||
|  |  | ||||||
|  |     @property | ||||||
|  |     def style(self) -> str: | ||||||
|  |         return self.CSS | ||||||
|  |  | ||||||
|  |     def render(self) -> str: | ||||||
|  |         self.doc = Document(self.TITLE, lang="en", id="sanic") | ||||||
|  |         self._head() | ||||||
|  |         self._body() | ||||||
|  |         self._foot() | ||||||
|  |         return str(self.doc) | ||||||
|  |  | ||||||
|  |     def _head(self) -> None: | ||||||
|  |         self.doc.style(HTML(self.style)) | ||||||
|  |         with self.doc.header: | ||||||
|  |             self.doc.div(self.HEADING or self.TITLE) | ||||||
|  |  | ||||||
|  |     def _foot(self) -> None: | ||||||
|  |         with self.doc.footer: | ||||||
|  |             self.doc.div("powered by") | ||||||
|  |             with self.doc.div: | ||||||
|  |                 self._sanic_logo() | ||||||
|  |             if self.debug: | ||||||
|  |                 self.doc.div(f"Version {VERSION}") | ||||||
|  |                 with self.doc.div: | ||||||
|  |                     for idx, (title, href) in enumerate( | ||||||
|  |                         ( | ||||||
|  |                             ("Docs", "https://sanic.dev"), | ||||||
|  |                             ("Help", "https://sanic.dev/en/help.html"), | ||||||
|  |                             ("GitHub", "https://github.com/sanic-org/sanic"), | ||||||
|  |                         ) | ||||||
|  |                     ): | ||||||
|  |                         if idx > 0: | ||||||
|  |                             self.doc(" | ") | ||||||
|  |                         self.doc.a( | ||||||
|  |                             title, | ||||||
|  |                             href=href, | ||||||
|  |                             target="_blank", | ||||||
|  |                             referrerpolicy="no-referrer", | ||||||
|  |                         ) | ||||||
|  |                 self.doc.div("DEBUG mode") | ||||||
|  |  | ||||||
|  |     @abstractmethod | ||||||
|  |     def _body(self) -> None: | ||||||
|  |         ... | ||||||
|  |  | ||||||
|  |     def _sanic_logo(self) -> None: | ||||||
|  |         self.doc.a( | ||||||
|  |             HTML(SVG_LOGO_SIMPLE), | ||||||
|  |             href="https://sanic.dev", | ||||||
|  |             target="_blank", | ||||||
|  |             referrerpolicy="no-referrer", | ||||||
|  |         ) | ||||||
							
								
								
									
										35
									
								
								sanic/pages/css.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										35
									
								
								sanic/pages/css.py
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,35 @@ | |||||||
|  | from abc import ABCMeta | ||||||
|  | from pathlib import Path | ||||||
|  | from typing import Optional | ||||||
|  |  | ||||||
|  |  | ||||||
|  | CURRENT_DIR = Path(__file__).parent | ||||||
|  |  | ||||||
|  |  | ||||||
|  | def _extract_style(maybe_style: Optional[str], name: str) -> str: | ||||||
|  |     if maybe_style is not None: | ||||||
|  |         maybe_path = Path(maybe_style) | ||||||
|  |         if maybe_path.exists(): | ||||||
|  |             return maybe_path.read_text(encoding="UTF-8") | ||||||
|  |         return maybe_style | ||||||
|  |     maybe_path = CURRENT_DIR / "styles" / f"{name}.css" | ||||||
|  |     if maybe_path.exists(): | ||||||
|  |         return maybe_path.read_text(encoding="UTF-8") | ||||||
|  |     return "" | ||||||
|  |  | ||||||
|  |  | ||||||
|  | class CSS(ABCMeta): | ||||||
|  |     """Cascade stylesheets, i.e. combine all ancestor styles""" | ||||||
|  |  | ||||||
|  |     def __new__(cls, name, bases, attrs): | ||||||
|  |         Page = super().__new__(cls, name, bases, attrs) | ||||||
|  |         # Use a locally defined STYLE or the one from styles directory | ||||||
|  |         Page.STYLE = _extract_style(attrs.get("STYLE_FILE"), name) | ||||||
|  |         Page.STYLE += attrs.get("STYLE_APPEND", "") | ||||||
|  |         # Combine with all ancestor styles | ||||||
|  |         Page.CSS = "".join( | ||||||
|  |             Class.STYLE | ||||||
|  |             for Class in reversed(Page.__mro__) | ||||||
|  |             if type(Class) is CSS | ||||||
|  |         ) | ||||||
|  |         return Page | ||||||
							
								
								
									
										66
									
								
								sanic/pages/directory_page.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										66
									
								
								sanic/pages/directory_page.py
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,66 @@ | |||||||
|  | import sys | ||||||
|  |  | ||||||
|  | from typing import Dict, Iterable | ||||||
|  |  | ||||||
|  | from html5tagger import E | ||||||
|  |  | ||||||
|  | from .base import BasePage | ||||||
|  |  | ||||||
|  |  | ||||||
|  | if sys.version_info < (3, 8):  # no cov | ||||||
|  |     FileInfo = Dict | ||||||
|  |  | ||||||
|  | else: | ||||||
|  |     from typing import TypedDict | ||||||
|  |  | ||||||
|  |     class FileInfo(TypedDict): | ||||||
|  |         icon: str | ||||||
|  |         file_name: str | ||||||
|  |         file_access: str | ||||||
|  |         file_size: str | ||||||
|  |  | ||||||
|  |  | ||||||
|  | class DirectoryPage(BasePage):  # no cov | ||||||
|  |     TITLE = "Directory Viewer" | ||||||
|  |  | ||||||
|  |     def __init__( | ||||||
|  |         self, files: Iterable[FileInfo], url: str, debug: bool | ||||||
|  |     ) -> None: | ||||||
|  |         super().__init__(debug) | ||||||
|  |         self.files = files | ||||||
|  |         self.url = url | ||||||
|  |  | ||||||
|  |     def _body(self) -> None: | ||||||
|  |         with self.doc.main: | ||||||
|  |             self._headline() | ||||||
|  |             files = list(self.files) | ||||||
|  |             if files: | ||||||
|  |                 self._file_table(files) | ||||||
|  |             else: | ||||||
|  |                 self.doc.p("The folder is empty.") | ||||||
|  |  | ||||||
|  |     def _headline(self): | ||||||
|  |         """Implement a heading with the current path, combined with | ||||||
|  |         breadcrumb links""" | ||||||
|  |         with self.doc.h1(id="breadcrumbs"): | ||||||
|  |             p = self.url.split("/")[:-1] | ||||||
|  |  | ||||||
|  |             for i, part in enumerate(p): | ||||||
|  |                 path = "/".join(p[: i + 1]) + "/" | ||||||
|  |                 with self.doc.a(href=path): | ||||||
|  |                     self.doc.span(part, class_="dir").span("/", class_="sep") | ||||||
|  |  | ||||||
|  |     def _file_table(self, files: Iterable[FileInfo]): | ||||||
|  |         with self.doc.table(class_="autoindex container"): | ||||||
|  |             for f in files: | ||||||
|  |                 self._file_row(**f) | ||||||
|  |  | ||||||
|  |     def _file_row( | ||||||
|  |         self, | ||||||
|  |         icon: str, | ||||||
|  |         file_name: str, | ||||||
|  |         file_access: str, | ||||||
|  |         file_size: str, | ||||||
|  |     ): | ||||||
|  |         first = E.span(icon, class_="icon").a(file_name, href=file_name) | ||||||
|  |         self.doc.tr.td(first).td(file_size).td(file_access) | ||||||
							
								
								
									
										109
									
								
								sanic/pages/error.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										109
									
								
								sanic/pages/error.py
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,109 @@ | |||||||
|  | from typing import Any, Mapping | ||||||
|  |  | ||||||
|  | import tracerite.html | ||||||
|  |  | ||||||
|  | from html5tagger import E | ||||||
|  | from tracerite import html_traceback, inspector | ||||||
|  |  | ||||||
|  | from sanic.request import Request | ||||||
|  |  | ||||||
|  | from .base import BasePage | ||||||
|  |  | ||||||
|  |  | ||||||
|  | # Avoid showing the request in the traceback variable inspectors | ||||||
|  | inspector.blacklist_types += (Request,) | ||||||
|  |  | ||||||
|  | ENDUSER_TEXT = """\ | ||||||
|  | We're sorry, but it looks like something went wrong. Please try refreshing \ | ||||||
|  | the page or navigating back to the homepage. If the issue persists, our \ | ||||||
|  | technical team is working to resolve it as soon as possible. We apologize \ | ||||||
|  | for the inconvenience and appreciate your patience.\ | ||||||
|  | """ | ||||||
|  |  | ||||||
|  |  | ||||||
|  | class ErrorPage(BasePage): | ||||||
|  |     STYLE_APPEND = tracerite.html.style | ||||||
|  |  | ||||||
|  |     def __init__( | ||||||
|  |         self, | ||||||
|  |         debug: bool, | ||||||
|  |         title: str, | ||||||
|  |         text: str, | ||||||
|  |         request: Request, | ||||||
|  |         exc: Exception, | ||||||
|  |     ) -> None: | ||||||
|  |         super().__init__(debug) | ||||||
|  |         name = request.app.name.replace("_", " ").strip() | ||||||
|  |         if name.islower(): | ||||||
|  |             name = name.title() | ||||||
|  |         self.TITLE = f"Application {name} cannot handle your request" | ||||||
|  |         self.HEADING = E("Application ").strong(name)( | ||||||
|  |             " cannot handle your request" | ||||||
|  |         ) | ||||||
|  |         self.title = title | ||||||
|  |         self.text = text | ||||||
|  |         self.request = request | ||||||
|  |         self.exc = exc | ||||||
|  |         self.details_open = not getattr(exc, "quiet", False) | ||||||
|  |  | ||||||
|  |     def _head(self) -> None: | ||||||
|  |         self.doc._script(tracerite.html.javascript) | ||||||
|  |         super()._head() | ||||||
|  |  | ||||||
|  |     def _body(self) -> None: | ||||||
|  |         debug = self.request.app.debug | ||||||
|  |         route_name = self.request.name or "[route not found]" | ||||||
|  |         with self.doc.main: | ||||||
|  |             self.doc.h1(f"⚠️ {self.title}").p(self.text) | ||||||
|  |             # Show context details if available on the exception | ||||||
|  |             context = getattr(self.exc, "context", None) | ||||||
|  |             if context: | ||||||
|  |                 self._key_value_table( | ||||||
|  |                     "Issue context", "exception-context", context | ||||||
|  |                 ) | ||||||
|  |  | ||||||
|  |             if not debug: | ||||||
|  |                 with self.doc.div(id="enduser"): | ||||||
|  |                     self.doc.p(ENDUSER_TEXT).p.a("Front Page", href="/") | ||||||
|  |                 return | ||||||
|  |             # Show additional details in debug mode, | ||||||
|  |             # open by default for 500 errors | ||||||
|  |             with self.doc.details(open=self.details_open, class_="smalltext"): | ||||||
|  |                 # Show extra details if available on the exception | ||||||
|  |                 extra = getattr(self.exc, "extra", None) | ||||||
|  |                 if extra: | ||||||
|  |                     self._key_value_table( | ||||||
|  |                         "Issue extra data", "exception-extra", extra | ||||||
|  |                     ) | ||||||
|  |  | ||||||
|  |                 self.doc.summary( | ||||||
|  |                     "Details for developers (Sanic debug mode only)" | ||||||
|  |                 ) | ||||||
|  |                 if self.exc: | ||||||
|  |                     with self.doc.div(class_="exception-wrapper"): | ||||||
|  |                         self.doc.h2(f"Exception in {route_name}:") | ||||||
|  |                         self.doc( | ||||||
|  |                             html_traceback(self.exc, include_js_css=False) | ||||||
|  |                         ) | ||||||
|  |  | ||||||
|  |                 self._key_value_table( | ||||||
|  |                     f"{self.request.method} {self.request.path}", | ||||||
|  |                     "request-headers", | ||||||
|  |                     self.request.headers, | ||||||
|  |                 ) | ||||||
|  |  | ||||||
|  |     def _key_value_table( | ||||||
|  |         self, title: str, table_id: str, data: Mapping[str, Any] | ||||||
|  |     ) -> None: | ||||||
|  |         with self.doc.div(class_="key-value-display"): | ||||||
|  |             self.doc.h2(title) | ||||||
|  |             with self.doc.dl(id=table_id, class_="key-value-table smalltext"): | ||||||
|  |                 for key, value in data.items(): | ||||||
|  |                     # Reading values may cause a new exception, so suppress it | ||||||
|  |                     try: | ||||||
|  |                         value = str(value) | ||||||
|  |                     except Exception: | ||||||
|  |                         value = E.em("Unable to display value") | ||||||
|  |                     self.doc.dt.span(key, class_="nobr key").span(": ").dd( | ||||||
|  |                         value | ||||||
|  |                     ) | ||||||
							
								
								
									
										146
									
								
								sanic/pages/styles/BasePage.css
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										146
									
								
								sanic/pages/styles/BasePage.css
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,146 @@ | |||||||
|  | /** BasePage **/ | ||||||
|  |  | ||||||
|  | :root { | ||||||
|  |     --sanic: #ff0d68; | ||||||
|  |     --sanic-yellow: #FFE900; | ||||||
|  |     --sanic-background: #efeced; | ||||||
|  |     --sanic-text: #121010; | ||||||
|  |     --sanic-text-lighter: #756169; | ||||||
|  |     --sanic-link: #ff0d68; | ||||||
|  |     --sanic-block-background: #f7f4f6; | ||||||
|  |     --sanic-block-text: #000; | ||||||
|  |     --sanic-block-alt-text: #6b6468; | ||||||
|  |     --sanic-header-background: #272325; | ||||||
|  |     --sanic-header-border: #fff; | ||||||
|  |     --sanic-header-text: #fff; | ||||||
|  |     --sanic-highlight-background: var(--sanic-yellow); | ||||||
|  |     --sanic-highlight-text: var(--sanic-text); | ||||||
|  |     --sanic-tab-background: #f7f4f6; | ||||||
|  |     --sanic-tab-shadow: #f7f6f6; | ||||||
|  |     --sanic-tab-text: #222021; | ||||||
|  |     --sanic-tracerite-var: var(--sanic-text); | ||||||
|  |     --sanic-tracerite-val: #ff0d68; | ||||||
|  |     --sanic-tracerite-type: #6d6a6b; | ||||||
|  | } | ||||||
|  |  | ||||||
|  |  | ||||||
|  | @media (prefers-color-scheme: dark) { | ||||||
|  |     :root { | ||||||
|  |         --sanic-text: #f7f4f6; | ||||||
|  |         --sanic-background: #121010; | ||||||
|  |         --sanic-block-background: #0f0d0e; | ||||||
|  |         --sanic-block-text: #f7f4f6; | ||||||
|  |         --sanic-header-background: #030203; | ||||||
|  |         --sanic-header-border: #000; | ||||||
|  |         --sanic-highlight-text: var(--sanic-background); | ||||||
|  |         --sanic-tab-background: #292728; | ||||||
|  |         --sanic-tab-shadow: #0f0d0e; | ||||||
|  |         --sanic-tab-text: #aea7ab; | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | html { | ||||||
|  |     font: 16px sans-serif; | ||||||
|  |     background: var(--sanic-background); | ||||||
|  |     color: var(--sanic-text); | ||||||
|  |     scrollbar-gutter: stable; | ||||||
|  |     overflow: hidden auto; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | body { | ||||||
|  |     margin: 0; | ||||||
|  |     font-size: 1.25rem; | ||||||
|  |     line-height: 125%; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | body>* { | ||||||
|  |     padding: 1rem 2vw; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | @media (max-width: 1000px) { | ||||||
|  |     body>* { | ||||||
|  |         padding: 0.5rem 1.5vw; | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     html { | ||||||
|  |         /* Scale everything by rem of 6px-16px by viewport width */ | ||||||
|  |         font-size: calc(6px + 10 * 100vw / 1000); | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | main { | ||||||
|  |     /* Make sure the footer is closer to bottom */ | ||||||
|  |     min-height: 70vh; | ||||||
|  |     /* Generous padding for readability */ | ||||||
|  |     padding: 1rem 2.5rem; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .smalltext { | ||||||
|  |     font-size: 1.0rem; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .container { | ||||||
|  |     min-width: 600px; | ||||||
|  |     max-width: 1600px; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | header { | ||||||
|  |     background: var(--sanic-header-background); | ||||||
|  |     color: var(--sanic-header-text); | ||||||
|  |     border-bottom: 1px solid var(--sanic-header-border); | ||||||
|  |     text-align: center; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | footer { | ||||||
|  |     text-align: center; | ||||||
|  |     display: flex; | ||||||
|  |     flex-direction: column; | ||||||
|  |     font-size: 0.8rem; | ||||||
|  |     margin: 2rem; | ||||||
|  |     line-height: 1.5em; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | h1 { | ||||||
|  |     text-align: left; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | a { | ||||||
|  |     text-decoration: none; | ||||||
|  |     color: var(--sanic-link); | ||||||
|  | } | ||||||
|  |  | ||||||
|  | a:hover, | ||||||
|  | a:focus { | ||||||
|  |     text-decoration: underline; | ||||||
|  |     outline: none; | ||||||
|  | } | ||||||
|  |  | ||||||
|  |  | ||||||
|  | span.icon { | ||||||
|  |     margin-right: 1rem; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | #logo-simple { | ||||||
|  |     height: 1.75rem; | ||||||
|  |     padding: 0 0.25rem; | ||||||
|  | } | ||||||
|  |  | ||||||
|  |  | ||||||
|  | @media (prefers-color-scheme: dark) { | ||||||
|  |     #logo-simple path:last-child { | ||||||
|  |         fill: #e1e1e1; | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | #sanic pre, | ||||||
|  | #sanic code { | ||||||
|  |     font-family: "Fira Code", | ||||||
|  |         "Source Code Pro", | ||||||
|  |         Menlo, | ||||||
|  |         Meslo, | ||||||
|  |         Monaco, | ||||||
|  |         Consolas, | ||||||
|  |         Lucida Console, | ||||||
|  |         monospace; | ||||||
|  |     font-size: 0.8rem; | ||||||
|  | } | ||||||
							
								
								
									
										63
									
								
								sanic/pages/styles/DirectoryPage.css
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										63
									
								
								sanic/pages/styles/DirectoryPage.css
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,63 @@ | |||||||
|  | /** DirectoryPage **/ | ||||||
|  | #breadcrumbs>a:hover { | ||||||
|  |     text-decoration: none; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | #breadcrumbs>a .dir { | ||||||
|  |     padding: 0 0.25em; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | #breadcrumbs>a:first-child:hover::before, | ||||||
|  | #breadcrumbs>a .dir:hover { | ||||||
|  |     text-decoration: underline; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | #breadcrumbs>a:first-child::before { | ||||||
|  |     content: "🏠"; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | #breadcrumbs>a:last-child { | ||||||
|  |     color: #ff0d68; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | main a { | ||||||
|  |     color: inherit; | ||||||
|  |     font-weight: bold; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table.autoindex { | ||||||
|  |     width: 100%; | ||||||
|  |     font-family: monospace; | ||||||
|  |     font-size: 1.25rem; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table.autoindex tr { | ||||||
|  |     display: flex; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table.autoindex tr:hover { | ||||||
|  |     background-color: #ddd; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table.autoindex td { | ||||||
|  |     margin: 0 0.5rem; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table.autoindex td:first-child { | ||||||
|  |     flex: 1; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table.autoindex td:nth-child(2) { | ||||||
|  |     text-align: right; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | table.autoindex td:last-child { | ||||||
|  |     text-align: right; | ||||||
|  | } | ||||||
|  |  | ||||||
|  |  | ||||||
|  | @media (prefers-color-scheme: dark) { | ||||||
|  |     table.autoindex tr:hover { | ||||||
|  |         background-color: #222; | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										108
									
								
								sanic/pages/styles/ErrorPage.css
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										108
									
								
								sanic/pages/styles/ErrorPage.css
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,108 @@ | |||||||
|  | /** ErrorPage **/ | ||||||
|  | #enduser { | ||||||
|  |     max-width: 30em; | ||||||
|  |     margin: 5em auto 5em auto; | ||||||
|  |     text-align: justify; | ||||||
|  |     /*text-justify: both;*/ | ||||||
|  | } | ||||||
|  |  | ||||||
|  | #enduser a { | ||||||
|  |     color: var(--sanic-blue); | ||||||
|  | } | ||||||
|  |  | ||||||
|  | #enduser p:last-child { | ||||||
|  |     text-align: right; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | summary { | ||||||
|  |     margin-top: 3em; | ||||||
|  |     color: var(--sanic-text-lighter); | ||||||
|  |     cursor: pointer; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .tracerite { | ||||||
|  |     --tracerite-var: var(--sanic-tracerite-var); | ||||||
|  |     --tracerite-val: var(--sanic-tracerite-val); | ||||||
|  |     --tracerite-type: var(--sanic-tracerite-type); | ||||||
|  |     --tracerite-exception: var(--sanic); | ||||||
|  |     --tracerite-highlight: var(--sanic-yellow); | ||||||
|  |     --tracerite-tab: var(--sanic-tab-background); | ||||||
|  |     --tracerite-tab-text: var(--sanic-tab-text); | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .tracerite>h3 { | ||||||
|  |     margin: 0.5rem 0 !important; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | #sanic .tracerite .traceback-labels button { | ||||||
|  |     font-size: 0.8rem; | ||||||
|  |     line-height: 120%; | ||||||
|  |     background: var(--tracerite-tab); | ||||||
|  |     color: var(--tracerite-tab-text); | ||||||
|  |     transition: 0.3s; | ||||||
|  |     cursor: pointer; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .tracerite .traceback-labels { | ||||||
|  |     padding-top: 5px; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .tracerite .traceback-labels button:hover { | ||||||
|  |     filter: contrast(150%) brightness(120%) drop-shadow(0 -0 2px var(--sanic-tab-shadow)); | ||||||
|  | } | ||||||
|  |  | ||||||
|  | #sanic .tracerite .tracerite-tooltip::before { | ||||||
|  |     bottom: 1.75em; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | #sanic .tracerite .traceback-details mark span { | ||||||
|  |     background: var(--sanic-highlight-background); | ||||||
|  |     color: var(--sanic-highlight-text); | ||||||
|  | } | ||||||
|  |  | ||||||
|  | header { | ||||||
|  |     background: var(--sanic-header-background); | ||||||
|  | } | ||||||
|  |  | ||||||
|  | h2 { | ||||||
|  |     font-size: 1.3rem; | ||||||
|  |     color: var(--sanic-text); | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .key-value-display, | ||||||
|  | .exception-wrapper { | ||||||
|  |     padding: 0.5rem; | ||||||
|  |     margin-top: 1rem; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .key-value-display { | ||||||
|  |     background-color: var(--sanic-block-background); | ||||||
|  |     color: var(--sanic-block-text); | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .key-value-display h2 { | ||||||
|  |     margin-bottom: 0.2em; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | dl.key-value-table { | ||||||
|  |     width: 100%; | ||||||
|  |     margin: 0; | ||||||
|  |     display: grid; | ||||||
|  |     grid-template-columns: 1fr 5fr; | ||||||
|  |     grid-gap: .3em; | ||||||
|  |     white-space: pre-wrap; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | dl.key-value-table * { | ||||||
|  |     margin: 0; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | dl.key-value-table dt { | ||||||
|  |     color: var(--sanic-block-alt-text); | ||||||
|  |     word-break: break-word; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | dl.key-value-table dd { | ||||||
|  |     /* Better breaking for cookies header and such */ | ||||||
|  |     word-break: break-all; | ||||||
|  | } | ||||||
							
								
								
									
										912
									
								
								sanic/request.py
									
									
									
									
									
								
							
							
						
						
									
										912
									
								
								sanic/request.py
									
									
									
									
									
								
							| @@ -1,908 +1,6 @@ | |||||||
| from __future__ import annotations | from sanic.breaking import ( | ||||||
|  |     File, | ||||||
| from typing import ( |     Request, | ||||||
|     TYPE_CHECKING, |     RequestParameters, | ||||||
|     Any, |     parse_multipart_form, | ||||||
|     DefaultDict, |  | ||||||
|     Dict, |  | ||||||
|     List, |  | ||||||
|     NamedTuple, |  | ||||||
|     Optional, |  | ||||||
|     Tuple, |  | ||||||
|     Union, |  | ||||||
| ) | ) | ||||||
|  |  | ||||||
| from sanic_routing.route import Route  # type: ignore |  | ||||||
|  |  | ||||||
| from sanic.models.http_types import Credentials |  | ||||||
|  |  | ||||||
|  |  | ||||||
| if TYPE_CHECKING:  # no cov |  | ||||||
|     from sanic.server import ConnInfo |  | ||||||
|     from sanic.app import Sanic |  | ||||||
|  |  | ||||||
| import email.utils |  | ||||||
| import uuid |  | ||||||
|  |  | ||||||
| from collections import defaultdict |  | ||||||
| from http.cookies import SimpleCookie |  | ||||||
| from types import SimpleNamespace |  | ||||||
| from urllib.parse import parse_qs, parse_qsl, unquote, urlunparse |  | ||||||
|  |  | ||||||
| from httptools import parse_url  # type: ignore |  | ||||||
| from httptools.parser.errors import HttpParserInvalidURLError  # type: ignore |  | ||||||
|  |  | ||||||
| from sanic.compat import CancelledErrors, Header |  | ||||||
| from sanic.constants import DEFAULT_HTTP_CONTENT_TYPE |  | ||||||
| from sanic.exceptions import BadURL, InvalidUsage, ServerError |  | ||||||
| from sanic.headers import ( |  | ||||||
|     AcceptContainer, |  | ||||||
|     Options, |  | ||||||
|     parse_accept, |  | ||||||
|     parse_content_header, |  | ||||||
|     parse_credentials, |  | ||||||
|     parse_forwarded, |  | ||||||
|     parse_host, |  | ||||||
|     parse_xforwarded, |  | ||||||
| ) |  | ||||||
| from sanic.http import Http, Stage |  | ||||||
| from sanic.log import error_logger, logger |  | ||||||
| from sanic.models.protocol_types import TransportProtocol |  | ||||||
| from sanic.response import BaseHTTPResponse, HTTPResponse |  | ||||||
|  |  | ||||||
|  |  | ||||||
| try: |  | ||||||
|     from ujson import loads as json_loads  # type: ignore |  | ||||||
| except ImportError: |  | ||||||
|     from json import loads as json_loads  # type: ignore |  | ||||||
|  |  | ||||||
|  |  | ||||||
| class RequestParameters(dict): |  | ||||||
|     """ |  | ||||||
|     Hosts a dict with lists as values where get returns the first |  | ||||||
|     value of the list and getlist returns the whole shebang |  | ||||||
|     """ |  | ||||||
|  |  | ||||||
|     def get(self, name: str, default: Optional[Any] = None) -> Optional[Any]: |  | ||||||
|         """Return the first value, either the default or actual""" |  | ||||||
|         return super().get(name, [default])[0] |  | ||||||
|  |  | ||||||
|     def getlist( |  | ||||||
|         self, name: str, default: Optional[Any] = None |  | ||||||
|     ) -> Optional[Any]: |  | ||||||
|         """ |  | ||||||
|         Return the entire list |  | ||||||
|         """ |  | ||||||
|         return super().get(name, default) |  | ||||||
|  |  | ||||||
|  |  | ||||||
| class Request: |  | ||||||
|     """ |  | ||||||
|     Properties of an HTTP request such as URL, headers, etc. |  | ||||||
|     """ |  | ||||||
|  |  | ||||||
|     __slots__ = ( |  | ||||||
|         "__weakref__", |  | ||||||
|         "_cookies", |  | ||||||
|         "_id", |  | ||||||
|         "_ip", |  | ||||||
|         "_parsed_url", |  | ||||||
|         "_port", |  | ||||||
|         "_protocol", |  | ||||||
|         "_remote_addr", |  | ||||||
|         "_socket", |  | ||||||
|         "_match_info", |  | ||||||
|         "_name", |  | ||||||
|         "app", |  | ||||||
|         "body", |  | ||||||
|         "conn_info", |  | ||||||
|         "ctx", |  | ||||||
|         "head", |  | ||||||
|         "headers", |  | ||||||
|         "method", |  | ||||||
|         "parsed_accept", |  | ||||||
|         "parsed_args", |  | ||||||
|         "parsed_credentials", |  | ||||||
|         "parsed_files", |  | ||||||
|         "parsed_form", |  | ||||||
|         "parsed_forwarded", |  | ||||||
|         "parsed_json", |  | ||||||
|         "parsed_not_grouped_args", |  | ||||||
|         "parsed_token", |  | ||||||
|         "raw_url", |  | ||||||
|         "responded", |  | ||||||
|         "request_middleware_started", |  | ||||||
|         "route", |  | ||||||
|         "stream", |  | ||||||
|         "transport", |  | ||||||
|         "version", |  | ||||||
|     ) |  | ||||||
|  |  | ||||||
|     def __init__( |  | ||||||
|         self, |  | ||||||
|         url_bytes: bytes, |  | ||||||
|         headers: Header, |  | ||||||
|         version: str, |  | ||||||
|         method: str, |  | ||||||
|         transport: TransportProtocol, |  | ||||||
|         app: Sanic, |  | ||||||
|         head: bytes = b"", |  | ||||||
|     ): |  | ||||||
|  |  | ||||||
|         self.raw_url = url_bytes |  | ||||||
|         try: |  | ||||||
|             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._name: Optional[str] = None |  | ||||||
|         self.app = app |  | ||||||
|  |  | ||||||
|         self.headers = Header(headers) |  | ||||||
|         self.version = version |  | ||||||
|         self.method = method |  | ||||||
|         self.transport = transport |  | ||||||
|         self.head = head |  | ||||||
|  |  | ||||||
|         # Init but do not inhale |  | ||||||
|         self.body = b"" |  | ||||||
|         self.conn_info: Optional[ConnInfo] = None |  | ||||||
|         self.ctx = SimpleNamespace() |  | ||||||
|         self.parsed_forwarded: Optional[Options] = None |  | ||||||
|         self.parsed_accept: Optional[AcceptContainer] = None |  | ||||||
|         self.parsed_credentials: Optional[Credentials] = None |  | ||||||
|         self.parsed_json = None |  | ||||||
|         self.parsed_form = None |  | ||||||
|         self.parsed_files = None |  | ||||||
|         self.parsed_token: Optional[str] = None |  | ||||||
|         self.parsed_args: DefaultDict[ |  | ||||||
|             Tuple[bool, bool, str, str], RequestParameters |  | ||||||
|         ] = defaultdict(RequestParameters) |  | ||||||
|         self.parsed_not_grouped_args: DefaultDict[ |  | ||||||
|             Tuple[bool, bool, str, str], List[Tuple[str, str]] |  | ||||||
|         ] = defaultdict(list) |  | ||||||
|         self.request_middleware_started = False |  | ||||||
|         self._cookies: Optional[Dict[str, str]] = None |  | ||||||
|         self._match_info: Dict[str, Any] = {} |  | ||||||
|         self.stream: Optional[Http] = None |  | ||||||
|         self.route: Optional[Route] = None |  | ||||||
|         self._protocol = None |  | ||||||
|         self.responded: bool = False |  | ||||||
|  |  | ||||||
|     def __repr__(self): |  | ||||||
|         class_name = self.__class__.__name__ |  | ||||||
|         return f"<{class_name}: {self.method} {self.path}>" |  | ||||||
|  |  | ||||||
|     @classmethod |  | ||||||
|     def generate_id(*_): |  | ||||||
|         return uuid.uuid4() |  | ||||||
|  |  | ||||||
|     def reset_response(self): |  | ||||||
|         try: |  | ||||||
|             if ( |  | ||||||
|                 self.stream is not None |  | ||||||
|                 and self.stream.stage is not Stage.HANDLER |  | ||||||
|             ): |  | ||||||
|                 raise ServerError( |  | ||||||
|                     "Cannot reset response because previous response was sent." |  | ||||||
|                 ) |  | ||||||
|             self.stream.response.stream = None |  | ||||||
|             self.stream.response = None |  | ||||||
|             self.responded = False |  | ||||||
|         except AttributeError: |  | ||||||
|             pass |  | ||||||
|  |  | ||||||
|     async def respond( |  | ||||||
|         self, |  | ||||||
|         response: Optional[BaseHTTPResponse] = None, |  | ||||||
|         *, |  | ||||||
|         status: int = 200, |  | ||||||
|         headers: Optional[Union[Header, Dict[str, 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: |  | ||||||
|             if self.stream is not None and self.stream.response: |  | ||||||
|                 raise ServerError("Second respond call is not allowed.") |  | ||||||
|         except AttributeError: |  | ||||||
|             pass |  | ||||||
|         # This logic of determining which response to use is subject to change |  | ||||||
|         if response is None: |  | ||||||
|             response = HTTPResponse( |  | ||||||
|                 status=status, |  | ||||||
|                 headers=headers, |  | ||||||
|                 content_type=content_type, |  | ||||||
|             ) |  | ||||||
|  |  | ||||||
|         # Connect the response |  | ||||||
|         if isinstance(response, BaseHTTPResponse) and self.stream: |  | ||||||
|             response = self.stream.respond(response) |  | ||||||
|         # Run response middleware |  | ||||||
|         try: |  | ||||||
|             response = await self.app._run_response_middleware( |  | ||||||
|                 self, response, request_name=self.name |  | ||||||
|             ) |  | ||||||
|         except CancelledErrors: |  | ||||||
|             raise |  | ||||||
|         except Exception: |  | ||||||
|             error_logger.exception( |  | ||||||
|                 "Exception occurred in one of response middleware handlers" |  | ||||||
|             ) |  | ||||||
|         self.responded = True |  | ||||||
|         return response |  | ||||||
|  |  | ||||||
|     async def receive_body(self): |  | ||||||
|         """Receive request.body, if not already received. |  | ||||||
|  |  | ||||||
|         Streaming handlers may call this to receive the full body. Sanic calls |  | ||||||
|         this function before running any handlers of non-streaming routes. |  | ||||||
|  |  | ||||||
|         Custom request classes can override this for custom handling of both |  | ||||||
|         streaming and non-streaming routes. |  | ||||||
|         """ |  | ||||||
|         if not self.body: |  | ||||||
|             self.body = b"".join([data async for data in self.stream]) |  | ||||||
|  |  | ||||||
|     @property |  | ||||||
|     def name(self): |  | ||||||
|         if self._name: |  | ||||||
|             return self._name |  | ||||||
|         elif self.route: |  | ||||||
|             return self.route.name |  | ||||||
|         return None |  | ||||||
|  |  | ||||||
|     @property |  | ||||||
|     def endpoint(self): |  | ||||||
|         return self.name |  | ||||||
|  |  | ||||||
|     @property |  | ||||||
|     def uri_template(self): |  | ||||||
|         return f"/{self.route.path}" |  | ||||||
|  |  | ||||||
|     @property |  | ||||||
|     def protocol(self): |  | ||||||
|         if not self._protocol: |  | ||||||
|             self._protocol = self.transport.get_protocol() |  | ||||||
|         return self._protocol |  | ||||||
|  |  | ||||||
|     @property |  | ||||||
|     def raw_headers(self): |  | ||||||
|         _, headers = self.head.split(b"\r\n", 1) |  | ||||||
|         return bytes(headers) |  | ||||||
|  |  | ||||||
|     @property |  | ||||||
|     def request_line(self): |  | ||||||
|         reqline, _ = self.head.split(b"\r\n", 1) |  | ||||||
|         return bytes(reqline) |  | ||||||
|  |  | ||||||
|     @property |  | ||||||
|     def id(self) -> Optional[Union[uuid.UUID, str, int]]: |  | ||||||
|         """ |  | ||||||
|         A request ID passed from the client, or generated from the backend. |  | ||||||
|  |  | ||||||
|         By default, this will look in a request header defined at: |  | ||||||
|         ``self.app.config.REQUEST_ID_HEADER``. It defaults to |  | ||||||
|         ``X-Request-ID``. Sanic will try to cast the ID into a ``UUID`` or an |  | ||||||
|         ``int``. If there is not a UUID from the client, then Sanic will try |  | ||||||
|         to generate an ID by calling ``Request.generate_id()``. The default |  | ||||||
|         behavior is to generate a ``UUID``. You can customize this behavior |  | ||||||
|         by subclassing ``Request``. |  | ||||||
|  |  | ||||||
|         .. code-block:: python |  | ||||||
|  |  | ||||||
|             from sanic import Request, Sanic |  | ||||||
|             from itertools import count |  | ||||||
|  |  | ||||||
|             class IntRequest(Request): |  | ||||||
|                 counter = count() |  | ||||||
|  |  | ||||||
|                 def generate_id(self): |  | ||||||
|                     return next(self.counter) |  | ||||||
|  |  | ||||||
|             app = Sanic("MyApp", request_class=IntRequest) |  | ||||||
|         """ |  | ||||||
|         if not self._id: |  | ||||||
|             self._id = self.headers.getone( |  | ||||||
|                 self.app.config.REQUEST_ID_HEADER, |  | ||||||
|                 self.__class__.generate_id(self),  # type: ignore |  | ||||||
|             ) |  | ||||||
|  |  | ||||||
|             # Try casting to a UUID or an integer |  | ||||||
|             if isinstance(self._id, str): |  | ||||||
|                 try: |  | ||||||
|                     self._id = uuid.UUID(self._id) |  | ||||||
|                 except ValueError: |  | ||||||
|                     try: |  | ||||||
|                         self._id = int(self._id)  # type: ignore |  | ||||||
|                     except ValueError: |  | ||||||
|                         ... |  | ||||||
|  |  | ||||||
|         return self._id  # type: ignore |  | ||||||
|  |  | ||||||
|     @property |  | ||||||
|     def json(self): |  | ||||||
|         if self.parsed_json is None: |  | ||||||
|             self.load_json() |  | ||||||
|  |  | ||||||
|         return self.parsed_json |  | ||||||
|  |  | ||||||
|     def load_json(self, loads=json_loads): |  | ||||||
|         try: |  | ||||||
|             self.parsed_json = loads(self.body) |  | ||||||
|         except Exception: |  | ||||||
|             if not self.body: |  | ||||||
|                 return None |  | ||||||
|             raise InvalidUsage("Failed when parsing body as json") |  | ||||||
|  |  | ||||||
|         return self.parsed_json |  | ||||||
|  |  | ||||||
|     @property |  | ||||||
|     def accept(self) -> AcceptContainer: |  | ||||||
|         if self.parsed_accept is None: |  | ||||||
|             accept_header = self.headers.getone("accept", "") |  | ||||||
|             self.parsed_accept = parse_accept(accept_header) |  | ||||||
|         return self.parsed_accept |  | ||||||
|  |  | ||||||
|     @property |  | ||||||
|     def token(self) -> Optional[str]: |  | ||||||
|         """Attempt to return the auth header token. |  | ||||||
|  |  | ||||||
|         :return: token related to request |  | ||||||
|         """ |  | ||||||
|         if self.parsed_token is None: |  | ||||||
|             prefixes = ("Bearer", "Token") |  | ||||||
|             _, token = parse_credentials( |  | ||||||
|                 self.headers.getone("authorization", None), prefixes |  | ||||||
|             ) |  | ||||||
|             self.parsed_token = token |  | ||||||
|         return self.parsed_token |  | ||||||
|  |  | ||||||
|     @property |  | ||||||
|     def credentials(self) -> Optional[Credentials]: |  | ||||||
|         """Attempt to return the auth header value. |  | ||||||
|  |  | ||||||
|         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 |  | ||||||
|  |  | ||||||
|     @property |  | ||||||
|     def form(self): |  | ||||||
|         if self.parsed_form is None: |  | ||||||
|             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")) |  | ||||||
|                     ) |  | ||||||
|                 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 |  | ||||||
|  |  | ||||||
|     @property |  | ||||||
|     def files(self): |  | ||||||
|         if self.parsed_files is None: |  | ||||||
|             self.form  # compute form to get files |  | ||||||
|  |  | ||||||
|         return self.parsed_files |  | ||||||
|  |  | ||||||
|     def get_args( |  | ||||||
|         self, |  | ||||||
|         keep_blank_values: bool = False, |  | ||||||
|         strict_parsing: bool = False, |  | ||||||
|         encoding: str = "utf-8", |  | ||||||
|         errors: str = "replace", |  | ||||||
|     ) -> RequestParameters: |  | ||||||
|         """ |  | ||||||
|         Method to parse `query_string` using `urllib.parse.parse_qs`. |  | ||||||
|         This methods is used by `args` property. |  | ||||||
|         Can be used directly if you need to change default parameters. |  | ||||||
|  |  | ||||||
|         :param keep_blank_values: |  | ||||||
|             flag indicating whether blank values in |  | ||||||
|             percent-encoded queries should be treated as blank strings. |  | ||||||
|             A true value indicates that blanks should be retained as blank |  | ||||||
|             strings.  The default false value indicates that blank values |  | ||||||
|             are to be ignored and treated as if they were  not included. |  | ||||||
|         :type keep_blank_values: bool |  | ||||||
|         :param strict_parsing: |  | ||||||
|             flag indicating what to do with parsing errors. |  | ||||||
|             If false (the default), errors are silently ignored. If true, |  | ||||||
|             errors raise a ValueError exception. |  | ||||||
|         :type strict_parsing: bool |  | ||||||
|         :param encoding: |  | ||||||
|             specify how to decode percent-encoded sequences |  | ||||||
|             into Unicode characters, as accepted by the bytes.decode() method. |  | ||||||
|         :type encoding: str |  | ||||||
|         :param errors: |  | ||||||
|             specify how to decode percent-encoded sequences |  | ||||||
|             into Unicode characters, as accepted by the bytes.decode() method. |  | ||||||
|         :type errors: str |  | ||||||
|         :return: RequestParameters |  | ||||||
|         """ |  | ||||||
|         if ( |  | ||||||
|             keep_blank_values, |  | ||||||
|             strict_parsing, |  | ||||||
|             encoding, |  | ||||||
|             errors, |  | ||||||
|         ) not in self.parsed_args: |  | ||||||
|             if self.query_string: |  | ||||||
|                 self.parsed_args[ |  | ||||||
|                     (keep_blank_values, strict_parsing, encoding, errors) |  | ||||||
|                 ] = RequestParameters( |  | ||||||
|                     parse_qs( |  | ||||||
|                         qs=self.query_string, |  | ||||||
|                         keep_blank_values=keep_blank_values, |  | ||||||
|                         strict_parsing=strict_parsing, |  | ||||||
|                         encoding=encoding, |  | ||||||
|                         errors=errors, |  | ||||||
|                     ) |  | ||||||
|                 ) |  | ||||||
|  |  | ||||||
|         return self.parsed_args[ |  | ||||||
|             (keep_blank_values, strict_parsing, encoding, errors) |  | ||||||
|         ] |  | ||||||
|  |  | ||||||
|     args = property(get_args) |  | ||||||
|  |  | ||||||
|     def get_query_args( |  | ||||||
|         self, |  | ||||||
|         keep_blank_values: bool = False, |  | ||||||
|         strict_parsing: bool = False, |  | ||||||
|         encoding: str = "utf-8", |  | ||||||
|         errors: str = "replace", |  | ||||||
|     ) -> list: |  | ||||||
|         """ |  | ||||||
|         Method to parse `query_string` using `urllib.parse.parse_qsl`. |  | ||||||
|         This methods is used by `query_args` property. |  | ||||||
|         Can be used directly if you need to change default parameters. |  | ||||||
|  |  | ||||||
|         :param keep_blank_values: |  | ||||||
|             flag indicating whether blank values in |  | ||||||
|             percent-encoded queries should be treated as blank strings. |  | ||||||
|             A true value indicates that blanks should be retained as blank |  | ||||||
|             strings.  The default false value indicates that blank values |  | ||||||
|             are to be ignored and treated as if they were  not included. |  | ||||||
|         :type keep_blank_values: bool |  | ||||||
|         :param strict_parsing: |  | ||||||
|             flag indicating what to do with parsing errors. |  | ||||||
|             If false (the default), errors are silently ignored. If true, |  | ||||||
|             errors raise a ValueError exception. |  | ||||||
|         :type strict_parsing: bool |  | ||||||
|         :param encoding: |  | ||||||
|             specify how to decode percent-encoded sequences |  | ||||||
|             into Unicode characters, as accepted by the bytes.decode() method. |  | ||||||
|         :type encoding: str |  | ||||||
|         :param errors: |  | ||||||
|             specify how to decode percent-encoded sequences |  | ||||||
|             into Unicode characters, as accepted by the bytes.decode() method. |  | ||||||
|         :type errors: str |  | ||||||
|         :return: list |  | ||||||
|         """ |  | ||||||
|         if ( |  | ||||||
|             keep_blank_values, |  | ||||||
|             strict_parsing, |  | ||||||
|             encoding, |  | ||||||
|             errors, |  | ||||||
|         ) not in self.parsed_not_grouped_args: |  | ||||||
|             if self.query_string: |  | ||||||
|                 self.parsed_not_grouped_args[ |  | ||||||
|                     (keep_blank_values, strict_parsing, encoding, errors) |  | ||||||
|                 ] = parse_qsl( |  | ||||||
|                     qs=self.query_string, |  | ||||||
|                     keep_blank_values=keep_blank_values, |  | ||||||
|                     strict_parsing=strict_parsing, |  | ||||||
|                     encoding=encoding, |  | ||||||
|                     errors=errors, |  | ||||||
|                 ) |  | ||||||
|         return self.parsed_not_grouped_args[ |  | ||||||
|             (keep_blank_values, strict_parsing, encoding, errors) |  | ||||||
|         ] |  | ||||||
|  |  | ||||||
|     query_args = property(get_query_args) |  | ||||||
|     """ |  | ||||||
|     Convenience property to access :meth:`Request.get_query_args` with |  | ||||||
|     default values. |  | ||||||
|     """ |  | ||||||
|  |  | ||||||
|     @property |  | ||||||
|     def cookies(self) -> Dict[str, str]: |  | ||||||
|         """ |  | ||||||
|         :return: Incoming cookies on the request |  | ||||||
|         :rtype: Dict[str, str] |  | ||||||
|         """ |  | ||||||
|  |  | ||||||
|         if self._cookies is None: |  | ||||||
|             cookie = self.headers.getone("cookie", None) |  | ||||||
|             if cookie is not None: |  | ||||||
|                 cookies: SimpleCookie = SimpleCookie() |  | ||||||
|                 cookies.load(cookie) |  | ||||||
|                 self._cookies = { |  | ||||||
|                     name: cookie.value for name, cookie in cookies.items() |  | ||||||
|                 } |  | ||||||
|             else: |  | ||||||
|                 self._cookies = {} |  | ||||||
|         return self._cookies |  | ||||||
|  |  | ||||||
|     @property |  | ||||||
|     def content_type(self) -> str: |  | ||||||
|         """ |  | ||||||
|         :return: Content-Type header form the request |  | ||||||
|         :rtype: str |  | ||||||
|         """ |  | ||||||
|         return self.headers.getone("content-type", DEFAULT_HTTP_CONTENT_TYPE) |  | ||||||
|  |  | ||||||
|     @property |  | ||||||
|     def match_info(self): |  | ||||||
|         """ |  | ||||||
|         :return: matched info after resolving route |  | ||||||
|         """ |  | ||||||
|         return self._match_info |  | ||||||
|  |  | ||||||
|     @match_info.setter |  | ||||||
|     def match_info(self, value): |  | ||||||
|         self._match_info = value |  | ||||||
|  |  | ||||||
|     # Transport properties (obtained from local interface only) |  | ||||||
|  |  | ||||||
|     @property |  | ||||||
|     def ip(self) -> str: |  | ||||||
|         """ |  | ||||||
|         :return: peer ip of the socket |  | ||||||
|         :rtype: str |  | ||||||
|         """ |  | ||||||
|         return self.conn_info.client_ip if self.conn_info else "" |  | ||||||
|  |  | ||||||
|     @property |  | ||||||
|     def port(self) -> int: |  | ||||||
|         """ |  | ||||||
|         :return: peer port of the socket |  | ||||||
|         :rtype: int |  | ||||||
|         """ |  | ||||||
|         return self.conn_info.client_port if self.conn_info else 0 |  | ||||||
|  |  | ||||||
|     @property |  | ||||||
|     def socket(self): |  | ||||||
|         return self.conn_info.peername if self.conn_info else (None, None) |  | ||||||
|  |  | ||||||
|     @property |  | ||||||
|     def path(self) -> str: |  | ||||||
|         """ |  | ||||||
|         :return: path of the local HTTP request |  | ||||||
|         :rtype: str |  | ||||||
|         """ |  | ||||||
|         return self._parsed_url.path.decode("utf-8") |  | ||||||
|  |  | ||||||
|     # Proxy properties (using SERVER_NAME/forwarded/request/transport info) |  | ||||||
|  |  | ||||||
|     @property |  | ||||||
|     def forwarded(self) -> Options: |  | ||||||
|         """ |  | ||||||
|         Active proxy information obtained from request headers, as specified in |  | ||||||
|         Sanic configuration. |  | ||||||
|  |  | ||||||
|         Field names by, for, proto, host, port and path are normalized. |  | ||||||
|         - for and by IPv6 addresses are bracketed |  | ||||||
|         - port (int) is only set by port headers, not from host. |  | ||||||
|         - path is url-unencoded |  | ||||||
|  |  | ||||||
|         Additional values may be available from new style Forwarded headers. |  | ||||||
|  |  | ||||||
|         :return: forwarded address info |  | ||||||
|         :rtype: Dict[str, str] |  | ||||||
|         """ |  | ||||||
|         if self.parsed_forwarded is None: |  | ||||||
|             self.parsed_forwarded = ( |  | ||||||
|                 parse_forwarded(self.headers, self.app.config) |  | ||||||
|                 or parse_xforwarded(self.headers, self.app.config) |  | ||||||
|                 or {} |  | ||||||
|             ) |  | ||||||
|         return self.parsed_forwarded |  | ||||||
|  |  | ||||||
|     @property |  | ||||||
|     def remote_addr(self) -> str: |  | ||||||
|         """ |  | ||||||
|         Client IP address, if available. |  | ||||||
|         1. proxied remote address `self.forwarded['for']` |  | ||||||
|         2. local remote address `self.ip` |  | ||||||
|  |  | ||||||
|         :return: IPv4, bracketed IPv6, UNIX socket name or arbitrary string |  | ||||||
|         :rtype: str |  | ||||||
|         """ |  | ||||||
|         if not hasattr(self, "_remote_addr"): |  | ||||||
|             self._remote_addr = str( |  | ||||||
|                 self.forwarded.get("for", "") |  | ||||||
|             )  # or self.ip |  | ||||||
|         return self._remote_addr |  | ||||||
|  |  | ||||||
|     @property |  | ||||||
|     def scheme(self) -> str: |  | ||||||
|         """ |  | ||||||
|         Determine request scheme. |  | ||||||
|         1. `config.SERVER_NAME` if in full URL format |  | ||||||
|         2. proxied proto/scheme |  | ||||||
|         3. local connection protocol |  | ||||||
|  |  | ||||||
|         :return: http|https|ws|wss or arbitrary value given by the headers. |  | ||||||
|         :rtype: str |  | ||||||
|         """ |  | ||||||
|         if "//" in self.app.config.get("SERVER_NAME", ""): |  | ||||||
|             return self.app.config.SERVER_NAME.split("//")[0] |  | ||||||
|         if "proto" in self.forwarded: |  | ||||||
|             return str(self.forwarded["proto"]) |  | ||||||
|  |  | ||||||
|         if ( |  | ||||||
|             self.app.websocket_enabled |  | ||||||
|             and self.headers.getone("upgrade", "").lower() == "websocket" |  | ||||||
|         ): |  | ||||||
|             scheme = "ws" |  | ||||||
|         else: |  | ||||||
|             scheme = "http" |  | ||||||
|  |  | ||||||
|         if self.transport.get_extra_info("sslcontext"): |  | ||||||
|             scheme += "s" |  | ||||||
|  |  | ||||||
|         return scheme |  | ||||||
|  |  | ||||||
|     @property |  | ||||||
|     def host(self) -> str: |  | ||||||
|         """ |  | ||||||
|         The currently effective server 'host' (hostname or hostname:port). |  | ||||||
|         1. `config.SERVER_NAME` overrides any client headers |  | ||||||
|         2. proxied host of original request |  | ||||||
|         3. request host header |  | ||||||
|         hostname and port may be separated by |  | ||||||
|         `sanic.headers.parse_host(request.host)`. |  | ||||||
|  |  | ||||||
|         :return: the first matching host found, or empty string |  | ||||||
|         :rtype: str |  | ||||||
|         """ |  | ||||||
|         server_name = self.app.config.get("SERVER_NAME") |  | ||||||
|         if server_name: |  | ||||||
|             return server_name.split("//", 1)[-1].split("/", 1)[0] |  | ||||||
|         return str( |  | ||||||
|             self.forwarded.get("host") or self.headers.getone("host", "") |  | ||||||
|         ) |  | ||||||
|  |  | ||||||
|     @property |  | ||||||
|     def server_name(self) -> str: |  | ||||||
|         """ |  | ||||||
|         :return: hostname the client connected to, by ``request.host`` |  | ||||||
|         :rtype: str |  | ||||||
|         """ |  | ||||||
|         return parse_host(self.host)[0] or "" |  | ||||||
|  |  | ||||||
|     @property |  | ||||||
|     def server_port(self) -> int: |  | ||||||
|         """ |  | ||||||
|         The port the client connected to, by forwarded ``port`` or |  | ||||||
|         ``request.host``. |  | ||||||
|  |  | ||||||
|         Default port is returned as 80 and 443 based on ``request.scheme``. |  | ||||||
|  |  | ||||||
|         :return: port number |  | ||||||
|         :rtype: int |  | ||||||
|         """ |  | ||||||
|         port = self.forwarded.get("port") or parse_host(self.host)[1] |  | ||||||
|         return int(port or (80 if self.scheme in ("http", "ws") else 443)) |  | ||||||
|  |  | ||||||
|     @property |  | ||||||
|     def server_path(self) -> str: |  | ||||||
|         """ |  | ||||||
|         :return: full path of current URL; uses proxied or local path |  | ||||||
|         :rtype: str |  | ||||||
|         """ |  | ||||||
|         return str(self.forwarded.get("path") or self.path) |  | ||||||
|  |  | ||||||
|     @property |  | ||||||
|     def query_string(self) -> str: |  | ||||||
|         """ |  | ||||||
|         :return: representation of the requested query |  | ||||||
|         :rtype: str |  | ||||||
|         """ |  | ||||||
|         if self._parsed_url.query: |  | ||||||
|             return self._parsed_url.query.decode("utf-8") |  | ||||||
|         else: |  | ||||||
|             return "" |  | ||||||
|  |  | ||||||
|     @property |  | ||||||
|     def url(self) -> str: |  | ||||||
|         """ |  | ||||||
|         :return: the URL |  | ||||||
|         :rtype: str |  | ||||||
|         """ |  | ||||||
|         return urlunparse( |  | ||||||
|             (self.scheme, self.host, self.path, None, self.query_string, None) |  | ||||||
|         ) |  | ||||||
|  |  | ||||||
|     def url_for(self, view_name: str, **kwargs) -> str: |  | ||||||
|         """ |  | ||||||
|         Same as :func:`sanic.Sanic.url_for`, but automatically determine |  | ||||||
|         `scheme` and `netloc` base on the request. Since this method is aiming |  | ||||||
|         to generate correct schema & netloc, `_external` is implied. |  | ||||||
|  |  | ||||||
|         :param kwargs: takes same parameters as in :func:`sanic.Sanic.url_for` |  | ||||||
|         :return: an absolute url to the given view |  | ||||||
|         :rtype: str |  | ||||||
|         """ |  | ||||||
|         # Full URL SERVER_NAME can only be handled in app.url_for |  | ||||||
|         try: |  | ||||||
|             if "//" in self.app.config.SERVER_NAME: |  | ||||||
|                 return self.app.url_for(view_name, _external=True, **kwargs) |  | ||||||
|         except AttributeError: |  | ||||||
|             pass |  | ||||||
|  |  | ||||||
|         scheme = self.scheme |  | ||||||
|         host = self.server_name |  | ||||||
|         port = self.server_port |  | ||||||
|  |  | ||||||
|         if (scheme.lower() in ("http", "ws") and port == 80) or ( |  | ||||||
|             scheme.lower() in ("https", "wss") and port == 443 |  | ||||||
|         ): |  | ||||||
|             netloc = host |  | ||||||
|         else: |  | ||||||
|             netloc = f"{host}:{port}" |  | ||||||
|  |  | ||||||
|         return self.app.url_for( |  | ||||||
|             view_name, _external=True, _scheme=scheme, _server=netloc, **kwargs |  | ||||||
|         ) |  | ||||||
|  |  | ||||||
|  |  | ||||||
| class File(NamedTuple): |  | ||||||
|     """ |  | ||||||
|     Model for defining a file. It is a ``namedtuple``, therefore you can |  | ||||||
|     iterate over the object, or access the parameters by name. |  | ||||||
|  |  | ||||||
|     :param type: The mimetype, defaults to text/plain |  | ||||||
|     :param body: Bytes of the file |  | ||||||
|     :param name: The filename |  | ||||||
|     """ |  | ||||||
|  |  | ||||||
|     type: str |  | ||||||
|     body: bytes |  | ||||||
|     name: str |  | ||||||
|  |  | ||||||
|  |  | ||||||
| def parse_multipart_form(body, boundary): |  | ||||||
|     """ |  | ||||||
|     Parse a request body and returns fields and files |  | ||||||
|  |  | ||||||
|     :param body: bytes request body |  | ||||||
|     :param boundary: bytes multipart boundary |  | ||||||
|     :return: fields (RequestParameters), files (RequestParameters) |  | ||||||
|     """ |  | ||||||
|     files = RequestParameters() |  | ||||||
|     fields = RequestParameters() |  | ||||||
|  |  | ||||||
|     form_parts = body.split(boundary) |  | ||||||
|     for form_part in form_parts[1:-1]: |  | ||||||
|         file_name = None |  | ||||||
|         content_type = "text/plain" |  | ||||||
|         content_charset = "utf-8" |  | ||||||
|         field_name = None |  | ||||||
|         line_index = 2 |  | ||||||
|         line_end_index = 0 |  | ||||||
|         while not line_end_index == -1: |  | ||||||
|             line_end_index = form_part.find(b"\r\n", line_index) |  | ||||||
|             form_line = form_part[line_index:line_end_index].decode("utf-8") |  | ||||||
|             line_index = line_end_index + 2 |  | ||||||
|  |  | ||||||
|             if not form_line: |  | ||||||
|                 break |  | ||||||
|  |  | ||||||
|             colon_index = form_line.index(":") |  | ||||||
|             idx = colon_index + 2 |  | ||||||
|             form_header_field = form_line[0:colon_index].lower() |  | ||||||
|             form_header_value, form_parameters = parse_content_header( |  | ||||||
|                 form_line[idx:] |  | ||||||
|             ) |  | ||||||
|  |  | ||||||
|             if form_header_field == "content-disposition": |  | ||||||
|                 field_name = form_parameters.get("name") |  | ||||||
|                 file_name = form_parameters.get("filename") |  | ||||||
|  |  | ||||||
|                 # non-ASCII filenames in RFC2231, "filename*" format |  | ||||||
|                 if file_name is None and form_parameters.get("filename*"): |  | ||||||
|                     encoding, _, value = email.utils.decode_rfc2231( |  | ||||||
|                         form_parameters["filename*"] |  | ||||||
|                     ) |  | ||||||
|                     file_name = unquote(value, encoding=encoding) |  | ||||||
|             elif form_header_field == "content-type": |  | ||||||
|                 content_type = form_header_value |  | ||||||
|                 content_charset = form_parameters.get("charset", "utf-8") |  | ||||||
|  |  | ||||||
|         if field_name: |  | ||||||
|             post_data = form_part[line_index:-4] |  | ||||||
|             if file_name is None: |  | ||||||
|                 value = post_data.decode(content_charset) |  | ||||||
|                 if field_name in fields: |  | ||||||
|                     fields[field_name].append(value) |  | ||||||
|                 else: |  | ||||||
|                     fields[field_name] = [value] |  | ||||||
|             else: |  | ||||||
|                 form_file = File( |  | ||||||
|                     type=content_type, name=file_name, body=post_data |  | ||||||
|                 ) |  | ||||||
|                 if field_name in files: |  | ||||||
|                     files[field_name].append(form_file) |  | ||||||
|                 else: |  | ||||||
|                     files[field_name] = [form_file] |  | ||||||
|         else: |  | ||||||
|             logger.debug( |  | ||||||
|                 "Form-data field does not have a 'name' parameter " |  | ||||||
|                 "in the Content-Disposition header" |  | ||||||
|             ) |  | ||||||
|  |  | ||||||
|     return fields, files |  | ||||||
|   | |||||||
| @@ -1,543 +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 |  | ||||||
|     """ |  | ||||||
|  |  | ||||||
|     __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]] = 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__ = () |  | ||||||
|  |  | ||||||
|     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, |  | ||||||
|     ) |  | ||||||
Some files were not shown because too many files have changed in this diff Show More
		Reference in New Issue
	
	Block a user