Update our fork to 1.5.0 #5

ryanluker · 2023-03-30T16:32:08Z

Merge method

Fetched the upstream versions and then used a new branch 1.5.0-grn with the default git merge method.
git merge 1.5.0

Current CI Failures

None! ✅

Work

Fix merge conflicts (see TODO sc-77176)
Fix readme to get project building locally
Add database setup instructions to readme
Fix failures in 3.9 build
Add new migration to add old 1.4.3-grn functionality
Rework migrations to not run
Add double write for old + new OIDC functionality.
Remove custom iat
- Article explaining why we had to do the initial fix: https://aaronoellis.com/articles/python-datetime-utcnow-considered-harmful
- Fix PR: IAT does not account for timezone #4
- oauthlib using time.time() link
- We should still manually test to confirm.
- If needed, I think we can make the modification in grnspace.

Important Commits

3622206
e4d5e1b
32f0051
dc0dd81
a8b43ef
af476e9
f87d071
3897436
2e734e5

…ango-oauth#877) This reverts commit 4655c03.

url() is deprecated in Django 3.1. Path is available in all supported versions of Django.

* add tests for issue of PKCE authorization code GET request * pass PKCE fields to AuthorizationView form Pass code_challenge and code_challenge_method from query string to AuthorizationView form in get(). Without this, it was impossible to use authorization code grant flow with GET, because code_challenge and code_challenge_method data were never passed to form, so they weren't in form.cleaned_data, which causes creating Grant with always empty code_challenge and code_challenge_method. This issue was quite hard bug to discover because there are already few tests for authorization code flow pkce, however, they weren't checking form rendering in GET request, but only response.status_code, I have added asserts for these 2 values, please look at the changes in test_public_pkce_plain_authorize_get and test_public_pkce_S256_authorize_get tests in test_authorization_code.py.

* Added Python 3.9 to test matrix for djangomaster * Added Python3.9 support for Django 2.2 and 3.0

added Support for 3.1 Removed support for 2.1

* Add black, isort and pre-commit hooks * Add black configuration * Run black as part of flake8 testenv in tox * Add editorconfig to ensure indent style in tox.ini/setup.cfg * Add pre-commit hooks to check flake8, black, isort and common errors * Update isort configuration to be black-compatible * Update contributing documentation * Add myself to AUTHORS * Skip migrations in black/isort/pre-commit * Run black over the source tree This is the result of running `black .` over the repository. By-hand improvements of the blackened code will be in follow up commits, to make it easier to reapply this commit to future updates, if necessary - IE to remove this commit and re-run black over a fresh tree, rather than trying to merge new changes in to this commit. * Hand tweak some of black's autoformatting Some minor hand tweaks: oauth2_provider/contrib/rest_framework/authentication.py oauth2_provider/oauth2_validators.py Construct OrderedDict in a clearer, still black compliant way (one line per dict entry) tests/test_token_revocation.py Remove empty method docstrings * Apply isort over codebase Co-authored-by: Tom Evans <[email protected]>

…min (django-oauth#904)

…jango-oauth#903) * Disable 255 chars length limit for redirect uri (django-oauth#902) RFC 7230 recommends to design system to be capable to work with URI at least to 8000 chars long. This commit allows handle redirect_uri that is over 255 chars.

* WIP - GH actions * drop pypy * Fix tox.ini * Try to fix coverage * Add 3.5 (for django 2.2) to GH actions * Minor doc updates. * Rename some tox config. * Minor typo. * Add release workflow. * Remove tarball from download URL. * Ignore errors on Django masters. * Minor fix. Co-authored-by: Jannis Leidel <[email protected]>

* removed limit on select for update (due to an Oracle 12c limitation) * added my name to authors * Use filter and wrap in a list * documentation

Add a new tox target, `livedocs`, that uses sphinx-autobuild to monitor the docs and auto rebuild the HTML docs when they change. It also starts a webserver on 127.0.0.1:8000 using livereload to serve the docs, which will automatically reload the pages in your browser as they are changed. Add docs on updating the docs. Add sphinx-rtd-theme so that the docs generated in development match the style that they are displayed in on readthedocs. Co-authored-by: Alan Crosswell <[email protected]>

… 36000. (django-oauth#917) Co-authored-by: Alan Crosswell <[email protected]>

* document how to contribute translations

More information: https://groups.google.com/g/django-developers/c/tctDuKUGosc/ Refs: django/django#14048

Single quotes are italics in reST and I see no need for them in this particular heading. Co-authored-by: Alan Crosswell <[email protected]>

Run lint in Github Actions to avoid PRs being merged that have accidentally included linting violations. Fix a file that has a linting violation.

* Fix wrong import fix wrong import from `url` (unused in example) to `path` * Update tutorial_02.rst Co-authored-by: Rust Saiargaliev <[email protected]>

* Fix weird grammar in messages on authorize screen The existing message to users was 'Application requires following permissions' which sounds like bad english to me. I've changed them to 'Application requires the following permissions'. * Add myself to authors Co-authored-by: Alan Crosswell <[email protected]>

* GHA: run CI on PRs and pushes to master only Previously, every pull request was running actions twice, since two signas were fired - push commit in the PR and new PR itself. * Update CHANGELOG * Review comments Co-authored-by: Alan Crosswell <[email protected]>

…o-oauth#939) This reverts commit 062408a.

* Drop retired Python 3.5 Python 3.5 did reach end-of-life in September 2020: https://www.python.org/downloads/release/python-3510/ We can safely remove it from CI to reduce test running time. * Add my name to AUTHORS Co-authored-by: Alan Crosswell <[email protected]>

Added all co-authors of the OIDC PR to AUTHORS and sorted alphabetically.

oauth2_provider/oauth2_validators.py

.editorconfig

ryanluker · 2023-03-31T16:42:30Z

@mackosx I say we give up on Add database setup instructions to readme as that is something already done in later upstream versions.

mackosx · 2023-03-31T16:44:48Z

@mackosx I say we give up on Add database setup instructions to readme as that is something already done in later upstream versions.

Yeah sounds good

oauth2_provider/oauth2_validators.py

n2ygk and others added 30 commits October 6, 2020 15:07

Revert "Openid Connect Core support - Round 2 (django-oauth#859)" (dj…

3bde632

…ango-oauth#877) This reverts commit 4655c03.

Updated url() to path()

1b2d73d

url() is deprecated in Django 3.1. Path is available in all supported versions of Django.

Update changelog for 1.3.3 release (django-oauth#889)

342a634

release 1.3.3 (django-oauth#890)

02a872c

improve contributing docs (django-oauth#891)

0a62a97

Make calls to super() more python3 (django-oauth#881)

6f08e3b

Fixed some grammar and spelling mistakes in the docs. (django-oauth#895)

6dc1ca2

Added Python 3.9 to test matrix for djangomaster (django-oauth#884)

29bed25

* Added Python 3.9 to test matrix for djangomaster * Added Python3.9 support for Django 2.2 and 3.0

Updated supported Django versions

afd651c

added Support for 3.1 Removed support for 2.1

Removed universal wheels (py2)

c2f379d

django-oauth#898 Added the ability to customize classes for django ad…

86e78b9

…min (django-oauth#904)

Use SVG for all badges.

3010059

Fix select for update (django-oauth#906)

331b49d

* removed limit on select for update (due to an Oracle 12c limitation) * added my name to authors * Use filter and wrap in a list * documentation

Update docs to inform that the default ACCESS_TOKEN_EXPIRE_SECONDS is…

b9083eb

… 36000. (django-oauth#917) Co-authored-by: Alan Crosswell <[email protected]>

Add pt-PT translation (django-oauth#920)

e1760df

* document how to contribute translations

Release 1.4.0 (django-oauth#921)

37640ee

new style middleware

41aa49e

Rename Django's dev branch to main. (django-oauth#932)

e3207d8

More information: https://groups.google.com/g/django-developers/c/tctDuKUGosc/ Refs: django/django#14048

Remove italics from "Models" section header (django-oauth#927)

ffff6b6

Single quotes are italics in reST and I see no need for them in this particular heading. Co-authored-by: Alan Crosswell <[email protected]>

Run lint in Github Actions (django-oauth#933)

1ada5af

Run lint in Github Actions to avoid PRs being merged that have accidentally included linting violations. Fix a file that has a linting violation.

Fix wrong import (django-oauth#930)

4c6f059

* Fix wrong import fix wrong import from `url` (unused in example) to `path` * Update tutorial_02.rst Co-authored-by: Rust Saiargaliev <[email protected]>

Revert "GitHub Actions: smart run strategy (django-oauth#937)" (djang…

d6d1f99

…o-oauth#939) This reverts commit 062408a.

n2ygk and others added 7 commits March 22, 2021 13:01

Release 1.5.0 (django-oauth#947)

5d53d24

Added all co-authors of the OIDC PR to AUTHORS and sorted alphabetically.

Merge tag '1.5.0' into 1.5.0-grn

993f67b

Fixup Readme for the short term local dev

4bd9edc

Only test python 3.9

28506db

Use self with settings to match rest of tests

77bf66d

Remove test since generate_at_hash no longer exists

347724a

Move out test so we can use the request factory

ee9054a

ryanluker commented Mar 30, 2023

View reviewed changes

oauth2_provider/oauth2_validators.py Outdated Show resolved Hide resolved

ryanluker force-pushed the 1.5.0-grn branch from 1804ce9 to ee9054a Compare March 30, 2023 19:28

Fix test

87bb44b

gregmallan reviewed Mar 30, 2023

View reviewed changes

.editorconfig Show resolved Hide resolved

ryanluker added 5 commits March 30, 2023 14:58

Add back old migration auto3

3622206

Add merge migration

e4d5e1b

Add back token on id token

32f0051

Add migration for new values

dc0dd81

Rewrite migration 0004 to remove already applied

40ace71

ryanluker force-pushed the 1.5.0-grn branch from a8b43ef to 40ace71 Compare March 30, 2023 23:36

mackosx added 3 commits March 30, 2023 16:50

Can remove custom iat because oauthlib uses time.time()

af476e9

Remove unneeded aud claim, its provided by oauthlib

3ffb051

Double write token and jti fields

f87d071

mackosx reviewed Mar 31, 2023

View reviewed changes

oauth2_provider/oauth2_validators.py Outdated Show resolved Hide resolved

oauth2_provider/oauth2_validators.py Show resolved Hide resolved

mackosx added 2 commits March 31, 2023 11:43

Lookup using token for now

2e734e5

Use correct token

3897436

ryanluker commented Mar 31, 2023

View reviewed changes

oauth2_provider/oauth2_validators.py Outdated Show resolved Hide resolved

Update todos to refer to tickets

2cf5391

mackosx approved these changes Mar 31, 2023

View reviewed changes

ryanluker merged commit de7d223 into master Mar 31, 2023

ryanluker deleted the 1.5.0-grn branch March 31, 2023 20:17

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Update our fork to 1.5.0 #5

Update our fork to 1.5.0 #5

Uh oh!

ryanluker commented Mar 30, 2023 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

ryanluker commented Mar 31, 2023

Uh oh!

mackosx commented Mar 31, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

19 participants

Update our fork to 1.5.0 #5

Update our fork to 1.5.0 #5

Uh oh!

Conversation

ryanluker commented Mar 30, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Merge method

Current CI Failures

Work

Important Commits

Uh oh!

Uh oh!

Uh oh!

ryanluker commented Mar 31, 2023

Uh oh!

mackosx commented Mar 31, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

19 participants

ryanluker commented Mar 30, 2023 •

edited

Loading