plain 0.57.0__py3-none-any.whl → 0.58.0__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- plain/CHANGELOG.md +15 -0
- plain/cli/agent.py +6 -0
- plain/csrf/README.md +61 -9
- plain/csrf/middleware.py +95 -406
- plain/exceptions.py +29 -13
- plain/forms/README.md +0 -2
- plain/internal/middleware/https.py +5 -3
- plain/runtime/global_settings.py +48 -53
- plain/templates/README.md +0 -1
- plain/test/client.py +2 -10
- plain/views/README.md +0 -2
- plain/views/templates.py +0 -18
- {plain-0.57.0.dist-info → plain-0.58.0.dist-info}/METADATA +1 -1
- {plain-0.57.0.dist-info → plain-0.58.0.dist-info}/RECORD +17 -18
- plain/views/csrf.py +0 -4
- {plain-0.57.0.dist-info → plain-0.58.0.dist-info}/WHEEL +0 -0
- {plain-0.57.0.dist-info → plain-0.58.0.dist-info}/entry_points.txt +0 -0
- {plain-0.57.0.dist-info → plain-0.58.0.dist-info}/licenses/LICENSE +0 -0
plain/CHANGELOG.md
CHANGED
@@ -1,5 +1,20 @@
|
|
1
1
|
# plain changelog
|
2
2
|
|
3
|
+
## [0.58.0](https://github.com/dropseed/plain/releases/plain@0.58.0) (2025-08-19)
|
4
|
+
|
5
|
+
### What's changed
|
6
|
+
|
7
|
+
- Complete rewrite of CSRF protection using modern Sec-Fetch-Site headers and origin validation ([955150800c](https://github.com/dropseed/plain/commit/955150800c))
|
8
|
+
- Replaced CSRF view mixin with path-based exemptions using `CSRF_EXEMPT_PATHS` setting ([2a50a9154e](https://github.com/dropseed/plain/commit/2a50a9154e))
|
9
|
+
- Renamed `HTTPS_REDIRECT_EXEMPT` to `HTTPS_REDIRECT_EXEMPT_PATHS` with leading slash requirement ([b53d3bb7a7](https://github.com/dropseed/plain/commit/b53d3bb7a7))
|
10
|
+
- Agent commands now print prompts directly when running in Claude Code or Codex Sandbox environments ([6eaed8ae3b](https://github.com/dropseed/plain/commit/6eaed8ae3b))
|
11
|
+
|
12
|
+
### Upgrade instructions
|
13
|
+
|
14
|
+
- Remove any usage of `CsrfExemptViewMixin` and `request.csrf_exempt` and add exempt paths to the `CSRF_EXEMPT_PATHS` setting instead (ex. `CSRF_EXEMPT_PATHS = [r"^/api/", r"/webhooks/.*"]` -- but consider first whether the view still needs CSRF exemption under the new implementation)
|
15
|
+
- Replace `HTTPS_REDIRECT_EXEMPT` with `HTTPS_REDIRECT_EXEMPT_PATHS` and ensure patterns include leading slash (ex. `[r"^/health$", r"/api/internal/.*"]`)
|
16
|
+
- Remove all CSRF cookie and token related settings - the new implementation doesn't use cookies or tokens (ex. `{{ csrf_input }}` and `{{ csrf_token }}`)
|
17
|
+
|
3
18
|
## [0.57.0](https://github.com/dropseed/plain/releases/plain@0.57.0) (2025-08-15)
|
4
19
|
|
5
20
|
### What's changed
|
plain/cli/agent.py
CHANGED
@@ -1,3 +1,4 @@
|
|
1
|
+
import os
|
1
2
|
import shlex
|
2
3
|
import subprocess
|
3
4
|
|
@@ -20,6 +21,11 @@ def prompt_agent(
|
|
20
21
|
True if the agent command succeeded (or no agent command was provided),
|
21
22
|
False if the agent command failed.
|
22
23
|
"""
|
24
|
+
# Check if running inside an agent and just print the prompt if so
|
25
|
+
if os.environ.get("CLAUDECODE") or os.environ.get("CODEX_SANDBOX"):
|
26
|
+
click.echo(prompt)
|
27
|
+
return True
|
28
|
+
|
23
29
|
if print_only or not agent_command:
|
24
30
|
click.echo(prompt)
|
25
31
|
if not print_only:
|
plain/csrf/README.md
CHANGED
@@ -1,23 +1,75 @@
|
|
1
1
|
# CSRF
|
2
2
|
|
3
|
-
**Cross-Site Request Forgery (CSRF) protection.**
|
3
|
+
**Cross-Site Request Forgery (CSRF) protection using modern request headers.**
|
4
4
|
|
5
5
|
- [Overview](#overview)
|
6
6
|
- [Usage](#usage)
|
7
|
+
- [CSRF Exempt Paths](#csrf-exempt-paths)
|
8
|
+
- [Trusted Origins](#trusted-origins)
|
7
9
|
|
8
10
|
## Overview
|
9
11
|
|
10
|
-
Plain
|
12
|
+
Plain provides modern CSRF protection based on [Filippo Valsorda's 2025 research](https://words.filippo.io/csrf/) using `Sec-Fetch-Site` headers and origin validation.
|
11
13
|
|
12
14
|
## Usage
|
13
15
|
|
14
|
-
The `CsrfViewMiddleware` is [automatically installed](../internal/handlers/base.py#BUILTIN_BEFORE_MIDDLEWARE)
|
16
|
+
The `CsrfViewMiddleware` is [automatically installed](../internal/handlers/base.py#BUILTIN_BEFORE_MIDDLEWARE) and works transparently. **No changes to your forms or templates are needed.**
|
15
17
|
|
16
|
-
|
18
|
+
## CSRF Exempt Paths
|
17
19
|
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
20
|
+
In some cases, you may need to disable CSRF protection for specific paths (like API endpoints or webhooks). Configure exempt paths using regex patterns in your settings:
|
21
|
+
|
22
|
+
```python
|
23
|
+
# settings.py
|
24
|
+
CSRF_EXEMPT_PATHS = [
|
25
|
+
r"^/api/", # All API endpoints
|
26
|
+
r"^/api/v\d+/", # Versioned APIs: /api/v1/, /api/v2/, etc.
|
27
|
+
r"/webhooks/.*", # All webhook paths
|
28
|
+
r"/webhooks/github/", # Specific webhook
|
29
|
+
r"/health$", # Exact match for /health endpoint
|
30
|
+
]
|
23
31
|
```
|
32
|
+
|
33
|
+
**Pattern Matching**: Exempt paths use Python regex patterns with `re.search()` against the full URL path including the leading slash.
|
34
|
+
|
35
|
+
**Examples:**
|
36
|
+
|
37
|
+
- `r"^/api/"` - matches `/api/users/`, `/api/posts/`
|
38
|
+
- `r"/webhooks/.*"` - matches `/webhooks/github/push`, `/webhooks/stripe/payment`
|
39
|
+
- `r"/health$"` - matches `/health` but not `/health-check`
|
40
|
+
- `r"^/api/v\d+/"` - matches `/api/v1/users/`, `/api/v2/posts/`
|
41
|
+
|
42
|
+
**Common Use Cases:**
|
43
|
+
|
44
|
+
```python
|
45
|
+
CSRF_EXEMPT_PATHS = [
|
46
|
+
# API endpoints (often consumed by JavaScript/mobile apps)
|
47
|
+
r"^/api/",
|
48
|
+
|
49
|
+
# Webhooks (external services posting data)
|
50
|
+
r"/webhooks/.*",
|
51
|
+
|
52
|
+
# Health checks and monitoring
|
53
|
+
r"/health$",
|
54
|
+
r"/status$",
|
55
|
+
r"/metrics$",
|
56
|
+
|
57
|
+
# File uploads (if using direct POST)
|
58
|
+
r"/upload/",
|
59
|
+
]
|
60
|
+
```
|
61
|
+
|
62
|
+
## Trusted Origins
|
63
|
+
|
64
|
+
In some cases, you may need to allow requests from specific external origins (like API clients or mobile apps). You can configure trusted origins in your settings:
|
65
|
+
|
66
|
+
```python
|
67
|
+
# settings.py
|
68
|
+
CSRF_TRUSTED_ORIGINS = [
|
69
|
+
"https://api.example.com",
|
70
|
+
"https://mobile.example.com:8443",
|
71
|
+
"https://trusted-partner.com",
|
72
|
+
]
|
73
|
+
```
|
74
|
+
|
75
|
+
**Important**: Trusted origins bypass **all** CSRF protection. Only add origins you completely trust, as they can make requests that appear to come from your users.
|
plain/csrf/middleware.py
CHANGED
@@ -1,230 +1,126 @@
|
|
1
|
-
"""
|
2
|
-
Cross Site Request Forgery Middleware.
|
3
|
-
|
4
|
-
This module provides a middleware that implements protection
|
5
|
-
against request forgeries from other sites.
|
6
|
-
"""
|
7
|
-
|
8
1
|
import logging
|
9
|
-
import
|
10
|
-
from collections import defaultdict
|
11
|
-
from functools import cached_property
|
2
|
+
import re
|
12
3
|
from urllib.parse import urlparse
|
13
4
|
|
14
5
|
from plain.exceptions import DisallowedHost
|
15
|
-
from plain.http import HttpHeaders, UnreadablePostError
|
16
6
|
from plain.logs import log_response
|
17
7
|
from plain.runtime import settings
|
18
|
-
from plain.utils.cache import patch_vary_headers
|
19
|
-
from plain.utils.crypto import constant_time_compare, get_random_string
|
20
|
-
from plain.utils.http import is_same_domain
|
21
|
-
from plain.utils.regex_helper import _lazy_re_compile
|
22
|
-
|
23
|
-
logger = logging.getLogger("plain.security.csrf")
|
24
|
-
# This matches if any character is not in CSRF_ALLOWED_CHARS.
|
25
|
-
invalid_token_chars_re = _lazy_re_compile("[^a-zA-Z0-9]")
|
26
|
-
|
27
|
-
REASON_BAD_ORIGIN = "Origin checking failed - %s does not match any trusted origins."
|
28
|
-
REASON_NO_REFERER = "Referer checking failed - no Referer."
|
29
|
-
REASON_BAD_REFERER = "Referer checking failed - %s does not match any trusted origins."
|
30
|
-
REASON_NO_CSRF_COOKIE = "CSRF cookie not set."
|
31
|
-
REASON_CSRF_TOKEN_MISSING = "CSRF token missing."
|
32
|
-
REASON_MALFORMED_REFERER = "Referer checking failed - Referer is malformed."
|
33
|
-
REASON_INSECURE_REFERER = (
|
34
|
-
"Referer checking failed - Referer is insecure while host is secure."
|
35
|
-
)
|
36
|
-
# The reason strings below are for passing to InvalidTokenFormat. They are
|
37
|
-
# phrases without a subject because they can be in reference to either the CSRF
|
38
|
-
# cookie or non-cookie token.
|
39
|
-
REASON_INCORRECT_LENGTH = "has incorrect length"
|
40
|
-
REASON_INVALID_CHARACTERS = "has invalid characters"
|
41
|
-
|
42
|
-
CSRF_SECRET_LENGTH = 32
|
43
|
-
CSRF_TOKEN_LENGTH = 2 * CSRF_SECRET_LENGTH
|
44
|
-
CSRF_ALLOWED_CHARS = string.ascii_letters + string.digits
|
45
|
-
|
46
|
-
|
47
|
-
def _get_new_csrf_string():
|
48
|
-
return get_random_string(CSRF_SECRET_LENGTH, allowed_chars=CSRF_ALLOWED_CHARS)
|
49
|
-
|
50
|
-
|
51
|
-
def _mask_cipher_secret(secret):
|
52
|
-
"""
|
53
|
-
Given a secret (assumed to be a string of CSRF_ALLOWED_CHARS), generate a
|
54
|
-
token by adding a mask and applying it to the secret.
|
55
|
-
"""
|
56
|
-
mask = _get_new_csrf_string()
|
57
|
-
chars = CSRF_ALLOWED_CHARS
|
58
|
-
pairs = zip((chars.index(x) for x in secret), (chars.index(x) for x in mask))
|
59
|
-
cipher = "".join(chars[(x + y) % len(chars)] for x, y in pairs)
|
60
|
-
return mask + cipher
|
61
|
-
|
62
|
-
|
63
|
-
def _unmask_cipher_token(token):
|
64
|
-
"""
|
65
|
-
Given a token (assumed to be a string of CSRF_ALLOWED_CHARS, of length
|
66
|
-
CSRF_TOKEN_LENGTH, and that its first half is a mask), use it to decrypt
|
67
|
-
the second half to produce the original secret.
|
68
|
-
"""
|
69
|
-
mask = token[:CSRF_SECRET_LENGTH]
|
70
|
-
token = token[CSRF_SECRET_LENGTH:]
|
71
|
-
chars = CSRF_ALLOWED_CHARS
|
72
|
-
pairs = zip((chars.index(x) for x in token), (chars.index(x) for x in mask))
|
73
|
-
return "".join(chars[x - y] for x, y in pairs) # Note negative values are ok
|
74
|
-
|
75
|
-
|
76
|
-
def _add_new_csrf_cookie(request):
|
77
|
-
"""Generate a new random CSRF_COOKIE value, and add it to request.meta."""
|
78
|
-
csrf_secret = _get_new_csrf_string()
|
79
|
-
request.meta.update(
|
80
|
-
{
|
81
|
-
"CSRF_COOKIE": csrf_secret,
|
82
|
-
"CSRF_COOKIE_NEEDS_UPDATE": True,
|
83
|
-
}
|
84
|
-
)
|
85
|
-
return csrf_secret
|
86
|
-
|
87
|
-
|
88
|
-
def get_token(request):
|
89
|
-
"""
|
90
|
-
Return the CSRF token required for a POST form. The token is an
|
91
|
-
alphanumeric value. A new token is created if one is not already set.
|
92
|
-
|
93
|
-
A side effect of calling this function is to make the csrf_protect
|
94
|
-
decorator and the CsrfViewMiddleware add a CSRF cookie and a 'Vary: Cookie'
|
95
|
-
header to the outgoing response. For this reason, you may need to use this
|
96
|
-
function lazily, as is done by the csrf context processor.
|
97
|
-
"""
|
98
|
-
if "CSRF_COOKIE" in request.meta:
|
99
|
-
csrf_secret = request.meta["CSRF_COOKIE"]
|
100
|
-
# Since the cookie is being used, flag to send the cookie in
|
101
|
-
# process_response() (even if the client already has it) in order to
|
102
|
-
# renew the expiry timer.
|
103
|
-
request.meta["CSRF_COOKIE_NEEDS_UPDATE"] = True
|
104
|
-
else:
|
105
|
-
csrf_secret = _add_new_csrf_cookie(request)
|
106
|
-
return _mask_cipher_secret(csrf_secret)
|
107
8
|
|
9
|
+
from .views import CsrfFailureView
|
108
10
|
|
109
|
-
|
110
|
-
"""
|
111
|
-
Change the CSRF token in use for a request - should be done on login
|
112
|
-
for security purposes.
|
113
|
-
"""
|
114
|
-
_add_new_csrf_cookie(request)
|
115
|
-
|
116
|
-
|
117
|
-
class InvalidTokenFormat(Exception):
|
118
|
-
def __init__(self, reason):
|
119
|
-
self.reason = reason
|
120
|
-
|
121
|
-
|
122
|
-
def _check_token_format(token):
|
123
|
-
"""
|
124
|
-
Raise an InvalidTokenFormat error if the token has an invalid length or
|
125
|
-
characters that aren't allowed. The token argument can be a CSRF cookie
|
126
|
-
secret or non-cookie CSRF token, and either masked or unmasked.
|
127
|
-
"""
|
128
|
-
if len(token) not in (CSRF_TOKEN_LENGTH, CSRF_SECRET_LENGTH):
|
129
|
-
raise InvalidTokenFormat(REASON_INCORRECT_LENGTH)
|
130
|
-
# Make sure all characters are in CSRF_ALLOWED_CHARS.
|
131
|
-
if invalid_token_chars_re.search(token):
|
132
|
-
raise InvalidTokenFormat(REASON_INVALID_CHARACTERS)
|
133
|
-
|
134
|
-
|
135
|
-
def _does_token_match(request_csrf_token, csrf_secret):
|
136
|
-
"""
|
137
|
-
Return whether the given CSRF token matches the given CSRF secret, after
|
138
|
-
unmasking the token if necessary.
|
139
|
-
|
140
|
-
This function assumes that the request_csrf_token argument has been
|
141
|
-
validated to have the correct length (CSRF_SECRET_LENGTH or
|
142
|
-
CSRF_TOKEN_LENGTH characters) and allowed characters, and that if it has
|
143
|
-
length CSRF_TOKEN_LENGTH, it is a masked secret.
|
144
|
-
"""
|
145
|
-
# Only unmask tokens that are exactly CSRF_TOKEN_LENGTH characters long.
|
146
|
-
if len(request_csrf_token) == CSRF_TOKEN_LENGTH:
|
147
|
-
request_csrf_token = _unmask_cipher_token(request_csrf_token)
|
148
|
-
assert len(request_csrf_token) == CSRF_SECRET_LENGTH
|
149
|
-
return constant_time_compare(request_csrf_token, csrf_secret)
|
150
|
-
|
151
|
-
|
152
|
-
class RejectRequest(Exception):
|
153
|
-
def __init__(self, reason):
|
154
|
-
self.reason = reason
|
11
|
+
logger = logging.getLogger("plain.security.csrf")
|
155
12
|
|
156
13
|
|
157
14
|
class CsrfViewMiddleware:
|
158
15
|
"""
|
159
|
-
|
160
|
-
|
16
|
+
Modern CSRF protection middleware using Sec-Fetch-Site headers and origin validation.
|
17
|
+
Based on Filippo Valsorda's 2025 research (https://words.filippo.io/csrf/).
|
161
18
|
|
162
|
-
This
|
163
|
-
|
19
|
+
Note: This provides same-origin (not same-site) protection. Same-site origins
|
20
|
+
like subdomains can have different trust levels and are rejected.
|
164
21
|
"""
|
165
22
|
|
166
23
|
def __init__(self, get_response):
|
167
24
|
self.get_response = get_response
|
168
25
|
|
26
|
+
# Compile CSRF exempt patterns once for performance
|
27
|
+
self.csrf_exempt_patterns = [re.compile(r) for r in settings.CSRF_EXEMPT_PATHS]
|
28
|
+
|
169
29
|
def __call__(self, request):
|
170
|
-
|
171
|
-
|
172
|
-
|
173
|
-
|
30
|
+
allowed, reason = self.should_allow_request(request)
|
31
|
+
|
32
|
+
if allowed:
|
33
|
+
return self.get_response(request)
|
174
34
|
else:
|
175
|
-
|
176
|
-
|
177
|
-
|
178
|
-
|
179
|
-
|
180
|
-
|
35
|
+
return self.reject(request, reason)
|
36
|
+
|
37
|
+
def should_allow_request(self, request) -> tuple[bool, str]:
|
38
|
+
# 1. Allow safe methods (GET, HEAD, OPTIONS)
|
39
|
+
if request.method in ("GET", "HEAD", "OPTIONS"):
|
40
|
+
return True, f"Safe HTTP method: {request.method}"
|
41
|
+
|
42
|
+
# 2. Path-based exemption (regex patterns)
|
43
|
+
for pattern in self.csrf_exempt_patterns:
|
44
|
+
if pattern.search(request.path_info):
|
45
|
+
return (
|
46
|
+
True,
|
47
|
+
f"Path {request.path_info} matches exempt pattern {pattern.pattern}",
|
48
|
+
)
|
181
49
|
|
182
|
-
|
183
|
-
|
50
|
+
origin = request.headers.get("Origin")
|
51
|
+
sec_fetch_site = request.headers.get("Sec-Fetch-Site", "").lower()
|
184
52
|
|
185
|
-
|
53
|
+
# 3. Check trusted origins allow-list
|
186
54
|
|
187
|
-
if
|
188
|
-
|
189
|
-
# Unset the flag to prevent _set_csrf_cookie() from being
|
190
|
-
# unnecessarily called again in process_response() by other
|
191
|
-
# instances of CsrfViewMiddleware. This can happen e.g. when both a
|
192
|
-
# decorator and middleware are used. However,
|
193
|
-
# CSRF_COOKIE_NEEDS_UPDATE is still respected in subsequent calls
|
194
|
-
# e.g. in case rotate_token() is called in process_response() later
|
195
|
-
# by custom middleware but before those subsequent calls.
|
196
|
-
request.meta["CSRF_COOKIE_NEEDS_UPDATE"] = False
|
55
|
+
if origin and origin in settings.CSRF_TRUSTED_ORIGINS:
|
56
|
+
return True, f"Trusted origin: {origin}"
|
197
57
|
|
198
|
-
|
58
|
+
# 4. Primary protection: Check Sec-Fetch-Site header
|
59
|
+
if sec_fetch_site in ("same-origin", "none"):
|
60
|
+
return (
|
61
|
+
True,
|
62
|
+
f"Same-origin request from Sec-Fetch-Site: {sec_fetch_site}",
|
63
|
+
)
|
64
|
+
elif sec_fetch_site in ("cross-site", "same-site"):
|
65
|
+
return (
|
66
|
+
False,
|
67
|
+
f"Cross-origin request detected from Sec-Fetch-Site: {sec_fetch_site}",
|
68
|
+
)
|
199
69
|
|
200
|
-
|
201
|
-
|
202
|
-
|
203
|
-
|
204
|
-
|
205
|
-
|
70
|
+
# 5. No fetch metadata or Origin headers - allow (non-browser requests)
|
71
|
+
if not origin and not sec_fetch_site:
|
72
|
+
return (
|
73
|
+
True,
|
74
|
+
"No Origin or Sec-Fetch-Site header - likely non-browser or old browser",
|
75
|
+
)
|
76
|
+
|
77
|
+
# 6. Fallback: Origin vs Host comparison for older browsers
|
78
|
+
# Note: On pre-2023 browsers, HTTP→HTTPS transitions may cause mismatches
|
79
|
+
# (Origin shows :443, request sees :80 if TLS terminated upstream).
|
80
|
+
# HSTS helps here; otherwise add external origins to CSRF_TRUSTED_ORIGINS.
|
81
|
+
if origin == "null":
|
82
|
+
return False, "Cross-origin request detected - null Origin header"
|
83
|
+
|
84
|
+
try:
|
85
|
+
if (parsed_origin := urlparse(origin)) and (host := request.get_host()):
|
86
|
+
# Scheme-agnostic host:port comparison
|
87
|
+
origin_host = parsed_origin.hostname
|
88
|
+
origin_port = parsed_origin.port or (
|
89
|
+
80
|
90
|
+
if parsed_origin.scheme == "http"
|
91
|
+
else 443
|
92
|
+
if parsed_origin.scheme == "https"
|
93
|
+
else None
|
94
|
+
)
|
206
95
|
|
207
|
-
|
208
|
-
|
209
|
-
|
96
|
+
# Extract hostname from request host (similar to how we parse origin)
|
97
|
+
# Use a fake scheme since we only care about host parsing
|
98
|
+
parsed_host = urlparse(f"http://{host}")
|
99
|
+
request_host = parsed_host.hostname or host
|
100
|
+
request_port = request.get_port()
|
101
|
+
|
102
|
+
# Compare hostname and port (scheme-agnostic)
|
103
|
+
# Both origin_host and request_host are normalized by urlparse (IPv6 brackets stripped)
|
104
|
+
if origin_host and origin_port and request_host and request_port:
|
105
|
+
if (
|
106
|
+
origin_host.lower() == request_host.lower()
|
107
|
+
and origin_port == int(request_port)
|
108
|
+
):
|
109
|
+
return (
|
110
|
+
True,
|
111
|
+
f"Same-origin request - Origin {origin} matches Host {host}",
|
112
|
+
)
|
113
|
+
except (ValueError, DisallowedHost):
|
114
|
+
pass
|
210
115
|
|
211
|
-
|
212
|
-
|
213
|
-
|
214
|
-
|
215
|
-
|
216
|
-
"""
|
217
|
-
allowed_origin_subdomains = defaultdict(list)
|
218
|
-
for parsed in (
|
219
|
-
urlparse(origin)
|
220
|
-
for origin in settings.CSRF_TRUSTED_ORIGINS
|
221
|
-
if "*" in origin
|
222
|
-
):
|
223
|
-
allowed_origin_subdomains[parsed.scheme].append(parsed.netloc.lstrip("*"))
|
224
|
-
return allowed_origin_subdomains
|
116
|
+
# Origin present but doesn't match host
|
117
|
+
return (
|
118
|
+
False,
|
119
|
+
f"Cross-origin request detected - Origin {origin} does not match Host",
|
120
|
+
)
|
225
121
|
|
226
|
-
def
|
227
|
-
|
122
|
+
def reject(self, request, reason):
|
123
|
+
"""Reject a request with a 403 Forbidden response."""
|
228
124
|
|
229
125
|
response = CsrfFailureView.as_view()(request, reason=reason)
|
230
126
|
log_response(
|
@@ -236,210 +132,3 @@ class CsrfViewMiddleware:
|
|
236
132
|
logger=logger,
|
237
133
|
)
|
238
134
|
return response
|
239
|
-
|
240
|
-
def _get_secret(self, request):
|
241
|
-
"""
|
242
|
-
Return the CSRF secret originally associated with the request, or None
|
243
|
-
if it didn't have one.
|
244
|
-
|
245
|
-
If the CSRF_USE_SESSIONS setting is false, raises InvalidTokenFormat if
|
246
|
-
the request's secret has invalid characters or an invalid length.
|
247
|
-
"""
|
248
|
-
try:
|
249
|
-
csrf_secret = request.cookies[settings.CSRF_COOKIE_NAME]
|
250
|
-
except KeyError:
|
251
|
-
csrf_secret = None
|
252
|
-
else:
|
253
|
-
# This can raise InvalidTokenFormat.
|
254
|
-
_check_token_format(csrf_secret)
|
255
|
-
|
256
|
-
if csrf_secret is None:
|
257
|
-
return None
|
258
|
-
return csrf_secret
|
259
|
-
|
260
|
-
def _set_csrf_cookie(self, request, response):
|
261
|
-
response.set_cookie(
|
262
|
-
settings.CSRF_COOKIE_NAME,
|
263
|
-
request.meta["CSRF_COOKIE"],
|
264
|
-
max_age=settings.CSRF_COOKIE_AGE,
|
265
|
-
domain=settings.CSRF_COOKIE_DOMAIN,
|
266
|
-
path=settings.CSRF_COOKIE_PATH,
|
267
|
-
secure=settings.CSRF_COOKIE_SECURE,
|
268
|
-
httponly=settings.CSRF_COOKIE_HTTPONLY,
|
269
|
-
samesite=settings.CSRF_COOKIE_SAMESITE,
|
270
|
-
)
|
271
|
-
# Set the Vary header since content varies with the CSRF cookie.
|
272
|
-
patch_vary_headers(response, ("Cookie",))
|
273
|
-
|
274
|
-
def _origin_verified(self, request):
|
275
|
-
request_origin = request.meta["HTTP_ORIGIN"]
|
276
|
-
try:
|
277
|
-
good_host = request.get_host()
|
278
|
-
except DisallowedHost:
|
279
|
-
pass
|
280
|
-
else:
|
281
|
-
good_origin = "{}://{}".format(
|
282
|
-
"https" if request.is_https() else "http",
|
283
|
-
good_host,
|
284
|
-
)
|
285
|
-
if request_origin == good_origin:
|
286
|
-
return True
|
287
|
-
if request_origin in self.allowed_origins_exact:
|
288
|
-
return True
|
289
|
-
try:
|
290
|
-
parsed_origin = urlparse(request_origin)
|
291
|
-
except ValueError:
|
292
|
-
return False
|
293
|
-
request_scheme = parsed_origin.scheme
|
294
|
-
request_netloc = parsed_origin.netloc
|
295
|
-
return any(
|
296
|
-
is_same_domain(request_netloc, host)
|
297
|
-
for host in self.allowed_origin_subdomains.get(request_scheme, ())
|
298
|
-
)
|
299
|
-
|
300
|
-
def _check_referer(self, request):
|
301
|
-
referer = request.meta.get("HTTP_REFERER")
|
302
|
-
if referer is None:
|
303
|
-
raise RejectRequest(REASON_NO_REFERER)
|
304
|
-
|
305
|
-
try:
|
306
|
-
referer = urlparse(referer)
|
307
|
-
except ValueError:
|
308
|
-
raise RejectRequest(REASON_MALFORMED_REFERER)
|
309
|
-
|
310
|
-
# Make sure we have a valid URL for Referer.
|
311
|
-
if "" in (referer.scheme, referer.netloc):
|
312
|
-
raise RejectRequest(REASON_MALFORMED_REFERER)
|
313
|
-
|
314
|
-
# Ensure that our Referer is also secure.
|
315
|
-
if referer.scheme != "https":
|
316
|
-
raise RejectRequest(REASON_INSECURE_REFERER)
|
317
|
-
|
318
|
-
if any(
|
319
|
-
is_same_domain(referer.netloc, host)
|
320
|
-
for host in self.csrf_trusted_origins_hosts
|
321
|
-
):
|
322
|
-
return
|
323
|
-
# Allow matching the configured cookie domain.
|
324
|
-
good_referer = settings.CSRF_COOKIE_DOMAIN
|
325
|
-
if good_referer is None:
|
326
|
-
# If no cookie domain is configured, allow matching the current
|
327
|
-
# host:port exactly if it's permitted by ALLOWED_HOSTS.
|
328
|
-
try:
|
329
|
-
# request.get_host() includes the port.
|
330
|
-
good_referer = request.get_host()
|
331
|
-
except DisallowedHost:
|
332
|
-
raise RejectRequest(REASON_BAD_REFERER % referer.geturl())
|
333
|
-
else:
|
334
|
-
server_port = request.get_port()
|
335
|
-
if server_port not in ("443", "80"):
|
336
|
-
good_referer = f"{good_referer}:{server_port}"
|
337
|
-
|
338
|
-
if not is_same_domain(referer.netloc, good_referer):
|
339
|
-
raise RejectRequest(REASON_BAD_REFERER % referer.geturl())
|
340
|
-
|
341
|
-
def _bad_token_message(self, reason, token_source):
|
342
|
-
if token_source != "POST":
|
343
|
-
# Assume it is a settings.CSRF_HEADER_NAME value.
|
344
|
-
header_name = HttpHeaders.parse_header_name(token_source)
|
345
|
-
token_source = f"the {header_name!r} HTTP header"
|
346
|
-
return f"CSRF token from {token_source} {reason}."
|
347
|
-
|
348
|
-
def _check_token(self, request):
|
349
|
-
# Access csrf_secret via self._get_secret() as rotate_token() may have
|
350
|
-
# been called by an authentication middleware during the
|
351
|
-
# process_request() phase.
|
352
|
-
try:
|
353
|
-
csrf_secret = self._get_secret(request)
|
354
|
-
except InvalidTokenFormat as exc:
|
355
|
-
raise RejectRequest(f"CSRF cookie {exc.reason}.")
|
356
|
-
|
357
|
-
if csrf_secret is None:
|
358
|
-
# No CSRF cookie. For POST requests, we insist on a CSRF cookie,
|
359
|
-
# and in this way we can avoid all CSRF attacks, including login
|
360
|
-
# CSRF.
|
361
|
-
raise RejectRequest(REASON_NO_CSRF_COOKIE)
|
362
|
-
|
363
|
-
# Check non-cookie token for match.
|
364
|
-
request_csrf_token = ""
|
365
|
-
if request.method == "POST":
|
366
|
-
try:
|
367
|
-
request_csrf_token = request.data.get(settings.CSRF_FIELD_NAME, "")
|
368
|
-
except UnreadablePostError:
|
369
|
-
# Handle a broken connection before we've completed reading the
|
370
|
-
# POST data. process_view shouldn't raise any exceptions, so
|
371
|
-
# we'll ignore and serve the user a 403 (assuming they're still
|
372
|
-
# listening, which they probably aren't because of the error).
|
373
|
-
pass
|
374
|
-
|
375
|
-
if request_csrf_token == "":
|
376
|
-
# Fall back to X-CSRFToken, to make things easier for AJAX, and
|
377
|
-
# possible for PUT/DELETE.
|
378
|
-
try:
|
379
|
-
# This can have length CSRF_SECRET_LENGTH or CSRF_TOKEN_LENGTH,
|
380
|
-
# depending on whether the client obtained the token from
|
381
|
-
# the DOM or the cookie (and if the cookie, whether the cookie
|
382
|
-
# was masked or unmasked).
|
383
|
-
request_csrf_token = request.headers[settings.CSRF_HEADER_NAME]
|
384
|
-
except KeyError:
|
385
|
-
raise RejectRequest(REASON_CSRF_TOKEN_MISSING)
|
386
|
-
token_source = settings.CSRF_HEADER_NAME
|
387
|
-
else:
|
388
|
-
token_source = "POST"
|
389
|
-
|
390
|
-
try:
|
391
|
-
_check_token_format(request_csrf_token)
|
392
|
-
except InvalidTokenFormat as exc:
|
393
|
-
reason = self._bad_token_message(exc.reason, token_source)
|
394
|
-
raise RejectRequest(reason)
|
395
|
-
|
396
|
-
if not _does_token_match(request_csrf_token, csrf_secret):
|
397
|
-
reason = self._bad_token_message("incorrect", token_source)
|
398
|
-
raise RejectRequest(reason)
|
399
|
-
|
400
|
-
def _get_csrf_response(self, request):
|
401
|
-
# Wait until request.meta["CSRF_COOKIE"] has been manipulated before
|
402
|
-
# bailing out, so that get_token still works
|
403
|
-
if getattr(request, "csrf_exempt", True):
|
404
|
-
return None
|
405
|
-
|
406
|
-
# Assume that anything not defined as 'safe' by RFC 9110 needs protection
|
407
|
-
if request.method in ("GET", "HEAD", "OPTIONS", "TRACE"):
|
408
|
-
return None
|
409
|
-
|
410
|
-
# Reject the request if the Origin header doesn't match an allowed
|
411
|
-
# value.
|
412
|
-
if "HTTP_ORIGIN" in request.meta:
|
413
|
-
if not self._origin_verified(request):
|
414
|
-
return self._reject(
|
415
|
-
request, REASON_BAD_ORIGIN % request.meta["HTTP_ORIGIN"]
|
416
|
-
)
|
417
|
-
elif request.is_https():
|
418
|
-
# If the Origin header wasn't provided, reject HTTPS requests if
|
419
|
-
# the Referer header doesn't match an allowed value.
|
420
|
-
#
|
421
|
-
# Suppose user visits http://example.com/
|
422
|
-
# An active network attacker (man-in-the-middle, MITM) sends a
|
423
|
-
# POST form that targets https://example.com/detonate-bomb/ and
|
424
|
-
# submits it via JavaScript.
|
425
|
-
#
|
426
|
-
# The attacker will need to provide a CSRF cookie and token, but
|
427
|
-
# that's no problem for a MITM and the session-independent secret
|
428
|
-
# we're using. So the MITM can circumvent the CSRF protection. This
|
429
|
-
# is true for any HTTP connection, but anyone using HTTPS expects
|
430
|
-
# better! For this reason, for https://example.com/ we need
|
431
|
-
# additional protection that treats http://example.com/ as
|
432
|
-
# completely untrusted. Under HTTPS, Barth et al. found that the
|
433
|
-
# Referer header is missing for same-domain requests in only about
|
434
|
-
# 0.2% of cases or less, so we can use strict Referer checking.
|
435
|
-
try:
|
436
|
-
self._check_referer(request)
|
437
|
-
except RejectRequest as exc:
|
438
|
-
return self._reject(request, exc.reason)
|
439
|
-
|
440
|
-
try:
|
441
|
-
self._check_token(request)
|
442
|
-
except RejectRequest as exc:
|
443
|
-
return self._reject(request, exc.reason)
|
444
|
-
|
445
|
-
return None
|
plain/exceptions.py
CHANGED
@@ -6,6 +6,23 @@ import operator
|
|
6
6
|
|
7
7
|
from plain.utils.hashable import make_hashable
|
8
8
|
|
9
|
+
# MARK: Configuration and Registry
|
10
|
+
|
11
|
+
|
12
|
+
class PackageRegistryNotReady(Exception):
|
13
|
+
"""The plain.packages registry is not populated yet"""
|
14
|
+
|
15
|
+
pass
|
16
|
+
|
17
|
+
|
18
|
+
class ImproperlyConfigured(Exception):
|
19
|
+
"""Plain is somehow improperly configured"""
|
20
|
+
|
21
|
+
pass
|
22
|
+
|
23
|
+
|
24
|
+
# MARK: Model and Field Errors
|
25
|
+
|
9
26
|
|
10
27
|
class FieldDoesNotExist(Exception):
|
11
28
|
"""The requested model field does not exist"""
|
@@ -13,8 +30,8 @@ class FieldDoesNotExist(Exception):
|
|
13
30
|
pass
|
14
31
|
|
15
32
|
|
16
|
-
class
|
17
|
-
"""
|
33
|
+
class FieldError(Exception):
|
34
|
+
"""Some kind of problem with a model field."""
|
18
35
|
|
19
36
|
pass
|
20
37
|
|
@@ -31,6 +48,9 @@ class MultipleObjectsReturned(Exception):
|
|
31
48
|
pass
|
32
49
|
|
33
50
|
|
51
|
+
# MARK: Security and Suspicious Operations
|
52
|
+
|
53
|
+
|
34
54
|
class SuspiciousOperation(Exception):
|
35
55
|
"""The user did something suspicious"""
|
36
56
|
|
@@ -80,6 +100,9 @@ class RequestDataTooBig(SuspiciousOperation):
|
|
80
100
|
pass
|
81
101
|
|
82
102
|
|
103
|
+
# MARK: HTTP and Request Errors
|
104
|
+
|
105
|
+
|
83
106
|
class BadRequest(Exception):
|
84
107
|
"""The request is malformed and cannot be processed."""
|
85
108
|
|
@@ -92,17 +115,7 @@ class PermissionDenied(Exception):
|
|
92
115
|
pass
|
93
116
|
|
94
117
|
|
95
|
-
|
96
|
-
"""Plain is somehow improperly configured"""
|
97
|
-
|
98
|
-
pass
|
99
|
-
|
100
|
-
|
101
|
-
class FieldError(Exception):
|
102
|
-
"""Some kind of problem with a model field."""
|
103
|
-
|
104
|
-
pass
|
105
|
-
|
118
|
+
# MARK: Validation
|
106
119
|
|
107
120
|
NON_FIELD_ERRORS = "__all__"
|
108
121
|
|
@@ -205,6 +218,9 @@ class ValidationError(Exception):
|
|
205
218
|
return hash(tuple(sorted(self.error_list, key=operator.attrgetter("message"))))
|
206
219
|
|
207
220
|
|
221
|
+
# MARK: Database
|
222
|
+
|
223
|
+
|
208
224
|
class EmptyResultSet(Exception):
|
209
225
|
"""A database query predicate is impossible."""
|
210
226
|
|
plain/forms/README.md
CHANGED
@@ -12,7 +12,7 @@ class HttpsRedirectMiddleware:
|
|
12
12
|
self.https_redirect_enabled = settings.HTTPS_REDIRECT_ENABLED
|
13
13
|
self.https_redirect_host = settings.HTTPS_REDIRECT_HOST
|
14
14
|
self.https_redirect_exempt = [
|
15
|
-
re.compile(r) for r in settings.
|
15
|
+
re.compile(r) for r in settings.HTTPS_REDIRECT_EXEMPT_PATHS
|
16
16
|
]
|
17
17
|
|
18
18
|
def __call__(self, request):
|
@@ -26,11 +26,13 @@ class HttpsRedirectMiddleware:
|
|
26
26
|
return self.get_response(request)
|
27
27
|
|
28
28
|
def maybe_https_redirect(self, request):
|
29
|
-
path = request.path.lstrip("/")
|
30
29
|
if (
|
31
30
|
self.https_redirect_enabled
|
32
31
|
and not request.is_https()
|
33
|
-
and not any(
|
32
|
+
and not any(
|
33
|
+
pattern.search(request.path_info)
|
34
|
+
for pattern in self.https_redirect_exempt
|
35
|
+
)
|
34
36
|
):
|
35
37
|
host = self.https_redirect_host or request.get_host()
|
36
38
|
return ResponseRedirect(
|
plain/runtime/global_settings.py
CHANGED
@@ -3,31 +3,20 @@ Default Plain settings. Override these with settings in the module pointed to
|
|
3
3
|
by the PLAIN_SETTINGS_MODULE environment variable.
|
4
4
|
"""
|
5
5
|
|
6
|
-
|
7
|
-
# CORE #
|
8
|
-
####################
|
6
|
+
# MARK: Core Settings
|
9
7
|
|
10
8
|
DEBUG: bool = False
|
11
9
|
|
12
|
-
# Hosts/domain names that are valid for this site.
|
13
|
-
# "*" matches anything, ".example.com" matches example.com and all subdomains
|
14
|
-
ALLOWED_HOSTS: list[str] = []
|
15
|
-
|
16
|
-
# Local time zone for this installation. All choices can be found here:
|
17
|
-
# https://en.wikipedia.org/wiki/List_of_tz_zones_by_name (although not all
|
18
|
-
# systems may support all possibilities). This is interpreted as the default
|
19
|
-
# user time zone.
|
20
|
-
TIME_ZONE: str = "UTC"
|
21
|
-
|
22
|
-
# Default charset to use for all Response objects, if a MIME type isn't
|
23
|
-
# manually specified. It's used to construct the Content-Type header.
|
24
|
-
DEFAULT_CHARSET = "utf-8"
|
25
|
-
|
26
10
|
# List of strings representing installed packages.
|
27
11
|
INSTALLED_PACKAGES: list[str] = []
|
28
12
|
|
29
|
-
|
30
|
-
|
13
|
+
URLS_ROUTER: str
|
14
|
+
|
15
|
+
# MARK: HTTP and Security
|
16
|
+
|
17
|
+
# Hosts/domain names that are valid for this site.
|
18
|
+
# "*" matches anything, ".example.com" matches example.com and all subdomains
|
19
|
+
ALLOWED_HOSTS: list[str] = []
|
31
20
|
|
32
21
|
# Default headers for all responses.
|
33
22
|
DEFAULT_RESPONSE_HEADERS = {
|
@@ -42,7 +31,13 @@ DEFAULT_RESPONSE_HEADERS = {
|
|
42
31
|
|
43
32
|
# Whether to redirect all non-HTTPS requests to HTTPS.
|
44
33
|
HTTPS_REDIRECT_ENABLED = True
|
45
|
-
|
34
|
+
|
35
|
+
# Regex patterns for paths that should be exempt from HTTPS redirect
|
36
|
+
# Examples: [r"^/health$", r"/api/internal/.*", r"/dev/.*"]
|
37
|
+
HTTPS_REDIRECT_EXEMPT_PATHS: list[str] = []
|
38
|
+
|
39
|
+
# Custom host to redirect to for HTTPS. If None, uses the same host as the request.
|
40
|
+
# Useful for redirecting to a different domain (e.g., "secure.example.com")
|
46
41
|
HTTPS_REDIRECT_HOST = None
|
47
42
|
|
48
43
|
# If your Plain app is behind a proxy that sets a header to specify secure
|
@@ -68,7 +63,24 @@ SECRET_KEY: str
|
|
68
63
|
# secret key rotation.
|
69
64
|
SECRET_KEY_FALLBACKS: list[str] = []
|
70
65
|
|
71
|
-
|
66
|
+
# MARK: Internationalization
|
67
|
+
|
68
|
+
# Local time zone for this installation. All choices can be found here:
|
69
|
+
# https://en.wikipedia.org/wiki/List_of_tz_zones_by_name (although not all
|
70
|
+
# systems may support all possibilities). This is interpreted as the default
|
71
|
+
# user time zone.
|
72
|
+
TIME_ZONE: str = "UTC"
|
73
|
+
|
74
|
+
# Default charset to use for all Response objects, if a MIME type isn't
|
75
|
+
# manually specified. It's used to construct the Content-Type header.
|
76
|
+
DEFAULT_CHARSET = "utf-8"
|
77
|
+
|
78
|
+
# MARK: URL Configuration
|
79
|
+
|
80
|
+
# Whether to append trailing slashes to URLs.
|
81
|
+
APPEND_SLASH = True
|
82
|
+
|
83
|
+
# MARK: File Uploads
|
72
84
|
|
73
85
|
# List of upload handler classes to be applied in order.
|
74
86
|
FILE_UPLOAD_HANDLERS = [
|
@@ -100,41 +112,30 @@ FILE_UPLOAD_TEMP_DIR = None
|
|
100
112
|
# User-defined overrides for error views by status code
|
101
113
|
HTTP_ERROR_VIEWS: dict[int] = {}
|
102
114
|
|
103
|
-
|
104
|
-
# MIDDLEWARE #
|
105
|
-
##############
|
115
|
+
# MARK: Middleware
|
106
116
|
|
107
117
|
# List of middleware to use. Order is important; in the request phase, these
|
108
118
|
# middleware will be applied in the order given, and in the response
|
109
119
|
# phase the middleware will be applied in reverse order.
|
110
120
|
MIDDLEWARE: list[str] = []
|
111
121
|
|
112
|
-
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
#
|
117
|
-
CSRF_COOKIE_NAME = "csrftoken"
|
118
|
-
CSRF_COOKIE_AGE = 60 * 60 * 24 * 7 * 52 # 1 year
|
119
|
-
CSRF_COOKIE_DOMAIN = None
|
120
|
-
CSRF_COOKIE_PATH = "/"
|
121
|
-
CSRF_COOKIE_SECURE = True
|
122
|
-
CSRF_COOKIE_HTTPONLY = False
|
123
|
-
CSRF_COOKIE_SAMESITE = "Lax"
|
124
|
-
CSRF_HEADER_NAME = "CSRF-Token"
|
125
|
-
CSRF_FIELD_NAME = "_csrftoken"
|
122
|
+
# MARK: CSRF
|
123
|
+
|
124
|
+
# A list of trusted origins for unsafe (POST/PUT/DELETE etc.) requests.
|
125
|
+
# These origins will be allowed regardless of the normal CSRF checks.
|
126
|
+
# Each origin should be a full origin like "https://example.com" or "https://sub.example.com:8080"
|
126
127
|
CSRF_TRUSTED_ORIGINS: list[str] = []
|
127
128
|
|
128
|
-
|
129
|
-
#
|
130
|
-
|
129
|
+
# Regex patterns for paths that should be exempt from CSRF protection
|
130
|
+
# Examples: [r"^/api/", r"/webhooks/.*", r"/health$"]
|
131
|
+
CSRF_EXEMPT_PATHS: list[str] = []
|
132
|
+
|
133
|
+
# MARK: Logging
|
131
134
|
|
132
135
|
# Custom logging configuration.
|
133
136
|
LOGGING = {}
|
134
137
|
|
135
|
-
|
136
|
-
# ASSETS #
|
137
|
-
###############
|
138
|
+
# MARK: Assets
|
138
139
|
|
139
140
|
# Whether to redirect the original asset path to the fingerprinted path.
|
140
141
|
ASSETS_REDIRECT_ORIGINAL = True
|
@@ -143,9 +144,7 @@ ASSETS_REDIRECT_ORIGINAL = True
|
|
143
144
|
# Ex. "https://cdn.example.com/assets/"
|
144
145
|
ASSETS_BASE_URL: str = ""
|
145
146
|
|
146
|
-
|
147
|
-
# PREFLIGHT CHECKS #
|
148
|
-
####################
|
147
|
+
# MARK: Preflight Checks
|
149
148
|
|
150
149
|
# List of all issues generated by system checks that should be silenced. Light
|
151
150
|
# issues like warnings, infos or debugs will not generate a message. Silencing
|
@@ -153,14 +152,10 @@ ASSETS_BASE_URL: str = ""
|
|
153
152
|
# message, but Plain will not stop you from e.g. running server.
|
154
153
|
PREFLIGHT_SILENCED_CHECKS = []
|
155
154
|
|
156
|
-
|
157
|
-
# Templates #
|
158
|
-
#############
|
155
|
+
# MARK: Templates
|
159
156
|
|
160
157
|
TEMPLATES_JINJA_ENVIRONMENT = "plain.templates.jinja.DefaultEnvironment"
|
161
158
|
|
162
|
-
|
163
|
-
# Shell #
|
164
|
-
#########
|
159
|
+
# MARK: Shell
|
165
160
|
|
166
161
|
SHELL_IMPORT: str = ""
|
plain/templates/README.md
CHANGED
plain/test/client.py
CHANGED
@@ -114,8 +114,7 @@ class ClientHandler(BaseHandler):
|
|
114
114
|
the originating WSGIRequest attached to its ``wsgi_request`` attribute.
|
115
115
|
"""
|
116
116
|
|
117
|
-
def __init__(self,
|
118
|
-
self.enforce_csrf_checks = enforce_csrf_checks
|
117
|
+
def __init__(self, *args, **kwargs):
|
119
118
|
super().__init__(*args, **kwargs)
|
120
119
|
|
121
120
|
def __call__(self, environ):
|
@@ -126,12 +125,6 @@ class ClientHandler(BaseHandler):
|
|
126
125
|
|
127
126
|
request_started.send(sender=self.__class__, environ=environ)
|
128
127
|
request = WSGIRequest(environ)
|
129
|
-
# sneaky little hack so that we can easily get round
|
130
|
-
# CsrfViewMiddleware. This makes life easier, and is probably
|
131
|
-
# required for backwards compatibility with external tests against
|
132
|
-
# admin views.
|
133
|
-
if not self.enforce_csrf_checks:
|
134
|
-
request.csrf_exempt = True
|
135
128
|
|
136
129
|
# Request goes through middleware.
|
137
130
|
response = self.get_response(request)
|
@@ -420,14 +413,13 @@ class Client(RequestFactory):
|
|
420
413
|
|
421
414
|
def __init__(
|
422
415
|
self,
|
423
|
-
enforce_csrf_checks=False,
|
424
416
|
raise_request_exception=True,
|
425
417
|
*,
|
426
418
|
headers=None,
|
427
419
|
**defaults,
|
428
420
|
):
|
429
421
|
super().__init__(headers=headers, **defaults)
|
430
|
-
self.handler = ClientHandler(
|
422
|
+
self.handler = ClientHandler()
|
431
423
|
self.raise_request_exception = raise_request_exception
|
432
424
|
self.exc_info = None
|
433
425
|
self.extra = None
|
plain/views/README.md
CHANGED
plain/views/templates.py
CHANGED
@@ -1,27 +1,11 @@
|
|
1
|
-
from plain.csrf.middleware import get_token
|
2
1
|
from plain.exceptions import ImproperlyConfigured
|
3
2
|
from plain.http import Response
|
4
3
|
from plain.runtime import settings
|
5
4
|
from plain.templates import Template, TemplateFileMissing
|
6
|
-
from plain.utils.functional import lazy
|
7
|
-
from plain.utils.html import format_html
|
8
|
-
from plain.utils.safestring import SafeString
|
9
5
|
|
10
6
|
from .base import View
|
11
7
|
|
12
8
|
|
13
|
-
def csrf_input(request):
|
14
|
-
return format_html(
|
15
|
-
'<input type="hidden" name="{}" value="{}">',
|
16
|
-
settings.CSRF_FIELD_NAME,
|
17
|
-
get_token(request),
|
18
|
-
)
|
19
|
-
|
20
|
-
|
21
|
-
csrf_input_lazy = lazy(csrf_input, SafeString, str)
|
22
|
-
csrf_token_lazy = lazy(get_token, str)
|
23
|
-
|
24
|
-
|
25
9
|
class TemplateView(View):
|
26
10
|
"""
|
27
11
|
Render a template.
|
@@ -37,8 +21,6 @@ class TemplateView(View):
|
|
37
21
|
return {
|
38
22
|
"request": self.request,
|
39
23
|
"template_names": self.get_template_names(),
|
40
|
-
"csrf_input": csrf_input_lazy(self.request),
|
41
|
-
"csrf_token": csrf_token_lazy(self.request),
|
42
24
|
"DEBUG": settings.DEBUG,
|
43
25
|
}
|
44
26
|
|
@@ -1,8 +1,8 @@
|
|
1
|
-
plain/CHANGELOG.md,sha256=
|
1
|
+
plain/CHANGELOG.md,sha256=NnYEqRRQ2lTPIgppmEarKtSZRoLq_N80pgXjyGf6c00,9602
|
2
2
|
plain/README.md,sha256=5BJyKhf0TDanWVbOQyZ3zsi5Lov9xk-LlJYCDWofM6Y,4078
|
3
3
|
plain/__main__.py,sha256=GK39854Lc_LO_JP8DzY9Y2MIQ4cQEl7SXFJy244-lC8,110
|
4
4
|
plain/debug.py,sha256=XdjnXcbPGsi0J2SpHGaLthhYU5AjhBlkHdemaP4sbYY,758
|
5
|
-
plain/exceptions.py,sha256=
|
5
|
+
plain/exceptions.py,sha256=ljOLqgVwPKlGWqaNmjHcHQf6y053bZ9ogkLFEGcs-Gg,5973
|
6
6
|
plain/json.py,sha256=McJdsbMT1sYwkGRG--f2NSZz0hVXPMix9x3nKaaak2o,1262
|
7
7
|
plain/paginator.py,sha256=iXiOyt2r_YwNrkqCRlaU7V-M_BKaaQ8XZElUBVa6yeU,5844
|
8
8
|
plain/signing.py,sha256=r2KvCOxkrSWCULFxYa9BHYx3L3a2oLq8RDnq_92inTw,8207
|
@@ -20,7 +20,7 @@ plain/chores/__init__.py,sha256=r9TXtQCH-VbvfnIJ5F8FxgQC35GRWFOfmMZN3q9niLg,67
|
|
20
20
|
plain/chores/registry.py,sha256=V3WjuekRI22LFvJbqSkUXQtiOtuE2ZK8gKV1TRvxRUI,1866
|
21
21
|
plain/cli/README.md,sha256=5C7vsH0ISxu7q5H6buC25MBOILkI_rzdySitswpQgJw,1032
|
22
22
|
plain/cli/__init__.py,sha256=6w9T7K2WrPwh6DcaMb2oNt_CWU6Bc57nUTO2Bt1p38Y,63
|
23
|
-
plain/cli/agent.py,sha256=
|
23
|
+
plain/cli/agent.py,sha256=nf-Tuc3abxpyV-nShBn1wq0JWjfgd3zY9lLH6rAZSRs,1678
|
24
24
|
plain/cli/build.py,sha256=Lo6AYghJz0DM9fIVUSiBSOKa5vR0XCOxZWEjza6sc8Q,3172
|
25
25
|
plain/cli/changelog.py,sha256=j-k1yZk9mpm-fLZgeWastiyIisxNSuAJfXTQ2B6WQmk,3457
|
26
26
|
plain/cli/chores.py,sha256=xXSSFvr8T5jWfLWqe6E8YVMw1BkQxyOHHVuY0x9RH0A,2412
|
@@ -40,10 +40,10 @@ plain/cli/startup.py,sha256=wLaFuyUb4ewWhtehBCGicrRCXIIGCRbeCT3ce9hUv-A,1022
|
|
40
40
|
plain/cli/upgrade.py,sha256=f1rL9M285i4D5UKlEk4ijmAUN3mAMfHCrbDPwBf1ePo,5514
|
41
41
|
plain/cli/urls.py,sha256=ghCW36aRszxmTo06A50FIvYopb6kQ07QekkDzM6_A1o,3824
|
42
42
|
plain/cli/utils.py,sha256=VwlIh0z7XxzVV8I3qM2kZo07fkJFPoeeVZa1ODG616k,258
|
43
|
-
plain/csrf/README.md,sha256=
|
44
|
-
plain/csrf/middleware.py,sha256=
|
43
|
+
plain/csrf/README.md,sha256=ApWpB-qlEf0LkOKm9Yr-6f_lB9XJEvGFDo_fraw8ghI,2391
|
44
|
+
plain/csrf/middleware.py,sha256=d_vb8l0-KxzyqCivVq0jTCsFOm-ljwjmjVuZXKVYR5U,5113
|
45
45
|
plain/csrf/views.py,sha256=HwQqfI6KPelHP9gSXhjfZaTLQic71PKsoZ6DPhr1rKI,572
|
46
|
-
plain/forms/README.md,sha256=
|
46
|
+
plain/forms/README.md,sha256=7MJQxNBoKkg0rW16qF6bGpUBxZrMrWjl2DZZk6gjzAU,2258
|
47
47
|
plain/forms/__init__.py,sha256=UxqPwB8CiYPCQdHmUc59jadqaXqDmXBH8y4bt9vTPms,226
|
48
48
|
plain/forms/boundfield.py,sha256=LhydhCVR0okrli0-QBMjGjAJ8-06gTCXVEaBZhBouQk,1741
|
49
49
|
plain/forms/exceptions.py,sha256=NYk1wjYDkk-lA_XMJQDItOebQcL_m_r2eNRc2mkLQkg,315
|
@@ -70,7 +70,7 @@ plain/internal/handlers/exception.py,sha256=vfha_6-fz6S6VYCP1PMBfue2Gw-_th6jqaTE
|
|
70
70
|
plain/internal/handlers/wsgi.py,sha256=dgPT29t_F9llB-c5RYU3SHxGuZNaZ83xRjOfuOmtOl8,8209
|
71
71
|
plain/internal/middleware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
72
72
|
plain/internal/middleware/headers.py,sha256=ENIW1Gwat54hv-ejgp2R8QTZm-PlaI7k44WU01YQrNk,964
|
73
|
-
plain/internal/middleware/https.py,sha256=
|
73
|
+
plain/internal/middleware/https.py,sha256=mS1YejfLB_5qlAoMfanh8Wn2O-RdSpOBdhvw2DRcTHs,1257
|
74
74
|
plain/internal/middleware/slash.py,sha256=JWcIfGbXEKH00I7STq1AMdHhFGmQHC8lkKENa6280ko,2846
|
75
75
|
plain/logs/README.md,sha256=ON6Zylg_WA_V7QiIbRY7sgsl2nfG7KFzIbxK2x3rPuc,1419
|
76
76
|
plain/logs/__init__.py,sha256=rASvo4qFBDIHfkACmGLNGa6lRGbG9PbNjW6FmBt95ys,168
|
@@ -90,14 +90,14 @@ plain/preflight/security.py,sha256=oxUZBp2M0bpBfUoLYepIxoex2Y90nyjlrL8XU8UTHYY,2
|
|
90
90
|
plain/preflight/urls.py,sha256=cQ-WnFa_5oztpKdtwhuIGb7pXEml__bHsjs1SWO2YNI,1468
|
91
91
|
plain/runtime/README.md,sha256=sTqXXJkckwqkk9O06XMMSNRokAYjrZBnB50JD36BsYI,4873
|
92
92
|
plain/runtime/__init__.py,sha256=8GtvKROf3HUCtneDYXTbEioPcCtwnV76dP57n2PnjuE,2343
|
93
|
-
plain/runtime/global_settings.py,sha256=
|
93
|
+
plain/runtime/global_settings.py,sha256=6vy8SacB4w4x_BAGsJv6zM3Sa7zcvnEcF2VzHfZs8qk,5645
|
94
94
|
plain/runtime/user_settings.py,sha256=OzMiEkE6ZQ50nxd1WIqirXPiNuMAQULklYHEzgzLWgA,11027
|
95
95
|
plain/signals/README.md,sha256=XefXqROlDhzw7Z5l_nx6Mhq6n9jjQ-ECGbH0vvhKWYg,272
|
96
96
|
plain/signals/__init__.py,sha256=eAs0kLqptuP6I31dWXeAqRNji3svplpAV4Ez6ktjwXM,131
|
97
97
|
plain/signals/dispatch/__init__.py,sha256=FzEygqV9HsM6gopio7O2Oh_X230nA4d5Q9s0sUjMq0E,292
|
98
98
|
plain/signals/dispatch/dispatcher.py,sha256=VxSlqn9PCOTghPPJLOqZPs6FNQZfV2BJpMfFMSg6Dtc,11531
|
99
99
|
plain/signals/dispatch/license.txt,sha256=o9EhDhsC4Q5HbmD-IfNGVTEkXtNE33r5rIt3lleJ8gc,1727
|
100
|
-
plain/templates/README.md,sha256=
|
100
|
+
plain/templates/README.md,sha256=QAQxoygpc0CE13fh4eH4ZILwl2xc-oMdGKtiZLLrNCk,2565
|
101
101
|
plain/templates/__init__.py,sha256=bX76FakE9T7mfK3N0deN85HlwHNQpeigytSC9Z8LcOs,451
|
102
102
|
plain/templates/core.py,sha256=mbcH0yTeFOI3XOg9dYSroXRIcdv9sETEy4HzY-ugwco,1258
|
103
103
|
plain/templates/jinja/__init__.py,sha256=xvYif0feMYR9pWjN0czthq2dk3qI4D5UQjgj9yp4dNA,2776
|
@@ -107,7 +107,7 @@ plain/templates/jinja/filters.py,sha256=ft5XUr4OLeQayn-MSxrycpFLyyN_yEo7j5WhWMwp
|
|
107
107
|
plain/templates/jinja/globals.py,sha256=VMpuMZvwWOmb5MbzKK-ox-QEX_WSsXFxq0mm8biJgaU,558
|
108
108
|
plain/test/README.md,sha256=wem0myAd-ij74nNV1MB9g4iH6FZUgii7-_euRq45oHs,1142
|
109
109
|
plain/test/__init__.py,sha256=MhNHtp7MYBl9kq-pMRGY11kJ6kU1I6vOkjNkit1TYRg,94
|
110
|
-
plain/test/client.py,sha256=
|
110
|
+
plain/test/client.py,sha256=OcL8wQDOu6PUNYvwcmslT5IGt81ffcPsXn05n-2n9oA,25128
|
111
111
|
plain/test/encoding.py,sha256=YJBOIE-BQRA5yl4zHnQy-9l67mJDTFmfy1DQXK0Wk-Q,3199
|
112
112
|
plain/test/exceptions.py,sha256=b-GHicg87Gh73W3g8QGWuSHi9PrQFVsxgWvEXDLt8gQ,290
|
113
113
|
plain/urls/README.md,sha256=026RkCK6I0GdqK3RE2QBLcCLIsiwtyKxgI2F0KBX95E,3882
|
@@ -142,18 +142,17 @@ plain/utils/text.py,sha256=42hJv06sadbWfsaAHNhqCQaP1W9qZ69trWDTS-Xva7k,9496
|
|
142
142
|
plain/utils/timesince.py,sha256=a_-ZoPK_s3Pt998CW4rWp0clZ1XyK2x04hCqak2giII,5928
|
143
143
|
plain/utils/timezone.py,sha256=6u0sE-9RVp0_OCe0Y1KiYYQoq5THWLokZFQYY8jf78g,6221
|
144
144
|
plain/utils/tree.py,sha256=wdWzmfsgc26YDF2wxhAY3yVxXTixQYqYDKE9mL3L3ZY,4383
|
145
|
-
plain/views/README.md,sha256=
|
145
|
+
plain/views/README.md,sha256=JmRGCQJgSr17uzUfsJfZbix1md3Qj6mmCkzWuoTFurQ,7223
|
146
146
|
plain/views/__init__.py,sha256=a-N1nkklVohJTtz0yD1MMaS0g66HviEjsKydNVVjvVc,392
|
147
147
|
plain/views/base.py,sha256=CC9UvMZeAjVvi90vGjoZzsQ0jnhbg3-7qCKQ8-Pb6cg,4184
|
148
|
-
plain/views/csrf.py,sha256=7q6l5xzLWhRnMY64aNj0hR6G-3pxI2yhRwG6k_5j00E,144
|
149
148
|
plain/views/errors.py,sha256=jbNCJIzowwCsEvqyJ3opMeZpPDqTyhtrbqb0VnAm2HE,1263
|
150
149
|
plain/views/exceptions.py,sha256=b4euI49ZUKS9O8AGAcFfiDpstzkRAuuj_uYQXzWNHME,138
|
151
150
|
plain/views/forms.py,sha256=ESZOXuo6IeYixp1RZvPb94KplkowRiwO2eGJCM6zJI0,2400
|
152
151
|
plain/views/objects.py,sha256=GGbcfg_9fPZ-PiaBwIHG2e__8GfWDR7JQtQ15wTyiHg,5970
|
153
152
|
plain/views/redirect.py,sha256=Xpb3cB7nZYvKgkNqcAxf9Jwm2SWcQ0u2xz4oO5M3vP8,1909
|
154
|
-
plain/views/templates.py,sha256=
|
155
|
-
plain-0.
|
156
|
-
plain-0.
|
157
|
-
plain-0.
|
158
|
-
plain-0.
|
159
|
-
plain-0.
|
153
|
+
plain/views/templates.py,sha256=TeVKxfyXwQTmWfWzwjtlZ8GXogcHUDZ1osc--G4YLVw,1588
|
154
|
+
plain-0.58.0.dist-info/METADATA,sha256=yNuHnxpkBcNUME3wBUBvYxV-X6brEHQaXUGeMdFC3qc,4488
|
155
|
+
plain-0.58.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
|
156
|
+
plain-0.58.0.dist-info/entry_points.txt,sha256=nn4uKTRRZuEKOJv3810s3jtSMW0Gew7XDYiKIvBRR6M,93
|
157
|
+
plain-0.58.0.dist-info/licenses/LICENSE,sha256=m0D5O7QoH9l5Vz_rrX_9r-C8d9UNr_ciK6Qwac7o6yo,3175
|
158
|
+
plain-0.58.0.dist-info/RECORD,,
|
plain/views/csrf.py
DELETED
File without changes
|
File without changes
|
File without changes
|