Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
django-rest-framework
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
django-rest-framework
Commits
b76984d2
Commit
b76984d2
authored
Aug 18, 2016
by
Tom Christie
Committed by
GitHub
Aug 18, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow custom CSRF_HEADER_NAME setting. (#4415)
parent
966330a8
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
2 deletions
+11
-2
rest_framework/renderers.py
+8
-1
rest_framework/static/rest_framework/js/csrf.js
+1
-1
rest_framework/templates/rest_framework/admin.html
+1
-0
rest_framework/templates/rest_framework/base.html
+1
-0
No files found.
rest_framework/renderers.py
View file @
b76984d2
...
@@ -645,6 +645,12 @@ class BrowsableAPIRenderer(BaseRenderer):
...
@@ -645,6 +645,12 @@ class BrowsableAPIRenderer(BaseRenderer):
else
:
else
:
paginator
=
None
paginator
=
None
csrf_cookie_name
=
settings
.
CSRF_COOKIE_NAME
csrf_header_name
=
getattr
(
settings
,
'CSRF_HEADER_NAME'
,
'HTTP_X_CSRFToken'
)
# Fallback for Django 1.8
if
csrf_header_name
.
startswith
(
'HTTP_'
):
csrf_header_name
=
csrf_header_name
[
5
:]
csrf_header_name
=
csrf_header_name
.
replace
(
'_'
,
'-'
)
context
=
{
context
=
{
'content'
:
self
.
get_content
(
renderer
,
data
,
accepted_media_type
,
renderer_context
),
'content'
:
self
.
get_content
(
renderer
,
data
,
accepted_media_type
,
renderer_context
),
'view'
:
view
,
'view'
:
view
,
...
@@ -675,7 +681,8 @@ class BrowsableAPIRenderer(BaseRenderer):
...
@@ -675,7 +681,8 @@ class BrowsableAPIRenderer(BaseRenderer):
'display_edit_forms'
:
bool
(
response
.
status_code
!=
403
),
'display_edit_forms'
:
bool
(
response
.
status_code
!=
403
),
'api_settings'
:
api_settings
,
'api_settings'
:
api_settings
,
'csrf_cookie_name'
:
settings
.
CSRF_COOKIE_NAME
,
'csrf_cookie_name'
:
csrf_cookie_name
,
'csrf_header_name'
:
csrf_header_name
}
}
return
context
return
context
...
...
rest_framework/static/rest_framework/js/csrf.js
View file @
b76984d2
...
@@ -46,7 +46,7 @@ $.ajaxSetup({
...
@@ -46,7 +46,7 @@ $.ajaxSetup({
// Send the token to same-origin, relative URLs only.
// Send the token to same-origin, relative URLs only.
// Send the token only if the method warrants CSRF protection
// Send the token only if the method warrants CSRF protection
// Using the CSRFToken value acquired earlier
// Using the CSRFToken value acquired earlier
xhr
.
setRequestHeader
(
"X-CSRFToken"
,
csrftoken
);
xhr
.
setRequestHeader
(
window
.
drf
.
csrfHeaderName
,
csrftoken
);
}
}
}
}
});
});
rest_framework/templates/rest_framework/admin.html
View file @
b76984d2
...
@@ -232,6 +232,7 @@
...
@@ -232,6 +232,7 @@
{% block script %}
{% block script %}
<script>
<script>
window
.
drf
=
{
window
.
drf
=
{
csrfHeaderName
:
"{{ csrf_header_name|default:'X-CSRFToken' }}"
csrfCookieName
:
"{{ csrf_cookie_name|default:'csrftoken' }}"
csrfCookieName
:
"{{ csrf_cookie_name|default:'csrftoken' }}"
};
};
</script>
</script>
...
...
rest_framework/templates/rest_framework/base.html
View file @
b76984d2
...
@@ -263,6 +263,7 @@
...
@@ -263,6 +263,7 @@
{% block script %}
{% block script %}
<script>
<script>
window
.
drf
=
{
window
.
drf
=
{
csrfHeaderName
:
"{{ csrf_header_name|default:'X-CSRFToken' }}"
csrfCookieName
:
"{{ csrf_cookie_name|default:'csrftoken' }}"
csrfCookieName
:
"{{ csrf_cookie_name|default:'csrftoken' }}"
};
};
</script>
</script>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment