Skip to content

skip json parsing if allowedUser or ignoredUser are empty #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

skip json parsing if allowedUser or ignoredUser are empty #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1b6c7a
skip unnecessary json parsing if ignoredUser and allowedUser properti…
stefan-mees Jun 12, 2020
db828bc
skip unnecessary json parsing if ignoredUser and allowedUser properti…
stefan-mees Jun 15, 2020
82c51a1
Merge branch 'master' into feat/skip_json_parsing
stefan-mees Aug 10, 2020
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 pkg/providers/gitlab.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func (p *GitlabProvider) Validate(hook Hook) bool {
func (p *GitlabProvider) GetCommitter(hook Hook) string {
var payloadData GitlabPushPayload
if err := json.Unmarshal(hook.Payload, &payloadData); err != nil {
log.Printf("Gitlab hook payload unmarshalling failed")
log.Printf("Gitlab hook payload unmarshalling failed: %v", err)
return ""
}

Expand Down
16 changes: 9 additions & 7 deletions pkg/proxy/proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,13 +142,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 len(p.ignoredUsers) > 0 || len(p.allowedUsers) > 0 {
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 len(strings.TrimSpace(p.secret)) > 0 && !provider.Validate(*hook) {
Expand Down
33 changes: 32 additions & 1 deletion pkg/proxy/proxy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (

const (
proxyGitlabTestSecret = "testSecret"
proxyGitlabTestEvent = "testEvent"
proxyGitlabTestEvent = "Push Hook"
proxyGitlabTestBody = "testBody"
httpBinURL = "httpbin.org"
httpBinURLInsecure = "http://" + httpBinURL
Expand Down Expand Up @@ -468,6 +468,7 @@ func TestProxy_proxyRequest(t *testing.T) {
upstreamURL string
allowedPaths []string
secret string
allowedUsers []string
}
type args struct {
request *http.Request
Expand Down Expand Up @@ -603,6 +604,35 @@ func TestProxy_proxyRequest(t *testing.T) {
},
wantStatusCode: http.StatusMethodNotAllowed,
},
{
name: "TestProxyRequestShouldNotParseJsonWithoutAllowedOrIgnoredUsersConfigured",
fields: fields{
provider: providers.GitlabProviderKind,
upstreamURL: httpBinURLSecure,
allowedPaths: []string{},
secret: "",
},
args: args{
request: createGitlabRequestWithPayload(http.MethodPost, "/post",
proxyGitlabTestSecret, proxyGitlabTestEvent, []byte("{}")),
},
wantStatusCode: http.StatusOK,
},
{
name: "TestProxyRequestShouldParseJsonWithAllowedOrIgnoredUsersConfigured",
fields: fields{
provider: providers.GitlabProviderKind,
upstreamURL: httpBinURLSecure,
allowedPaths: []string{},
secret: "",
allowedUsers: []string{"jsmith"},
},
args: args{
request: createGitlabRequestWithPayload(http.MethodPost, "/post",
proxyGitlabTestSecret, proxyGitlabTestEvent, proxyGitlabTestPayload),
},
wantStatusCode: http.StatusOK,
},
{
name: "TestProxyRequestWithInvalidHttpMethod",
fields: fields{
Expand Down Expand Up @@ -737,6 +767,7 @@ func TestProxy_proxyRequest(t *testing.T) {
upstreamURL: tt.fields.upstreamURL,
allowedPaths: tt.fields.allowedPaths,
secret: tt.fields.secret,
allowedUsers: tt.fields.allowedUsers,
}
router := httprouter.New()
router.POST("/*path", p.proxyRequest)
Expand Down