Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add device authorization grant (device code flow - rfc 8628) #1539

Draft
wants to merge 27 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
d6feb72
Add Device model
duzumaki Jan 6, 2025
34efc5b
Adhere content-type request header to CGI standard
duzumaki Jan 6, 2025
c97af21
Add create device authorization response method
duzumaki Jan 6, 2025
dcbc220
Update the grant type mapping to recognize device code
duzumaki Jan 6, 2025
221fdde
Devices that are public should not need basic auth
duzumaki Jan 6, 2025
0d95e22
Add device settings
duzumaki Jan 6, 2025
482403a
Create device authorization view
duzumaki Jan 6, 2025
bba6915
Ensure we import in the views module
duzumaki Jan 6, 2025
5260472
Migrations
duzumaki Jan 6, 2025
5874b92
Increase grant type length
duzumaki Jan 6, 2025
c272257
Add initial stage test
duzumaki Jan 7, 2025
926f939
Temp commit: Point oauthlib to master
duzumaki Jan 7, 2025
2e0dcc3
Add device poll change test
duzumaki Jan 7, 2025
192891c
Add incorrect client id test
duzumaki Jan 7, 2025
aa9eeee
Update authors and changelog
duzumaki Jan 7, 2025
f8d1950
Make user field on abstract refresh token nullable
duzumaki Jan 14, 2025
3da64f8
Add the device user code form
duzumaki Jan 14, 2025
ba0d6ca
Add approve deny form
duzumaki Jan 14, 2025
cf08930
Update request body validator
duzumaki Jan 14, 2025
12da4d8
Update device imports
duzumaki Jan 14, 2025
0788763
Add django-ratelimit dep
duzumaki Jan 14, 2025
a6b3445
Update token endpoint
duzumaki Jan 14, 2025
85aaa7f
Prep the tests: Create user_code_generator util
duzumaki Jan 14, 2025
d632ebc
Add user code generator to main settings
duzumaki Jan 14, 2025
ef8f862
Add tests to test the whole flow
duzumaki Jan 14, 2025
f561822
Update idp requirements
duzumaki Jan 14, 2025
a9eb10e
Add tutotial doc
duzumaki Jan 7, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ Dave Burkholder
David Fischer
David Hill
David Smith
David Uzumaki
Dawid Wolski
Diego Garcia
Dominik George
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [unreleased]
### Added
* #1506 Support for Wildcard Origin and Redirect URIs
* Add device authorization grant support
<!--
### Changed
### Deprecated
Expand Down
Binary file added docs/_images/application-register-device-code.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_images/device-approve-deny.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_images/device-enter-code-displayed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/tutorial/tutorial.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ Tutorials
tutorial_03
tutorial_04
tutorial_05

tutorial_06
95 changes: 95 additions & 0 deletions docs/tutorial/tutorial_06.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
Device authorization grant flow
====================================================

Scenario
--------
In :doc:`Part 1 <tutorial_01>` you created your own :term:`Authorization Server` and it's running along just fine.
You have devices that your users have, and those users need to authenticate the device against your
:term:`Authorization Server` in order to make the required API calls.

Device Authorization
--------------------
The OAuth 2.0 device authorization grant is designed for Internet
connected devices that either lack a browser to perform a user-agent
based authorization or are input-constrained to the extent that
requiring the user to input text in order to authenticate during the
authorization flow is impractical. It enables OAuth clients on such
devices (like smart TVs, media consoles, digital picture frames, and
printers) to obtain user authorization to access protected resources
by using a user agent on a separate device.

Point your browser to `http://127.0.0.1:8000/o/applications/register/` to create an application.

Fill the form as shown in the screenshot below, and before saving, take note of the ``Client id``.
Make sure the client type is set to "Public." There are cases where a confidential client makes sense,
but generally, it is assumed the device is unable to safely store the client secret.

.. image:: _images/application-register-device-code.png
:alt: Device Authorization application registration

Ensure the setting ``OAUTH_DEVICE_VERIFICATION_URI`` is set to a URI you want to return in the
`verification_uri` key in the response. This is what the device will display to the user.

1: Navigate to the tests/app/idp directory:

.. code-block:: sh

cd tests/app/idp

To initiate device authorization, send this request:

.. code-block:: sh

curl --location 'http://127.0.0.1:8000/o/device-authorization/' \
--header 'Content-Type: application/x-www-form-urlencoded' \
--data-urlencode 'client_id={your application\'s client id}'

The OAuth2 provider will return the following response:

.. code-block:: json

{
"verification_uri": "http://127.0.0.1:8000/o/device",
"expires_in": 1800,
"user_code": "A32RVADM",
"device_code": "G30j94v0kNfipD4KmGLTWeL4eZnKHm",
"interval": 5
}

Go to `http://127.0.0.1:8000/o/device` in your browser.

.. image:: _images/device-enter-code-displayed.png

Enter the code, and it will redirect you to the device-confirm endpoint.

Device-confirm endpoint
-----------------------
Device polling occurs concurrently while the user approves or denies the request.

.. image:: _images/device-approve-deny.png

Device polling
--------------
Note: You should already have the `/token` endpoint implemented in your authorization server before this.

Send the following request (in the real world, the device makes this request):

.. code-block:: sh

curl --location 'http://localhost:8000/o/token/' \
--header 'Content-Type: application/x-www-form-urlencoded' \
--data-urlencode 'device_code={the device code from the device-authorization response}' \
--data-urlencode 'client_id={your application\'s client id}' \
--data-urlencode 'grant_type=urn:ietf:params:oauth:grant-type:device_code'

The response will be similar to this:

.. code-block:: json

{
"access_token": "SkJMgyL432P04nHDPyB63DEAM0nVxk",
"expires_in": 36000,
"token_type": "Bearer",
"scope": "openid",
"refresh_token": "Go6VumurDfFAeCeKrpCKPDtElV77id"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# Generated by Django 5.1.4 on 2025-01-06 15:49

import oauth2_provider.generators
from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('oauth2_provider', '0012_add_token_checksum'),
]

operations = [
migrations.AlterField(
model_name='application',
name='authorization_grant_type',
field=models.CharField(choices=[('authorization-code', 'Authorization code'), ('urn:ietf:params:oauth:grant-type:device_code', 'Device Code'), ('implicit', 'Implicit'), ('password', 'Resource owner password-based'), ('client-credentials', 'Client credentials'), ('openid-hybrid', 'OpenID connect hybrid')], max_length=64),
),
migrations.CreateModel(
name='Device',
fields=[
('id', models.BigAutoField(primary_key=True, serialize=False)),
('device_code', models.CharField(max_length=100, unique=True)),
('user_code', models.CharField(max_length=100)),
('scope', models.CharField(default='openid', max_length=64)),
('interval', models.IntegerField(default=5)),
('expires', models.DateTimeField()),
('status', models.CharField(blank=True, choices=[('authorized', 'Authorized'), ('authorization-pending', 'Authorization pending'), ('expired', 'Expired'), ('denied', 'Denied')], default='authorization-pending', max_length=64)),
('client_id', models.CharField(db_index=True, default=oauth2_provider.generators.generate_client_id, max_length=100)),
('last_checked', models.DateTimeField(auto_now=True)),
],
options={
'abstract': False,
'swappable': 'OAUTH2_PROVIDER_DEVICE_MODEL',
'constraints': [models.UniqueConstraint(fields=('device_code',), name='unique_device_code')],
},
),
]
21 changes: 21 additions & 0 deletions oauth2_provider/migrations/0014_alter_refreshtoken_user.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Generated by Django 4.2.17 on 2025-01-13 17:24

from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('oauth2_provider', '0013_alter_application_authorization_grant_type_device'),
]

operations = [
migrations.AlterField(
model_name='refreshtoken',
name='user',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(app_label)s_%(class)s', to=settings.AUTH_USER_MODEL),
),
]
92 changes: 89 additions & 3 deletions oauth2_provider/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
import time
import uuid
from contextlib import suppress
from datetime import timedelta
from dataclasses import dataclass
from datetime import datetime, timedelta
from datetime import timezone as dt_timezone
from urllib.parse import parse_qsl, urlparse

from django.apps import apps
Expand Down Expand Up @@ -86,12 +88,14 @@ class AbstractApplication(models.Model):
)

GRANT_AUTHORIZATION_CODE = "authorization-code"
GRANT_DEVICE_CODE = "urn:ietf:params:oauth:grant-type:device_code"
GRANT_IMPLICIT = "implicit"
GRANT_PASSWORD = "password"
GRANT_CLIENT_CREDENTIALS = "client-credentials"
GRANT_OPENID_HYBRID = "openid-hybrid"
GRANT_TYPES = (
(GRANT_AUTHORIZATION_CODE, _("Authorization code")),
(GRANT_DEVICE_CODE, _("Device Code")),
(GRANT_IMPLICIT, _("Implicit")),
(GRANT_PASSWORD, _("Resource owner password-based")),
(GRANT_CLIENT_CREDENTIALS, _("Client credentials")),
Expand Down Expand Up @@ -127,7 +131,7 @@ class AbstractApplication(models.Model):
default="",
)
client_type = models.CharField(max_length=32, choices=CLIENT_TYPES)
authorization_grant_type = models.CharField(max_length=32, choices=GRANT_TYPES)
authorization_grant_type = models.CharField(max_length=64, choices=GRANT_TYPES)
client_secret = ClientSecretField(
max_length=255,
blank=True,
Expand Down Expand Up @@ -499,7 +503,7 @@ class AbstractRefreshToken(models.Model):

id = models.BigAutoField(primary_key=True)
user = models.ForeignKey(
settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name="%(app_label)s_%(class)s"
settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name="%(app_label)s_%(class)s", null=True
)
token = models.CharField(max_length=255)
application = models.ForeignKey(oauth2_settings.APPLICATION_MODEL, on_delete=models.CASCADE)
Expand Down Expand Up @@ -650,11 +654,93 @@ class Meta(AbstractIDToken.Meta):
swappable = "OAUTH2_PROVIDER_ID_TOKEN_MODEL"


class AbstractDevice(models.Model):

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe this should be named AbstractDeviceGrant?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

class Meta:
abstract = True
constraints = [
models.UniqueConstraint(
fields=["device_code"],
name="unique_device_code",

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
name="unique_device_code",
name="%(app_label)s_%(class)s_unique_device_code",

),
]

AUTHORIZED = "authorized"
AUTHORIZATION_PENDING = "authorization-pending"
EXPIRED = "expired"
DENIED = "denied"

DEVICE_FLOW_STATUS = (
(AUTHORIZED, _("Authorized")),
(AUTHORIZATION_PENDING, _("Authorization pending")),
(EXPIRED, _("Expired")),
(DENIED, _("Denied")),
)

id = models.BigAutoField(primary_key=True)
device_code = models.CharField(max_length=100, unique=True)
user_code = models.CharField(max_length=100)
scope = models.CharField(max_length=64, default="openid")

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is scope mandatory and defaults to openid? Is there a reason it should deviate from what AbstractGrant does?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might be a remnant from when I first started this work; I wanted to integrate it with openid but decided to keep it just focused to oauth2, the official rfc. I'll double check this and try remove it. also this

interval = models.IntegerField(default=5)
expires = models.DateTimeField()
status = models.CharField(
max_length=64, blank=True, choices=DEVICE_FLOW_STATUS, default=AUTHORIZATION_PENDING
)
client_id = models.CharField(max_length=100, default=generate_client_id, db_index=True)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason this generates its own client_id instead of pointing to an Application that has one? I'm not too familiar with this part of the codebase so feel free to ignore.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah this default shouldn't be needed

last_checked = models.DateTimeField(auto_now=True)


class DeviceManager(models.Manager):
def get_by_natural_key(self, client_id, device_code, user_code):
return self.get(client_id=client_id, device_code=device_code, user_code=user_code)


class Device(AbstractDevice):

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Likewise maybe DeviceGrant?

Copy link
Author

@duzumaki duzumaki Jan 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not the grant, it's the model that represents the device during the flow's session,
this is the device grant

objects = DeviceManager()

class Meta(AbstractDevice.Meta):
swappable = "OAUTH2_PROVIDER_DEVICE_MODEL"

def natural_key(self):
return (self.client_id, self.device_code, self.user_code)


@dataclass
class DeviceRequest:
client_id: str
scope: str = "openid"


@dataclass
class DeviceCodeResponse:
verification_uri: str

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should there perhaps be some way of configuring verification_uri_complete similar to verification_uri? That way clients wanting to use a QR code won't have to do their own URI assembly.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah can do

expires_in: int
user_code: int
device_code: str
interval: int


def create_device(device_request: DeviceRequest, device_response: DeviceCodeResponse) -> Device:
now = datetime.now(tz=dt_timezone.utc)

return Device.objects.create(
client_id=device_request.client_id,
device_code=device_response.device_code,
user_code=device_response.user_code,
scope=device_request.scope,
expires=now + timedelta(seconds=device_response.expires_in),
)


def get_application_model():
"""Return the Application model that is active in this project."""
return apps.get_model(oauth2_settings.APPLICATION_MODEL)


def get_device_model():
"""Return the Device model that is active in this project."""
return apps.get_model(oauth2_settings.DEVICE_MODEL)


def get_grant_model():
"""Return the Grant model that is active in this project."""
return apps.get_model(oauth2_settings.GRANT_MODEL)
Expand Down
13 changes: 13 additions & 0 deletions oauth2_provider/oauth2_backends.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import json
from urllib.parse import urlparse, urlunparse

from django.http import HttpRequest
from oauthlib import oauth2
from oauthlib.common import Request as OauthlibRequest
from oauthlib.common import quote, urlencode, urlencoded
Expand Down Expand Up @@ -75,6 +76,8 @@ def extract_headers(self, request):
del headers["wsgi.errors"]
if "HTTP_AUTHORIZATION" in headers:
headers["Authorization"] = headers["HTTP_AUTHORIZATION"]
if "CONTENT_TYPE" in headers:
headers["Content-Type"] = headers["CONTENT_TYPE"]
# Add Access-Control-Allow-Origin header to the token endpoint response for authentication code grant,
# if the origin is allowed by RequestValidator.is_origin_allowed.
# https://github.com/oauthlib/oauthlib/pull/791
Expand Down Expand Up @@ -148,6 +151,16 @@ def create_authorization_response(self, request, scopes, credentials, allow):
except oauth2.OAuth2Error as error:
raise OAuthToolkitError(error=error, redirect_uri=credentials["redirect_uri"])

def create_device_authorization_response(self, request: HttpRequest):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure this is a django.http.HttpRequest and not an oauthlib.common.Request?

uri, http_method, body, headers = self._extract_params(request)
try:
headers, body, status = self.server.create_device_authorization_response(
uri, http_method, body, headers
)
return headers, body, status
except OAuth2Error as exc:
return exc.headers, exc.json, exc.status_code

def create_token_response(self, request):
"""
A wrapper method that calls create_token_response on `server_class` instance.
Expand Down
11 changes: 11 additions & 0 deletions oauth2_provider/oauth2_validators.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
AbstractApplication.GRANT_CLIENT_CREDENTIALS,
AbstractApplication.GRANT_OPENID_HYBRID,
),
"urn:ietf:params:oauth:grant-type:device_code": (AbstractApplication.GRANT_DEVICE_CODE,),
}

Application = get_application_model()
Expand Down Expand Up @@ -166,6 +167,11 @@ def _authenticate_basic_auth(self, request):
elif request.client.client_id != client_id:
log.debug("Failed basic auth: wrong client id %s" % client_id)
return False
elif (
request.client.client_type == "public"
and request.grant_type == "urn:ietf:params:oauth:grant-type:device_code"
):
return True
elif not self._check_secret(client_secret, request.client.client_secret):
log.debug("Failed basic auth: wrong client secret %s" % client_secret)
return False
Expand All @@ -191,6 +197,11 @@ def _authenticate_request_body(self, request):
if self._load_application(client_id, request) is None:
log.debug("Failed body auth: Application %s does not exists" % client_id)
return False
elif (
request.client.client_type == "public"
and request.grant_type == "urn:ietf:params:oauth:grant-type:device_code"
):
return True
elif not self._check_secret(client_secret, request.client.client_secret):
log.debug("Failed body auth: wrong client secret %s" % client_secret)
return False
Expand Down
Loading