self-hosted/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-11-24 08:02:18 +02:00
Code Issues Releases Activity

Don't expose task data via api (#4108)

Browse Source
This commit is contained in:
6543 2024-09-14 22:40:12 +02:00 committed by GitHub
parent 83926133d4
commit 41b2127e04
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/server/docs/docs.go
View File

@ -5064,12 +5064,6 @@ const docTemplate = `{
"agent_id": { "agent_id": {
"type": "integer" "type": "integer"
}, },
"data": {
"type": "array",
"items": {
"type": "integer"
}
},
"dep_status": { "dep_status": {
"type": "object", "type": "object",
"additionalProperties": { "additionalProperties": {

2
server/model/task.go
View File

@ -22,7 +22,7 @@ import (
// Task defines scheduled pipeline Task. // Task defines scheduled pipeline Task.
type Task struct { type Task struct {
ID string `json:"id" xorm:"PK UNIQUE 'id'"` ID string `json:"id" xorm:"PK UNIQUE 'id'"`
Data []byte `json:"data" xorm:"LONGBLOB 'data'"` Data []byte `json:"-" xorm:"LONGBLOB 'data'"`
Labels map[string]string `json:"labels" xorm:"json 'labels'"` Labels map[string]string `json:"labels" xorm:"json 'labels'"`
Dependencies []string `json:"dependencies" xorm:"json 'dependencies'"` Dependencies []string `json:"dependencies" xorm:"json 'dependencies'"`
RunOn []string `json:"run_on" xorm:"json 'run_on'"` RunOn []string `json:"run_on" xorm:"json 'run_on'"`

1
web/src/lib/api/types/queue.ts
View File

@ -1,6 +1,5 @@
export interface Task { export interface Task {
id: number; id: number;
data: string;
labels: { [key: string]: string }; labels: { [key: string]: string };
dependencies: string[]; dependencies: string[];
dep_status: { [key: string]: string }; dep_status: { [key: string]: string };

6
woodpecker-go/woodpecker/agent_test.go
View File

@ -431,16 +431,14 @@ func TestClient_AgentTasksList(t *testing.T) {
agentID: 1, agentID: 1,
expected: []*Task{ expected: []*Task{
{ {
ID: "4696", ID: "4696",
Data: []byte{},
Labels: map[string]string{ Labels: map[string]string{
"platform": "linux/amd64", "platform": "linux/amd64",
"repo": "woodpecker-ci/woodpecker", "repo": "woodpecker-ci/woodpecker",
}, },
}, },
{ {
ID: "4697", ID: "4697",
Data: []byte{},
Labels: map[string]string{ Labels: map[string]string{
"platform": "linux/arm64", "platform": "linux/arm64",
"repo": "woodpecker-ci/woodpecker", "repo": "woodpecker-ci/woodpecker",

3
woodpecker-go/woodpecker/queue_test.go
View File

@ -49,8 +49,7 @@ func TestClient_QueueInfo(t *testing.T) {
expected: &Info{ expected: &Info{
Running: []Task{ Running: []Task{
{ {
ID: "4696", ID: "4696",
Data: []byte{},
Labels: map[string]string{ Labels: map[string]string{
"platform": "linux/amd64", "platform": "linux/amd64",
"repo": "woodpecker-ci/woodpecker", "repo": "woodpecker-ci/woodpecker",

1
woodpecker-go/woodpecker/types.go
View File

@ -246,7 +246,6 @@ type (
// Task is the JSON data for a task. // Task is the JSON data for a task.
Task struct { Task struct {
ID string `json:"id"` ID string `json:"id"`
Data []byte `json:"data"`
Labels map[string]string `json:"labels"` Labels map[string]string `json:"labels"`
Dependencies []string `json:"dependencies"` Dependencies []string `json:"dependencies"`
RunOn []string `json:"run_on"` RunOn []string `json:"run_on"`