Commit on '2024-05-27 18:04:08'

Author: mlophez

Makefile

@@ -4,7 +4,7 @@ test:
 	cd src/; go test
 
 run:
-	go run ./cmd/main.go
+	CONFIG_FILE=config.yaml go run ./cmd/main.go
 
 build-image:
 	export DOCKER_BUILDKIT=1

cmd/main.go

@@ -8,45 +8,15 @@ import (
 	"gitbot/internal/event"
 	"gitbot/internal/event/provider"
 	"gitbot/internal/event/queue"
-	"gitbot/internal/event/worker"
 
 	"log/slog"
 	"net/http"
 	"os"
 	"os/signal"
 	"syscall"
 	"time"
-
-	"k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/rest"
-	"k8s.io/client-go/tools/clientcmd"
-)
-
-const (
-	kubeconfig = "/home/mlr/Documents/Code/gitbot/kubeconfig"
 )
 
-func NewKubernetes() *kubernetes.Clientset {
-	config, err := func() (*rest.Config, error) {
-		_, exists := os.LookupEnv("KUBERNETES_SERVICE_HOST")
-		if exists {
-			return rest.InClusterConfig()
-		} else {
-			return clientcmd.BuildConfigFromFlags("", kubeconfig)
-		}
-	}()
-	if err != nil {
-		panic(err)
-	}
-
-	clientset, err := kubernetes.NewForConfig(config)
-	if err != nil {
-		panic(err)
-	}
-
-	return clientset
-}
-
 type Server struct {
 }
 
@@ -55,29 +25,27 @@ func main() {
 	slog.SetDefault(slog.New(slog.NewJSONHandler(os.Stdout, nil)))
 
 	// Load config
-	//config := config.Load(config.Get("CONFIG_FILE"))
-
-	// Configure kubernetes
-	//clientset := NewKubernetes()
+	c := config.Load()
 
-	// Configure webhook queue
+	/* Events */
+	// Service
 	queue := queue.NewMemoryQueue[event.QueueItem]()
-	worker := worker.NewWorker(queue)
-
+	eService := event.NewService(queue, c.SecurityRules)
+	// Worker
+	worker := event.NewWorker(eService)
 	// Handlers
-	bitbucketProvider := provider.NewBitbucketProvider(config.Get("BITBUCKET_BEARER_TOKEN"))
-	bitbucketHandler := event.NewHandler(queue, bitbucketProvider)
+	bitbucket := provider.NewBitbucketProvider(c.BitbucketBearerToken)
+	bitbucketHandler := event.NewHandler(eService, bitbucket)
 
-	// Routes
+	/* Routes */
 	router := http.NewServeMux()
-
 	router.HandleFunc("GET /status", status)
 	router.HandleFunc("POST /api/v1/webhook/bitbucket", bitbucketHandler.Handle())
 
 	// Starting Http Server
-	srv := &http.Server{Addr: ":" + config.Get("HTTP_PORT"), Handler: router}
+	srv := &http.Server{Addr: ":" + c.HttpPort, Handler: router}
 	go func() {
-		slog.Info("Starting server in port :" + config.Get("HTTP_PORT"))
+		slog.Info("Starting server in port :" + c.HttpPort)
 		err := srv.ListenAndServe()
 
 		if err != nil && !errors.Is(err, http.ErrServerClosed) {

env.local.ini

@@ -1,2 +1,3 @@
 HTTP_PORT=8080
 BITBUCKET_BEARER_TOKEN=token
+CONFIG_FILE=config.yaml

internal/types/app.go internal/app/domain.gointernal/types/app.go renamed to internal/app/domain.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 type Application struct {
 	Name          string

internal/config/config.go

@@ -1,8 +1,28 @@
 package config
 
-import "fmt"
+import (
+	"fmt"
 
-func (c iYamlConfigFile) validate() error {
+	"gitbot/internal/event"
+)
+
+type ConfigFile struct {
+	Security struct {
+		Groups []struct {
+			Name  string   `yaml:"name"`
+			Users []string `yaml:"users"`
+		} `yaml:"groups"`
+		Rules []struct {
+			Respository     string   `yaml:"repository"`
+			FilePatternList []string `yaml:"filepattern"`
+			ActionList      []string `yaml:"action"`
+			GroupList       []string `yaml:"group"`
+			UserList        []string `yaml:"user"`
+		} `yaml:"rules"`
+	} `yaml:"security"`
+}
+
+func (c ConfigFile) validate() error {
 
 	// Group has any user
 	if err := c.hasEmptyGroup(); err != nil {
@@ -26,7 +46,7 @@ func (c iYamlConfigFile) validate() error {
 	return nil
 }
 
-func (c iYamlConfigFile) hasEmptyGroup() error {
+func (c ConfigFile) hasEmptyGroup() error {
 	for _, g := range c.Security.Groups {
 		if len(g.Users) == 0 {
 			return fmt.Errorf("Group '%s' is empty", g.Name)
@@ -36,7 +56,7 @@ func (c iYamlConfigFile) hasEmptyGroup() error {
 	return nil
 }
 
-func (c iYamlConfigFile) hasRuleGroupThatExists() error {
+func (c ConfigFile) hasRuleGroupThatExists() error {
 	for _, rule := range c.Security.Rules {
 		for _, group := range rule.GroupList {
 			exists := false
@@ -53,7 +73,7 @@ func (c iYamlConfigFile) hasRuleGroupThatExists() error {
 	return nil
 }
 
-func (c iYamlConfigFile) hasRuleCorrectActions() error {
+func (c ConfigFile) hasRuleCorrectActions() error {
 	for _, rule := range c.Security.Rules {
 		for _, action := range rule.ActionList {
 			if !(action == "lock" || action == "unlock") {
@@ -64,7 +84,7 @@ func (c iYamlConfigFile) hasRuleCorrectActions() error {
 	return nil
 }
 
-func (c iYamlConfigFile) hasRuleFieldEmpty() error {
+func (c ConfigFile) hasRuleFieldEmpty() error {
 	for _, rule := range c.Security.Rules {
 		if len(rule.ActionList) == 0 {
 			return fmt.Errorf("The field action is empty")
@@ -78,3 +98,30 @@ func (c iYamlConfigFile) hasRuleFieldEmpty() error {
 	}
 	return nil
 }
+
+func (c ConfigFile) seRules() []event.SecurityRule {
+	var result []event.SecurityRule
+
+	for _, r := range c.Security.Rules {
+		// Add users from group to userlist
+		userList := r.UserList
+		for _, group := range r.GroupList {
+			for _, g := range c.Security.Groups {
+				if group != g.Name {
+					continue
+				}
+				userList = append(userList, g.Users...)
+			}
+		}
+
+		// create final securityrule
+		result = append(result, event.SecurityRule{
+			Repository:   r.Respository,
+			FilePatterns: r.FilePatternList,
+			Actions:      r.ActionList,
+			Users:        userList,
+		})
+	}
+
+	return result
+}