Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version: v0.2.80
version: v0.2.82
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ push: ## push the latest Docker image to DockerHub
apply:
kubectl apply -f deployments/manifests/

deploy: binary-image push apply
deploy: binary-image push apply
14 changes: 10 additions & 4 deletions pkg/parser/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,17 @@ func Parse(req *http.Request, provider providers.Provider) (*providers.Hook, err
}

for _, header := range provider.GetHeaderKeys() {
if req.Header.Get(header) != "" {
hook.Headers[header] = req.Header.Get(header)
continue
if req.Header.Get(header) == "" {
return nil, errors.New("Required header '" + header + "' not found in Request")
}
return nil, errors.New("Required header '" + header + "' not found in Request")

// Store required headers in the expected casing
hook.Headers[header] = req.Header.Get(header)
}

for header := range req.Header {
// Store the rest of the headers in any casing
hook.Headers[header] = req.Header.Get(header)
}

if body, err := ioutil.ReadAll(req.Body); err != nil {
Expand Down
12 changes: 10 additions & 2 deletions pkg/providers/github.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,21 @@ func (p *GithubProvider) GetProviderName() string {
return GithubName
}

func (p *GithubProvider) GetCommitter(hook Hook) string {
func (p *GithubProvider) GetEventType(hook Hook) Event {
eventType := Event(hook.Headers[XGitHubEvent])
log.Printf("Received event type: %v", eventType)
return eventType
}

func (p *GithubProvider) IsCommitterCheckEvent(event Event) bool {
return event == GithubPushEvent || event == GithubPullRequestEvent || event == GithubIssueCommentEvent
}

func (p *GithubProvider) GetCommitter(hook Hook, eventType Event) string {
var pushPayloadData GithubPushPayload
var pullRequestPayloadData GithubPullRequestPayload
var issueCommentPayloadData GithubIssueCommentPayload

log.Printf("Received event type: %v", eventType)
switch eventType {
case GithubPushEvent:
if err := json.Unmarshal(hook.Payload, &pushPayloadData); err != nil {
Expand Down
14 changes: 11 additions & 3 deletions pkg/providers/gitlab.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,22 @@ func (p *GitlabProvider) Validate(hook Hook) bool {
return strings.TrimSpace(token) == strings.TrimSpace(p.secret)
}

func (p *GitlabProvider) GetCommitter(hook Hook) string {
func (p *GitlabProvider) GetEventType(hook Hook) Event {
event := Event(hook.Headers[XGitlabEvent])
log.Printf("Received event type: %v", event)
return event
}

func (p *GitlabProvider) IsCommitterCheckEvent(event Event) bool {
return event == GitlabPushEvent
}

func (p *GitlabProvider) GetCommitter(hook Hook, eventType Event) string {
var payloadData GitlabPushPayload
if err := json.Unmarshal(hook.Payload, &payloadData); err != nil {
log.Printf("Gitlab hook payload unmarshalling failed")
return ""
}

eventType := Event(hook.Headers[XGitlabEvent])
switch eventType {
case GitlabPushEvent:
return payloadData.Username
Expand Down
8 changes: 5 additions & 3 deletions pkg/providers/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ type Event string
type Provider interface {
GetHeaderKeys() []string
Validate(hook Hook) bool
GetCommitter(hook Hook) string
GetEventType(hook Hook) Event
IsCommitterCheckEvent(event Event) bool
GetCommitter(hook Hook, eventType Event) string
GetProviderName() string
}

Expand All @@ -29,7 +31,7 @@ func assertProviderImplementations() {

func NewProvider(provider string, secret string) (Provider, error) {
if len(provider) == 0 {
return nil, errors.New("Empty provider string specified")
return nil, errors.New("empty provider string specified")
}

switch strings.ToLower(provider) {
Expand All @@ -38,7 +40,7 @@ func NewProvider(provider string, secret string) (Provider, error) {
case GitlabProviderKind:
return NewGitlabProvider(secret)
default:
return nil, errors.New("Unknown Git Provider '" + provider + "' specified")
return nil, errors.New("unknown Git Provider '" + provider + "' specified")
}
}

Expand Down
16 changes: 9 additions & 7 deletions pkg/proxy/proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,15 @@ func (p *Proxy) proxyRequest(w http.ResponseWriter, r *http.Request, params http
return
}

committer := provider.GetCommitter(*hook)
log.Printf("Incoming request from user: %s", committer)
if p.isIgnoredUser(committer) || (!p.isAllowedUser(committer)) {
log.Printf("Ignoring request for user: %s", committer)
w.WriteHeader(http.StatusOK)
w.Write([]byte(fmt.Sprintf("Ignoring request for user: %s", committer)))
return
if event := provider.GetEventType(*hook); provider.IsCommitterCheckEvent(event) {
committer := provider.GetCommitter(*hook, event)
log.Printf("Incoming request from user: %s", committer)
if p.isIgnoredUser(committer) || (!p.isAllowedUser(committer)) {
log.Printf("Ignoring request for user: %s", committer)
w.WriteHeader(http.StatusOK)
w.Write([]byte(fmt.Sprintf("Ignoring request for user: %s", committer)))
return
}
}

if len(strings.TrimSpace(p.secret)) > 0 && !provider.Validate(*hook) {
Expand Down