Skip to content

Prevent registering as arbitrary agents with system token #6283

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
6543 merged 1 commit into from
Mar 21, 2026
Merged

Prevent registering as arbitrary agents with system token #6283

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 10 additions & 3 deletions server/rpc/auth_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,17 @@ func (s *WoodpeckerAuthServer) getAgent(agentID int64, agentToken string) (*mode

if agentToken == s.agentMasterToken {
agent, err := s.store.AgentFind(agentID)
if err != nil && errors.Is(err, types.ErrRecordNotExist) {
return nil, fmt.Errorf("AgentID not found in database")
if err != nil {
if errors.Is(err, types.ErrRecordNotExist) {
return nil, fmt.Errorf("AgentID not found in database")
} else {
return nil, err
}
}
if !agent.IsSystemAgent() {
return nil, fmt.Errorf("the agent with this ID is not a system agent")
}
return agent, err
return agent, nil
}
}

Expand Down