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
b68263fb
Commit
b68263fb
authored
Nov 23, 2012
by
Xavier Ordoquy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Default encoding should probably be latin-1 as some RFC seems to imply it.
parent
4007b564
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
rest_framework/authentication.py
+1
-1
rest_framework/tests/authentication.py
+2
-2
rest_framework/utils/mediatypes.py
+1
-1
No files found.
rest_framework/authentication.py
View file @
b68263fb
...
@@ -40,7 +40,7 @@ class BasicAuthentication(BaseAuthentication):
...
@@ -40,7 +40,7 @@ class BasicAuthentication(BaseAuthentication):
auth
=
request
.
META
[
'HTTP_AUTHORIZATION'
]
.
split
()
auth
=
request
.
META
[
'HTTP_AUTHORIZATION'
]
.
split
()
if
len
(
auth
)
==
2
and
auth
[
0
]
.
lower
()
==
"basic"
:
if
len
(
auth
)
==
2
and
auth
[
0
]
.
lower
()
==
"basic"
:
try
:
try
:
auth_parts
=
base64
.
b64decode
(
auth
[
1
]
.
encode
(
'
utf8'
))
.
decode
(
'utf8
'
)
.
partition
(
':'
)
auth_parts
=
base64
.
b64decode
(
auth
[
1
]
.
encode
(
'
iso-8859-1'
))
.
decode
(
'iso-8859-1
'
)
.
partition
(
':'
)
except
TypeError
:
except
TypeError
:
return
None
return
None
...
...
rest_framework/tests/authentication.py
View file @
b68263fb
...
@@ -44,13 +44,13 @@ class BasicAuthTests(TestCase):
...
@@ -44,13 +44,13 @@ class BasicAuthTests(TestCase):
def
test_post_form_passing_basic_auth
(
self
):
def
test_post_form_passing_basic_auth
(
self
):
"""Ensure POSTing json over basic auth with correct credentials passes and does not require CSRF"""
"""Ensure POSTing json over basic auth with correct credentials passes and does not require CSRF"""
auth
=
'Basic '
+
base64
.
encodestring
((
'
%
s:
%
s'
%
(
self
.
username
,
self
.
password
))
.
encode
(
'
utf8'
))
.
strip
()
.
decode
(
'utf8
'
)
auth
=
'Basic '
+
base64
.
encodestring
((
'
%
s:
%
s'
%
(
self
.
username
,
self
.
password
))
.
encode
(
'
iso-8859-1'
))
.
strip
()
.
decode
(
'iso-8859-1
'
)
response
=
self
.
csrf_client
.
post
(
'/'
,
{
'example'
:
'example'
},
HTTP_AUTHORIZATION
=
auth
)
response
=
self
.
csrf_client
.
post
(
'/'
,
{
'example'
:
'example'
},
HTTP_AUTHORIZATION
=
auth
)
self
.
assertEqual
(
response
.
status_code
,
200
)
self
.
assertEqual
(
response
.
status_code
,
200
)
def
test_post_json_passing_basic_auth
(
self
):
def
test_post_json_passing_basic_auth
(
self
):
"""Ensure POSTing form over basic auth with correct credentials passes and does not require CSRF"""
"""Ensure POSTing form over basic auth with correct credentials passes and does not require CSRF"""
auth
=
'Basic '
+
base64
.
encodestring
((
'
%
s:
%
s'
%
(
self
.
username
,
self
.
password
))
.
encode
(
'
utf8'
))
.
strip
()
.
decode
(
'utf8
'
)
auth
=
'Basic '
+
base64
.
encodestring
((
'
%
s:
%
s'
%
(
self
.
username
,
self
.
password
))
.
encode
(
'
iso-8859-1'
))
.
strip
()
.
decode
(
'iso-8859-1
'
)
response
=
self
.
csrf_client
.
post
(
'/'
,
json
.
dumps
({
'example'
:
'example'
}),
'application/json'
,
HTTP_AUTHORIZATION
=
auth
)
response
=
self
.
csrf_client
.
post
(
'/'
,
json
.
dumps
({
'example'
:
'example'
}),
'application/json'
,
HTTP_AUTHORIZATION
=
auth
)
self
.
assertEqual
(
response
.
status_code
,
200
)
self
.
assertEqual
(
response
.
status_code
,
200
)
...
...
rest_framework/utils/mediatypes.py
View file @
b68263fb
...
@@ -47,7 +47,7 @@ class _MediaType(object):
...
@@ -47,7 +47,7 @@ class _MediaType(object):
if
media_type_str
is
None
:
if
media_type_str
is
None
:
media_type_str
=
''
media_type_str
=
''
self
.
orig
=
media_type_str
self
.
orig
=
media_type_str
self
.
full_type
,
self
.
params
=
parse_header
(
media_type_str
.
encode
(
'
utf8
'
))
self
.
full_type
,
self
.
params
=
parse_header
(
media_type_str
.
encode
(
'
iso-8859-1
'
))
self
.
main_type
,
sep
,
self
.
sub_type
=
self
.
full_type
.
partition
(
'/'
)
self
.
main_type
,
sep
,
self
.
sub_type
=
self
.
full_type
.
partition
(
'/'
)
def
match
(
self
,
other
):
def
match
(
self
,
other
):
...
...
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