Infrastructure/opengist
0
Fork 0
mirror of https://github.com/thomiceli/opengist.git synced 2025-02-05 01:38:45 -05:00
Code Issues Activity

fix: replace path.Join with filepath.Join for file system paths (#414)

Browse source
This commit is contained in:
gofastasf 2025-01-21 12:16:59 +05:30 • committed by GitHub
parent 2ab9cf556f
commit 8369cbf2f0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
internal/web/test/auth_test.go
View file

@ -1,14 +1,15 @@
package test package test
import ( import (
"os"
"os/exec"
"path/filepath"
"testing"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/thomiceli/opengist/internal/config" "github.com/thomiceli/opengist/internal/config"
"github.com/thomiceli/opengist/internal/db" "github.com/thomiceli/opengist/internal/db"
"os"
"os/exec"
"path"
"testing"
) )
func TestRegister(t *testing.T) { func TestRegister(t *testing.T) {
@ -280,26 +281,26 @@ func TestGitOperations(t *testing.T) {
} }
func clientGitClone(creds string, user string, url string) error { func clientGitClone(creds string, user string, url string) error {
return exec.Command("git", "clone", "http://"+creds+"@localhost:6157/"+user+"/"+url, path.Join(config.GetHomeDir(), "tmp", url)).Run() return exec.Command("git", "clone", "http://"+creds+"@localhost:6157/"+user+"/"+url, filepath.Join(config.GetHomeDir(), "tmp", url)).Run()
} }
func clientGitPush(url string) error { func clientGitPush(url string) error {
f, err := os.Create(path.Join(config.GetHomeDir(), "tmp", url, "newfile.txt")) f, err := os.Create(filepath.Join(config.GetHomeDir(), "tmp", url, "newfile.txt"))
if err != nil { if err != nil {
return err return err
} }
f.Close() f.Close()
_ = exec.Command("git", "-C", path.Join(config.GetHomeDir(), "tmp", url), "add", "newfile.txt").Run() _ = exec.Command("git", "-C", filepath.Join(config.GetHomeDir(), "tmp", url), "add", "newfile.txt").Run()
_ = exec.Command("git", "-C", path.Join(config.GetHomeDir(), "tmp", url), "commit", "-m", "new file").Run() _ = exec.Command("git", "-C", filepath.Join(config.GetHomeDir(), "tmp", url), "commit", "-m", "new file").Run()
err = exec.Command("git", "-C", path.Join(config.GetHomeDir(), "tmp", url), "push", "origin", "master").Run() err = exec.Command("git", "-C", filepath.Join(config.GetHomeDir(), "tmp", url), "push", "origin", "master").Run()
_ = os.RemoveAll(path.Join(config.GetHomeDir(), "tmp", url)) _ = os.RemoveAll(filepath.Join(config.GetHomeDir(), "tmp", url))
return err return err
} }
func clientCheckRepo(url string, file string) error { func clientCheckRepo(url string, file string) error {
_, err := os.ReadFile(path.Join(config.GetHomeDir(), "tmp", url, file)) _, err := os.ReadFile(filepath.Join(config.GetHomeDir(), "tmp", url, file))
return err return err
} }

9
internal/web/test/server.go
View file

@ -8,7 +8,6 @@ import (
"net/http/httptest" "net/http/httptest"
"net/url" "net/url"
"os" "os"
"path"
"path/filepath" "path/filepath"
"reflect" "reflect"
"runtime" "runtime"
@ -35,7 +34,7 @@ type TestServer struct {
func newTestServer() (*TestServer, error) { func newTestServer() (*TestServer, error) {
s := &TestServer{ s := &TestServer{
server: server.NewServer(true, path.Join(config.GetHomeDir(), "tmp", "sessions"), true), server: server.NewServer(true, filepath.Join(config.GetHomeDir(), "tmp", "sessions"), true),
} }
go s.start() go s.start()
@ -146,7 +145,7 @@ func Setup(t *testing.T) *TestServer {
config.SetupSecretKey() config.SetupSecretKey()
git.ReposDirectory = path.Join("tests") git.ReposDirectory = filepath.Join("tests")
config.C.IndexEnabled = false config.C.IndexEnabled = false
config.C.LogLevel = "error" config.C.LogLevel = "error"
@ -205,7 +204,7 @@ func Teardown(t *testing.T, s *TestServer) {
err := db.TruncateDatabase() err := db.TruncateDatabase()
require.NoError(t, err, "Could not truncate database") require.NoError(t, err, "Could not truncate database")
err = os.RemoveAll(path.Join(config.GetHomeDir(), "tests")) err = os.RemoveAll(filepath.Join(config.GetHomeDir(), "tests"))
require.NoError(t, err, "Could not remove repos directory") require.NoError(t, err, "Could not remove repos directory")
if runtime.GOOS == "windows" { if runtime.GOOS == "windows" {
@ -214,7 +213,7 @@ func Teardown(t *testing.T, s *TestServer) {
time.Sleep(2 * time.Second) time.Sleep(2 * time.Second)
} }
err = os.RemoveAll(path.Join(config.GetHomeDir(), "tmp")) err = os.RemoveAll(filepath.Join(config.GetHomeDir(), "tmp"))
require.NoError(t, err, "Could not remove tmp directory") require.NoError(t, err, "Could not remove tmp directory")
// err = os.RemoveAll(path.Join(config.C.OpengistHome, "testsindex")) // err = os.RemoveAll(path.Join(config.C.OpengistHome, "testsindex"))