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
4f16c544
Commit
4f16c544
authored
Apr 26, 2016
by
José Padilla
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4049 from clintonb/csrf-cookie-fix
Added support for custom CSRF cookie names
parents
1823662e
9d9658f1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
2 deletions
+14
-2
rest_framework/renderers.py
+3
-1
rest_framework/static/rest_framework/js/csrf.js
+1
-1
rest_framework/templates/rest_framework/admin.html
+5
-0
rest_framework/templates/rest_framework/base.html
+5
-0
No files found.
rest_framework/renderers.py
View file @
4f16c544
...
...
@@ -12,6 +12,7 @@ import json
from
collections
import
OrderedDict
from
django
import
forms
from
django.conf
import
settings
from
django.core.exceptions
import
ImproperlyConfigured
from
django.core.paginator
import
Page
from
django.http.multipartparser
import
parse_header
...
...
@@ -657,7 +658,8 @@ class BrowsableAPIRenderer(BaseRenderer):
'display_edit_forms'
:
bool
(
response
.
status_code
!=
403
),
'api_settings'
:
api_settings
'api_settings'
:
api_settings
,
'csrf_cookie_name'
:
settings
.
CSRF_COOKIE_NAME
,
}
return
context
...
...
rest_framework/static/rest_framework/js/csrf.js
View file @
4f16c544
...
...
@@ -33,7 +33,7 @@ function sameOrigin(url) {
!
(
/^
(\/\/
|http:|https:
)
.*/
.
test
(
url
));
}
var
csrftoken
=
getCookie
(
'csrftoken'
);
var
csrftoken
=
getCookie
(
window
.
drf
.
csrfCookieName
);
$
.
ajaxSetup
({
beforeSend
:
function
(
xhr
,
settings
)
{
...
...
rest_framework/templates/rest_framework/admin.html
View file @
4f16c544
...
...
@@ -230,6 +230,11 @@
{% if filter_form %}{{ filter_form }}{% endif %}
{% block script %}
<script>
window
.
drf
=
{
csrfCookieName
:
"{{ csrf_cookie_name|default:'csrftoken' }}"
};
</script>
<script
src=
"{% static "
rest_framework
/
js
/
jquery-1
.
11
.
3
.
min
.
js
"
%}"
></script>
<script
src=
"{% static "
rest_framework
/
js
/
ajax-form
.
js
"
%}"
></script>
<script
src=
"{% static "
rest_framework
/
js
/
csrf
.
js
"
%}"
></script>
...
...
rest_framework/templates/rest_framework/base.html
View file @
4f16c544
...
...
@@ -258,6 +258,11 @@
</div>
<!-- ./wrapper -->
{% block script %}
<script>
window
.
drf
=
{
csrfCookieName
:
"{{ csrf_cookie_name|default:'csrftoken' }}"
};
</script>
<script
src=
"{% static "
rest_framework
/
js
/
jquery-1
.
11
.
3
.
min
.
js
"
%}"
></script>
<script
src=
"{% static "
rest_framework
/
js
/
ajax-form
.
js
"
%}"
></script>
<script
src=
"{% static "
rest_framework
/
js
/
csrf
.
js
"
%}"
></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