sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-09-12 17:59:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix tests

Browse Source
This commit is contained in:
bcmmbaga
2026-09-11 09:08:47 +03:00
parent 4627d76d5b
commit 64d1ebd402
3 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
upload-server/server/local.go
+1 -4
View File
@@ -33,13 +33,10 @@ func configureLocalHandlers(mux *http.ServeMux, limiter *middleware.APIRateLimit
if !ok {
return fmt.Errorf("SERVER_URL environment variable is required")
}
parsedURL, err := url.Parse(envURL)
_, err := url.Parse(envURL)
if err != nil {
return fmt.Errorf("SERVER_URL environment variable is invalid: %w", err)
}
if parsedURL.Scheme != "https" {
return fmt.Errorf("SERVER_URL environment variable must use https, got %q", parsedURL.Scheme)
}
dir := defaultDir
envDir, ok := os.LookupEnv("STORE_DIR")
upload-server/server/local_test.go
+7 -16
View File
@@ -24,7 +24,7 @@ func signedQuery(t *testing.T, objectKey string) string {
}
func Test_LocalHandlerGetUploadURL(t *testing.T) {
mockURL := "https://localhost:8080"
mockURL := "http://localhost:8080"
t.Setenv("SERVER_URL", mockURL)
t.Setenv("STORE_DIR", t.TempDir())
@@ -50,7 +50,7 @@ func Test_LocalHandlerGetUploadURL(t *testing.T) {
func Test_LocalHandlePutRequest(t *testing.T) {
mockDir := t.TempDir()
mockURL := "https://localhost:8080"
mockURL := "http://localhost:8080"
t.Setenv("SERVER_URL", mockURL)
t.Setenv("STORE_DIR", mockDir)
t.Setenv(signingKeyVar, testSigningKey)
@@ -76,7 +76,7 @@ func Test_LocalHandlePutRequest(t *testing.T) {
func Test_LocalHandlePutRequest_PathTraversal(t *testing.T) {
mockDir := t.TempDir()
mockURL := "https://localhost:8080"
mockURL := "http://localhost:8080"
t.Setenv("SERVER_URL", mockURL)
t.Setenv("STORE_DIR", mockDir)
t.Setenv(signingKeyVar, testSigningKey)
@@ -101,11 +101,11 @@ func Test_LocalHandlePutRequest_PathTraversal(t *testing.T) {
func Test_LocalHandlePutRequest_DirTraversal(t *testing.T) {
mockDir := t.TempDir()
t.Setenv("SERVER_URL", "https://localhost:8080")
t.Setenv("SERVER_URL", "http://localhost:8080")
t.Setenv("STORE_DIR", mockDir)
t.Setenv(signingKeyVar, testSigningKey)
l := &local{url: "https://localhost:8080", dir: mockDir, signer: &signer{key: []byte(testSigningKey)}}
l := &local{url: "http://localhost:8080", dir: mockDir, signer: &signer{key: []byte(testSigningKey)}}
body := bytes.NewReader([]byte("bad"))
req := httptest.NewRequest(http.MethodPut,
@@ -124,7 +124,7 @@ func Test_LocalHandlePutRequest_DirTraversal(t *testing.T) {
func Test_LocalHandlePutRequest_DuplicateFile(t *testing.T) {
mockDir := t.TempDir()
t.Setenv("SERVER_URL", "https://localhost:8080")
t.Setenv("SERVER_URL", "http://localhost:8080")
t.Setenv("STORE_DIR", mockDir)
t.Setenv(signingKeyVar, testSigningKey)
@@ -151,7 +151,7 @@ func Test_LocalHandlePutRequest_DuplicateFile(t *testing.T) {
func Test_LocalHandlePutRequest_BodyTooLarge(t *testing.T) {
mockDir := t.TempDir()
t.Setenv("SERVER_URL", "https://localhost:8080")
t.Setenv("SERVER_URL", "http://localhost:8080")
t.Setenv("STORE_DIR", mockDir)
t.Setenv(signingKeyVar, testSigningKey)
@@ -170,12 +170,3 @@ func Test_LocalHandlePutRequest_BodyTooLarge(t *testing.T) {
_, err = os.Stat(filepath.Join(mockDir, "dir", "big.txt"))
require.True(t, os.IsNotExist(err))
}
func Test_ConfigureLocalHandlersRejectsPlaintextURL(t *testing.T) {
t.Setenv("SERVER_URL", "http://localhost:8080")
t.Setenv("STORE_DIR", t.TempDir())
t.Setenv(signingKeyVar, testSigningKey)
err := configureLocalHandlers(http.NewServeMux(), newTestRateLimiter(t))
require.Error(t, err)
}
upload-server/server/signing_test.go
+1 -1
View File
@@ -21,7 +21,7 @@ func newLocalMux(t *testing.T) (*http.ServeMux, string) {
t.Helper()
mockDir := t.TempDir()
t.Setenv("SERVER_URL", "https://localhost:8080")
t.Setenv("SERVER_URL", "http://localhost:8080")
t.Setenv("STORE_DIR", mockDir)
t.Setenv(signingKeyVar, testSigningKey)