Merge pull request #468 from joereuss12/enable-dir-listing-branch

Adding dir listing capability to Pelican Origins
PelicanPlatform · Dec 6, 2023 · 9969933 · 9969933
2 parents db8cb9e + 5853896
commit 9969933
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/docs/parameters.yaml b/docs/parameters.yaml
@@ -349,6 +349,14 @@ type: bool
 default: true
 components: ["origin"]
 ---
+name: Origin.EnableDirListing
+description: >-
+  Allows the origin to enable directory listings. Needs to be enabled for recursive
+  downloads to work properly and for directories to be visable.
+type: bool
+default: false
+components: ["origin"]
+---
 
 ############################
 #   Cache-level configs    #

diff --git a/xrootd/resources/xrootd-origin.cfg b/xrootd/resources/xrootd-origin.cfg
@@ -28,6 +28,9 @@ xrd.tlsca certdir {{.Server.TLSCACertificateDirectory}}
 {{else}}
 xrd.tlsca certfile {{.Server.TLSCACertificateFile}}
 {{end}}
+{{if eq .Origin.EnableDirListing false}}
+http.listingdeny true
+{{end}}
 {{if .Origin.EnableMacaroons}}
 http.exthandler xrdmacaroons libXrdMacaroons.so
 macaroons.secretkey {{.Xrootd.MacaroonsKeyFile}}

diff --git a/xrootd/xrootd_config.go b/xrootd/xrootd_config.go
@@ -39,12 +39,13 @@ var (
 
 type (
 	OriginConfig struct {
-		Multiuser       bool
-		EnableCmsd      bool
-		EnableMacaroons bool
-		EnableVoms      bool
-		SelfTest        bool
-		NamespacePrefix string
+		Multiuser        bool
+		EnableCmsd       bool
+		EnableMacaroons  bool
+		EnableVoms       bool
+		EnableDirListing bool
+		SelfTest         bool
+		NamespacePrefix  string
 	}
 
 	CacheConfig struct {