aboutsummaryrefslogtreecommitdiff
path: root/internal
diff options
context:
space:
mode:
authorMax Resnick <max@ofmax.li>2024-03-02 15:03:46 -0800
committerMax Resnick <max@ofmax.li>2024-03-02 15:03:46 -0800
commit11e393cbc6e7be6757ec8d92cb37ea9e14ed8c9d (patch)
tree453fbdcf13ba1a8252f843641fb60319f670549c /internal
parent9fe8f31ae379d4b30823f3c4f19842bf32aae034 (diff)
downloadgo-git-server-11e393cbc6e7be6757ec8d92cb37ea9e14ed8c9d.tar.gz
feat: refactor some tests and policies.
Diffstat (limited to 'internal')
-rw-r--r--internal/admin/model_test.go2
-rw-r--r--internal/admin/service_test.go2
-rw-r--r--internal/authz/middleware.go2
-rw-r--r--internal/authz/middleware_test.go2
4 files changed, 4 insertions, 4 deletions
diff --git a/internal/admin/model_test.go b/internal/admin/model_test.go
index 70ec738..ee0b72a 100644
--- a/internal/admin/model_test.go
+++ b/internal/admin/model_test.go
@@ -86,7 +86,7 @@ func TestLoadServerConfig(t *testing.T) {
localDir := t.TempDir()
// TODO Refactor next touch
localFile := filepath.Join(localDir, "stuff.yaml")
- srcFile, err := os.Open(filepath.Clean("../../gitserver.yaml"))
+ srcFile, err := os.Open(filepath.Clean("../../tests/test_gitserver.yaml"))
if err != nil {
t.Fatalf("Error opening base config %s", err)
}
diff --git a/internal/admin/service_test.go b/internal/admin/service_test.go
index e13d28c..ae616c3 100644
--- a/internal/admin/service_test.go
+++ b/internal/admin/service_test.go
@@ -73,7 +73,7 @@ func TestInitServer(t *testing.T) {
// policy
destPolicyFile := filepath.Join(tempDir, "testpolicy.csv")
- srcPolicyFile := "../../testpolicy.csv"
+ srcPolicyFile := "../../tests/testpolicy.csv"
copyFile(t, srcPolicyFile, destPolicyFile)
// end policy
diff --git a/internal/authz/middleware.go b/internal/authz/middleware.go
index abebcdb..441240f 100644
--- a/internal/authz/middleware.go
+++ b/internal/authz/middleware.go
@@ -65,7 +65,7 @@ func Authorization(adminSvc *admin.Servicer, next http.Handler) http.Handler {
return
}
if !ok {
- log.Printf("Not Authorized - attempted access %s", urn)
+ log.Printf("Not Authorized - %s attempted access %s", urn, repo)
http.Error(rw, "Access denied", http.StatusForbidden)
return
}
diff --git a/internal/authz/middleware_test.go b/internal/authz/middleware_test.go
index 314c24e..99ca0b0 100644
--- a/internal/authz/middleware_test.go
+++ b/internal/authz/middleware_test.go
@@ -115,7 +115,7 @@ func TestAuthorization(t *testing.T) {
}
svcr := admin.NewService(
"../../auth_model.ini",
- "../../testpolicy.csv",
+ "../../tests/testpolicy.csv",
"../../gitserver.yaml",
"../../repos",
false)