add tests, new policies, init repo manager

1 files changed, 10 insertions, 10 deletions

diff --git a/cmd/main.go b/cmd/main.go
index 962eaa1..94c5d13 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -6,8 +6,7 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/casbin/casbin/v2"
-
+	"git.ofmax.li/go-git-server/internal/admin"
 	"git.ofmax.li/go-git-server/internal/authz"
 	"git.ofmax.li/go-git-server/internal/git"
 )
@@ -16,16 +15,15 @@ var (
 	reposDir       = flag.String("r", "./repos", "Directory containing git repositories")
 	backendCommand = flag.String("c", "git http-backend", "CGI binary to execute")
 	addr           = flag.String("l", ":8080", "Address/port to listen on")
+	modelPath      = flag.String("m", "./auth_model.ini", "Authentication model")
+	policyPath     = flag.String("p", "./policy.csv", "auth policy")
+	serverConfig   = flag.String("s", "./gitserver.yaml", "serverconfig path")
 	newToken       = flag.Bool("t", false, "make a new token")
+	updatePolicies = flag.Bool("u", false, "update policies")
 )
 
 func main() {
-	// TODO this should be configurable
-	enf, err := casbin.NewEnforcer("./auth_model.ini", "./policy.csv")
-	if err != nil {
-		log.Fatalf("Couldn't load the enforcer encountered the following error: %s", err)
-	}
-	flag.Parse()
+	admin.ReconcileGitConf("./config.ini")
 	if *newToken {
 		token, hash, err := authz.GenerateNewToken()
 		if err != nil {
@@ -34,8 +32,10 @@ func main() {
 		fmt.Printf("token: %s\nhash: %s\n", token, hash)
 		return
 	}
+	adminSvc := admin.NewService(*modelPath, *policyPath, *serverConfig)
+	adminSvc.InitServer()
 	tokens := authz.NewTokenMap()
-	err = tokens.LoadTokensFromFile("./tokens.csv")
+	err := tokens.LoadTokensFromFile("./tokens.csv")
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -43,6 +43,6 @@ func main() {
 	// TODO we don't want to use a global
 	// de-reference args
 	router.Handle("/", git.GitHttpBackendHandler(*reposDir, *backendCommand))
-	mux := authz.Authentication(tokens, authz.Authorization(enf, router))
+	mux := authz.Authentication(tokens, authz.Authorization(adminSvc, router))
 	log.Fatal(http.ListenAndServe(":8080", mux))
 }