diff options
| author | Jakob Borg <jakob@kastelo.net> | 2024-01-23 12:07:58 +0100 |
|---|---|---|
| committer | Jakob Borg <jakob@kastelo.net> | 2024-01-23 12:07:58 +0100 |
| commit | 45beb28fa5b051d14a10f102a05ec46d36ecaa75 (patch) | |
| tree | ec1b281e7b1c8000055418b880e39d138f336793 | |
| parent | ee9b20e47af48b7e6e0f5124248da5a9318176b1 (diff) | |
| download | syncthing-45beb28fa5b051d14a10f102a05ec46d36ecaa75.tar.gz syncthing-45beb28fa5b051d14a10f102a05ec46d36ecaa75.zip | |
lib/api: Remove remnants of CSRF tokens file mentions (ref #9284)
| -rw-r--r-- | lib/api/.gitignore | 1 | ||||
| -rw-r--r-- | lib/api/api_test.go | 4 | ||||
| -rw-r--r-- | test/.gitignore | 1 |
3 files changed, 0 insertions, 6 deletions
diff --git a/lib/api/.gitignore b/lib/api/.gitignore deleted file mode 100644 index d7a32b123..000000000 --- a/lib/api/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/testdata/config/csrftokens.txt diff --git a/lib/api/api_test.go b/lib/api/api_test.go index facbb85e6..9b053a340 100644 --- a/lib/api/api_test.go +++ b/lib/api/api_test.go @@ -51,7 +51,6 @@ import ( var ( confDir = filepath.Join("testdata", "config") - token = filepath.Join(confDir, "csrftokens.txt") dev1 protocol.DeviceID apiCfg = newMockedConfig() testAPIKey = "foobarbaz" @@ -87,7 +86,6 @@ func TestStopAfterBrokenConfig(t *testing.T) { mdb, _ := db.NewLowlevel(backend.OpenMemory(), events.NoopLogger) kdb := db.NewMiscDataNamespace(mdb) srv := New(protocol.LocalDeviceID, w, "", "syncthing", nil, nil, nil, events.NoopLogger, nil, nil, nil, nil, nil, nil, false, kdb).(*service) - defer os.Remove(token) srv.started = make(chan string) @@ -867,7 +865,6 @@ func startHTTP(cfg config.Wrapper) (string, context.CancelFunc, error) { mdb, _ := db.NewLowlevel(backend.OpenMemory(), events.NoopLogger) kdb := db.NewMiscDataNamespace(mdb) svc := New(protocol.LocalDeviceID, cfg, assetDir, "syncthing", m, eventSub, diskEventSub, events.NoopLogger, discoverer, connections, urService, mockedSummary, errorLog, systemLog, false, kdb).(*service) - defer os.Remove(token) svc.started = addrChan // Actually start the API service @@ -1410,7 +1407,6 @@ func TestEventMasks(t *testing.T) { mdb, _ := db.NewLowlevel(backend.OpenMemory(), events.NoopLogger) kdb := db.NewMiscDataNamespace(mdb) svc := New(protocol.LocalDeviceID, cfg, "", "syncthing", nil, defSub, diskSub, events.NoopLogger, nil, nil, nil, nil, nil, nil, false, kdb).(*service) - defer os.Remove(token) if mask := svc.getEventMask(""); mask != DefaultEventMask { t.Errorf("incorrect default mask %x != %x", int64(mask), int64(DefaultEventMask)) diff --git a/test/.gitignore b/test/.gitignore index 85a787119..97102478b 100644 --- a/test/.gitignore +++ b/test/.gitignore @@ -13,7 +13,6 @@ json *.idx.gz dirs-* *.out -csrftokens.txt s4d http h*/index* |