From d82129052e1c99a61abce7c34ea83f508737eeb9 Mon Sep 17 00:00:00 2001 From: Max Resnick Date: Tue, 19 Mar 2024 22:38:28 -0700 Subject: feat: handle a fresh start using a mgmt repo --- cmd/main.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'cmd/main.go') diff --git a/cmd/main.go b/cmd/main.go index 84d2fa0..9f1292f 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -20,6 +20,7 @@ var ( modelPath string policyPath string serverConfigPath string + tokenFilePath string newToken bool ) @@ -36,7 +37,7 @@ func main() { adminSvc := admin.NewService(modelPath, policyPath, serverConfigPath, reposDir, mgmtRepo) adminSvc.InitServer() tokens := authz.NewTokenMap() - err := tokens.LoadTokensFromFile("./tokens.csv") + err := tokens.LoadTokensFromFile(tokenFilePath) if err != nil { log.Fatal(err) } @@ -57,10 +58,11 @@ func main() { func init() { flag.StringVar(&backendCommand, "c", "git http-backend", "CGI binary to execute") flag.StringVar(&addr, "l", ":8080", "Address/port to listen on") - flag.StringVar(&modelPath, "m", "./auth_model.ini", "Authentication model") - flag.StringVar(&policyPath, "p", "./policy.csv", "auth policy") - flag.StringVar(&serverConfigPath, "s", "/gitserver.yaml", "serverconfig path") + flag.StringVar(&modelPath, "m", "./auth_model.ini", "casbin authentication model") + flag.StringVar(&policyPath, "p", "./policy.csv", "casbin auth policy") + flag.StringVar(&tokenFilePath, "t", "./tokens.csv", "casbin auth policy") + flag.StringVar(&serverConfigPath, "s", "./gitserver.yaml", "serverconfig path, this should be relative to the git root or absolute if not using mgmt repo") flag.StringVar(&reposDir, "r", "./repos", "Directory containing git repositories") flag.BoolVar(&mgmtRepo, "a", false, "mgmt repo used for configuration") - flag.BoolVar(&newToken, "t", false, "make a new token") + flag.BoolVar(&newToken, "g", false, "make a new token") } -- cgit v1.2.3