Skip to content

Commit 2b60238

Browse files
committed
Add email notication on package/release removal
Until now, where there are multiple contributors on a single the project, if one of them deletes a release or the whole project the other contributors don't get any notification, which is problematic. Connected with issue #5714. Signed-off-by: Martin Vrachev <[email protected]>
1 parent 519afb3 commit 2b60238

File tree

9 files changed

+355
-1
lines changed

9 files changed

+355
-1
lines changed

tests/unit/manage/test_views.py

Lines changed: 69 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2310,7 +2310,7 @@ def test_delete_project_disallow_deletion(self):
23102310
pretend.call("manage.project.settings", project_name="foo")
23112311
]
23122312

2313-
def test_delete_project(self, db_request):
2313+
def test_delete_project(self, monkeypatch, db_request):
23142314
project = ProjectFactory.create(name="foo")
23152315

23162316
db_request.route_path = pretend.call_recorder(lambda *a, **kw: "/the-redirect")
@@ -2319,6 +2319,21 @@ def test_delete_project(self, db_request):
23192319
)
23202320
db_request.POST["confirm_project_name"] = project.normalized_name
23212321
db_request.user = UserFactory.create()
2322+
2323+
get_user_role_in_project = pretend.call_recorder(
2324+
lambda project, username, req: "Owner"
2325+
)
2326+
monkeypatch.setattr(views, "get_user_role_in_project", get_user_role_in_project)
2327+
get_project_contributors = pretend.call_recorder(
2328+
lambda project, req: [db_request.user]
2329+
)
2330+
monkeypatch.setattr(views, "get_project_contributors", get_project_contributors)
2331+
2332+
send_removed_project_email = pretend.call_recorder(lambda req, user, **k: None)
2333+
monkeypatch.setattr(
2334+
views, "send_removed_project_email", send_removed_project_email
2335+
)
2336+
23222337
db_request.remote_addr = "192.168.1.1"
23232338

23242339
result = views.delete_project(project, db_request)
@@ -2329,6 +2344,21 @@ def test_delete_project(self, db_request):
23292344
assert db_request.route_path.calls == [pretend.call("manage.projects")]
23302345
assert isinstance(result, HTTPSeeOther)
23312346
assert result.headers["Location"] == "/the-redirect"
2347+
assert get_user_role_in_project.calls == [
2348+
pretend.call(project, db_request.user.username, db_request,),
2349+
pretend.call(project, db_request.user.username, db_request,),
2350+
]
2351+
assert get_project_contributors.calls == [pretend.call(project, db_request,)]
2352+
assert send_removed_project_email.calls == [
2353+
pretend.call(
2354+
db_request,
2355+
db_request.user,
2356+
project_name=project.name,
2357+
submitter_name=db_request.user.username,
2358+
submitter_role="Owner",
2359+
recipient_role="Owner",
2360+
)
2361+
]
23322362
assert not (db_request.db.query(Project).filter(Project.name == "foo").count())
23332363

23342364

@@ -2495,6 +2525,7 @@ def test_delete_project_release(self, monkeypatch):
24952525
project=pretend.stub(
24962526
name="foobar", record_event=pretend.call_recorder(lambda *a, **kw: None)
24972527
),
2528+
created=datetime.datetime(2017, 2, 5, 17, 18, 18, 462_634),
24982529
)
24992530
request = pretend.stub(
25002531
POST={"confirm_version": release.version},
@@ -2511,7 +2542,25 @@ def test_delete_project_release(self, monkeypatch):
25112542
)
25122543
journal_obj = pretend.stub()
25132544
journal_cls = pretend.call_recorder(lambda **kw: journal_obj)
2545+
2546+
get_user_role_in_project = pretend.call_recorder(
2547+
lambda project, username, req: "Owner"
2548+
)
2549+
monkeypatch.setattr(views, "get_user_role_in_project", get_user_role_in_project)
2550+
get_project_contributors = pretend.call_recorder(
2551+
lambda project, request: [request.user]
2552+
)
2553+
monkeypatch.setattr(views, "get_project_contributors", get_project_contributors)
2554+
25142555
monkeypatch.setattr(views, "JournalEntry", journal_cls)
2556+
send_removed_project_release_email = pretend.call_recorder(
2557+
lambda req, contrib, **k: None
2558+
)
2559+
monkeypatch.setattr(
2560+
views,
2561+
"send_removed_project_release_email",
2562+
send_removed_project_release_email,
2563+
)
25152564

25162565
view = views.ManageProjectRelease(release, request)
25172566

@@ -2520,6 +2569,25 @@ def test_delete_project_release(self, monkeypatch):
25202569
assert isinstance(result, HTTPSeeOther)
25212570
assert result.headers["Location"] == "/the-redirect"
25222571

2572+
assert get_user_role_in_project.calls == [
2573+
pretend.call(release.project, request.user.username, request,),
2574+
pretend.call(release.project, request.user.username, request,),
2575+
]
2576+
assert get_project_contributors.calls == [
2577+
pretend.call(release.project, request,)
2578+
]
2579+
2580+
assert send_removed_project_release_email.calls == [
2581+
pretend.call(
2582+
request,
2583+
request.user,
2584+
release=release.version,
2585+
submitter_name=request.user.username,
2586+
submitter_role="Owner",
2587+
recipient_role="Owner",
2588+
)
2589+
]
2590+
25232591
assert request.db.delete.calls == [pretend.call(release)]
25242592
assert request.db.add.calls == [pretend.call(journal_obj)]
25252593
assert request.flags.enabled.calls == [

warehouse/email/__init__.py

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,40 @@ def send_two_factor_removed_email(request, user, method):
213213
return {"method": pretty_methods[method], "username": user.username}
214214

215215

216+
@_email("removed-project")
217+
def send_removed_project_email(
218+
request, user, *, project_name, submitter_name, submitter_role, recipient_role
219+
):
220+
recipient_role_descr = "an owner"
221+
if recipient_role == "Maintainer":
222+
recipient_role_descr = "a maintainer"
223+
224+
return {
225+
"project": project_name,
226+
"submitter": submitter_name,
227+
"submitter_role": submitter_role,
228+
"recipient_role_descr": recipient_role_descr,
229+
}
230+
231+
232+
@_email("removed-project-release")
233+
def send_removed_project_release_email(
234+
request, user, *, release, submitter_name, submitter_role, recipient_role
235+
):
236+
recipient_role_descr = "an owner"
237+
if recipient_role == "Maintainer":
238+
recipient_role_descr = "a maintainer"
239+
240+
return {
241+
"project": release.project.name,
242+
"release": release,
243+
"release_date": release.created.strftime("%b %d %Y"),
244+
"submitter": submitter_name,
245+
"submitter_role": submitter_role,
246+
"recipient_role_descr": recipient_role_descr,
247+
}
248+
249+
216250
def includeme(config):
217251
email_sending_class = config.maybe_dotted(config.registry.settings["mail.backend"])
218252
config.register_service_factory(email_sending_class.create_service, IEmailSender)

warehouse/manage/views.py

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
send_email_verification_email,
3939
send_password_change_email,
4040
send_primary_email_change_email,
41+
send_removed_project_email,
42+
send_removed_project_release_email,
4143
send_two_factor_added_email,
4244
send_two_factor_removed_email,
4345
)
@@ -899,6 +901,40 @@ def manage_project_settings(project, request):
899901
return {"project": project}
900902

901903

904+
def get_project_contributors(project, request):
905+
query_res = (
906+
request.db.query(Project)
907+
.join(User, Project.users)
908+
.filter(Project.name == project.name)
909+
.one()
910+
)
911+
return query_res.users
912+
913+
914+
def get_user_role_in_project(project, username, request):
915+
query_res = (
916+
request.db.query(Project)
917+
.join(User, Project.users)
918+
.filter(User.username == username, Project.name == project.name)
919+
.with_entities(Role.role_name)
920+
.distinct(Role.role_name)
921+
.all()
922+
)
923+
924+
user_role = ""
925+
# This check is needed because of
926+
# issue https://github.com/pypa/warehouse/issues/2745
927+
# which is not yet resolved and a user could be an owner
928+
# and a maintainer at the same time
929+
if len(query_res) == 2 and (
930+
query_res[0].role_name == "Owner" or query_res[1].role_name == "Owner"
931+
):
932+
user_role = "Owner"
933+
else:
934+
user_role = "Maintainer"
935+
return user_role
936+
937+
902938
@view_config(
903939
route_name="manage.project.delete_project",
904940
context=Project,
@@ -921,6 +957,24 @@ def delete_project(project, request):
921957
)
922958

923959
confirm_project(project, request, fail_route="manage.project.settings")
960+
961+
submitter_role = get_user_role_in_project(project, request.user.username, request)
962+
contributors = get_project_contributors(project, request)
963+
964+
for contributor in contributors:
965+
contributor_role = get_user_role_in_project(
966+
project, contributor.username, request
967+
)
968+
969+
send_removed_project_email(
970+
request,
971+
contributor,
972+
project_name=project.name,
973+
submitter_name=request.user.username,
974+
submitter_role=submitter_role,
975+
recipient_role=contributor_role,
976+
)
977+
924978
remove_project(project, request)
925979

926980
return HTTPSeeOther(request.route_path("manage.projects"))
@@ -1053,6 +1107,11 @@ def delete_project_release(self):
10531107
)
10541108
)
10551109

1110+
submitter_role = get_user_role_in_project(
1111+
self.release.project, self.request.user.username, self.request
1112+
)
1113+
contributors = get_project_contributors(self.release.project, self.request)
1114+
10561115
self.request.db.add(
10571116
JournalEntry(
10581117
name=self.release.project.name,
@@ -1078,6 +1137,20 @@ def delete_project_release(self):
10781137
f"Deleted release {self.release.version!r}", queue="success"
10791138
)
10801139

1140+
for contributor in contributors:
1141+
contributor_role = get_user_role_in_project(
1142+
self.release.project, contributor.username, self.request
1143+
)
1144+
1145+
send_removed_project_release_email(
1146+
self.request,
1147+
contributor,
1148+
release=self.release.version,
1149+
submitter_name=self.request.user.username,
1150+
submitter_role=submitter_role,
1151+
recipient_role=contributor_role,
1152+
)
1153+
10811154
return HTTPSeeOther(
10821155
self.request.route_path(
10831156
"manage.project.releases", project_name=self.release.project.name
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{#
2+
# Licensed under the Apache License, Version 2.0 (the "License");
3+
# you may not use this file except in compliance with the License.
4+
# You may obtain a copy of the License at
5+
#
6+
# http://www.apache.org/licenses/LICENSE-2.0
7+
#
8+
# Unless required by applicable law or agreed to in writing, software
9+
# distributed under the License is distributed on an "AS IS" BASIS,
10+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
# See the License for the specific language governing permissions and
12+
# limitations under the License.
13+
-#}
14+
{% extends "email/_base/body.html" %}
15+
16+
{% block extra_style %}
17+
ul.collaborator-details {
18+
list-style-type: none;
19+
}
20+
{% endblock %}
21+
22+
{% block content %}
23+
<p>
24+
<ul class="removed-project-release">
25+
<li>{% trans project=project, release=release, date=release_date %}The {{ project }} release {{ release }} released on {{ date }} has been deleted.{% endtrans %}</li>
26+
<li>{% trans submitter=submitter, role=submitter_role %}<strong>Deleted by:</strong> {{ submitter }} with a role:
27+
{{ role }}.{% endtrans %}
28+
</li>
29+
</ul>
30+
</p>
31+
32+
<p>{% trans href='mailto:[email protected]', email_address='[email protected]' %}If this was a mistake, you can email <a
33+
href="{{ href }}">{{ email_address }}</a> to communicate with the PyPI administrators.{% endtrans %}</p>
34+
{% endblock %}
35+
36+
{% block reason %}
37+
38+
<p>{% trans recipient_role_descr=recipient_role_descr %}
39+
You are receiving this because you are {{ recipient_role_descr }} of this project.
40+
{% endtrans %}</p>
41+
42+
{% endblock %}
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{#
2+
# Licensed under the Apache License, Version 2.0 (the "License");
3+
# you may not use this file except in compliance with the License.
4+
# You may obtain a copy of the License at
5+
#
6+
# http://www.apache.org/licenses/LICENSE-2.0
7+
#
8+
# Unless required by applicable law or agreed to in writing, software
9+
# distributed under the License is distributed on an "AS IS" BASIS,
10+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
# See the License for the specific language governing permissions and
12+
# limitations under the License.
13+
-#}
14+
15+
{% extends "email/_base/body.txt" %}
16+
17+
{% block content %}
18+
{% trans project=project, release=release, date=release_date %}The {{ project }} release {{ release }} released on {{ date }} has been deleted.{% endtrans %}
19+
20+
{% trans submitter=submitter, role=submitter_role %}Deleted by: {{ submitter }} with a role: {{ role }}.{% endtrans %}
21+
22+
{% trans email_address='[email protected]' %}If this was a mistake, you can email {{ email_address }} to communicate with the PyPI administrators.{% endtrans %}
23+
{% endblock %}
24+
25+
{% block reason %}
26+
{% trans recipient_role_descr=recipient_role_descr %}
27+
You are receiving this because you are {{ recipient_role_descr }} of this project.
28+
{% endtrans %}
29+
{% endblock %}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{#
2+
# Licensed under the Apache License, Version 2.0 (the "License");
3+
# you may not use this file except in compliance with the License.
4+
# You may obtain a copy of the License at
5+
#
6+
# http://www.apache.org/licenses/LICENSE-2.0
7+
#
8+
# Unless required by applicable law or agreed to in writing, software
9+
# distributed under the License is distributed on an "AS IS" BASIS,
10+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
# See the License for the specific language governing permissions and
12+
# limitations under the License.
13+
-#}
14+
15+
{% extends "email/_base/subject.txt" %}
16+
17+
{% block content %}
18+
{% trans project=project, release=release %}The {{ project }} release {{ release }} has been deleted.{% endtrans %}{% endblock %}
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{#
2+
# Licensed under the Apache License, Version 2.0 (the "License");
3+
# you may not use this file except in compliance with the License.
4+
# You may obtain a copy of the License at
5+
#
6+
# http://www.apache.org/licenses/LICENSE-2.0
7+
#
8+
# Unless required by applicable law or agreed to in writing, software
9+
# distributed under the License is distributed on an "AS IS" BASIS,
10+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
# See the License for the specific language governing permissions and
12+
# limitations under the License.
13+
-#}
14+
{% extends "email/_base/body.html" %}
15+
16+
{% block extra_style %}
17+
ul.collaborator-details {
18+
list-style-type: none;
19+
}
20+
{% endblock %}
21+
22+
{% block content %}
23+
<p>
24+
<ul class="removed-project-details">
25+
<li>{% trans project=project %}The project {{ project }} has been deleted.{% endtrans %}</li>
26+
<li>{% trans submitter=submitter, role=submitter_role %}<strong>Deleted by:</strong> {{ submitter }} with a role:
27+
{{ role }}.{% endtrans %}
28+
</li>
29+
</ul>
30+
</p>
31+
32+
<p>{% trans href='mailto:[email protected]', email_address='[email protected]' %}If this was a mistake, you can email <a
33+
href="{{ href }}">{{ email_address }}</a> to communicate with the PyPI administrators.{% endtrans %}</p>
34+
{% endblock %}
35+
36+
{% block reason %}
37+
38+
<p>{% trans recipient_role_descr=recipient_role_descr %}
39+
You are receiving this because you are {{ recipient_role_descr }} of this project.
40+
{% endtrans %}</p>
41+
42+
{% endblock %}

0 commit comments

Comments
 (0)