diff --git a/.github/workflows/test-template.yml b/.github/workflows/test-template.yml index 0109c967e..12e09f25f 100644 --- a/.github/workflows/test-template.yml +++ b/.github/workflows/test-template.yml @@ -95,7 +95,5 @@ jobs: run: ./github_scripts/get_put_test.sh - name: Run End-to-End Test for Director stat run: ./github_scripts/stat_test.sh - - name: Run End-to-End Test of x509 access - run: ./github_scripts/x509_test.sh - name: Run End-to-End Test for --version flag run: ./github_scripts/version_test.sh diff --git a/xrootd/resources/xrootd-cache.cfg b/xrootd/resources/xrootd-cache.cfg index 60883b15a..ae2aabb25 100644 --- a/xrootd/resources/xrootd-cache.cfg +++ b/xrootd/resources/xrootd-cache.cfg @@ -58,10 +58,6 @@ pfc.writequeue 16 4 pfc.ram 4g pfc.diskusage {{if .Cache.LowWatermark}}{{.Cache.LowWatermark}}{{else}}0.90{{end}} {{if .Cache.HighWaterMark}}{{.Cache.HighWaterMark}}{{else}}0.95{{end}} purgeinterval 300s xrootd.fslib ++ throttle # throttle plugin is needed to calculate server IO load -http.tlsclientauth defer -{{- range $Prefix := .Cache.X509ClientAuthenticationPrefixes}} -http.tlsrequiredprefix {{$Prefix}} -{{- end}} {{if .Cache.Concurrency}} throttle.throttle concurrency {{.Cache.Concurrency}} {{end}} diff --git a/xrootd/xrootd_config_test.go b/xrootd/xrootd_config_test.go index 235ad53a3..35d6f1e0e 100644 --- a/xrootd/xrootd_config_test.go +++ b/xrootd/xrootd_config_test.go @@ -582,52 +582,6 @@ func TestXrootDCacheConfig(t *testing.T) { assert.NotNil(t, configPath) }) - t.Run("TestCacheHTTPTLSRequiredPrefixCorrectConfig", func(t *testing.T) { - xrootd := xrootdTest{T: t} - xrootd.setup() - - // Set our config - viper.Set("Cache.X509ClientAuthenticationPrefixes", []string{"pref1", "pref2", "pref3"}) - - // Generate the xrootd config - configPath, err := ConfigXrootd(ctx, false) - require.NoError(t, err) - assert.NotNil(t, configPath) - - // Verify the output - file, err := os.Open(configPath) - assert.NoError(t, err) - defer file.Close() - - content, err := io.ReadAll(file) - assert.NoError(t, err) - assert.Contains(t, string(content), "http.tlsrequiredprefix pref1") - assert.Contains(t, string(content), "http.tlsrequiredprefix pref2") - assert.Contains(t, string(content), "http.tlsrequiredprefix pref3") - }) - - t.Run("TestCacheAuthenticationPrefixes", func(t *testing.T) { - xrootd := xrootdTest{T: t} - xrootd.setup() - - // Set our config - viper.Set("Cache.X509AuthenticationPrefixes", []string{}) - - // Generate the xrootd config - configPath, err := ConfigXrootd(ctx, false) - require.NoError(t, err) - assert.NotNil(t, configPath) - - // Verify the output - file, err := os.Open(configPath) - assert.NoError(t, err) - defer file.Close() - - content, err := io.ReadAll(file) - assert.NoError(t, err) - assert.NotContains(t, string(content), "http.tlsrequiredprefix") - }) - t.Run("TestNestedDataMetaNamespace", func(t *testing.T) { testDir := t.TempDir() viper.Set("Cache.StorageLocation", testDir)