Page MenuHomeSoftware Heritage
Differential D7073

auth: Add UserMailmap model and edition endpoints
ClosedPublic
Actions

Authored by anlambert on Feb 3 2022, 3:18 PM.

Details

Reviewers
vlorentz
Group Reviewers
Reviewers
Commits
rDWAPPSf2cf669b55de: auth: Add UserMailmap model and edition endpoints
Summary

Add a new database table to store mailmap settings that will be
used to add display names for an authors that can be found in the
archive.

Add endpoints to add or update these mailmap settings restricted
to staff users or users with special permission.
They will be used in the upcoming Web UI to manage mailmaps.

Diff Detail

Repository
rDWAPPS Web applications
Branch
auth-mailmap-model
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 26496
Build 41436: Phabricator diff pipeline on jenkinsJenkins console · Jenkins
Build 41435: arc lint + arc unit

Unit TestsFailed
View All

TimeTest
224 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.web.tests.common.test_archive::Tests / Python tests / test_lookup_revision_log
archive_data = <swh.web.tests.conftest._ArchiveData object at 0x7f3e50f6d438> revision = '4d4bfe0afc142d67fc39f0bb959e3d4ad9736402'
223 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.web.tests.admin.test_deposit::Tests / Python tests / test_deposit_admin_view_available_for_staff_user
231 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.web.tests.admin.test_deposit::Tests / Python tests / test_deposit_admin_view_available_for_user_with_permission
256 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.web.tests.admin.test_deposit::Tests / Python tests / test_deposit_admin_view_not_available_for_anonymous_user
1,013 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.web.tests.admin.test_origin_save::Tests / Python tests / test_accept_pending_save_request
View Full Test Results (1 Failed · 825 Passed · 5 Skipped)

Event Timeline

anlambert created this revision.Feb 3 2022, 3:18 PM
Herald added a reviewer: Reviewers. · View Herald TranscriptFeb 3 2022, 3:18 PM
anlambert updated this revision to Diff 25665.Feb 3 2022, 3:20 PM

Update years in license headers

vlorentz published this revision for review.Feb 3 2022, 3:31 PM
vlorentz added a subscriber: vlorentz.

Looks great, thanks. Some minor change requests below

swh/web/auth/mailmap.py
25

I don't think everyone in the staff should have access to this, this seems very sensitive

swh/web/auth/models.py
28

why not a nullable foreign key to the user table?

34

is this the default?

49

ditto

vlorentz requested changes to this revision.Feb 3 2022, 3:31 PM
This revision now requires changes to proceed.Feb 3 2022, 3:31 PM
swh-public-ci added a comment.Feb 3 2022, 3:34 PM

Build has FAILED

Patch application report for D7073 (id=25664)

Rebasing onto f990d789aa...

Current branch diff-target is up to date.
Changes applied before test
commit f375cc01b19cef7b9729722f873184a299105edd
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Thu Feb 3 13:47:43 2022 +0100

    auth: Add UserMailmap model and edition endpoints
    
    Add a new database table to store mailmap settings that will be
    used to add display names for an authors that can be found in the
    archive.
    
    Add endpoints to add or update these mailmap settings restricted
    to staff users or users with special permission.
    They will be used in the upcoming Web UI to manage mailmaps.

Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/1313/
See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/1313/console

Harbormaster failed remote builds in B26495: Diff 25664!Feb 3 2022, 3:34 PM
swh-public-ci added a comment.Feb 3 2022, 3:36 PM

Build has FAILED

Patch application report for D7073 (id=25665)

Rebasing onto f990d789aa...

Current branch diff-target is up to date.
Changes applied before test
commit ca9ef5d15a350f9f609859e22e335798a4383d96
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Thu Feb 3 13:47:43 2022 +0100

    auth: Add UserMailmap model and edition endpoints
    
    Add a new database table to store mailmap settings that will be
    used to add display names for an authors that can be found in the
    archive.
    
    Add endpoints to add or update these mailmap settings restricted
    to staff users or users with special permission.
    They will be used in the upcoming Web UI to manage mailmaps.

Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/1314/
See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/1314/console

Harbormaster failed remote builds in B26496: Diff 25665!Feb 3 2022, 3:36 PM
anlambert added inline comments.Feb 3 2022, 3:38 PM
swh/web/auth/mailmap.py
25

ack

swh/web/auth/models.py
28

Because we do not use the user table in swh-web (apart when developing with the sqlite backend).
In production, django User objects are created from Keycloak JWT tokens and not saved to database.

That field is mostly useful to filter the mailmaps of an user in the web UI and it is a char one to
work under postgres and sqlite backends.

34

Yes, why should it not be ?

anlambert updated this revision to Diff 25666.Feb 3 2022, 3:43 PM

Remove endpoints access to staff users.

anlambert added a comment.Feb 3 2022, 3:47 PM
In D7073#184077, @swh-public-ci wrote:

Build has FAILED

Patch application report for D7073 (id=25665)

Rebasing onto f990d789aa...

Current branch diff-target is up to date.
Changes applied before test
commit ca9ef5d15a350f9f609859e22e335798a4383d96
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Thu Feb 3 13:47:43 2022 +0100

    auth: Add UserMailmap model and edition endpoints
    
    Add a new database table to store mailmap settings that will be
    used to add display names for an authors that can be found in the
    archive.
    
    Add endpoints to add or update these mailmap settings restricted
    to staff users or users with special permission.
    They will be used in the upcoming Web UI to manage mailmaps.

Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/1314/
See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/1314/console

Test failures are not related to these changes, need to investigate.

ardumont added a subscriber: ardumont.Feb 3 2022, 3:48 PM

Is it possible to have a dedicated (eventually staff only if it's sensible) task (and 'related to TXYZ' to the diffs) about the needs regarding the overall changes you are introducing please (for historical purpose)?

(even if there is nothing in the task yet ;)

swh-public-ci added a comment.Feb 3 2022, 3:59 PM

Build has FAILED

Patch application report for D7073 (id=25666)

Rebasing onto f990d789aa...

Current branch diff-target is up to date.
Changes applied before test
commit ffe0051b2c2a24126a011522774b182e651e7529
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Thu Feb 3 13:47:43 2022 +0100

    auth: Add UserMailmap model and edition endpoints
    
    Add a new database table to store mailmap settings that will be
    used to add display names for an authors that can be found in the
    archive.
    
    Add endpoints to add or update these mailmap settings restricted
    to staff users or users with special permission.
    They will be used in the upcoming Web UI to manage mailmaps.

Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/1316/
See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/1316/console

Harbormaster failed remote builds in B26497: Diff 25666!Feb 3 2022, 3:59 PM
anlambert added a comment.Feb 3 2022, 4:04 PM

Test failures are not related to these changes, need to investigate.

Fixed in D7076

vlorentz added inline comments.Feb 3 2022, 4:12 PM
swh/web/auth/models.py
28

ok

34

I just wanted to be sure

vlorentz accepted this revision.Feb 3 2022, 4:13 PM
This revision is now accepted and ready to land.Feb 3 2022, 4:13 PM
anlambert updated this revision to Diff 25674.Feb 3 2022, 4:35 PM

Rebase

swh-public-ci added a comment.Feb 3 2022, 4:52 PM

Build is green

Patch application report for D7073 (id=25674)

Rebasing onto eebb27ebdb...

Current branch diff-target is up to date.
Changes applied before test
commit f2cf669b55deca5f263ad9498c946b38c694d01a
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Thu Feb 3 13:47:43 2022 +0100

    auth: Add UserMailmap model and edition endpoints
    
    Add a new database table to store mailmap settings that will be
    used to add display names for an authors that can be found in the
    archive.
    
    Add endpoints to add or update these mailmap settings restricted
    to staff users or users with special permission.
    They will be used in the upcoming Web UI to manage mailmaps.

See https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/1318/ for more details.

Harbormaster completed remote builds in B26505: Diff 25674.Feb 3 2022, 4:52 PM
Closed by commit rDWAPPSf2cf669b55de: auth: Add UserMailmap model and edition endpoints (authored by anlambert). · Explain WhyFeb 3 2022, 4:58 PM
This revision was automatically updated to reflect the committed changes.
anlambert added a commit: rDWAPPSf2cf669b55de: auth: Add UserMailmap model and edition endpoints.

Revision Contents
Changeset List

PathSize
swh/
web/
auth/
54 lines
migrations/
45 lines
45 lines
3 lines
64 lines
tests/
auth/
58 lines

Diff 25665

View Options

swh/web/auth/mailmap.py

Loading...
View Options

swh/web/auth/migrations/0004_usermailmap.py

Loading...
View Options

swh/web/auth/models.py

Loading...
View Options

swh/web/auth/utils.py

Loading...
View Options

swh/web/auth/views.py

Loading...
View Options

swh/web/tests/auth/test_mailmap.py

Loading...
About · Developer information · Legal