mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-06-16 04:10:44 +00:00
Code Issues Projects Releases Wiki Activity

more todos

Browse source
This commit is contained in:
6543 2024-03-29 11:32:37 +01:00
parent ad96a2dbe5
commit b68761f3c1
No known key found for this signature in database
GPG key ID: B8BE6D610E61C862
4 changed files with 52 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
server/grpc/auth_server.go
View file

@ -89,5 +89,8 @@ func (s *WoodpeckerAuthServer) getAgent(agentID int64, agentToken string) (*mode
if err != nil && errors.Is(err, types.RecordNotExist) {
return nil, fmt.Errorf("individual agent not found by token: %w", err)
}
// TODO: check if an agent can still pretend to be an other one
return agent, err
}

42
server/grpc/rpc.go
View file

@ -105,11 +105,16 @@ func (s *RPC) Wait(c context.Context, id string) error {
// Extend implements the rpc.Extend function
func (s *RPC) Extend(c context.Context, id string) error {
return s.queue.Extend(c, id)
agent, err := s.getAgentFromContext(c)
if err != nil {
return err
}
return s.queue.Extend(c, agent.ID, id)
}
// Update implements the rpc.Update function
func (s *RPC) Update(_ context.Context, id string, state rpc.State) error {
func (s *RPC) Update(c context.Context, id string, state rpc.State) error {
workflowID, err := strconv.ParseInt(id, 10, 64)
if err != nil {
return err
@ -127,6 +132,15 @@ func (s *RPC) Update(_ context.Context, id string, state rpc.State) error {
return err
}
agent, err := s.getAgentFromContext(c)
if err != nil {
return err
}
if !agent.IsSystemAgent() {
// TODO: check if agent is allowed to alter things
}
step, err := s.store.StepByUUID(state.StepUUID)
if err != nil {
log.Error().Err(err).Msgf("cannot find step with uuid %s", state.StepUUID)
@ -191,6 +205,11 @@ func (s *RPC) Init(c context.Context, id string, state rpc.State) error {
if err != nil {
return err
}
if !agent.IsSystemAgent() {
// TODO: check if agent is allowed to alter things
}
workflow.AgentID = agent.ID
currentPipeline, err := s.store.GetPipeline(workflow.PipelineID)
@ -270,6 +289,15 @@ func (s *RPC) Done(c context.Context, id string, state rpc.State) error {
return err
}
agent, err := s.getAgentFromContext(c)
if err != nil {
return err
}
if !agent.IsSystemAgent() {
// TODO: check if agent is allowed to alter things
}
logger := log.With().
Str("repo_id", fmt.Sprint(repo.ID)).
Str("pipeline_id", fmt.Sprint(currentPipeline.ID)).
@ -336,6 +364,16 @@ func (s *RPC) Log(c context.Context, _logEntry *rpc.LogEntry) error {
if err != nil {
return fmt.Errorf("could not find step with uuid %s in store: %w", _logEntry.StepUUID, err)
}
agent, err := s.getAgentFromContext(c)
if err != nil {
return err
}
if !agent.IsSystemAgent() {
// TODO: check if agent is allowed to alter things
}
logEntry := &model.LogEntry{
StepID: step.ID,
Time: _logEntry.Time,

6
server/queue/fifo.go
View file

@ -187,12 +187,16 @@ func (q *fifo) Wait(c context.Context, id string) error {
}
// Extend extends the task execution deadline.
func (q *fifo) Extend(_ context.Context, id string) error {
func (q *fifo) Extend(_ context.Context, agentID int64, id string) error {
q.Lock()
defer q.Unlock()
state, ok := q.running[id]
if ok {
if state.item.AgentID != agentID {
return ErrAgentMissmatch
}
state.deadline = time.Now().Add(q.extension)
return nil
}

5
server/queue/queue.go
View file

@ -28,6 +28,9 @@ var (
// ErrNotFound indicates the task was not found in the queue.
ErrNotFound = errors.New("queue: task not found")
// ErrAgentMissmatch indicates an agent does not mat to the task
ErrAgentMissmatch = errors.New("task has not expected agent id")
)
// InfoT provides runtime information.
@ -79,7 +82,7 @@ type Queue interface {
Poll(c context.Context, agentID int64, f FilterFn) (*model.Task, error)
// Extend extends the deadline for a task.
Extend(c context.Context, id string) error
Extend(c context.Context, agentID int64, id string) error
// Done signals the task is complete.
Done(c context.Context, id string, exitStatus model.StatusValue) error