Page MenuHomeSoftware Heritage
Differential D5685

Add new bundle type to list only when connected as privileged user
ClosedPublic
Actions

Authored by ardumont on May 5 2021, 3:53 PM.

Details

Reviewers
anlambert
Group Reviewers
Reviewers
Maniphest Tasks
T3213: Enable save code now of software source code archives for specific users
Commits
rDWAPPS2a4f2e966a03: Add new bundle type to list only when connected as privileged user
Summary

This is only doing listing for now. It's in a dedicated commit so review is easier.

Some more work is required ui and server side to actually schedule those new visit type.
It will be done in a future commit [1]

[1] D5676 which will get reworked and based on this.

Related to T3213

Test Plan

tox

Diff Detail

Event Timeline

ardumont created this revision.May 5 2021, 3:53 PM
swh-public-ci added a comment.May 5 2021, 4:03 PM

Build is green

Patch application report for D5685 (id=20303)

Rebasing onto 934cb65cdf...

Current branch diff-target is up to date.
Changes applied before test
commit 9753e2c48bdf243c0cdb6d1efaec000f3e4490d6
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Wed May 5 15:25:33 2021 +0200

    Add new bundle type to list only when privileged
    
    This is only doing listing for now. It's in a dedicated commit so review is easier.
    
    Related to T3213

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

Harbormaster completed remote builds in B21287: Diff 20303.May 5 2021, 4:03 PM
ardumont requested review of this revision.May 5 2021, 4:03 PM
ardumont edited the summary of this revision. (Show Details)May 5 2021, 4:38 PM
anlambert added inline comments.May 5 2021, 4:48 PM
swh/web/auth/utils.py
74

privileged_user sounds like a better name for me.

swh/web/common/origin_save.py
140–141

I would name the parameter privileged_user, this is clearer.

355

same here

swh/web/common/swh_templatetags.py
128–139

This is only used for the "Take new snapshot" action so you can keep that function as it is.

anlambert added inline comments.May 5 2021, 4:50 PM
swh/web/common/origin_save.py
153

the second call to list copy is not needed

ardumont added a comment.May 5 2021, 5:02 PM

ack on what you said, thanks.

I'll adapt as soon as i succeed in adding my last test about that privileged listing which is resisting me ;)

ardumont marked 5 inline comments as done.May 5 2021, 5:23 PM
ardumont updated this revision to Diff 20307.May 5 2021, 5:24 PM
ardumont edited the summary of this revision. (Show Details)
  • Add missing tests (there remains one to uncomment and make green)
  • Adapt according to suggestions
swh-public-ci added a comment.May 5 2021, 5:32 PM

Build has FAILED

Patch application report for D5685 (id=20307)

Rebasing onto 934cb65cdf...

Current branch diff-target is up to date.
Changes applied before test
commit 8a017d6ccadac03d440042feeb0858cabd9a8f35
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Wed May 5 15:25:33 2021 +0200

    Add new bundle type to list only when privileged
    
    This is only doing listing for now. It's in a dedicated commit so review is easier.
    
    Related to T3213

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

Harbormaster failed remote builds in B21289: Diff 20307!May 5 2021, 5:32 PM
ardumont retitled this revision from Add new bundle type to list only when privileged to Add new bundle type to list only when connected as privileged user.May 5 2021, 5:34 PM
ardumont edited the summary of this revision. (Show Details)
swh-public-ci added a comment.May 5 2021, 5:43 PM

Build is green

Patch application report for D5685 (id=20307)

Rebasing onto 934cb65cdf...

Current branch diff-target is up to date.
Changes applied before test
commit 8a017d6ccadac03d440042feeb0858cabd9a8f35
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Wed May 5 15:25:33 2021 +0200

    Add new bundle type to list only when privileged
    
    This is only doing listing for now. It's in a dedicated commit so review is easier.
    
    Related to T3213

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

Harbormaster completed remote builds in B21289: Diff 20307.May 5 2021, 5:43 PM
ardumont added inline comments.May 5 2021, 5:49 PM
swh/web/tests/misc/test_origin_save.py
40

so far... That won't see the user as an ambassador one...

>       assert set(actual_response) == set(PRIVILEGED_VISIT_TYPES)
E       AssertionError: assert {'git', 'hg', 'svn'} == {'bundle', 'git', 'hg', 'svn'}
E         Extra items in the right set:
E         'bundle'
E         Use -v to get the full diff
anlambert added inline comments.May 5 2021, 5:58 PM
swh/web/tests/misc/test_origin_save.py
41–56

Because "origin-save-types-list" is not a DRF view so the bearer token auth will not work here.

You need to use the client fixture and login with client.login(code="", code_verifier="", redirect_uri="")

ardumont added inline comments.May 5 2021, 6:02 PM
swh/web/tests/misc/test_origin_save.py
41–56

ah! ok
I bypassed it so far using a mock but i don't like that much.
So i'll give your suggestion a try ;)

Thanks.

ardumont updated this revision to Diff 20309.May 5 2021, 6:09 PM
  • Add the last test!
  • reword commit message
swh/web/tests/misc/test_origin_save.py
41–56

it worked ;)

anlambert added inline comments.May 5 2021, 6:15 PM
swh/web/api/views/origin_save.py
88

you can save some lines by inlining privileged_user(request) in the function call

swh/web/common/origin_save.py
153

you can drop the call to list() here

swh/web/misc/origin_save.py
31–32

could be a one liner

swh-public-ci added a comment.May 5 2021, 6:25 PM

Build is green

Patch application report for D5685 (id=20309)

Rebasing onto 934cb65cdf...

Current branch diff-target is up to date.
Changes applied before test
commit 0311b02a0d48ed990f9852bf9a3dc8db2ad6e73d
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Wed May 5 15:25:33 2021 +0200

    Add new bundle type to list only when connected as privileged user
    
    This is only doing listing for now. It's in a dedicated commit so review is easier.
    
    Some more work is required ui and server side to actually schedule those new visit type.
    It will be done in a future commit.
    
    Related to T3213

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

Harbormaster completed remote builds in B21291: Diff 20309.May 5 2021, 6:25 PM
ardumont updated this revision to Diff 20323.EditedMay 6 2021, 9:18 AM
ardumont marked 2 inline comments as done.

Adapt according to last suggestions

ardumont added a comment.May 6 2021, 9:23 AM

Thanks adapted.

swh-public-ci added a comment.May 6 2021, 9:28 AM

Build is green

Patch application report for D5685 (id=20323)

Rebasing onto 934cb65cdf...

Current branch diff-target is up to date.
Changes applied before test
commit bba3c8cb1ec47367cea6ec7fa91ad4725957f6f0
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Wed May 5 15:25:33 2021 +0200

    Add new bundle type to list only when connected as privileged user
    
    This is only doing listing for now. It's in a dedicated commit so review is easier.
    
    Some more work is required ui and server side to actually schedule those new visit type.
    It will be done in a future commit.
    
    Related to T3213

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

Harbormaster completed remote builds in B21305: Diff 20323.May 6 2021, 9:28 AM
ardumont added a child revision: D5676: Allow privileged user to trigger save code now bundle visit type.May 6 2021, 9:34 AM
anlambert accepted this revision.May 6 2021, 11:03 AM

Looks good to me !

This revision is now accepted and ready to land.May 6 2021, 11:03 AM
ardumont updated this revision to Diff 20334.May 6 2021, 11:32 AM

Rebase

swh-public-ci added a comment.May 6 2021, 11:41 AM

Build is green

Patch application report for D5685 (id=20334)

Rebasing onto 43636f47d5...

Current branch diff-target is up to date.
Changes applied before test
commit 1a2c53716cbeaedf7492702324fbcfbfd6c9ae18
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Wed May 5 15:25:33 2021 +0200

    Add new bundle type to list only when connected as privileged user
    
    This is only doing listing for now. It's in a dedicated commit so review is easier.
    
    Some more work is required ui and server side to actually schedule those new visit type.
    It will be done in a future commit.
    
    Related to T3213

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

Harbormaster completed remote builds in B21316: Diff 20334.May 6 2021, 11:41 AM
ardumont mentioned this in D5676: Allow privileged user to trigger save code now bundle visit type.May 7 2021, 11:42 AM
ardumont added a child revision: D5696: tests: Add new ambassador user for frontend tests.
ardumont removed a child revision: D5676: Allow privileged user to trigger save code now bundle visit type.
ardumont updated this revision to Diff 20399.May 7 2021, 2:18 PM

Rebase

ardumont updated this revision to Diff 20402.May 7 2021, 2:20 PM

Actually rebase

swh-public-ci added a comment.May 7 2021, 2:27 PM

Build is green

Patch application report for D5685 (id=20399)

Rebasing onto fcf53f1ec3...

First, rewinding head to replay your work on top of it...
Applying: Add new bundle type to list only when connected as privileged user
Changes applied before test
commit 6a1013d53a3f426c80e6fb2dee87857a9218ece6
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Wed May 5 15:25:33 2021 +0200

    Add new bundle type to list only when connected as privileged user
    
    This is only doing listing for now. It's in a dedicated commit so review is easier.
    
    Some more work is required ui and server side to actually schedule those new visit type.
    It will be done in a future commit.
    
    Related to T3213

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

Harbormaster completed remote builds in B21379: Diff 20399.May 7 2021, 2:27 PM
swh-public-ci added a comment.May 7 2021, 2:42 PM

Build is green

Patch application report for D5685 (id=20402)

Rebasing onto fcf53f1ec3...

Current branch diff-target is up to date.
Changes applied before test
commit 11d7c4ef5fedac657953e1e610eb5a7ccab7c9c4
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Wed May 5 15:25:33 2021 +0200

    Add new bundle type to list only when connected as privileged user
    
    This is only doing listing for now. It's in a dedicated commit so review is easier.
    
    Some more work is required ui and server side to actually schedule those new visit type.
    It will be done in a future commit.
    
    Related to T3213

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

Harbormaster completed remote builds in B21382: Diff 20402.May 7 2021, 2:43 PM
ardumont updated this revision to Diff 20435.May 10 2021, 2:26 PM

Rebase

ardumont updated this revision to Diff 20436.May 10 2021, 2:30 PM

Rebase with the correct commit range

swh-public-ci added a comment.May 10 2021, 2:36 PM

Build is green

Patch application report for D5685 (id=20435)

Rebasing onto 1e97586914...

Current branch diff-target is up to date.
Changes applied before test
commit 28e5b7298047a6321a0ff4e486fb7d9d6f8081d4
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Wed May 5 15:41:34 2021 +0200

    Allow privileged user to trigger save code now bundle visit type
    
    Related to T3213

commit 19452d1b88aace058902241b06db925ec1f65afe
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Thu May 6 14:05:15 2021 +0200

    tests: Add new ambassador user for frontend tests
    
    This refactor existing permission code to allow creation of user with some permissions.
    
    Related to T3213

commit 2a4f2e966a034e034a736e7e10b2b572ef32c89b
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Wed May 5 15:25:33 2021 +0200

    Add new bundle type to list only when connected as privileged user
    
    This is only doing listing for now. It's in a dedicated commit so review is easier.
    
    Some more work is required ui and server side to actually schedule those new visit type.
    It will be done in a future commit.
    
    Related to T3213

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

Harbormaster completed remote builds in B21412: Diff 20435.May 10 2021, 2:36 PM
swh-public-ci added a comment.May 10 2021, 2:46 PM

Build is green

Patch application report for D5685 (id=20436)

Rebasing onto 1e97586914...

Current branch diff-target is up to date.
Changes applied before test
commit 2a4f2e966a034e034a736e7e10b2b572ef32c89b
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Wed May 5 15:25:33 2021 +0200

    Add new bundle type to list only when connected as privileged user
    
    This is only doing listing for now. It's in a dedicated commit so review is easier.
    
    Some more work is required ui and server side to actually schedule those new visit type.
    It will be done in a future commit.
    
    Related to T3213

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

Harbormaster completed remote builds in B21413: Diff 20436.May 10 2021, 2:46 PM
Closed by commit rDWAPPS2a4f2e966a03: Add new bundle type to list only when connected as privileged user (authored by ardumont). · Explain WhyMay 11 2021, 10:51 AM
This revision was automatically updated to reflect the committed changes.
ardumont added a commit: rDWAPPS2a4f2e966a03: Add new bundle type to list only when connected as privileged user.

Revision Contents
Changeset List

PathSizeCoverage (All)Coverage (Touched)
swh/
web/
api/
views/
8 lines100%
Loading...
auth/
11 lines100%
Loading...
common/
50 lines94%
Loading...
7 lines86%
Loading...
misc/
8 lines84%
Loading...
tests/
common/
32 lines100%
Loading...
misc/
45 lines100%
Loading...

Diff 20436

View Options

swh/web/api/views/origin_save.py

Loading...
View Options

swh/web/auth/utils.py

Loading...
View Options

swh/web/common/origin_save.py

Loading...
View Options

swh/web/common/swh_templatetags.py

Loading...
View Options

swh/web/misc/origin_save.py

Loading...
View Options

swh/web/tests/common/test_origin_save.py

Loading...
View Options

swh/web/tests/misc/test_origin_save.py

Loading...
About · Developer information · Legal