You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tooling.apache.org by sb...@apache.org on 2026/06/22 17:16:13 UTC
(tooling-trusted-releases) branch sbp updated: Enforce expedited release permissions for reads
This is an automated email from the ASF dual-hosted git repository.
sbp pushed a commit to branch sbp
in repository https://gitbox.apache.org/repos/asf/tooling-trusted-releases.git
The following commit(s) were added to refs/heads/sbp by this push:
new f495dd4f Enforce expedited release permissions for reads
f495dd4f is described below
commit f495dd4f6f8454682db12ec55a82836222795b9d
Author: Sean B. Palmer <se...@miscoranda.com>
AuthorDate: Mon Jun 22 18:15:35 2026 +0100
Enforce expedited release permissions for reads
---
atr/api/__init__.py | 31 +++++++++++++++++++++++--------
atr/blueprints/api.py | 1 +
atr/blueprints/common.py | 28 ++++++++++++++++++++++++++++
atr/blueprints/get.py | 1 +
atr/blueprints/post.py | 1 +
atr/db/__init__.py | 2 +-
atr/db/interaction.py | 4 +++-
atr/get/projects.py | 31 +++++++++++++++++++++++--------
atr/get/release.py | 3 +++
atr/get/root.py | 4 +++-
atr/get/start.py | 3 +++
atr/models/sql.py | 14 +++++++++++---
atr/post/projects.py | 2 +-
atr/server.py | 2 +-
atr/ssh.py | 6 +++++-
atr/storage/__init__.py | 2 +-
atr/storage/writers/project.py | 4 ++--
atr/user.py | 14 ++++++++++++++
tests/unit/test_signature_provenance.py | 18 +++++++++++-------
tests/unit/test_vote_resolution.py | 2 ++
20 files changed, 138 insertions(+), 35 deletions(-)
diff --git a/atr/api/__init__.py b/atr/api/__init__.py
index 275e518d..ff88dc0e 100644
--- a/atr/api/__init__.py
+++ b/atr/api/__init__.py
@@ -1045,6 +1045,7 @@ async def project_releases(
async with db.session() as data:
await data.project(key=str(project_key)).demand(exceptions.NotFound())
releases = await data.release(project_key=str(project_key)).all()
+ releases = [r for r in releases if (not r.is_embargoed)]
return models.api.ProjectReleasesResults(
endpoint="/project/releases",
releases=releases,
@@ -1520,8 +1521,9 @@ async def releases_list(
except ValueError as e:
raise exceptions.BadRequest(str(e))
via = sql.validate_instrumented_attribute
+ not_embargoed = (~via(sql.Release.expedited)) | (via(sql.Release.phase) == sql.ReleasePhase.RELEASE)
async with db.session() as data:
- statement = sqlmodel.select(sql.Release)
+ statement = sqlmodel.select(sql.Release).where(not_embargoed)
if query_args.phase:
try:
@@ -1536,7 +1538,7 @@ async def releases_list(
paged_releases = (await data.execute(statement)).scalars().all()
- count_stmt = sqlalchemy.select(sqlalchemy.func.count(via(sql.Release.key)))
+ count_stmt = sqlalchemy.select(sqlalchemy.func.count(via(sql.Release.key))).where(not_embargoed)
if query_args.phase:
phase_value = sql.ReleasePhase(query_args.phase) if query_args.phase else None
if phase_value is not None:
@@ -1591,9 +1593,9 @@ async def signature_provenance(
)
if data.project_key is not None:
- matched_committees = await _match_committees_scoped(key.committees, data)
+ matched_committees = await _match_committees_scoped(key.committees, data, _jwt_asf_uid())
else:
- matched_committees = await _match_committees(key.committees, data)
+ matched_committees = await _match_committees(key.committees, data, _jwt_asf_uid())
for committee in matched_committees:
keys_file_path = paths.committee_downloads_dir(committee) / "KEYS"
@@ -1841,6 +1843,12 @@ async def vote_cast(
Cast a Trusted Vote ballot.
"""
asf_uid = _jwt_asf_uid()
+ async with db.session() as db_data:
+ release_key = sql.release_key(data.project, data.version)
+ release = await db_data.release(key=str(release_key), _committee=True).get()
+ if (release is not None) and user.embargo_hides_release(release, asf_uid, is_member=False):
+ raise exceptions.NotFound(f"Release {release_key} not found")
+
fullname = await _ldap_fullname(asf_uid)
try:
async with storage.write(asf_uid) as write:
@@ -2007,6 +2015,9 @@ async def vote_tabulate(
exceptions.NotFound(f"Release {release_key} not found"),
)
+ if user.embargo_hides_release(release, _jwt_asf_uid(), is_member=False):
+ raise exceptions.NotFound(f"Release {release_key} not found")
+
is_trusted = (release.effective_vote_mode == sql.VoteMode.TRUSTED) and (release.current_vote_seq is not None)
trusted_ballots, trusted_summary, trusted_passed = await _vote_tabulate_trusted(release, is_trusted)
details = await _vote_tabulate_email_details(release, is_trusted)
@@ -2132,7 +2143,7 @@ async def _ldap_fullname(asf_uid: str) -> str:
async def _match_committees(
- key_committees: list[sql.Committee], data: models.api.SignatureProvenanceArgs
+ key_committees: list[sql.Committee], data: models.api.SignatureProvenanceArgs, asf_uid: str
) -> list[sql.Committee]:
matched: dict[str, sql.Committee] = {}
async with db.session() as db_data:
@@ -2143,7 +2154,8 @@ async def _match_committees(
release_dirs: list[safe.StatePath] = []
for project in projects:
releases = await db_data.release(project_key=project.key).all()
- release_dirs.extend(paths.release_directory(release) for release in releases)
+ visible = [r for r in releases if (not user.embargo_hides_release(r, asf_uid, is_member=False))]
+ release_dirs.extend(paths.release_directory(release) for release in visible)
for release_dir in release_dirs:
if await _match_release(release_dir, data):
matched[committee.key] = committee
@@ -2152,7 +2164,7 @@ async def _match_committees(
async def _match_committees_scoped(
- key_committees: list[sql.Committee], data: models.api.SignatureProvenanceArgs
+ key_committees: list[sql.Committee], data: models.api.SignatureProvenanceArgs, asf_uid: str
) -> list[sql.Committee]:
project_key = data.project_key
if project_key is None:
@@ -2176,10 +2188,13 @@ async def _match_committees_scoped(
).get()
if release is None:
return []
+ if user.embargo_hides_release(release, asf_uid, is_member=False):
+ return []
release_dirs = [paths.release_directory(release)]
else:
releases = await db_data.release(project_key=str(project_key)).all()
- release_dirs = [paths.release_directory(release) for release in releases]
+ visible = [r for r in releases if (not user.embargo_hides_release(r, asf_uid, is_member=False))]
+ release_dirs = [paths.release_directory(release) for release in visible]
for release_dir in release_dirs:
if await _match_release(release_dir, data):
diff --git a/atr/blueprints/api.py b/atr/blueprints/api.py
index 69202f28..11ddf723 100644
--- a/atr/blueprints/api.py
+++ b/atr/blueprints/api.py
@@ -81,6 +81,7 @@ def typed(
async def wrapper(*_args: Any, **kwargs: Any) -> Any:
await common.validate_params(kwargs, validated_params)
kwargs.update(literal_params)
+ await common.confidential_release_block(kwargs, validated_params, None, allow_asf_member=False)
if body_param is not None:
await common.parse_body(body_param, body_safe_params, kwargs)
diff --git a/atr/blueprints/common.py b/atr/blueprints/common.py
index 067382a6..0fce23da 100644
--- a/atr/blueprints/common.py
+++ b/atr/blueprints/common.py
@@ -28,11 +28,13 @@ import quart
import quart_schema
import werkzeug.exceptions as exceptions
+import atr.db as db
import atr.form as form
import atr.models.safe as safe
import atr.models.sql as sql
import atr.models.unsafe as unsafe
import atr.sessions as sessions
+import atr.user as user
import atr.web as web
QUART_CONVERTERS: Final[dict[Any, str]] = {
@@ -180,6 +182,32 @@ def build_api_path(
return path, validated_params, literal_params, unique.body, unique.form, unique.query, optional_params
+async def confidential_release_block(
+ kwargs: dict[str, Any],
+ validated_params: list[tuple[str, type]],
+ session: web.Public,
+ *,
+ allow_asf_member: bool,
+) -> None:
+ project_keys = [
+ kwargs[name] for name, hint in validated_params if (hint is safe.ProjectKey) and (kwargs.get(name) is not None)
+ ]
+ version_keys = [
+ kwargs[name] for name, hint in validated_params if (hint is safe.VersionKey) and (kwargs.get(name) is not None)
+ ]
+ if (len(project_keys) != 1) or (len(version_keys) != 1):
+ return
+ release_key = sql.release_key(str(project_keys[0]), str(version_keys[0]))
+ async with db.session() as data:
+ release = await data.release(key=str(release_key), _committee=True).get()
+ if release is None:
+ return
+ uid = session.uid if (session is not None) else None
+ is_member = bool(allow_asf_member and (session is not None) and session.is_member)
+ if user.embargo_hides_release(release, uid, is_member=is_member):
+ raise base.ASFQuartException("Release does not exist", errorcode=404)
+
+
def setup_wrapper(wrapper: Callable[..., Any], func: Callable[..., Any], blueprint_name: str) -> str:
"""Set standard metadata on a route wrapper and return the endpoint name."""
endpoint = func.__module__.replace(".", "_") + "_" + func.__name__
diff --git a/atr/blueprints/get.py b/atr/blueprints/get.py
index b7c60c51..d1fdc210 100644
--- a/atr/blueprints/get.py
+++ b/atr/blueprints/get.py
@@ -61,6 +61,7 @@ def typed(func: Callable[..., Any]) -> web.RouteFunction[Any]:
enhanced_session = await common.authenticate_public() if public else await common.authenticate()
await common.validate_params(kwargs, validated_params)
kwargs.update(literal_params)
+ await common.confidential_release_block(kwargs, validated_params, enhanced_session, allow_asf_member=True)
start_time_ns = time.perf_counter_ns()
response = await func(enhanced_session, **kwargs)
diff --git a/atr/blueprints/post.py b/atr/blueprints/post.py
index 86d17823..dd536d78 100644
--- a/atr/blueprints/post.py
+++ b/atr/blueprints/post.py
@@ -65,6 +65,7 @@ def typed(func: Callable[..., Any]) -> web.RouteFunction[Any]:
enhanced_session = await common.authenticate_public() if public else await common.authenticate()
await common.validate_params(kwargs, validated_params)
kwargs.update(literal_params)
+ await common.confidential_release_block(kwargs, validated_params, enhanced_session, allow_asf_member=True)
if form_param is not None:
form_param_name, form_cls = form_param
diff --git a/atr/db/__init__.py b/atr/db/__init__.py
index fefa1233..a3c2dba1 100644
--- a/atr/db/__init__.py
+++ b/atr/db/__init__.py
@@ -477,7 +477,7 @@ class Session(sqlalchemy.ext.asyncio.AsyncSession):
query = query.options(joined_load(sql.Project.committee))
if _releases:
- query = query.options(select_in_load(sql.Project.releases))
+ query = query.options(select_in_load(sql.Project.releases_including_embargoed))
if _super_project:
query = query.options(joined_load(sql.Project.super_project))
if _release_policy:
diff --git a/atr/db/interaction.py b/atr/db/interaction.py
index ecf387c6..3089339e 100644
--- a/atr/db/interaction.py
+++ b/atr/db/interaction.py
@@ -909,7 +909,7 @@ def trusted_vote_round(release: sql.Release) -> int | None:
return None
-async def unfinished_releases(asfuid: str) -> list[tuple[str, str, list[sql.Release]]]:
+async def unfinished_releases(asfuid: str, is_member: bool) -> list[tuple[str, str, list[sql.Release]]]:
releases: list[tuple[str, str, list[sql.Release]]] = []
async with db.session() as data:
user_projects = await user.projects(asfuid)
@@ -932,6 +932,8 @@ async def unfinished_releases(asfuid: str) -> list[tuple[str, str, list[sql.Rele
)
result = await data.execute(stmt)
active_releases = list(result.scalars().all())
+ if not user.can_view_embargoed_release(project.committee, asfuid, is_member=is_member):
+ active_releases = [r for r in active_releases if (not r.is_embargoed)]
if active_releases:
active_releases.sort(key=lambda r: r.created, reverse=True)
releases.append((project.short_display_name, project.key, active_releases))
diff --git a/atr/get/projects.py b/atr/get/projects.py
index f667ad66..b365fc45 100644
--- a/atr/get/projects.py
+++ b/atr/get/projects.py
@@ -175,7 +175,8 @@ async def projects(session: web.Public, _projects: Literal["projects"]) -> str:
continue
if project.committee and committee_project_counts[str(project.committee.key)] <= 1:
continue
- if not project.releases:
+ project_releases = project.releases_including_embargoed
+ if not project_releases:
action_forms[str(project.key)] = await form.render(
model_cls=shared.projects.DeleteSelectedProject,
action=util.as_url(post.projects.delete),
@@ -186,7 +187,7 @@ async def projects(session: web.Public, _projects: Literal["projects"]) -> str:
defaults={"project_key": str(project.key)},
confirm="Are you sure you want to delete this project? This cannot be undone.",
)
- elif all(r.phase == sql.ReleasePhase.RELEASE_CANDIDATE_DRAFT for r in project.releases):
+ elif all(r.phase == sql.ReleasePhase.RELEASE_CANDIDATE_DRAFT for r in project_releases):
action_forms[str(project.key)] = await form.render(
model_cls=shared.projects.ArchiveSelectedProject,
action=util.as_url(post.projects.archive),
@@ -196,7 +197,7 @@ async def projects(session: web.Public, _projects: Literal["projects"]) -> str:
empty=True,
defaults={"project_key": str(project.key)},
confirm=(
- f"This project has {util.plural(len(project.releases), 'draft release')}."
+ f"This project has {util.plural(len(project_releases), 'draft release')}."
" Archiving will delete those drafts and mark the project as retired."
" Continue?"
),
@@ -275,6 +276,15 @@ async def view(
can_start_release = (is_committee_member or is_privileged) and (project.status != sql.ProjectStatus.RETIRED)
is_sole_active_project = (project.committee is not None) and (active_committee_projects <= 1)
+ if user.can_view_embargoed_release(project.committee, session.uid, is_member=session.is_member):
+ visible_releases = project.releases_including_embargoed
+ else:
+ visible_releases = project.releases
+
+ released_cycle_keys = {r.cycle_key for r in project.releases_including_embargoed}
+ visible_cycle_keys = {r.cycle_key for r in visible_releases}
+ cycles = [c for c in cycles if (c.cycle_key not in released_cycle_keys) or (c.cycle_key in visible_cycle_keys)]
+
page = htm.Block()
page_styles = """
@@ -319,6 +329,7 @@ async def view(
can_start_release,
project,
cycles,
+ visible_releases,
)
page.append(tabs)
@@ -463,7 +474,8 @@ def _cycle_has_dates(cycle: sql.ProjectCycle) -> bool:
async def _delete_form(project: sql.Project) -> htm.Element | None:
delete_form = None
- if not project.releases:
+ releases = project.releases_including_embargoed
+ if not releases:
delete_form = await form.render(
shared.projects.DeleteSelectedProject,
action=util.as_url(post.projects.delete),
@@ -474,7 +486,7 @@ async def _delete_form(project: sql.Project) -> htm.Element | None:
confirm="Are you sure you want to delete this project? This cannot be undone.",
empty=True,
)
- elif all(r.phase == sql.ReleasePhase.RELEASE_CANDIDATE_DRAFT for r in project.releases):
+ elif all(r.phase == sql.ReleasePhase.RELEASE_CANDIDATE_DRAFT for r in releases):
delete_form = await form.render(
model_cls=shared.projects.ArchiveSelectedProject,
action=util.as_url(post.projects.archive),
@@ -484,7 +496,7 @@ async def _delete_form(project: sql.Project) -> htm.Element | None:
empty=True,
defaults={"project_key": str(project.key)},
confirm=(
- f"This project has {util.plural(len(project.releases), 'draft release')}."
+ f"This project has {util.plural(len(releases), 'draft release')}."
" Archiving will delete those drafts and mark the project as retired."
" Continue?"
),
@@ -499,6 +511,7 @@ async def _generate_tabs(
can_start_release: bool,
project: sql.Project,
cycles: list[sql.ProjectCycle],
+ releases: list[sql.Release],
) -> htpy.Element:
tab_items: list[htm.Tab] = [
htm.Tab(
@@ -507,6 +520,7 @@ async def _generate_tabs(
render=lambda: _render_releases_tab(
project,
cycles,
+ releases,
can_edit_policy=can_edit_policy,
can_start_release=can_start_release,
),
@@ -1179,6 +1193,7 @@ async def _render_releases_sections(
async def _render_releases_tab(
project: sql.Project,
cycles: list[sql.ProjectCycle],
+ releases: list[sql.Release],
*,
can_edit_policy: bool,
can_start_release: bool,
@@ -1194,7 +1209,7 @@ async def _render_releases_tab(
)["Start a new release"]
]
- if not project.releases:
+ if not releases:
body.p(".text-muted.mb-4")["No releases found."]
# Stay flat for projects with only the implicit "default" cycle and no
@@ -1204,7 +1219,7 @@ async def _render_releases_tab(
show_cycle_heading = (len(cycles) > 1) or any(c.cycle != "default" for c in cycles)
# Newest first, as the old per-phase queries returned them.
- releases = sorted(project.releases, key=lambda r: r.created, reverse=True)
+ releases = sorted(releases, key=lambda r: r.created, reverse=True)
for cycle in cycles:
cycle_drafts = [
diff --git a/atr/get/release.py b/atr/get/release.py
index 3ffd81fd..9d8faccd 100644
--- a/atr/get/release.py
+++ b/atr/get/release.py
@@ -29,6 +29,7 @@ import atr.db.interaction as interaction
import atr.models.safe as safe
import atr.models.sql as sql
import atr.template as template
+import atr.user as user
import atr.util as util
import atr.web as web
@@ -96,6 +97,8 @@ async def select(
base.ASFQuartException(f"Project {project_key} not found", errorcode=404)
)
releases = await interaction.releases_in_progress(project)
+ if not user.can_view_embargoed_release(project.committee, session.uid, is_member=session.is_member):
+ releases = [r for r in releases if (not r.is_embargoed)]
return await template.render(
"release-select.html", project=project, releases=releases, format_datetime=util.format_datetime
)
diff --git a/atr/get/root.py b/atr/get/root.py
index d38b6629..053734c6 100644
--- a/atr/get/root.py
+++ b/atr/get/root.py
@@ -104,7 +104,9 @@ async def index(_session: web.Public, _root: Literal[""]) -> quart_response.Resp
.order_by(sql.validate_instrumented_attribute(sql.Release.created).desc())
)
result = await data.execute(stmt)
- active_releases = result.scalars().all()
+ active_releases = list(result.scalars().all())
+ if not user.can_view_embargoed_release(project.committee, uid, is_member=session_data.is_member):
+ active_releases = [r for r in active_releases if (not r.is_embargoed)]
completed_releases = (
len(await data.release(phase=sql.ReleasePhase.RELEASE, project_key=project.key).all()) > 0
)
diff --git a/atr/get/start.py b/atr/get/start.py
index cfeb487a..b17e96ba 100644
--- a/atr/get/start.py
+++ b/atr/get/start.py
@@ -31,6 +31,7 @@ import atr.models.safe as safe
import atr.models.sql as sql
import atr.shared as shared
import atr.template as template
+import atr.user as user
import atr.util as util
import atr.web as web
@@ -47,6 +48,8 @@ async def selected(session: web.Committer, _start: Literal["start"], project_key
).demand(base.ASFQuartException(f"Project {project_key} not found", errorcode=404))
releases = await interaction.all_releases(project)
+ if not user.can_view_embargoed_release(project.committee, session.uid, is_member=session.is_member):
+ releases = [r for r in releases if (not r.is_embargoed)]
content = await _render_page(project, releases)
javascripts = ["start-cycle-preview"] if project.cycle_match else None
return await template.blank(
diff --git a/atr/models/sql.py b/atr/models/sql.py
index fa7d7be1..56965f90 100644
--- a/atr/models/sql.py
+++ b/atr/models/sql.py
@@ -901,7 +901,11 @@ class Project(sqlmodel.SQLModel, table=True):
# 1-M: Project -> [Release]
# M-1: Release -> Project
# see_also(Release.project)
- releases: list["Release"] = sqlmodel.Relationship(back_populates="project")
+ releases_including_embargoed: list["Release"] = sqlmodel.Relationship(back_populates="project")
+
+ @property
+ def releases(self) -> list["Release"]:
+ return [release for release in self.releases_including_embargoed if (not release.is_embargoed)]
# 1-M: Project -C-> [ProjectCycle]
# M-1: ProjectCycle -> Project
@@ -1311,8 +1315,8 @@ class Release(sqlmodel.SQLModel, table=True):
# M-1: Release -> Project
# 1-M: Project -> [Release]
project_key: str = sqlmodel.Field(foreign_key="project.key", **example("example"))
- project: Project = sqlmodel.Relationship(back_populates="releases")
- see_also(Project.releases)
+ project: Project = sqlmodel.Relationship(back_populates="releases_including_embargoed")
+ see_also(Project.releases_including_embargoed)
# M-1: Release -> ProjectCycle
# 1-M: ProjectCycle -> [Release]
@@ -1404,6 +1408,10 @@ class Release(sqlmodel.SQLModel, table=True):
# return None
return project.committee
+ @property
+ def is_embargoed(self) -> bool:
+ return self.expedited and (self.phase != ReleasePhase.RELEASE)
+
@property
def days_since_active(self) -> int:
"""Get the number of whole days since the release was last active."""
diff --git a/atr/post/projects.py b/atr/post/projects.py
index 6d3d9c7f..3e04a352 100644
--- a/atr/post/projects.py
+++ b/atr/post/projects.py
@@ -85,7 +85,7 @@ async def archive(
draft_versions: list[safe.VersionKey] = (
[
safe.VersionKey(r.version)
- for r in project.releases
+ for r in project.releases_including_embargoed
if r.phase == sql.ReleasePhase.RELEASE_CANDIDATE_DRAFT
]
if project is not None
diff --git a/atr/server.py b/atr/server.py
index 77d22052..08b3f4bb 100644
--- a/atr/server.py
+++ b/atr/server.py
@@ -281,7 +281,7 @@ def _app_setup_context(app: base.QuartApp) -> None:
user_notifications: list[sql.Notification] = []
if current_user is not None:
current_uid = current_user.uid
- topnav_unfinished_releases = await interaction.unfinished_releases(current_uid)
+ topnav_unfinished_releases = await interaction.unfinished_releases(current_uid, current_user.is_member)
topnav_user_projects = await interaction.user_projects(current_uid)
async with db.session() as data:
db_user = await data.user(asf_uid=current_uid).get()
diff --git a/atr/ssh.py b/atr/ssh.py
index a11afb9f..bc378d8e 100644
--- a/atr/ssh.py
+++ b/atr/ssh.py
@@ -535,7 +535,11 @@ async def _step_06a_validate_read_permissions(
if release.phase not in allowed_read_phases:
raise RsyncArgsError(f"Release '{release.key}' is not in a readable phase ({release.phase.value})")
- if not user.is_committer(project.committee, ssh_uid):
+ if release.is_embargoed:
+ read_allowed = user.can_view_embargoed_release(project.committee, ssh_uid, is_member=False)
+ else:
+ read_allowed = user.is_committer(project.committee, ssh_uid)
+ if not read_allowed:
raise RsyncArgsError(
f"You must be a committer or committee member for project '{project.key}' to read this release"
)
diff --git a/atr/storage/__init__.py b/atr/storage/__init__.py
index 5b53c2e3..eb432c1a 100644
--- a/atr/storage/__init__.py
+++ b/atr/storage/__init__.py
@@ -485,7 +485,7 @@ class Write:
return outcome.Result(warm)
def ensure_release_writable(self, release: sql.Release) -> None:
- if (not release.expedited) or (release.phase == sql.ReleasePhase.RELEASE):
+ if not release.is_embargoed:
return
committee_key = release.project.committee_key
if (committee_key is None) or (not self.__authorisation.is_member_of(committee_key)):
diff --git a/atr/storage/writers/project.py b/atr/storage/writers/project.py
index ca320287..86fe6767 100644
--- a/atr/storage/writers/project.py
+++ b/atr/storage/writers/project.py
@@ -230,7 +230,7 @@ class CommitteeMember(ReleaseManager):
sql.ReleasePhase.RELEASE_PREVIEW,
sql.ReleasePhase.RELEASE,
}
- if any(r.phase in post_draft_phases for r in project.releases):
+ if any(r.phase in post_draft_phases for r in project.releases_including_embargoed):
raise storage.AccessError(
f"Cannot archive project '{project_key}' because it has active releases; complete or remove them first."
)
@@ -267,7 +267,7 @@ class CommitteeMember(ReleaseManager):
f"Cannot delete project '{project_key}' because it is the only project in its committee."
)
- if project.releases:
+ if project.releases_including_embargoed:
raise storage.AccessError(
f"Cannot delete project '{project_key}' because it has associated releases. Delete them first.",
status=409,
diff --git a/atr/user.py b/atr/user.py
index 3ab1293c..0c3dd8fc 100644
--- a/atr/user.py
+++ b/atr/user.py
@@ -38,6 +38,16 @@ def binding_terminology(vote_round: int | None) -> tuple[str, str]:
return "Binding", "Non-binding"
+def can_view_embargoed_release(committee: sql.Committee | None, uid: str | None, *, is_member: bool) -> bool:
+ if uid is None:
+ return False
+ if is_admin(uid):
+ return True
+ if is_committee_member(committee, uid):
+ return True
+ return is_member
+
+
async def candidate_drafts(uid: str, user_projects: list[sql.Project] | None = None) -> list[sql.Release]:
# Must be imported here, to avoid a circular import
import atr.db.interaction as interaction
@@ -51,6 +61,10 @@ async def candidate_drafts(uid: str, user_projects: list[sql.Project] | None = N
return user_candidate_drafts
+def embargo_hides_release(release: sql.Release, uid: str | None, *, is_member: bool) -> bool:
+ return release.is_embargoed and (not can_view_embargoed_release(release.committee, uid, is_member=is_member))
+
+
def is_admin(user_id: str | None) -> bool:
if user_id is None:
return False
diff --git a/tests/unit/test_signature_provenance.py b/tests/unit/test_signature_provenance.py
index 851cf62a..789483b0 100644
--- a/tests/unit/test_signature_provenance.py
+++ b/tests/unit/test_signature_provenance.py
@@ -215,6 +215,7 @@ async def test_scoped_finds_committee_with_project_and_version(tmp_path: pathlib
project=project,
version="0.0.1",
latest_revision_number=None,
+ is_embargoed=False,
)
release_dir = safe.StatePath(tmp_path)
mock_data = MockDBSession(
@@ -233,7 +234,7 @@ async def test_scoped_finds_committee_with_project_and_version(tmp_path: pathlib
mock.patch.object(atr.api.paths, "release_directory", return_value=release_dir),
mock.patch.object(atr.api, "_match_release", new=mock.AsyncMock(return_value=True)),
):
- result = await atr.api._match_committees_scoped([committee], args)
+ result = await atr.api._match_committees_scoped([committee], args, "tester")
assert len(result) == 1
assert result[0].key == "example-pmc"
@@ -248,6 +249,7 @@ async def test_scoped_finds_committee_with_project_only(tmp_path: pathlib.Path)
project=project,
version="0.0.1",
latest_revision_number=None,
+ is_embargoed=False,
)
release_dir = safe.StatePath(tmp_path)
mock_data = MockDBSession(
@@ -265,7 +267,7 @@ async def test_scoped_finds_committee_with_project_only(tmp_path: pathlib.Path)
mock.patch.object(atr.api.paths, "release_directory", return_value=release_dir),
mock.patch.object(atr.api, "_match_release", new=mock.AsyncMock(return_value=True)),
):
- result = await atr.api._match_committees_scoped([committee], args)
+ result = await atr.api._match_committees_scoped([committee], args, "tester")
assert len(result) == 1
assert result[0].key == "example-pmc"
@@ -286,7 +288,7 @@ async def test_scoped_returns_empty_when_committee_not_linked() -> None:
)
with mock.patch.object(atr.api.db, "session", new=_mock_session_factory(mock_data)):
- result = await atr.api._match_committees_scoped([unlinked_committee], args)
+ result = await atr.api._match_committees_scoped([unlinked_committee], args, "tester")
assert result == []
@@ -302,7 +304,7 @@ async def test_scoped_returns_empty_when_project_not_found() -> None:
)
with mock.patch.object(atr.api.db, "session", new=_mock_session_factory(mock_data)):
- result = await atr.api._match_committees_scoped([committee], args)
+ result = await atr.api._match_committees_scoped([committee], args, "tester")
assert result == []
@@ -323,7 +325,7 @@ async def test_scoped_returns_empty_when_version_not_found() -> None:
)
with mock.patch.object(atr.api.db, "session", new=_mock_session_factory(mock_data)):
- result = await atr.api._match_committees_scoped([committee], args)
+ result = await atr.api._match_committees_scoped([committee], args, "tester")
assert result == []
@@ -337,6 +339,7 @@ async def test_unscoped_finds_matching_committee(tmp_path: pathlib.Path) -> None
project=project,
version="0.0.1",
latest_revision_number=None,
+ is_embargoed=False,
)
release_dir = safe.StatePath(tmp_path)
mock_data = MockDBSession(
@@ -350,7 +353,7 @@ async def test_unscoped_finds_matching_committee(tmp_path: pathlib.Path) -> None
mock.patch.object(atr.api.paths, "release_directory", return_value=release_dir),
mock.patch.object(atr.api, "_match_release", new=mock.AsyncMock(return_value=True)),
):
- result = await atr.api._match_committees([committee], args)
+ result = await atr.api._match_committees([committee], args, "tester")
assert len(result) == 1
assert result[0].key == "example-pmc"
@@ -365,6 +368,7 @@ async def test_unscoped_returns_empty_when_no_match(tmp_path: pathlib.Path) -> N
project=project,
version="0.0.1",
latest_revision_number=None,
+ is_embargoed=False,
)
release_dir = safe.StatePath(tmp_path)
mock_data = MockDBSession(
@@ -378,7 +382,7 @@ async def test_unscoped_returns_empty_when_no_match(tmp_path: pathlib.Path) -> N
mock.patch.object(atr.api.paths, "release_directory", return_value=release_dir),
mock.patch.object(atr.api, "_match_release", new=mock.AsyncMock(return_value=False)),
):
- result = await atr.api._match_committees([committee], args)
+ result = await atr.api._match_committees([committee], args, "tester")
assert result == []
diff --git a/tests/unit/test_vote_resolution.py b/tests/unit/test_vote_resolution.py
index a13b5a45..a1d056f8 100644
--- a/tests/unit/test_vote_resolution.py
+++ b/tests/unit/test_vote_resolution.py
@@ -1255,6 +1255,7 @@ async def test_vote_tabulate_api_passes_trusted_receipt_exclusions(monkeypatch:
)
ballot_receipt_message_ids = mock.AsyncMock(return_value={"receipt@apache.org"})
+ monkeypatch.setattr(atr.api, "_jwt_asf_uid", lambda: "tester")
monkeypatch.setattr(atr.api.db, "session", _db_session)
monkeypatch.setattr(atr.api.storage, "write", _write_context)
monkeypatch.setattr(
@@ -1289,6 +1290,7 @@ def _api_vote_tabulate_handler():
def _candidate_release(podling_thread_id: str | None = None) -> SimpleNamespace:
return SimpleNamespace(
phase=sql.ReleasePhase.RELEASE_CANDIDATE,
+ is_embargoed=False,
vote_mode=sql.VoteMode.EMAIL,
effective_vote_mode=sql.VoteMode.EMAIL,
release_policy=SimpleNamespace(vote_mode=sql.VoteMode.EMAIL),
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tooling.apache.org
For additional commands, e-mail: commits-help@tooling.apache.org