add new config to enforce public link password

owncloud · Oct 20, 2023 · b942fd9 · b942fd9
1 parent 87e8dcc
commit b942fd9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/changelog/unreleased/readable-share-enforce-password.md b/changelog/unreleased/readable-share-enforce-password.md
@@ -0,0 +1,6 @@
+Enhancement: Add config to enforce passwords on readable links
+
+We added the config `OCIS_SHARING_PUBLIC_READABLE_SHARE_MUST_HAVE_PASSWORD` to enforce passwords on "Viewer" public shares.
+
+https://github.com/owncloud/ocis/pull/7547
+https://github.com/owncloud/ocis/issues/7539
diff --git a/services/frontend/pkg/config/config.go b/services/frontend/pkg/config/config.go
@@ -138,6 +138,7 @@ type OCS struct {
 	CacheWarmupDriver                    string             `yaml:"cache_warmup_driver,omitempty"`  // not supported by the oCIS product, therefore not part of docs
 	CacheWarmupDrivers                   CacheWarmupDrivers `yaml:"cache_warmup_drivers,omitempty"` // not supported by the oCIS product, therefore not part of docs
 	EnableDenials                        bool               `yaml:"enable_denials" env:"FRONTEND_OCS_ENABLE_DENIALS" desc:"EXPERIMENTAL: enable the feature to deny access on folders."`
+	ReadablePublicShareMustHavePassword  bool               `yaml:"public_sharing_readableshare_must_have_password" env:"OCIS_SHARING_PUBLIC_READABLE_SHARE_MUST_HAVE_PASSWORD;FRONTEND_OCS_PUBLIC_READABLE_SHARE_MUST_HAVE_PASSWORD" desc:"Set this to true if you want to enforce passwords on Viewer shares."`
 	WriteablePublicShareMustHavePassword bool               `yaml:"public_sharing_writeableshare_must_have_password" env:"OCIS_SHARING_PUBLIC_WRITEABLE_SHARE_MUST_HAVE_PASSWORD;FRONTEND_OCS_PUBLIC_WRITEABLE_SHARE_MUST_HAVE_PASSWORD" desc:"Set this to true if you want to enforce passwords on Uploader, Editor or Contributor shares."`
 }
 

diff --git a/services/frontend/pkg/revaconfig/config.go b/services/frontend/pkg/revaconfig/config.go
@@ -249,7 +249,7 @@ func FrontendConfigFromStruct(cfg *config.Config, logger log.Logger) (map[string
 									"password": map[string]interface{}{
 										"enforced": false,
 										"enforced_for": map[string]interface{}{
-											"read_only":         false,
+											"read_only":         cfg.OCS.ReadablePublicShareMustHavePassword,
 											"read_write":        cfg.OCS.WriteablePublicShareMustHavePassword,
 											"read_write_delete": cfg.OCS.WriteablePublicShareMustHavePassword,
 											"upload_only":       cfg.OCS.WriteablePublicShareMustHavePassword,