mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-01-09 09:05:26 +00:00
Code Issues Projects Releases Wiki Activity

enforce plugin whitelist

Browse source
This commit is contained in:
Brad Rydzewski 2015-06-07 17:04:57 -07:00
parent eb90ef3ba1
commit 906bbe9cc5
5 changed files with 27 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.dockerignore
View file

@ -6,6 +6,7 @@ doc/
.dockerignore .dockerignore
.drone.yml .drone.yml
.gitignore .gitignore
drone.sqlite
Dockerfile Dockerfile
LICENSE LICENSE
README.md README.md

6
cmd/drone-build/run.go
View file

@ -29,9 +29,9 @@ type Context struct {
func setup(c *Context) error { func setup(c *Context) error {
var err error var err error
var opts = parser.Opts{ var opts = parser.Opts{
Network: true, Network: false,
Privileged: true, Privileged: false,
Volumes: true, Volumes: false,
Whitelist: c.Plugins, Whitelist: c.Plugins,
} }

16
pkg/server/commits.go
View file

@ -114,6 +114,8 @@ func RunBuild(c *gin.Context) {
store := ToDatastore(c) store := ToDatastore(c)
queue_ := ToQueue(c) queue_ := ToQueue(c)
repo := ToRepo(c) repo := ToRepo(c)
conf := ToSettings(c)
num, err := strconv.Atoi(c.Params.ByName("number")) num, err := strconv.Atoi(c.Params.ByName("number"))
if err != nil { if err != nil {
c.Fail(400, err) c.Fail(400, err)
@ -185,12 +187,14 @@ func RunBuild(c *gin.Context) {
c.JSON(202, commit) c.JSON(202, commit)
queue_.Publish(&queue.Work{ queue_.Publish(&queue.Work{
User: user, User: user,
Repo: repo, Repo: repo,
Commit: commit, Commit: commit,
Keys: keys, Keys: keys,
Netrc: netrc, Netrc: netrc,
Yaml: raw, Yaml: raw,
Plugins: conf.Plugins,
Env: conf.Environment,
}) })
} }

15
pkg/server/hooks.go
View file

@ -22,6 +22,7 @@ func PostHook(c *gin.Context) {
store := ToDatastore(c) store := ToDatastore(c)
queue_ := ToQueue(c) queue_ := ToQueue(c)
sess := ToSession(c) sess := ToSession(c)
conf := ToSettings(c)
hook, err := remote.Hook(c.Request) hook, err := remote.Hook(c.Request)
if err != nil { if err != nil {
@ -151,11 +152,13 @@ func PostHook(c *gin.Context) {
} }
queue_.Publish(&queue.Work{ queue_.Publish(&queue.Work{
User: user, User: user,
Repo: repo, Repo: repo,
Commit: commit, Commit: commit,
Keys: keys, Keys: keys,
Netrc: netrc, Netrc: netrc,
Yaml: raw, Yaml: raw,
Plugins: conf.Plugins,
Env: conf.Environment,
}) })
} }

4
pkg/yaml/parse.go
View file

@ -77,6 +77,10 @@ func ParseSingle(raw string, opts *Opts) (*common.Config, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
err = LintPlugins(conf, opts)
if err != nil {
return nil, err
}
// apply rules / transofms // apply rules / transofms
transformSetup(conf) transformSetup(conf)
transformClone(conf) transformClone(conf)