lei.chen/myxce
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(apiserver): enforce self_ug job scopes and accept project filters (bug-1934, bug-1935)

Browse source 
bug-1934: every job-permission check read a single scope and compared it
only with "self", so a job:view or job:control grant scoped to self_ug acted
like "all" (list, get by ID, control), and self + self_ug collapsed to self.
userJobScope() now collects all of a user's grants of a job permission
before deduplication and adds them up (all; self; self_ug = the user and
everyone sharing a user group). The job list appends a submit_user filter
for narrower scopes, get-by-ID keeps covered rows in a new slice (removing
from the ranged slice skipped rows) and answers 403, both control paths
and job output check the owner against the scope. User groups now reach
the apiserver: the config push converts cluster_config_t.ugroups and
OnUserGroupsUpdated() replaces the new store (nested groups, all,
exclusions). The default basic_user now also sees its user-group mates'
jobs, as its configuration says.

bug-1935: project_name and license_project are accepted job filters, so
xcecli jobs list -P works.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
Rongsong Shen 2026-10-10 06:56:57 +00:00
parent 6114f16dac
commit 4a38bb3ca9
Signed by untrusted user: rshen
GPG key ID: 80533536B0EB651C
18 changed files with 750 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/frontend/apiserver/controllers/output.go
View file

@ -88,10 +88,11 @@ func (j JobController) GetJobOutput(ctx *gin.Context) {
return
}
// Check ownership: users with domain_type=all can view any job
permission, perr := GetRequireResourcePermission(submitUser, "job:view")
if perr != nil || permission.DomainType != models.DomainTypeAll {
if job.SubmitUser != submitUser {
// Check ownership: the owner may always read; anyone else needs a
// job:view grant covering the job (bug-1934)
if job.SubmitUser != submitUser {
scope, perr := userJobScope(submitUser, "job:view")
if perr != nil || !scope.covers(job.SubmitUser) {
ReturnError(ctx, common.ERROR_AUTH_CODE, common.ERROR_ACCESS_FORBIDDEN_MSG, nil)
return
}