remove code for parsing github payload

Signed-off-by: Somtochi Onyekwere <somtochionyekwere@gmail.com>
This commit is contained in:
Somtochi Onyekwere 2022-08-10 21:19:22 +01:00
parent 6f729e491b
commit db485228dd
2 changed files with 340 additions and 5 deletions

View File

@ -0,0 +1,339 @@
/*
Copyright 2022 The Flux authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package server
import (
"bytes"
"crypto/hmac"
"crypto/sha256"
"encoding/hex"
"encoding/json"
"github.com/google/go-github/v41/github"
"net/http"
"net/http/httptest"
"testing"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"sigs.k8s.io/controller-runtime/pkg/client/fake"
"github.com/fluxcd/notification-controller/api/v1beta1"
"github.com/fluxcd/pkg/apis/meta"
"github.com/fluxcd/pkg/runtime/logger"
)
func Test_HandlePayload(t *testing.T) {
type hashOpts struct {
calculate bool
header string
}
status := v1beta1.ReceiverStatus{
Conditions: []metav1.Condition{
{
Type: meta.ReadyCondition,
Status: metav1.ConditionTrue,
},
},
URL: "/hook/digest",
ObservedGeneration: 1,
}
tests := []struct {
name string
hashOpts hashOpts
headers map[string]string
payload map[string]interface{}
receiver *v1beta1.Receiver
expected int
receiverType string
secret *corev1.Secret
}{
{
name: "Generic receiver",
receiver: &v1beta1.Receiver{
ObjectMeta: metav1.ObjectMeta{
Name: "test-receiver",
},
Spec: v1beta1.ReceiverSpec{
Type: v1beta1.GenericReceiver,
Resources: nil,
SecretRef: meta.LocalObjectReference{
Name: "token",
},
Suspend: false,
},
},
secret: &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Name: "token",
},
Data: map[string][]byte{
"token": []byte("token"),
},
},
expected: http.StatusOK,
},
{
name: "gitlab receiver",
receiver: &v1beta1.Receiver{
ObjectMeta: metav1.ObjectMeta{
Name: "gitlab-receiver",
},
Spec: v1beta1.ReceiverSpec{
Type: v1beta1.GitLabReceiver,
Resources: nil,
SecretRef: meta.LocalObjectReference{
Name: "token",
},
Suspend: false,
},
},
headers: map[string]string{
"X-Gitlab-Token": "token",
},
secret: &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Name: "token",
},
Data: map[string][]byte{
"token": []byte("token"),
},
},
expected: http.StatusOK,
},
{
name: "github receiver",
receiver: &v1beta1.Receiver{
ObjectMeta: metav1.ObjectMeta{
Name: "test-receiver",
},
Spec: v1beta1.ReceiverSpec{
Type: v1beta1.GitHubReceiver,
Resources: nil,
SecretRef: meta.LocalObjectReference{
Name: "token",
},
Suspend: false,
},
},
hashOpts: hashOpts{
calculate: true,
header: github.SHA256SignatureHeader,
},
headers: map[string]string{
"Content-Type": "application/json",
},
payload: map[string]interface{}{
"action": "push",
},
secret: &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Name: "token",
},
Data: map[string][]byte{
"token": []byte("token"),
},
},
expected: http.StatusOK,
},
{
name: "generic hmac receiver",
receiver: &v1beta1.Receiver{
ObjectMeta: metav1.ObjectMeta{
Name: "generic-hmac-receiver",
},
Spec: v1beta1.ReceiverSpec{
Type: v1beta1.GenericHMACReceiver,
Resources: nil,
SecretRef: meta.LocalObjectReference{
Name: "token",
},
Suspend: false,
},
},
hashOpts: hashOpts{
calculate: true,
header: "X-Signature",
},
headers: map[string]string{
"Content-Type": "application/json",
},
secret: &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Name: "token",
},
Data: map[string][]byte{
"token": []byte("token"),
},
},
expected: http.StatusOK,
},
{
name: "bitbucket receiver",
receiver: &v1beta1.Receiver{
ObjectMeta: metav1.ObjectMeta{
Name: "bitbucket-receiver",
},
Spec: v1beta1.ReceiverSpec{
Type: v1beta1.BitbucketReceiver,
Events: []string{"push"},
SecretRef: meta.LocalObjectReference{
Name: "token",
},
},
},
hashOpts: hashOpts{
calculate: true,
header: github.SHA256SignatureHeader,
},
headers: map[string]string{
"Content-Type": "application/json",
"X-Event-Key": "push",
},
secret: &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Name: "token",
},
Data: map[string][]byte{
"token": []byte("token"),
},
},
expected: http.StatusOK,
},
{
name: "quay receiver",
receiver: &v1beta1.Receiver{
ObjectMeta: metav1.ObjectMeta{
Name: "quay-receiver",
},
Spec: v1beta1.ReceiverSpec{
Type: v1beta1.QuayReceiver,
Resources: nil,
SecretRef: meta.LocalObjectReference{
Name: "token",
},
},
},
secret: &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Name: "token",
},
Data: map[string][]byte{
"token": []byte("token"),
},
},
payload: map[string]interface{}{
"docker_url": "docker.io",
"updated_tags": []string{
"v0.0.1",
},
},
expected: http.StatusOK,
},
{
name: "harbor receiver",
receiver: &v1beta1.Receiver{
ObjectMeta: metav1.ObjectMeta{
Name: "harbor-receiver",
},
Spec: v1beta1.ReceiverSpec{
Type: v1beta1.HarborReceiver,
SecretRef: meta.LocalObjectReference{
Name: "token",
},
},
},
secret: &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Name: "token",
},
Data: map[string][]byte{
"token": []byte("token"),
},
},
headers: map[string]string{
"Authorization": "token",
},
expected: http.StatusOK,
},
{
name: "missing secret",
receiver: &v1beta1.Receiver{
ObjectMeta: metav1.ObjectMeta{
Name: "missing-secret",
},
Spec: v1beta1.ReceiverSpec{
Type: v1beta1.GenericReceiver,
Resources: nil,
SecretRef: meta.LocalObjectReference{
Name: "non-existing",
},
},
},
expected: http.StatusBadRequest,
},
}
scheme := runtime.NewScheme()
v1beta1.AddToScheme(scheme)
corev1.AddToScheme(scheme)
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
tt.receiver.Status = status
builder := fake.NewClientBuilder()
builder.WithScheme(scheme)
builder.WithObjects(tt.receiver)
if tt.secret != nil {
builder.WithObjects(tt.secret)
}
client := builder.Build()
s := ReceiverServer{
port: "",
logger: logger.NewLogger(logger.Options{}),
kubeClient: client,
}
handler := http.HandlerFunc(s.handlePayload())
data, err := json.Marshal(tt.payload)
if err != nil {
t.Errorf("error marshalling test payload: '%s'", err)
}
req := httptest.NewRequest("POST", tt.receiver.Status.URL, bytes.NewBuffer(data))
for key, val := range tt.headers {
req.Header.Set(key, val)
}
if tt.hashOpts.calculate {
mac := hmac.New(sha256.New, tt.secret.Data["token"])
_, err := mac.Write(data)
if err != nil {
t.Errorf("error writing hmac: '%s'", err)
}
req.Header.Set(tt.hashOpts.header, "sha256="+hex.EncodeToString(mac.Sum(nil)))
}
res := httptest.NewRecorder()
handler.ServeHTTP(res, req)
if res.Code != tt.expected {
t.Errorf("expected status code '%d' but got '%d'", tt.expected, res.Code)
}
})
}
}

View File

@ -130,15 +130,11 @@ func (s *ReceiverServer) validate(ctx context.Context, receiver v1beta1.Receiver
}
return nil
case v1beta1.GitHubReceiver:
payload, err := github.ValidatePayload(r, []byte(token))
_, err := github.ValidatePayload(r, []byte(token))
if err != nil {
return fmt.Errorf("the GitHub signature header is invalid, err: %w", err)
}
if _, err := github.ParseWebHook(github.WebHookType(r), payload); err != nil {
return fmt.Errorf("unable to parse GitHub payload, err: %w", err)
}
event := github.WebHookType(r)
if len(receiver.Spec.Events) > 0 {
allowed := false