github/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-10-20 20:50:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1593 from bradrydzewski/master

Browse Source 
implemented 0.5 in-memory stream multiplexer
This commit is contained in:
Brad Rydzewski
2016-04-23 14:04:37 -07:00
parent f8b3ec5681 6fffa7af26
commit 8dc3c452e0
45 changed files with 6147 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
web/hook.go
View File

@@ -33,7 +33,7 @@ func init() {
}
droneSec = fmt.Sprintf("%s.sec", strings.TrimSuffix(droneYml, filepath.Ext(droneYml)))
if os.Getenv("CANARY") == "true" {
droneSec = fmt.Sprintf("%s.sig", strings.TrimSuffix(droneYml, filepath.Ext(droneYml)))
droneSec = fmt.Sprintf("%s.sig", droneYml)
}
}
@@ -209,7 +209,10 @@ func PostHook(c *gin.Context) {
// get the previous build so that we can send
// on status change notifications
last, _ := store.GetBuildLastBefore(c, repo, build.Branch, build.ID)
secs, _ := store.GetSecretList(c, repo)
secs, err := store.GetSecretList(c, repo)
if err != nil {
log.Errorf("Error getting secrets for %s#%d. %s", repo.FullName, build.Number, err)
}
// IMPORTANT. PLEASE READ
//
@@ -223,14 +226,24 @@ func PostHook(c *gin.Context) {
var verified bool
signature, err := jose.ParseSigned(string(sec))
if err == nil && len(sec) != 0 {
if err != nil {
log.Debugf("cannot parse .drone.yml.sig file. %s", err)
} else if len(sec) == 0 {
log.Debugf("cannot parse .drone.yml.sig file. empty file")
} else {
signed = true
output, err := signature.Verify(repo.Hash)
if err == nil && string(output) == string(raw) {
output, err := signature.Verify([]byte(repo.Hash))
if err != nil {
log.Debugf("cannot verify .drone.yml.sig file. %s", err)
} else if string(output) != string(raw) {
log.Debugf("cannot verify .drone.yml.sig file. no match")
} else {
verified = true
}
}
log.Debugf(".drone.yml is signed=%v and verified=%v", signed, verified)
bus.Publish(c, bus.NewBuildEvent(bus.Enqueued, repo, build))
for _, job := range jobs {
queue.Publish(c, &queue.Work{

13
web/stream2.go
View File

@@ -91,21 +91,12 @@ func GetStream2(c *gin.Context) {
return
}
rc, wc, err := stream.Open(c, stream.ToKey(job.ID))
rc, err := stream.Reader(c, stream.ToKey(job.ID))
if err != nil {
c.AbortWithError(404, err)
return
}
defer func() {
if wc != nil {
wc.Close()
}
if rc != nil {
rc.Close()
}
}()
go func() {
<-c.Writer.CloseNotify()
rc.Close()
@@ -125,4 +116,6 @@ func GetStream2(c *gin.Context) {
}
c.Writer.Flush()
}
log.Debugf("Closed stream %s#%d", repo.FullName, build.Number)
}