darkkirb/harness-drone
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

use sha of per-repo secret key for hook validation

Browse source
This commit is contained in:
Brad Rydzewski 2015-08-11 01:36:07 -07:00
parent 25c905c7ed
commit d688121844
11 changed files with 324 additions and 214 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkg/server/hooks.go
View file

@ -21,7 +21,6 @@ func PostHook(c *gin.Context) {
remote := ToRemote(c) remote := ToRemote(c)
store := ToDatastore(c) store := ToDatastore(c)
queue_ := ToQueue(c) queue_ := ToQueue(c)
sess := ToSession(c)
conf := ToSettings(c) conf := ToSettings(c)
hook, err := remote.Hook(c.Request) hook, err := remote.Hook(c.Request)
@ -40,14 +39,6 @@ func PostHook(c *gin.Context) {
return return
} }
// get the token and verify the hook is authorized
token := sess.GetLogin(c.Request)
if token == nil || token.Label != hook.Repo.FullName {
log.Errorf("invalid token sent with hook.")
c.AbortWithStatus(403)
return
}
// a build may be skipped if the text [CI SKIP] // a build may be skipped if the text [CI SKIP]
// is found inside the commit message // is found inside the commit message
if hook.Commit != nil && strings.Contains(hook.Commit.Message, "[CI SKIP]") { if hook.Commit != nil && strings.Contains(hook.Commit.Message, "[CI SKIP]") {
@ -63,6 +54,13 @@ func PostHook(c *gin.Context) {
return return
} }
// get the token and verify the hook is authorized
if c.Request.FormValue("access_token") != hash(repo.FullName, repo.Hash) {
log.Errorf("invalid token sent with hook.")
c.AbortWithStatus(403)
return
}
switch { switch {
case repo.UserID == 0: case repo.UserID == 0:
log.Warnf("ignoring hook. repo %s has no owner.", repo.FullName) log.Warnf("ignoring hook. repo %s has no owner.", repo.FullName)

7
pkg/server/login.go
View file

@ -82,12 +82,7 @@ func GetLogin(c *gin.Context) {
u.Secret = login.Secret u.Secret = login.Secret
u.Email = login.Email u.Email = login.Email
u.Avatar = login.Avatar u.Avatar = login.Avatar
u.Hash = common.GenerateToken()
// TODO: remove this once gitlab implements setting
// avatar in the remote package, similar to github
if len(u.Avatar) == 0 {
u.Avatar = gravatar.Hash(u.Email)
}
// insert the user into the database // insert the user into the database
if err := store.AddUser(u); err != nil { if err := store.AddUser(u); err != nil {

31
pkg/server/repos.go
View file

@ -1,6 +1,8 @@
package server package server
import ( import (
"crypto/sha256"
"encoding/hex"
"fmt" "fmt"
"github.com/drone/drone/Godeps/_workspace/src/github.com/gin-gonic/gin" "github.com/drone/drone/Godeps/_workspace/src/github.com/gin-gonic/gin"
@ -160,7 +162,6 @@ func DeleteRepo(c *gin.Context) {
// //
func PostRepo(c *gin.Context) { func PostRepo(c *gin.Context) {
user := ToUser(c) user := ToUser(c)
sess := ToSession(c)
store := ToDatastore(c) store := ToDatastore(c)
owner := c.Params.ByName("owner") owner := c.Params.ByName("owner")
name := c.Params.ByName("name") name := c.Params.ByName("name")
@ -189,21 +190,6 @@ func PostRepo(c *gin.Context) {
return return
} }
token := &common.Token{}
token.Kind = common.TokenHook
token.Label = r.FullName
tokenstr, err := sess.GenerateToken(token)
if err != nil {
c.Fail(500, err)
return
}
link := fmt.Sprintf(
"%s/api/hook?access_token=%s",
httputil.GetURL(c.Request),
tokenstr,
)
// set the repository owner to the // set the repository owner to the
// currently authenticated user. // currently authenticated user.
r.UserID = user.ID r.UserID = user.ID
@ -211,12 +197,19 @@ func PostRepo(c *gin.Context) {
r.Hooks.Push = true r.Hooks.Push = true
r.Hooks.PullRequest = true r.Hooks.PullRequest = true
r.Timeout = 60 // 1 hour default build time r.Timeout = 60 // 1 hour default build time
r.Hash = common.GenerateToken()
r.Self = fmt.Sprintf( r.Self = fmt.Sprintf(
"%s/%s", "%s/%s",
httputil.GetURL(c.Request), httputil.GetURL(c.Request),
r.FullName, r.FullName,
) )
link := fmt.Sprintf(
"%s/api/hook?access_token=%s",
httputil.GetURL(c.Request),
hash(r.FullName, r.Hash),
)
// generate an RSA key and add to the repo // generate an RSA key and add to the repo
key, err := sshutil.GeneratePrivateKey() key, err := sshutil.GeneratePrivateKey()
if err != nil { if err != nil {
@ -301,3 +294,9 @@ func perms(remote remote.Remote, u *common.User, r *common.Repo) *common.Perm {
} }
return p return p
} }
func hash(text, salt string) string {
hasher := sha256.New()
hasher.Write([]byte(text + salt))
return hex.EncodeToString(hasher.Sum(nil))
}

246
pkg/store/builtin/build_sql.go
View file

@ -47,8 +47,8 @@ func createBuild(db buildDB, query string, v *Build) error {
var v10 string var v10 string
var v11 string var v11 string
var v12 string var v12 string
var v13 int var v13 string
var v14 string var v14 int
var v15 string var v15 string
var v16 string var v16 string
var v17 string var v17 string
@ -57,6 +57,9 @@ func createBuild(db buildDB, query string, v *Build) error {
var v20 string var v20 string
var v21 string var v21 string
var v22 string var v22 string
var v23 string
var v24 string
var v25 string
v0 = v.RepoID v0 = v.RepoID
v1 = v.Number v1 = v.Number
v2 = v.Status v2 = v.Status
@ -65,32 +68,34 @@ func createBuild(db buildDB, query string, v *Build) error {
if v.Commit != nil { if v.Commit != nil {
v5 = v.Commit.Sha v5 = v.Commit.Sha
v6 = v.Commit.Ref v6 = v.Commit.Ref
v7 = v.Commit.Branch v7 = v.Commit.Link
v8 = v.Commit.Message v8 = v.Commit.Branch
v9 = v.Commit.Timestamp v9 = v.Commit.Message
v10 = v.Commit.Remote v10 = v.Commit.Timestamp
v11 = v.Commit.Remote
if v.Commit.Author != nil { if v.Commit.Author != nil {
v11 = v.Commit.Author.Login v12 = v.Commit.Author.Login
v12 = v.Commit.Author.Email v13 = v.Commit.Author.Email
} }
} }
if v.PullRequest != nil { if v.PullRequest != nil {
v13 = v.PullRequest.Number v14 = v.PullRequest.Number
v14 = v.PullRequest.Title v15 = v.PullRequest.Title
v16 = v.PullRequest.Link
if v.PullRequest.Base != nil { if v.PullRequest.Base != nil {
v15 = v.PullRequest.Base.Sha v17 = v.PullRequest.Base.Sha
v16 = v.PullRequest.Base.Ref v18 = v.PullRequest.Base.Ref
v17 = v.PullRequest.Base.Branch v19 = v.PullRequest.Base.Link
v18 = v.PullRequest.Base.Message v20 = v.PullRequest.Base.Branch
v19 = v.PullRequest.Base.Timestamp v21 = v.PullRequest.Base.Message
v20 = v.PullRequest.Base.Remote v22 = v.PullRequest.Base.Timestamp
v23 = v.PullRequest.Base.Remote
if v.PullRequest.Base.Author != nil { if v.PullRequest.Base.Author != nil {
v21 = v.PullRequest.Base.Author.Login v24 = v.PullRequest.Base.Author.Login
v22 = v.PullRequest.Base.Author.Email v25 = v.PullRequest.Base.Author.Email
} }
} }
} }
res, err := db.Exec(query, res, err := db.Exec(query,
&v0, &v0,
&v1, &v1,
@ -115,6 +120,9 @@ func createBuild(db buildDB, query string, v *Build) error {
&v20, &v20,
&v21, &v21,
&v22, &v22,
&v23,
&v24,
&v25,
) )
if err != nil { if err != nil {
return err return err
@ -139,8 +147,8 @@ func updateBuild(db buildDB, query string, v *Build) error {
var v11 string var v11 string
var v12 string var v12 string
var v13 string var v13 string
var v14 int var v14 string
var v15 string var v15 int
var v16 string var v16 string
var v17 string var v17 string
var v18 string var v18 string
@ -149,6 +157,9 @@ func updateBuild(db buildDB, query string, v *Build) error {
var v21 string var v21 string
var v22 string var v22 string
var v23 string var v23 string
var v24 string
var v25 string
var v26 string
v0 = v.ID v0 = v.ID
v1 = v.RepoID v1 = v.RepoID
v2 = v.Number v2 = v.Number
@ -158,28 +169,31 @@ func updateBuild(db buildDB, query string, v *Build) error {
if v.Commit != nil { if v.Commit != nil {
v6 = v.Commit.Sha v6 = v.Commit.Sha
v7 = v.Commit.Ref v7 = v.Commit.Ref
v8 = v.Commit.Branch v8 = v.Commit.Link
v9 = v.Commit.Message v9 = v.Commit.Branch
v10 = v.Commit.Timestamp v10 = v.Commit.Message
v11 = v.Commit.Remote v11 = v.Commit.Timestamp
v12 = v.Commit.Remote
if v.Commit.Author != nil { if v.Commit.Author != nil {
v12 = v.Commit.Author.Login v13 = v.Commit.Author.Login
v13 = v.Commit.Author.Email v14 = v.Commit.Author.Email
} }
} }
if v.PullRequest != nil { if v.PullRequest != nil {
v14 = v.PullRequest.Number v15 = v.PullRequest.Number
v15 = v.PullRequest.Title v16 = v.PullRequest.Title
v17 = v.PullRequest.Link
if v.PullRequest.Base != nil { if v.PullRequest.Base != nil {
v16 = v.PullRequest.Base.Sha v18 = v.PullRequest.Base.Sha
v17 = v.PullRequest.Base.Ref v19 = v.PullRequest.Base.Ref
v18 = v.PullRequest.Base.Branch v20 = v.PullRequest.Base.Link
v19 = v.PullRequest.Base.Message v21 = v.PullRequest.Base.Branch
v20 = v.PullRequest.Base.Timestamp v22 = v.PullRequest.Base.Message
v21 = v.PullRequest.Base.Remote v23 = v.PullRequest.Base.Timestamp
v24 = v.PullRequest.Base.Remote
if v.PullRequest.Base.Author != nil { if v.PullRequest.Base.Author != nil {
v22 = v.PullRequest.Base.Author.Login v25 = v.PullRequest.Base.Author.Login
v23 = v.PullRequest.Base.Author.Email v26 = v.PullRequest.Base.Author.Email
} }
} }
} }
@ -208,6 +222,9 @@ func updateBuild(db buildDB, query string, v *Build) error {
&v21, &v21,
&v22, &v22,
&v23, &v23,
&v24,
&v25,
&v26,
&v0, &v0,
) )
return err return err
@ -228,8 +245,8 @@ func scanBuild(row *sql.Row) (*Build, error) {
var v11 string var v11 string
var v12 string var v12 string
var v13 string var v13 string
var v14 int var v14 string
var v15 string var v15 int
var v16 string var v16 string
var v17 string var v17 string
var v18 string var v18 string
@ -238,6 +255,9 @@ func scanBuild(row *sql.Row) (*Build, error) {
var v21 string var v21 string
var v22 string var v22 string
var v23 string var v23 string
var v24 string
var v25 string
var v26 string
err := row.Scan( err := row.Scan(
&v0, &v0,
@ -264,6 +284,9 @@ func scanBuild(row *sql.Row) (*Build, error) {
&v21, &v21,
&v22, &v22,
&v23, &v23,
&v24,
&v25,
&v26,
) )
if err != nil { if err != nil {
return nil, err return nil, err
@ -279,26 +302,29 @@ func scanBuild(row *sql.Row) (*Build, error) {
v.Commit = &Commit{} v.Commit = &Commit{}
v.Commit.Sha = v6 v.Commit.Sha = v6
v.Commit.Ref = v7 v.Commit.Ref = v7
v.Commit.Branch = v8 v.Commit.Link = v8
v.Commit.Message = v9 v.Commit.Branch = v9
v.Commit.Timestamp = v10 v.Commit.Message = v10
v.Commit.Remote = v11 v.Commit.Timestamp = v11
v.Commit.Remote = v12
v.Commit.Author = &Author{} v.Commit.Author = &Author{}
v.Commit.Author.Login = v12 v.Commit.Author.Login = v13
v.Commit.Author.Email = v13 v.Commit.Author.Email = v14
v.PullRequest = &PullRequest{} v.PullRequest = &PullRequest{}
v.PullRequest.Number = v14 v.PullRequest.Number = v15
v.PullRequest.Title = v15 v.PullRequest.Title = v16
v.PullRequest.Link = v17
v.PullRequest.Base = &Commit{} v.PullRequest.Base = &Commit{}
v.PullRequest.Base.Sha = v16 v.PullRequest.Base.Sha = v18
v.PullRequest.Base.Ref = v17 v.PullRequest.Base.Ref = v19
v.PullRequest.Base.Branch = v18 v.PullRequest.Base.Link = v20
v.PullRequest.Base.Message = v19 v.PullRequest.Base.Branch = v21
v.PullRequest.Base.Timestamp = v20 v.PullRequest.Base.Message = v22
v.PullRequest.Base.Remote = v21 v.PullRequest.Base.Timestamp = v23
v.PullRequest.Base.Remote = v24
v.PullRequest.Base.Author = &Author{} v.PullRequest.Base.Author = &Author{}
v.PullRequest.Base.Author.Login = v22 v.PullRequest.Base.Author.Login = v25
v.PullRequest.Base.Author.Email = v23 v.PullRequest.Base.Author.Email = v26
return v, nil return v, nil
} }
@ -321,8 +347,8 @@ func scanBuilds(rows *sql.Rows) ([]*Build, error) {
var v11 string var v11 string
var v12 string var v12 string
var v13 string var v13 string
var v14 int var v14 string
var v15 string var v15 int
var v16 string var v16 string
var v17 string var v17 string
var v18 string var v18 string
@ -331,6 +357,9 @@ func scanBuilds(rows *sql.Rows) ([]*Build, error) {
var v21 string var v21 string
var v22 string var v22 string
var v23 string var v23 string
var v24 string
var v25 string
var v26 string
err = rows.Scan( err = rows.Scan(
&v0, &v0,
&v1, &v1,
@ -356,6 +385,9 @@ func scanBuilds(rows *sql.Rows) ([]*Build, error) {
&v21, &v21,
&v22, &v22,
&v23, &v23,
&v24,
&v25,
&v26,
) )
if err != nil { if err != nil {
return vv, err return vv, err
@ -371,26 +403,29 @@ func scanBuilds(rows *sql.Rows) ([]*Build, error) {
v.Commit = &Commit{} v.Commit = &Commit{}
v.Commit.Sha = v6 v.Commit.Sha = v6
v.Commit.Ref = v7 v.Commit.Ref = v7
v.Commit.Branch = v8 v.Commit.Link = v8
v.Commit.Message = v9 v.Commit.Branch = v9
v.Commit.Timestamp = v10 v.Commit.Message = v10
v.Commit.Remote = v11 v.Commit.Timestamp = v11
v.Commit.Remote = v12
v.Commit.Author = &Author{} v.Commit.Author = &Author{}
v.Commit.Author.Login = v12 v.Commit.Author.Login = v13
v.Commit.Author.Email = v13 v.Commit.Author.Email = v14
v.PullRequest = &PullRequest{} v.PullRequest = &PullRequest{}
v.PullRequest.Number = v14 v.PullRequest.Number = v15
v.PullRequest.Title = v15 v.PullRequest.Title = v16
v.PullRequest.Link = v17
v.PullRequest.Base = &Commit{} v.PullRequest.Base = &Commit{}
v.PullRequest.Base.Sha = v16 v.PullRequest.Base.Sha = v18
v.PullRequest.Base.Ref = v17 v.PullRequest.Base.Ref = v19
v.PullRequest.Base.Branch = v18 v.PullRequest.Base.Link = v20
v.PullRequest.Base.Message = v19 v.PullRequest.Base.Branch = v21
v.PullRequest.Base.Timestamp = v20 v.PullRequest.Base.Message = v22
v.PullRequest.Base.Remote = v21 v.PullRequest.Base.Timestamp = v23
v.PullRequest.Base.Remote = v24
v.PullRequest.Base.Author = &Author{} v.PullRequest.Base.Author = &Author{}
v.PullRequest.Base.Author.Login = v22 v.PullRequest.Base.Author.Login = v25
v.PullRequest.Base.Author.Email = v23 v.PullRequest.Base.Author.Email = v26
vv = append(vv, v) vv = append(vv, v)
} }
return vv, rows.Err() return vv, rows.Err()
@ -406,6 +441,7 @@ SELECT
,build_finished ,build_finished
,build_commit_sha ,build_commit_sha
,build_commit_ref ,build_commit_ref
,build_commit_link
,build_commit_branch ,build_commit_branch
,build_commit_message ,build_commit_message
,build_commit_timestamp ,build_commit_timestamp
@ -414,8 +450,10 @@ SELECT
,build_commit_author_email ,build_commit_author_email
,build_pull_request_number ,build_pull_request_number
,build_pull_request_title ,build_pull_request_title
,build_pull_request_link
,build_pull_request_base_sha ,build_pull_request_base_sha
,build_pull_request_base_ref ,build_pull_request_base_ref
,build_pull_request_base_link
,build_pull_request_base_branch ,build_pull_request_base_branch
,build_pull_request_base_message ,build_pull_request_base_message
,build_pull_request_base_timestamp ,build_pull_request_base_timestamp
@ -435,6 +473,7 @@ SELECT
,build_finished ,build_finished
,build_commit_sha ,build_commit_sha
,build_commit_ref ,build_commit_ref
,build_commit_link
,build_commit_branch ,build_commit_branch
,build_commit_message ,build_commit_message
,build_commit_timestamp ,build_commit_timestamp
@ -443,8 +482,10 @@ SELECT
,build_commit_author_email ,build_commit_author_email
,build_pull_request_number ,build_pull_request_number
,build_pull_request_title ,build_pull_request_title
,build_pull_request_link
,build_pull_request_base_sha ,build_pull_request_base_sha
,build_pull_request_base_ref ,build_pull_request_base_ref
,build_pull_request_base_link
,build_pull_request_base_branch ,build_pull_request_base_branch
,build_pull_request_base_message ,build_pull_request_base_message
,build_pull_request_base_timestamp ,build_pull_request_base_timestamp
@ -465,6 +506,7 @@ SELECT
,build_finished ,build_finished
,build_commit_sha ,build_commit_sha
,build_commit_ref ,build_commit_ref
,build_commit_link
,build_commit_branch ,build_commit_branch
,build_commit_message ,build_commit_message
,build_commit_timestamp ,build_commit_timestamp
@ -473,8 +515,10 @@ SELECT
,build_commit_author_email ,build_commit_author_email
,build_pull_request_number ,build_pull_request_number
,build_pull_request_title ,build_pull_request_title
,build_pull_request_link
,build_pull_request_base_sha ,build_pull_request_base_sha
,build_pull_request_base_ref ,build_pull_request_base_ref
,build_pull_request_base_link
,build_pull_request_base_branch ,build_pull_request_base_branch
,build_pull_request_base_message ,build_pull_request_base_message
,build_pull_request_base_timestamp ,build_pull_request_base_timestamp
@ -495,6 +539,7 @@ SELECT
,build_finished ,build_finished
,build_commit_sha ,build_commit_sha
,build_commit_ref ,build_commit_ref
,build_commit_link
,build_commit_branch ,build_commit_branch
,build_commit_message ,build_commit_message
,build_commit_timestamp ,build_commit_timestamp
@ -503,8 +548,10 @@ SELECT
,build_commit_author_email ,build_commit_author_email
,build_pull_request_number ,build_pull_request_number
,build_pull_request_title ,build_pull_request_title
,build_pull_request_link
,build_pull_request_base_sha ,build_pull_request_base_sha
,build_pull_request_base_ref ,build_pull_request_base_ref
,build_pull_request_base_link
,build_pull_request_base_branch ,build_pull_request_base_branch
,build_pull_request_base_message ,build_pull_request_base_message
,build_pull_request_base_timestamp ,build_pull_request_base_timestamp
@ -525,6 +572,7 @@ SELECT
,build_finished ,build_finished
,build_commit_sha ,build_commit_sha
,build_commit_ref ,build_commit_ref
,build_commit_link
,build_commit_branch ,build_commit_branch
,build_commit_message ,build_commit_message
,build_commit_timestamp ,build_commit_timestamp
@ -533,8 +581,10 @@ SELECT
,build_commit_author_email ,build_commit_author_email
,build_pull_request_number ,build_pull_request_number
,build_pull_request_title ,build_pull_request_title
,build_pull_request_link
,build_pull_request_base_sha ,build_pull_request_base_sha
,build_pull_request_base_ref ,build_pull_request_base_ref
,build_pull_request_base_link
,build_pull_request_base_branch ,build_pull_request_base_branch
,build_pull_request_base_message ,build_pull_request_base_message
,build_pull_request_base_timestamp ,build_pull_request_base_timestamp
@ -556,6 +606,7 @@ SELECT
,build_finished ,build_finished
,build_commit_sha ,build_commit_sha
,build_commit_ref ,build_commit_ref
,build_commit_link
,build_commit_branch ,build_commit_branch
,build_commit_message ,build_commit_message
,build_commit_timestamp ,build_commit_timestamp
@ -564,8 +615,10 @@ SELECT
,build_commit_author_email ,build_commit_author_email
,build_pull_request_number ,build_pull_request_number
,build_pull_request_title ,build_pull_request_title
,build_pull_request_link
,build_pull_request_base_sha ,build_pull_request_base_sha
,build_pull_request_base_ref ,build_pull_request_base_ref
,build_pull_request_base_link
,build_pull_request_base_branch ,build_pull_request_base_branch
,build_pull_request_base_message ,build_pull_request_base_message
,build_pull_request_base_timestamp ,build_pull_request_base_timestamp
@ -591,6 +644,7 @@ INSERT INTO builds (
,build_finished ,build_finished
,build_commit_sha ,build_commit_sha
,build_commit_ref ,build_commit_ref
,build_commit_link
,build_commit_branch ,build_commit_branch
,build_commit_message ,build_commit_message
,build_commit_timestamp ,build_commit_timestamp
@ -599,15 +653,17 @@ INSERT INTO builds (
,build_commit_author_email ,build_commit_author_email
,build_pull_request_number ,build_pull_request_number
,build_pull_request_title ,build_pull_request_title
,build_pull_request_link
,build_pull_request_base_sha ,build_pull_request_base_sha
,build_pull_request_base_ref ,build_pull_request_base_ref
,build_pull_request_base_link
,build_pull_request_base_branch ,build_pull_request_base_branch
,build_pull_request_base_message ,build_pull_request_base_message
,build_pull_request_base_timestamp ,build_pull_request_base_timestamp
,build_pull_request_base_remote ,build_pull_request_base_remote
,build_pull_request_base_author_login ,build_pull_request_base_author_login
,build_pull_request_base_author_email ,build_pull_request_base_author_email
) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); ) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?);
` `
const stmtBuildUpdate = ` const stmtBuildUpdate = `
@ -619,6 +675,7 @@ UPDATE builds SET
,build_finished = ? ,build_finished = ?
,build_commit_sha = ? ,build_commit_sha = ?
,build_commit_ref = ? ,build_commit_ref = ?
,build_commit_link = ?
,build_commit_branch = ? ,build_commit_branch = ?
,build_commit_message = ? ,build_commit_message = ?
,build_commit_timestamp = ? ,build_commit_timestamp = ?
@ -627,8 +684,10 @@ UPDATE builds SET
,build_commit_author_email = ? ,build_commit_author_email = ?
,build_pull_request_number = ? ,build_pull_request_number = ?
,build_pull_request_title = ? ,build_pull_request_title = ?
,build_pull_request_link = ?
,build_pull_request_base_sha = ? ,build_pull_request_base_sha = ?
,build_pull_request_base_ref = ? ,build_pull_request_base_ref = ?
,build_pull_request_base_link = ?
,build_pull_request_base_branch = ? ,build_pull_request_base_branch = ?
,build_pull_request_base_message = ? ,build_pull_request_base_message = ?
,build_pull_request_base_timestamp = ? ,build_pull_request_base_timestamp = ?
@ -648,27 +707,30 @@ CREATE TABLE IF NOT EXISTS builds (
build_id INTEGER PRIMARY KEY AUTOINCREMENT build_id INTEGER PRIMARY KEY AUTOINCREMENT
,build_repo_id INTEGER ,build_repo_id INTEGER
,build_number INTEGER ,build_number INTEGER
,build_status VARCHAR(512) ,build_status VARCHAR
,build_started INTEGER ,build_started INTEGER
,build_finished INTEGER ,build_finished INTEGER
,build_commit_sha VARCHAR(512) ,build_commit_sha VARCHAR
,build_commit_ref VARCHAR(512) ,build_commit_ref VARCHAR
,build_commit_branch VARCHAR(512) ,build_commit_link VARCHAR
,build_commit_message VARCHAR(512) ,build_commit_branch VARCHAR
,build_commit_timestamp VARCHAR(512) ,build_commit_message VARCHAR
,build_commit_remote VARCHAR(512) ,build_commit_timestamp VARCHAR
,build_commit_author_login VARCHAR(512) ,build_commit_remote VARCHAR
,build_commit_author_email VARCHAR(512) ,build_commit_author_login VARCHAR
,build_commit_author_email VARCHAR
,build_pull_request_number INTEGER ,build_pull_request_number INTEGER
,build_pull_request_title VARCHAR(512) ,build_pull_request_title VARCHAR
,build_pull_request_base_sha VARCHAR(512) ,build_pull_request_link VARCHAR
,build_pull_request_base_ref VARCHAR(512) ,build_pull_request_base_sha VARCHAR
,build_pull_request_base_branch VARCHAR(512) ,build_pull_request_base_ref VARCHAR
,build_pull_request_base_message VARCHAR(512) ,build_pull_request_base_link VARCHAR
,build_pull_request_base_timestamp VARCHAR(512) ,build_pull_request_base_branch VARCHAR
,build_pull_request_base_remote VARCHAR(512) ,build_pull_request_base_message VARCHAR
,build_pull_request_base_author_login VARCHAR(512) ,build_pull_request_base_timestamp VARCHAR
,build_pull_request_base_author_email VARCHAR(512) ,build_pull_request_base_remote VARCHAR
,build_pull_request_base_author_login VARCHAR
,build_pull_request_base_author_email VARCHAR
); );
` `

5
pkg/store/builtin/migrate/migrate.go
View file

@ -42,6 +42,7 @@ CREATE TABLE IF NOT EXISTS users (
,user_avatar VARCHAR(255) ,user_avatar VARCHAR(255)
,user_admin BOOLEAN ,user_admin BOOLEAN
,user_active BOOLEAN ,user_active BOOLEAN
,user_hash VARCHAR(255)
,UNIQUE(user_login) ,UNIQUE(user_login)
); );
` `
@ -67,6 +68,7 @@ CREATE TABLE IF NOT EXISTS repos (
,repo_hooks_push BOOLEAN ,repo_hooks_push BOOLEAN
,repo_hooks_tags BOOLEAN ,repo_hooks_tags BOOLEAN
,repo_params BLOB ,repo_params BLOB
,repo_hash VARCHAR(255)
,UNIQUE(repo_owner, repo_name) ,UNIQUE(repo_owner, repo_name)
,UNIQUE(repo_full_name) ,UNIQUE(repo_full_name)
@ -96,6 +98,7 @@ CREATE TABLE IF NOT EXISTS builds (
,build_finished INTEGER ,build_finished INTEGER
,build_commit_sha VARCHAR(512) ,build_commit_sha VARCHAR(512)
,build_commit_ref VARCHAR(512) ,build_commit_ref VARCHAR(512)
,build_commit_link VARCHAR(2048)
,build_commit_branch VARCHAR(512) ,build_commit_branch VARCHAR(512)
,build_commit_message VARCHAR(2048) ,build_commit_message VARCHAR(2048)
,build_commit_timestamp VARCHAR(512) ,build_commit_timestamp VARCHAR(512)
@ -104,8 +107,10 @@ CREATE TABLE IF NOT EXISTS builds (
,build_commit_author_email VARCHAR(512) ,build_commit_author_email VARCHAR(512)
,build_pull_request_number INTEGER ,build_pull_request_number INTEGER
,build_pull_request_title VARCHAR(512) ,build_pull_request_title VARCHAR(512)
,build_pull_request_link VARCHAR(2048)
,build_pull_request_base_sha VARCHAR(512) ,build_pull_request_base_sha VARCHAR(512)
,build_pull_request_base_ref VARCHAR(512) ,build_pull_request_base_ref VARCHAR(512)
,build_pull_request_base_link VARCHAR(2048)
,build_pull_request_base_branch VARCHAR(512) ,build_pull_request_base_branch VARCHAR(512)
,build_pull_request_base_message VARCHAR(2048) ,build_pull_request_base_message VARCHAR(2048)
,build_pull_request_base_timestamp VARCHAR(512) ,build_pull_request_base_timestamp VARCHAR(512)

1
pkg/store/builtin/repo.go
View file

@ -71,6 +71,7 @@ SELECT
,repo_hooks_push ,repo_hooks_push
,repo_hooks_tags ,repo_hooks_tags
,repo_params ,repo_params
,repo_hash
FROM FROM
repos r repos r
,stars s ,stars s

81
pkg/store/builtin/repo_sql.go
View file

@ -52,6 +52,7 @@ func createRepo(db repoDB, query string, v *Repo) error {
var v15 bool var v15 bool
var v16 bool var v16 bool
var v17 []byte var v17 []byte
var v18 string
v0 = v.UserID v0 = v.UserID
v1 = v.Owner v1 = v.Owner
v2 = v.Name v2 = v.Name
@ -74,6 +75,7 @@ func createRepo(db repoDB, query string, v *Repo) error {
v16 = v.Hooks.Tags v16 = v.Hooks.Tags
} }
v17, _ = json.Marshal(v.Params) v17, _ = json.Marshal(v.Params)
v18 = v.Hash
res, err := db.Exec(query, res, err := db.Exec(query,
&v0, &v0,
@ -94,6 +96,7 @@ func createRepo(db repoDB, query string, v *Repo) error {
&v15, &v15,
&v16, &v16,
&v17, &v17,
&v18,
) )
if err != nil { if err != nil {
return err return err
@ -123,6 +126,7 @@ func updateRepo(db repoDB, query string, v *Repo) error {
var v16 bool var v16 bool
var v17 bool var v17 bool
var v18 []byte var v18 []byte
var v19 string
v0 = v.ID v0 = v.ID
v1 = v.UserID v1 = v.UserID
v2 = v.Owner v2 = v.Owner
@ -146,6 +150,7 @@ func updateRepo(db repoDB, query string, v *Repo) error {
v17 = v.Hooks.Tags v17 = v.Hooks.Tags
} }
v18, _ = json.Marshal(v.Params) v18, _ = json.Marshal(v.Params)
v19 = v.Hash
_, err := db.Exec(query, _, err := db.Exec(query,
&v1, &v1,
@ -166,6 +171,7 @@ func updateRepo(db repoDB, query string, v *Repo) error {
&v16, &v16,
&v17, &v17,
&v18, &v18,
&v19,
&v0, &v0,
) )
return err return err
@ -191,6 +197,7 @@ func scanRepo(row *sql.Row) (*Repo, error) {
var v16 bool var v16 bool
var v17 bool var v17 bool
var v18 []byte var v18 []byte
var v19 string
err := row.Scan( err := row.Scan(
&v0, &v0,
@ -212,6 +219,7 @@ func scanRepo(row *sql.Row) (*Repo, error) {
&v16, &v16,
&v17, &v17,
&v18, &v18,
&v19,
) )
if err != nil { if err != nil {
return nil, err return nil, err
@ -239,6 +247,7 @@ func scanRepo(row *sql.Row) (*Repo, error) {
v.Hooks.Push = v16 v.Hooks.Push = v16
v.Hooks.Tags = v17 v.Hooks.Tags = v17
json.Unmarshal(v18, &v.Params) json.Unmarshal(v18, &v.Params)
v.Hash = v19
return v, nil return v, nil
} }
@ -266,6 +275,7 @@ func scanRepos(rows *sql.Rows) ([]*Repo, error) {
var v16 bool var v16 bool
var v17 bool var v17 bool
var v18 []byte var v18 []byte
var v19 string
err = rows.Scan( err = rows.Scan(
&v0, &v0,
&v1, &v1,
@ -286,6 +296,7 @@ func scanRepos(rows *sql.Rows) ([]*Repo, error) {
&v16, &v16,
&v17, &v17,
&v18, &v18,
&v19,
) )
if err != nil { if err != nil {
return vv, err return vv, err
@ -313,6 +324,7 @@ func scanRepos(rows *sql.Rows) ([]*Repo, error) {
v.Hooks.Push = v16 v.Hooks.Push = v16
v.Hooks.Tags = v17 v.Hooks.Tags = v17
json.Unmarshal(v18, &v.Params) json.Unmarshal(v18, &v.Params)
v.Hash = v19
vv = append(vv, v) vv = append(vv, v)
} }
return vv, rows.Err() return vv, rows.Err()
@ -339,6 +351,7 @@ SELECT
,repo_hooks_push ,repo_hooks_push
,repo_hooks_tags ,repo_hooks_tags
,repo_params ,repo_params
,repo_hash
FROM repos FROM repos
` `
@ -363,6 +376,7 @@ SELECT
,repo_hooks_push ,repo_hooks_push
,repo_hooks_tags ,repo_hooks_tags
,repo_params ,repo_params
,repo_hash
FROM repos FROM repos
LIMIT ? OFFSET ? LIMIT ? OFFSET ?
` `
@ -388,10 +402,37 @@ SELECT
,repo_hooks_push ,repo_hooks_push
,repo_hooks_tags ,repo_hooks_tags
,repo_params ,repo_params
,repo_hash
FROM repos FROM repos
WHERE repo_id = ? WHERE repo_id = ?
` `
const stmtRepoSelectRepoFullName = `
SELECT
repo_id
,repo_user_id
,repo_owner
,repo_name
,repo_full_name
,repo_avatar
,repo_self
,repo_link
,repo_clone
,repo_branch
,repo_private
,repo_trusted
,repo_timeout
,repo_keys_public
,repo_keys_private
,repo_hooks_pull_request
,repo_hooks_push
,repo_hooks_tags
,repo_params
,repo_hash
FROM repos
WHERE repo_full_name = ?
`
const stmtRepoSelectRepoUserId = ` const stmtRepoSelectRepoUserId = `
SELECT SELECT
repo_id repo_id
@ -413,6 +454,7 @@ SELECT
,repo_hooks_push ,repo_hooks_push
,repo_hooks_tags ,repo_hooks_tags
,repo_params ,repo_params
,repo_hash
FROM repos FROM repos
WHERE repo_user_id = ? WHERE repo_user_id = ?
` `
@ -438,36 +480,12 @@ SELECT
,repo_hooks_push ,repo_hooks_push
,repo_hooks_tags ,repo_hooks_tags
,repo_params ,repo_params
,repo_hash
FROM repos FROM repos
WHERE repo_owner = ? WHERE repo_owner = ?
AND repo_name = ? AND repo_name = ?
` `
const stmtRepoSelectRepoFullName = `
SELECT
repo_id
,repo_user_id
,repo_owner
,repo_name
,repo_full_name
,repo_avatar
,repo_self
,repo_link
,repo_clone
,repo_branch
,repo_private
,repo_trusted
,repo_timeout
,repo_keys_public
,repo_keys_private
,repo_hooks_pull_request
,repo_hooks_push
,repo_hooks_tags
,repo_params
FROM repos
WHERE repo_full_name = ?
`
const stmtRepoSelectCount = ` const stmtRepoSelectCount = `
SELECT count(1) SELECT count(1)
FROM repos FROM repos
@ -493,7 +511,8 @@ INSERT INTO repos (
,repo_hooks_push ,repo_hooks_push
,repo_hooks_tags ,repo_hooks_tags
,repo_params ,repo_params
) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); ,repo_hash
) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?);
` `
const stmtRepoUpdate = ` const stmtRepoUpdate = `
@ -516,6 +535,7 @@ UPDATE repos SET
,repo_hooks_push = ? ,repo_hooks_push = ?
,repo_hooks_tags = ? ,repo_hooks_tags = ?
,repo_params = ? ,repo_params = ?
,repo_hash = ?
WHERE repo_id = ? WHERE repo_id = ?
` `
@ -545,9 +565,14 @@ CREATE TABLE IF NOT EXISTS repos (
,repo_hooks_push BOOLEAN ,repo_hooks_push BOOLEAN
,repo_hooks_tags BOOLEAN ,repo_hooks_tags BOOLEAN
,repo_params BLOB ,repo_params BLOB
,repo_hash VARCHAR
); );
` `
const stmtRepoRepoFullNameIndex = `
CREATE UNIQUE INDEX IF NOT EXISTS ux_repo_full_name ON repos (repo_full_name);
`
const stmtRepoRepoUserIdIndex = ` const stmtRepoRepoUserIdIndex = `
CREATE INDEX IF NOT EXISTS ix_repo_user_id ON repos (repo_user_id); CREATE INDEX IF NOT EXISTS ix_repo_user_id ON repos (repo_user_id);
` `
@ -555,7 +580,3 @@ CREATE INDEX IF NOT EXISTS ix_repo_user_id ON repos (repo_user_id);
const stmtRepoRepoOwnerNameIndex = ` const stmtRepoRepoOwnerNameIndex = `
CREATE UNIQUE INDEX IF NOT EXISTS ux_repo_owner_name ON repos (repo_owner,repo_name); CREATE UNIQUE INDEX IF NOT EXISTS ux_repo_owner_name ON repos (repo_owner,repo_name);
` `
const stmtRepoRepoFullNameIndex = `
CREATE UNIQUE INDEX IF NOT EXISTS ux_repo_full_name ON repos (repo_full_name);
`

21
pkg/store/builtin/user_sql.go
View file

@ -41,6 +41,7 @@ func createUser(db userDB, query string, v *User) error {
var v4 string var v4 string
var v5 bool var v5 bool
var v6 bool var v6 bool
var v7 string
v0 = v.Login v0 = v.Login
v1 = v.Token v1 = v.Token
v2 = v.Secret v2 = v.Secret
@ -48,6 +49,7 @@ func createUser(db userDB, query string, v *User) error {
v4 = v.Avatar v4 = v.Avatar
v5 = v.Active v5 = v.Active
v6 = v.Admin v6 = v.Admin
v7 = v.Hash
res, err := db.Exec(query, res, err := db.Exec(query,
&v0, &v0,
@ -57,6 +59,7 @@ func createUser(db userDB, query string, v *User) error {
&v4, &v4,
&v5, &v5,
&v6, &v6,
&v7,
) )
if err != nil { if err != nil {
return err return err
@ -75,6 +78,7 @@ func updateUser(db userDB, query string, v *User) error {
var v5 string var v5 string
var v6 bool var v6 bool
var v7 bool var v7 bool
var v8 string
v0 = v.ID v0 = v.ID
v1 = v.Login v1 = v.Login
v2 = v.Token v2 = v.Token
@ -83,6 +87,7 @@ func updateUser(db userDB, query string, v *User) error {
v5 = v.Avatar v5 = v.Avatar
v6 = v.Active v6 = v.Active
v7 = v.Admin v7 = v.Admin
v8 = v.Hash
_, err := db.Exec(query, _, err := db.Exec(query,
&v1, &v1,
@ -92,6 +97,7 @@ func updateUser(db userDB, query string, v *User) error {
&v5, &v5,
&v6, &v6,
&v7, &v7,
&v8,
&v0, &v0,
) )
return err return err
@ -106,6 +112,7 @@ func scanUser(row *sql.Row) (*User, error) {
var v5 string var v5 string
var v6 bool var v6 bool
var v7 bool var v7 bool
var v8 string
err := row.Scan( err := row.Scan(
&v0, &v0,
@ -116,6 +123,7 @@ func scanUser(row *sql.Row) (*User, error) {
&v5, &v5,
&v6, &v6,
&v7, &v7,
&v8,
) )
if err != nil { if err != nil {
return nil, err return nil, err
@ -130,6 +138,7 @@ func scanUser(row *sql.Row) (*User, error) {
v.Avatar = v5 v.Avatar = v5
v.Active = v6 v.Active = v6
v.Admin = v7 v.Admin = v7
v.Hash = v8
return v, nil return v, nil
} }
@ -146,6 +155,7 @@ func scanUsers(rows *sql.Rows) ([]*User, error) {
var v5 string var v5 string
var v6 bool var v6 bool
var v7 bool var v7 bool
var v8 string
err = rows.Scan( err = rows.Scan(
&v0, &v0,
&v1, &v1,
@ -155,6 +165,7 @@ func scanUsers(rows *sql.Rows) ([]*User, error) {
&v5, &v5,
&v6, &v6,
&v7, &v7,
&v8,
) )
if err != nil { if err != nil {
return vv, err return vv, err
@ -169,6 +180,7 @@ func scanUsers(rows *sql.Rows) ([]*User, error) {
v.Avatar = v5 v.Avatar = v5
v.Active = v6 v.Active = v6
v.Admin = v7 v.Admin = v7
v.Hash = v8
vv = append(vv, v) vv = append(vv, v)
} }
return vv, rows.Err() return vv, rows.Err()
@ -184,6 +196,7 @@ SELECT
,user_avatar ,user_avatar
,user_active ,user_active
,user_admin ,user_admin
,user_hash
FROM users FROM users
` `
@ -197,6 +210,7 @@ SELECT
,user_avatar ,user_avatar
,user_active ,user_active
,user_admin ,user_admin
,user_hash
FROM users FROM users
LIMIT ? OFFSET ? LIMIT ? OFFSET ?
` `
@ -211,6 +225,7 @@ SELECT
,user_avatar ,user_avatar
,user_active ,user_active
,user_admin ,user_admin
,user_hash
FROM users FROM users
WHERE user_id = ? WHERE user_id = ?
` `
@ -225,6 +240,7 @@ SELECT
,user_avatar ,user_avatar
,user_active ,user_active
,user_admin ,user_admin
,user_hash
FROM users FROM users
WHERE user_login = ? WHERE user_login = ?
` `
@ -243,7 +259,8 @@ INSERT INTO users (
,user_avatar ,user_avatar
,user_active ,user_active
,user_admin ,user_admin
) VALUES (?,?,?,?,?,?,?); ,user_hash
) VALUES (?,?,?,?,?,?,?,?);
` `
const stmtUserUpdate = ` const stmtUserUpdate = `
@ -255,6 +272,7 @@ UPDATE users SET
,user_avatar = ? ,user_avatar = ?
,user_active = ? ,user_active = ?
,user_admin = ? ,user_admin = ?
,user_hash = ?
WHERE user_id = ? WHERE user_id = ?
` `
@ -273,6 +291,7 @@ CREATE TABLE IF NOT EXISTS users (
,user_avatar VARCHAR ,user_avatar VARCHAR
,user_active BOOLEAN ,user_active BOOLEAN
,user_admin BOOLEAN ,user_admin BOOLEAN
,user_hash VARCHAR
); );
` `

2
pkg/types/build.go
View file

@ -26,12 +26,14 @@ type Build struct {
type PullRequest struct { type PullRequest struct {
Number int `json:"number,omitempty"` Number int `json:"number,omitempty"`
Title string `json:"title,omitempty"` Title string `json:"title,omitempty"`
Link string `json:"link,omitempty"`
Base *Commit `json:"base_commit,omitempty"` Base *Commit `json:"base_commit,omitempty"`
} }
type Commit struct { type Commit struct {
Sha string `json:"sha"` Sha string `json:"sha"`
Ref string `json:"ref"` Ref string `json:"ref"`
Link string `json:"link,omitempty"`
Branch string `json:"branch" sql:"index:ix_commit_branch"` Branch string `json:"branch" sql:"index:ix_commit_branch"`
Message string `json:"message"` Message string `json:"message"`
Timestamp string `json:"timestamp,omitempty"` Timestamp string `json:"timestamp,omitempty"`

64
pkg/types/repo.go
View file

@ -1,19 +1,19 @@
package types package types
type Repo struct { type Repo struct {
ID int64 `meddler:"repo_id,pk" json:"id"` ID int64 `json:"id"`
UserID int64 `meddler:"repo_user_id" json:"-" sql:"index:ix_repo_user_id"` UserID int64 `json:"-" sql:"index:ix_repo_user_id"`
Owner string `meddler:"repo_owner" json:"owner" sql:"unique:ux_repo_owner_name"` Owner string `json:"owner" sql:"unique:ux_repo_owner_name"`
Name string `meddler:"repo_name" json:"name" sql:"unique:ux_repo_owner_name"` Name string `json:"name" sql:"unique:ux_repo_owner_name"`
FullName string `meddler:"repo_full_name" json:"full_name" sql:"unique:ux_repo_full_name"` FullName string `json:"full_name" sql:"unique:ux_repo_full_name"`
Avatar string `meddler:"repo_avatar" json:"avatar"` Avatar string `json:"avatar"`
Self string `meddler:"repo_self" json:"self_url"` Self string `json:"self_url"`
Link string `meddler:"repo_link" json:"link_url"` Link string `json:"link_url"`
Clone string `meddler:"repo_clone" json:"clone_url"` Clone string `json:"clone_url"`
Branch string `meddler:"repo_branch" json:"default_branch"` Branch string `json:"default_branch"`
Private bool `meddler:"repo_private" json:"private"` Private bool `json:"private"`
Trusted bool `meddler:"repo_trusted" json:"trusted"` Trusted bool `json:"trusted"`
Timeout int64 `meddler:"repo_timeout" json:"timeout"` Timeout int64 `json:"timeout"`
Keys *Keypair `json:"-"` Keys *Keypair `json:"-"`
Hooks *Hooks `json:"hooks"` Hooks *Hooks `json:"hooks"`
@ -27,29 +27,33 @@ type Repo struct {
// considered secret and are therefore stored external // considered secret and are therefore stored external
// to the source code repository inside Drone. // to the source code repository inside Drone.
Params map[string]string `json:"-"` Params map[string]string `json:"-"`
// randomly generated hash used to sign repository
// tokens and encrypt and decrypt private variables.
Hash string `json:"-"`
} }
type RepoLite struct { type RepoLite struct {
ID int64 `meddler:"repo_id,pk" json:"id"` ID int64 `json:"id"`
UserID int64 `meddler:"user_id" json:"-"` UserID int64 `json:"-"`
Owner string `meddler:"repo_owner" json:"owner"` Owner string `json:"owner"`
Name string `meddler:"repo_name" json:"name"` Name string `json:"name"`
FullName string `meddler:"repo_slug" json:"full_name"` FullName string `json:"full_name"`
Language string `meddler:"repo_lang" json:"language"` Language string `json:"language"`
Private bool `meddler:"repo_private" json:"private"` Private bool `json:"private"`
Created int64 `meddler:"repo_created" json:"created_at"` Created int64 `json:"created_at"`
Updated int64 `meddler:"repo_updated" json:"updated_at"` Updated int64 `json:"updated_at"`
} }
type RepoCommit struct { type RepoCommit struct {
ID int64 `meddler:"repo_id,pk" json:"id"` ID int64 `json:"id"`
Owner string `meddler:"repo_owner" json:"owner"` Owner string `json:"owner"`
Name string `meddler:"repo_name" json:"name"` Name string `json:"name"`
FullName string `meddler:"repo_full_name" json:"full_name"` FullName string `json:"full_name"`
Number int `meddler:"commit_sequence" json:"number"` Number int `json:"number"`
State string `meddler:"commit_state" json:"state"` State string `json:"state"`
Started int64 `meddler:"commit_started" json:"started_at"` Started int64 `json:"started_at"`
Finished int64 `meddler:"commit_finished" json:"finished_at"` Finished int64 `json:"finished_at"`
} }
type Perm struct { type Perm struct {

4
pkg/types/user.go
View file

@ -9,4 +9,8 @@ type User struct {
Avatar string `json:"avatar,omitempty"` Avatar string `json:"avatar,omitempty"`
Active bool `json:"active,omitempty"` Active bool `json:"active,omitempty"`
Admin bool `json:"admin,omitempty"` Admin bool `json:"admin,omitempty"`
// randomly generated hash used to sign user
// session and application tokens.
Hash string `json:"-"`
} }