Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-10 07:25:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix WebHook message garbling:

Browse Source 
76079aa1e8
This commit is contained in:
Naoki Takezoe
2016-07-11 13:31:06 +09:00
parent cf9a55d896
commit ebff7baf07
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/scala/gitbucket/core/service/WebHookService.scala
View File

@@ -22,6 +22,7 @@ import org.apache.http.HttpRequest
import org.apache.http.HttpResponse import org.apache.http.HttpResponse
import gitbucket.core.model.WebHookContentType import gitbucket.core.model.WebHookContentType
import org.apache.http.client.entity.EntityBuilder import org.apache.http.client.entity.EntityBuilder
import org.apache.http.entity.ContentType
trait WebHookService { trait WebHookService {
@@ -118,7 +119,7 @@ trait WebHookService {
} }
} }
case WebHookContentType.JSON => { case WebHookContentType.JSON => {
httpPost.setEntity(EntityBuilder.create().setText(json).build()) httpPost.setEntity(EntityBuilder.create().setContentType(ContentType.APPLICATION_JSON).setText(json).build())
if (webHook.token.exists(_.trim.nonEmpty)) { if (webHook.token.exists(_.trim.nonEmpty)) {
httpPost.addHeader("X-Hub-Signature", XHub.generateHeaderXHubToken(XHubConverter.HEXA_LOWERCASE, XHubDigest.SHA1, webHook.token.orNull, json.getBytes("UTF-8"))) httpPost.addHeader("X-Hub-Signature", XHub.generateHeaderXHubToken(XHubConverter.HEXA_LOWERCASE, XHubDigest.SHA1, webHook.token.orNull, json.getBytes("UTF-8")))
} }