Skip to content

Prevent regranting legacy user roles and access #7995

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
melton-jason merged 3 commits into from
Apr 18, 2026
Merged

Prevent regranting legacy user roles and access #7995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5840503
avoid null task warning
acwhite211 Apr 17, 2026
2faec3d
Prevent startup permission initialization from re-granting legacy col…
acwhite211 Apr 17, 2026
6e15f7b
refactor: use apply over run when running celery task locally
melton-jason Apr 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions specifyweb/backend/permissions/initialize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,22 @@ def is_sp6_user_permissions_migrated(user, apps=apps) -> bool:
return UserRole.objects.filter(specifyuser=user).exists() or \
UserPolicy.objects.filter(specifyuser=user).exists()

def initialize(wipe: bool=False, apps=apps) -> None:
def initialize(
wipe: bool = False,
apps=apps,
*,
migrate_sp6_users: bool = True,
) -> None:
with transaction.atomic():
if wipe:
wipe_permissions(apps)
create_admins(apps)
create_roles(apps)
if 'test' in ''.join(sys.argv):
assign_users_to_roles_during_testing(apps)
else:
assign_users_to_roles(apps)
if migrate_sp6_users:
if 'test' in ''.join(sys.argv):
assign_users_to_roles_during_testing(apps)
else:
assign_users_to_roles(apps)

def create_admins(apps=apps) -> None:
UserPolicy = apps.get_model('permissions', 'UserPolicy')
Expand Down
8 changes: 6 additions & 2 deletions specifyweb/backend/setup_tool/schema_defaults.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ def enqueue() -> None:
@app.task(bind=True, max_retries=SCHEMA_DEFAULTS_MISSING_DISCIPLINE_MAX_RETRIES)
def apply_schema_defaults_task(self, discipline_id: int):
"""Run schema localization defaults for one discipline in a background worker."""
task_id = getattr(self.request, 'id', None)

try:
discipline = Discipline.objects.get(id=discipline_id)
except Discipline.DoesNotExist as exc:
Expand All @@ -98,9 +100,11 @@ def apply_schema_defaults_task(self, discipline_id: int):
discipline_id,
SCHEMA_DEFAULTS_MISSING_DISCIPLINE_MAX_RETRIES,
)
finish_discipline_background_task(discipline_id, self.request.id)
if task_id is not None:
finish_discipline_background_task(discipline_id, task_id)
return
try:
apply_schema_defaults(discipline)
finally:
finish_discipline_background_task(discipline_id, self.request.id)
if task_id is not None:
finish_discipline_background_task(discipline_id, task_id)
4 changes: 2 additions & 2 deletions specifyweb/specify/management/commands/run_key_migration_functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def apply_schema_overrides_for_all_disciplines(_apps):
stdout(
f"Applying schema defaults/overrides for discipline {discipline.id} ({discipline.type})..."
)
apply_schema_defaults_task.run(discipline.id)
apply_schema_defaults_task.apply(args=[discipline.id])

funcs = [
# usc.update_all_table_schema_config_with_defaults,
Expand Down Expand Up @@ -129,7 +129,7 @@ def fix_business_rules(stdout: WriteToStdOut | None = None):
log_and_run(funcs, stdout)

def initialize_permissions(apps):
initialize(False, apps)
initialize(False, apps, migrate_sp6_users=False)

def fix_permissions(stdout: WriteToStdOut | None = None):
funcs = [
Expand Down
Loading