diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2018-09-03 16:54:33 +0200 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2018-09-04 07:35:44 +0200 |
| commit | 8354c50911c440b42ca555b36000c18ec1d5450c (patch) | |
| tree | a47a2c8b9d8dd8ddcc614d465e3076f529e3a07e /lib | |
| parent | c8fe4b4fc864ca025610621903f30e97486dbd43 (diff) | |
| download | nextcloud-server-8354c50911c440b42ca555b36000c18ec1d5450c.tar.gz nextcloud-server-8354c50911c440b42ca555b36000c18ec1d5450c.zip | |
Deprecate the childSrc functions
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Security/CSP/ContentSecurityPolicy.php | 2 | ||||
| -rw-r--r-- | lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/private/Security/CSP/ContentSecurityPolicy.php b/lib/private/Security/CSP/ContentSecurityPolicy.php index de62b5ee76a..cae247f9f4f 100644 --- a/lib/private/Security/CSP/ContentSecurityPolicy.php +++ b/lib/private/Security/CSP/ContentSecurityPolicy.php @@ -187,6 +187,7 @@ class ContentSecurityPolicy extends \OCP\AppFramework\Http\ContentSecurityPolicy /** * @return array + * @deprecated 15.0.0 use FrameDomains and WorkerSrcDomains */ public function getAllowedChildSrcDomains(): array { return $this->allowedChildSrcDomains; @@ -194,6 +195,7 @@ class ContentSecurityPolicy extends \OCP\AppFramework\Http\ContentSecurityPolicy /** * @param array $allowedChildSrcDomains + * @deprecated 15.0.0 use FrameDomains and WorkerSrcDomains */ public function setAllowedChildSrcDomains($allowedChildSrcDomains) { $this->allowedChildSrcDomains = $allowedChildSrcDomains; diff --git a/lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php b/lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php index 6784f5723bf..ddc7918d094 100644 --- a/lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php +++ b/lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php @@ -315,6 +315,7 @@ class EmptyContentSecurityPolicy { * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized. * @return $this * @since 8.1.0 + * @deprecated 15.0.0 use addAllowedWorkerSrcDomains or addAllowedFrameDomain */ public function addAllowedChildSrcDomain($domain) { $this->allowedChildSrcDomains[] = $domain; @@ -327,6 +328,7 @@ class EmptyContentSecurityPolicy { * @param string $domain * @return $this * @since 8.1.0 + * @deprecated 15.0.0 use the WorkerSrcDomains or FrameDomain */ public function disallowChildSrcDomain($domain) { $this->allowedChildSrcDomains = array_diff($this->allowedChildSrcDomains, [$domain]); |