@@ -31,9 +31,9 @@ |
||
31 | 31 | * @since 17.0.0 |
32 | 32 | */ |
33 | 33 | interface IVersionedPreviewFile { |
34 | - /** |
|
35 | - * @return string |
|
36 | - * @since 17.0.0 |
|
37 | - */ |
|
38 | - public function getPreviewVersion(): string; |
|
34 | + /** |
|
35 | + * @return string |
|
36 | + * @since 17.0.0 |
|
37 | + */ |
|
38 | + public function getPreviewVersion(): string; |
|
39 | 39 | } |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | $tokens = $this->tokenProvider->getTokenByUser($user->getUID()); |
86 | 86 | |
87 | 87 | /** @var IWipeableToken[] $wipeable */ |
88 | - $wipeable = array_filter($tokens, function (IToken $token) { |
|
88 | + $wipeable = array_filter($tokens, function(IToken $token) { |
|
89 | 89 | return $token instanceof IWipeableToken; |
90 | 90 | }); |
91 | 91 | |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | |
122 | 122 | $dbToken = $e->getToken(); |
123 | 123 | |
124 | - $this->logger->info("user " . $dbToken->getUID() . " started a remote wipe"); |
|
124 | + $this->logger->info("user ".$dbToken->getUID()." started a remote wipe"); |
|
125 | 125 | |
126 | 126 | $this->eventDispatcher->dispatch(RemoteWipeStarted::class, new RemoteWipeStarted($dbToken)); |
127 | 127 | |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | |
150 | 150 | $this->tokenProvider->invalidateToken($token); |
151 | 151 | |
152 | - $this->logger->info("user " . $dbToken->getUID() . " finished a remote wipe"); |
|
152 | + $this->logger->info("user ".$dbToken->getUID()." finished a remote wipe"); |
|
153 | 153 | $this->eventDispatcher->dispatch(RemoteWipeFinished::class, new RemoteWipeFinished($dbToken)); |
154 | 154 | |
155 | 155 | return true; |
@@ -37,117 +37,117 @@ |
||
37 | 37 | use OCP\IUser; |
38 | 38 | |
39 | 39 | class RemoteWipe { |
40 | - /** @var IProvider */ |
|
41 | - private $tokenProvider; |
|
42 | - |
|
43 | - /** @var IEventDispatcher */ |
|
44 | - private $eventDispatcher; |
|
45 | - |
|
46 | - /** @var LoggerInterface */ |
|
47 | - private $logger; |
|
48 | - |
|
49 | - public function __construct(IProvider $tokenProvider, |
|
50 | - IEventDispatcher $eventDispatcher, |
|
51 | - LoggerInterface $logger) { |
|
52 | - $this->tokenProvider = $tokenProvider; |
|
53 | - $this->eventDispatcher = $eventDispatcher; |
|
54 | - $this->logger = $logger; |
|
55 | - } |
|
56 | - |
|
57 | - /** |
|
58 | - * @param IToken $token |
|
59 | - * @return bool |
|
60 | - * |
|
61 | - * @throws InvalidTokenException |
|
62 | - * @throws WipeTokenException |
|
63 | - */ |
|
64 | - public function markTokenForWipe(IToken $token): bool { |
|
65 | - if (!$token instanceof IWipeableToken) { |
|
66 | - return false; |
|
67 | - } |
|
68 | - |
|
69 | - $token->wipe(); |
|
70 | - $this->tokenProvider->updateToken($token); |
|
71 | - |
|
72 | - return true; |
|
73 | - } |
|
74 | - |
|
75 | - /** |
|
76 | - * @param IUser $user |
|
77 | - * |
|
78 | - * @return bool true if any tokens have been marked for remote wipe |
|
79 | - */ |
|
80 | - public function markAllTokensForWipe(IUser $user): bool { |
|
81 | - $tokens = $this->tokenProvider->getTokenByUser($user->getUID()); |
|
82 | - |
|
83 | - /** @var IWipeableToken[] $wipeable */ |
|
84 | - $wipeable = array_filter($tokens, function (IToken $token) { |
|
85 | - return $token instanceof IWipeableToken; |
|
86 | - }); |
|
87 | - |
|
88 | - if (empty($wipeable)) { |
|
89 | - return false; |
|
90 | - } |
|
91 | - |
|
92 | - foreach ($wipeable as $token) { |
|
93 | - $token->wipe(); |
|
94 | - $this->tokenProvider->updateToken($token); |
|
95 | - } |
|
96 | - |
|
97 | - return true; |
|
98 | - } |
|
99 | - |
|
100 | - /** |
|
101 | - * @param string $token |
|
102 | - * |
|
103 | - * @return bool whether wiping was started |
|
104 | - * @throws InvalidTokenException |
|
105 | - * |
|
106 | - */ |
|
107 | - public function start(string $token): bool { |
|
108 | - try { |
|
109 | - $this->tokenProvider->getToken($token); |
|
110 | - |
|
111 | - // We expect a WipedTokenException here. If we reach this point this |
|
112 | - // is an ordinary token |
|
113 | - return false; |
|
114 | - } catch (WipeTokenException $e) { |
|
115 | - // Expected -> continue below |
|
116 | - } |
|
117 | - |
|
118 | - $dbToken = $e->getToken(); |
|
119 | - |
|
120 | - $this->logger->info("user " . $dbToken->getUID() . " started a remote wipe"); |
|
121 | - |
|
122 | - $this->eventDispatcher->dispatch(RemoteWipeStarted::class, new RemoteWipeStarted($dbToken)); |
|
123 | - |
|
124 | - return true; |
|
125 | - } |
|
126 | - |
|
127 | - /** |
|
128 | - * @param string $token |
|
129 | - * |
|
130 | - * @return bool whether wiping could be finished |
|
131 | - * @throws InvalidTokenException |
|
132 | - */ |
|
133 | - public function finish(string $token): bool { |
|
134 | - try { |
|
135 | - $this->tokenProvider->getToken($token); |
|
136 | - |
|
137 | - // We expect a WipedTokenException here. If we reach this point this |
|
138 | - // is an ordinary token |
|
139 | - return false; |
|
140 | - } catch (WipeTokenException $e) { |
|
141 | - // Expected -> continue below |
|
142 | - } |
|
143 | - |
|
144 | - $dbToken = $e->getToken(); |
|
145 | - |
|
146 | - $this->tokenProvider->invalidateToken($token); |
|
147 | - |
|
148 | - $this->logger->info("user " . $dbToken->getUID() . " finished a remote wipe"); |
|
149 | - $this->eventDispatcher->dispatch(RemoteWipeFinished::class, new RemoteWipeFinished($dbToken)); |
|
150 | - |
|
151 | - return true; |
|
152 | - } |
|
40 | + /** @var IProvider */ |
|
41 | + private $tokenProvider; |
|
42 | + |
|
43 | + /** @var IEventDispatcher */ |
|
44 | + private $eventDispatcher; |
|
45 | + |
|
46 | + /** @var LoggerInterface */ |
|
47 | + private $logger; |
|
48 | + |
|
49 | + public function __construct(IProvider $tokenProvider, |
|
50 | + IEventDispatcher $eventDispatcher, |
|
51 | + LoggerInterface $logger) { |
|
52 | + $this->tokenProvider = $tokenProvider; |
|
53 | + $this->eventDispatcher = $eventDispatcher; |
|
54 | + $this->logger = $logger; |
|
55 | + } |
|
56 | + |
|
57 | + /** |
|
58 | + * @param IToken $token |
|
59 | + * @return bool |
|
60 | + * |
|
61 | + * @throws InvalidTokenException |
|
62 | + * @throws WipeTokenException |
|
63 | + */ |
|
64 | + public function markTokenForWipe(IToken $token): bool { |
|
65 | + if (!$token instanceof IWipeableToken) { |
|
66 | + return false; |
|
67 | + } |
|
68 | + |
|
69 | + $token->wipe(); |
|
70 | + $this->tokenProvider->updateToken($token); |
|
71 | + |
|
72 | + return true; |
|
73 | + } |
|
74 | + |
|
75 | + /** |
|
76 | + * @param IUser $user |
|
77 | + * |
|
78 | + * @return bool true if any tokens have been marked for remote wipe |
|
79 | + */ |
|
80 | + public function markAllTokensForWipe(IUser $user): bool { |
|
81 | + $tokens = $this->tokenProvider->getTokenByUser($user->getUID()); |
|
82 | + |
|
83 | + /** @var IWipeableToken[] $wipeable */ |
|
84 | + $wipeable = array_filter($tokens, function (IToken $token) { |
|
85 | + return $token instanceof IWipeableToken; |
|
86 | + }); |
|
87 | + |
|
88 | + if (empty($wipeable)) { |
|
89 | + return false; |
|
90 | + } |
|
91 | + |
|
92 | + foreach ($wipeable as $token) { |
|
93 | + $token->wipe(); |
|
94 | + $this->tokenProvider->updateToken($token); |
|
95 | + } |
|
96 | + |
|
97 | + return true; |
|
98 | + } |
|
99 | + |
|
100 | + /** |
|
101 | + * @param string $token |
|
102 | + * |
|
103 | + * @return bool whether wiping was started |
|
104 | + * @throws InvalidTokenException |
|
105 | + * |
|
106 | + */ |
|
107 | + public function start(string $token): bool { |
|
108 | + try { |
|
109 | + $this->tokenProvider->getToken($token); |
|
110 | + |
|
111 | + // We expect a WipedTokenException here. If we reach this point this |
|
112 | + // is an ordinary token |
|
113 | + return false; |
|
114 | + } catch (WipeTokenException $e) { |
|
115 | + // Expected -> continue below |
|
116 | + } |
|
117 | + |
|
118 | + $dbToken = $e->getToken(); |
|
119 | + |
|
120 | + $this->logger->info("user " . $dbToken->getUID() . " started a remote wipe"); |
|
121 | + |
|
122 | + $this->eventDispatcher->dispatch(RemoteWipeStarted::class, new RemoteWipeStarted($dbToken)); |
|
123 | + |
|
124 | + return true; |
|
125 | + } |
|
126 | + |
|
127 | + /** |
|
128 | + * @param string $token |
|
129 | + * |
|
130 | + * @return bool whether wiping could be finished |
|
131 | + * @throws InvalidTokenException |
|
132 | + */ |
|
133 | + public function finish(string $token): bool { |
|
134 | + try { |
|
135 | + $this->tokenProvider->getToken($token); |
|
136 | + |
|
137 | + // We expect a WipedTokenException here. If we reach this point this |
|
138 | + // is an ordinary token |
|
139 | + return false; |
|
140 | + } catch (WipeTokenException $e) { |
|
141 | + // Expected -> continue below |
|
142 | + } |
|
143 | + |
|
144 | + $dbToken = $e->getToken(); |
|
145 | + |
|
146 | + $this->tokenProvider->invalidateToken($token); |
|
147 | + |
|
148 | + $this->logger->info("user " . $dbToken->getUID() . " finished a remote wipe"); |
|
149 | + $this->eventDispatcher->dispatch(RemoteWipeFinished::class, new RemoteWipeFinished($dbToken)); |
|
150 | + |
|
151 | + return true; |
|
152 | + } |
|
153 | 153 | } |
@@ -30,23 +30,23 @@ |
||
30 | 30 | * @since 9.0.0 |
31 | 31 | */ |
32 | 32 | interface IApp { |
33 | - /** |
|
34 | - * @param INotification $notification |
|
35 | - * @throws \InvalidArgumentException When the notification is not valid |
|
36 | - * @since 9.0.0 |
|
37 | - */ |
|
38 | - public function notify(INotification $notification): void; |
|
33 | + /** |
|
34 | + * @param INotification $notification |
|
35 | + * @throws \InvalidArgumentException When the notification is not valid |
|
36 | + * @since 9.0.0 |
|
37 | + */ |
|
38 | + public function notify(INotification $notification): void; |
|
39 | 39 | |
40 | - /** |
|
41 | - * @param INotification $notification |
|
42 | - * @since 9.0.0 |
|
43 | - */ |
|
44 | - public function markProcessed(INotification $notification): void; |
|
40 | + /** |
|
41 | + * @param INotification $notification |
|
42 | + * @since 9.0.0 |
|
43 | + */ |
|
44 | + public function markProcessed(INotification $notification): void; |
|
45 | 45 | |
46 | - /** |
|
47 | - * @param INotification $notification |
|
48 | - * @return int |
|
49 | - * @since 9.0.0 |
|
50 | - */ |
|
51 | - public function getCount(INotification $notification): int; |
|
46 | + /** |
|
47 | + * @param INotification $notification |
|
48 | + * @return int |
|
49 | + * @since 9.0.0 |
|
50 | + */ |
|
51 | + public function getCount(INotification $notification): int; |
|
52 | 52 | } |
@@ -34,51 +34,51 @@ |
||
34 | 34 | * @package OCA\LookupServerConnector |
35 | 35 | */ |
36 | 36 | class UpdateLookupServer { |
37 | - /** @var IConfig */ |
|
38 | - private $config; |
|
39 | - /** @var IJobList */ |
|
40 | - private $jobList; |
|
37 | + /** @var IConfig */ |
|
38 | + private $config; |
|
39 | + /** @var IJobList */ |
|
40 | + private $jobList; |
|
41 | 41 | |
42 | - /** |
|
43 | - * @param IJobList $jobList |
|
44 | - * @param IConfig $config |
|
45 | - */ |
|
46 | - public function __construct(IJobList $jobList, |
|
47 | - IConfig $config) { |
|
48 | - $this->config = $config; |
|
49 | - $this->jobList = $jobList; |
|
50 | - } |
|
42 | + /** |
|
43 | + * @param IJobList $jobList |
|
44 | + * @param IConfig $config |
|
45 | + */ |
|
46 | + public function __construct(IJobList $jobList, |
|
47 | + IConfig $config) { |
|
48 | + $this->config = $config; |
|
49 | + $this->jobList = $jobList; |
|
50 | + } |
|
51 | 51 | |
52 | - /** |
|
53 | - * @param IUser $user |
|
54 | - */ |
|
55 | - public function userUpdated(IUser $user): void { |
|
56 | - if (!$this->shouldUpdateLookupServer()) { |
|
57 | - return; |
|
58 | - } |
|
52 | + /** |
|
53 | + * @param IUser $user |
|
54 | + */ |
|
55 | + public function userUpdated(IUser $user): void { |
|
56 | + if (!$this->shouldUpdateLookupServer()) { |
|
57 | + return; |
|
58 | + } |
|
59 | 59 | |
60 | - // Reset retry counter |
|
61 | - $this->config->deleteUserValue( |
|
62 | - $user->getUID(), |
|
63 | - 'lookup_server_connector', |
|
64 | - 'update_retries' |
|
65 | - ); |
|
66 | - $this->jobList->add(RetryJob::class, ['userId' => $user->getUID()]); |
|
67 | - } |
|
60 | + // Reset retry counter |
|
61 | + $this->config->deleteUserValue( |
|
62 | + $user->getUID(), |
|
63 | + 'lookup_server_connector', |
|
64 | + 'update_retries' |
|
65 | + ); |
|
66 | + $this->jobList->add(RetryJob::class, ['userId' => $user->getUID()]); |
|
67 | + } |
|
68 | 68 | |
69 | - /** |
|
70 | - * check if we should update the lookup server, we only do it if |
|
71 | - * |
|
72 | - * + we have an internet connection |
|
73 | - * + the lookup server update was not disabled by the admin |
|
74 | - * + we have a valid lookup server URL |
|
75 | - * |
|
76 | - * @return bool |
|
77 | - */ |
|
78 | - private function shouldUpdateLookupServer(): bool { |
|
79 | - return $this->config->getSystemValueBool('has_internet_connection', true) === true && |
|
80 | - $this->config->getAppValue('files_sharing', 'lookupServerUploadEnabled', 'yes') === 'yes' && |
|
81 | - $this->config->getSystemValueString('lookup_server', 'https://lookup.nextcloud.com') !== ''; |
|
82 | - } |
|
69 | + /** |
|
70 | + * check if we should update the lookup server, we only do it if |
|
71 | + * |
|
72 | + * + we have an internet connection |
|
73 | + * + the lookup server update was not disabled by the admin |
|
74 | + * + we have a valid lookup server URL |
|
75 | + * |
|
76 | + * @return bool |
|
77 | + */ |
|
78 | + private function shouldUpdateLookupServer(): bool { |
|
79 | + return $this->config->getSystemValueBool('has_internet_connection', true) === true && |
|
80 | + $this->config->getAppValue('files_sharing', 'lookupServerUploadEnabled', 'yes') === 'yes' && |
|
81 | + $this->config->getSystemValueString('lookup_server', 'https://lookup.nextcloud.com') !== ''; |
|
82 | + } |
|
83 | 83 | |
84 | 84 | } |
@@ -32,10 +32,10 @@ |
||
32 | 32 | */ |
33 | 33 | class UnsupportedLimitOnInitialSyncException extends InsufficientStorage { |
34 | 34 | |
35 | - /** |
|
36 | - * @inheritDoc |
|
37 | - */ |
|
38 | - public function serialize(Server $server, \DOMElement $errorNode) { |
|
39 | - $errorNode->appendChild($errorNode->ownerDocument->createElementNS('DAV:', 'd:number-of-matches-within-limits')); |
|
40 | - } |
|
35 | + /** |
|
36 | + * @inheritDoc |
|
37 | + */ |
|
38 | + public function serialize(Server $server, \DOMElement $errorNode) { |
|
39 | + $errorNode->appendChild($errorNode->ownerDocument->createElementNS('DAV:', 'd:number-of-matches-within-limits')); |
|
40 | + } |
|
41 | 41 | } |
@@ -42,45 +42,45 @@ |
||
42 | 42 | * @deprecated 17.0.0 |
43 | 43 | */ |
44 | 44 | class StrictContentSecurityPolicy extends EmptyContentSecurityPolicy { |
45 | - /** @var bool Whether inline JS snippets are allowed */ |
|
46 | - protected $inlineScriptAllowed = false; |
|
47 | - /** @var bool Whether eval in JS scripts is allowed */ |
|
48 | - protected $evalScriptAllowed = false; |
|
49 | - /** @var array Domains from which scripts can get loaded */ |
|
50 | - protected $allowedScriptDomains = [ |
|
51 | - '\'self\'', |
|
52 | - ]; |
|
53 | - /** @var bool Whether inline CSS is allowed */ |
|
54 | - protected $inlineStyleAllowed = false; |
|
55 | - /** @var array Domains from which CSS can get loaded */ |
|
56 | - protected $allowedStyleDomains = [ |
|
57 | - '\'self\'', |
|
58 | - ]; |
|
59 | - /** @var array Domains from which images can get loaded */ |
|
60 | - protected $allowedImageDomains = [ |
|
61 | - '\'self\'', |
|
62 | - 'data:', |
|
63 | - 'blob:', |
|
64 | - ]; |
|
65 | - /** @var array Domains to which connections can be done */ |
|
66 | - protected $allowedConnectDomains = [ |
|
67 | - '\'self\'', |
|
68 | - ]; |
|
69 | - /** @var array Domains from which media elements can be loaded */ |
|
70 | - protected $allowedMediaDomains = [ |
|
71 | - '\'self\'', |
|
72 | - ]; |
|
73 | - /** @var array Domains from which object elements can be loaded */ |
|
74 | - protected $allowedObjectDomains = []; |
|
75 | - /** @var array Domains from which iframes can be loaded */ |
|
76 | - protected $allowedFrameDomains = []; |
|
77 | - /** @var array Domains from which fonts can be loaded */ |
|
78 | - protected $allowedFontDomains = [ |
|
79 | - '\'self\'', |
|
80 | - ]; |
|
81 | - /** @var array Domains from which web-workers and nested browsing content can load elements */ |
|
82 | - protected $allowedChildSrcDomains = []; |
|
45 | + /** @var bool Whether inline JS snippets are allowed */ |
|
46 | + protected $inlineScriptAllowed = false; |
|
47 | + /** @var bool Whether eval in JS scripts is allowed */ |
|
48 | + protected $evalScriptAllowed = false; |
|
49 | + /** @var array Domains from which scripts can get loaded */ |
|
50 | + protected $allowedScriptDomains = [ |
|
51 | + '\'self\'', |
|
52 | + ]; |
|
53 | + /** @var bool Whether inline CSS is allowed */ |
|
54 | + protected $inlineStyleAllowed = false; |
|
55 | + /** @var array Domains from which CSS can get loaded */ |
|
56 | + protected $allowedStyleDomains = [ |
|
57 | + '\'self\'', |
|
58 | + ]; |
|
59 | + /** @var array Domains from which images can get loaded */ |
|
60 | + protected $allowedImageDomains = [ |
|
61 | + '\'self\'', |
|
62 | + 'data:', |
|
63 | + 'blob:', |
|
64 | + ]; |
|
65 | + /** @var array Domains to which connections can be done */ |
|
66 | + protected $allowedConnectDomains = [ |
|
67 | + '\'self\'', |
|
68 | + ]; |
|
69 | + /** @var array Domains from which media elements can be loaded */ |
|
70 | + protected $allowedMediaDomains = [ |
|
71 | + '\'self\'', |
|
72 | + ]; |
|
73 | + /** @var array Domains from which object elements can be loaded */ |
|
74 | + protected $allowedObjectDomains = []; |
|
75 | + /** @var array Domains from which iframes can be loaded */ |
|
76 | + protected $allowedFrameDomains = []; |
|
77 | + /** @var array Domains from which fonts can be loaded */ |
|
78 | + protected $allowedFontDomains = [ |
|
79 | + '\'self\'', |
|
80 | + ]; |
|
81 | + /** @var array Domains from which web-workers and nested browsing content can load elements */ |
|
82 | + protected $allowedChildSrcDomains = []; |
|
83 | 83 | |
84 | - /** @var array Domains which can embed this Nextcloud instance */ |
|
85 | - protected $allowedFrameAncestors = []; |
|
84 | + /** @var array Domains which can embed this Nextcloud instance */ |
|
85 | + protected $allowedFrameAncestors = []; |
|
86 | 86 | } |
@@ -61,5 +61,5 @@ |
||
61 | 61 | * @return string|null - The value stored for the key, null if no value stored |
62 | 62 | * @since 17.0.0 |
63 | 63 | */ |
64 | - public function getMetadataForKey(string $key):?string; |
|
64 | + public function getMetadataForKey(string $key): ?string; |
|
65 | 65 | } |
@@ -30,33 +30,33 @@ |
||
30 | 30 | * @since 17.0.0 |
31 | 31 | */ |
32 | 32 | interface IMetadataProvider { |
33 | - /** |
|
34 | - * Get a list of all metadata keys available for this room |
|
35 | - * |
|
36 | - * Room backends are allowed to return custom keys, beyond the ones |
|
37 | - * defined in this class. If they do, they should make sure to use their |
|
38 | - * own namespace. |
|
39 | - * |
|
40 | - * @return String[] - A list of available keys |
|
41 | - * @since 17.0.0 |
|
42 | - */ |
|
43 | - public function getAllAvailableMetadataKeys():array; |
|
33 | + /** |
|
34 | + * Get a list of all metadata keys available for this room |
|
35 | + * |
|
36 | + * Room backends are allowed to return custom keys, beyond the ones |
|
37 | + * defined in this class. If they do, they should make sure to use their |
|
38 | + * own namespace. |
|
39 | + * |
|
40 | + * @return String[] - A list of available keys |
|
41 | + * @since 17.0.0 |
|
42 | + */ |
|
43 | + public function getAllAvailableMetadataKeys():array; |
|
44 | 44 | |
45 | - /** |
|
46 | - * Get whether or not a metadata key is set for this room |
|
47 | - * |
|
48 | - * @param string $key - The key to check for |
|
49 | - * @return bool - Whether or not key is available |
|
50 | - * @since 17.0.0 |
|
51 | - */ |
|
52 | - public function hasMetadataForKey(string $key):bool; |
|
45 | + /** |
|
46 | + * Get whether or not a metadata key is set for this room |
|
47 | + * |
|
48 | + * @param string $key - The key to check for |
|
49 | + * @return bool - Whether or not key is available |
|
50 | + * @since 17.0.0 |
|
51 | + */ |
|
52 | + public function hasMetadataForKey(string $key):bool; |
|
53 | 53 | |
54 | - /** |
|
55 | - * Get the value for a metadata key |
|
56 | - * |
|
57 | - * @param string $key - The key to check for |
|
58 | - * @return string|null - The value stored for the key, null if no value stored |
|
59 | - * @since 17.0.0 |
|
60 | - */ |
|
61 | - public function getMetadataForKey(string $key):?string; |
|
54 | + /** |
|
55 | + * Get the value for a metadata key |
|
56 | + * |
|
57 | + * @param string $key - The key to check for |
|
58 | + * @return string|null - The value stored for the key, null if no value stored |
|
59 | + * @since 17.0.0 |
|
60 | + */ |
|
61 | + public function getMetadataForKey(string $key):?string; |
|
62 | 62 | } |
@@ -60,10 +60,10 @@ |
||
60 | 60 | */ |
61 | 61 | public function mergePolicies(FeaturePolicy $defaultPolicy, |
62 | 62 | EmptyFeaturePolicy $originalPolicy): FeaturePolicy { |
63 | - foreach ((object)(array)$originalPolicy as $name => $value) { |
|
64 | - $setter = 'set' . ucfirst($name); |
|
63 | + foreach ((object) (array) $originalPolicy as $name => $value) { |
|
64 | + $setter = 'set'.ucfirst($name); |
|
65 | 65 | if (\is_array($value)) { |
66 | - $getter = 'get' . ucfirst($name); |
|
66 | + $getter = 'get'.ucfirst($name); |
|
67 | 67 | $currentValues = \is_array($defaultPolicy->$getter()) ? $defaultPolicy->$getter() : []; |
68 | 68 | $defaultPolicy->$setter(\array_values(\array_unique(\array_merge($currentValues, $value)))); |
69 | 69 | } elseif (\is_bool($value)) { |
@@ -31,48 +31,48 @@ |
||
31 | 31 | use OCP\Security\FeaturePolicy\AddFeaturePolicyEvent; |
32 | 32 | |
33 | 33 | class FeaturePolicyManager { |
34 | - /** @var EmptyFeaturePolicy[] */ |
|
35 | - private $policies = []; |
|
34 | + /** @var EmptyFeaturePolicy[] */ |
|
35 | + private $policies = []; |
|
36 | 36 | |
37 | - /** @var IEventDispatcher */ |
|
38 | - private $dispatcher; |
|
37 | + /** @var IEventDispatcher */ |
|
38 | + private $dispatcher; |
|
39 | 39 | |
40 | - public function __construct(IEventDispatcher $dispatcher) { |
|
41 | - $this->dispatcher = $dispatcher; |
|
42 | - } |
|
40 | + public function __construct(IEventDispatcher $dispatcher) { |
|
41 | + $this->dispatcher = $dispatcher; |
|
42 | + } |
|
43 | 43 | |
44 | - public function addDefaultPolicy(EmptyFeaturePolicy $policy): void { |
|
45 | - $this->policies[] = $policy; |
|
46 | - } |
|
44 | + public function addDefaultPolicy(EmptyFeaturePolicy $policy): void { |
|
45 | + $this->policies[] = $policy; |
|
46 | + } |
|
47 | 47 | |
48 | - public function getDefaultPolicy(): FeaturePolicy { |
|
49 | - $event = new AddFeaturePolicyEvent($this); |
|
50 | - $this->dispatcher->dispatchTyped($event); |
|
48 | + public function getDefaultPolicy(): FeaturePolicy { |
|
49 | + $event = new AddFeaturePolicyEvent($this); |
|
50 | + $this->dispatcher->dispatchTyped($event); |
|
51 | 51 | |
52 | - $defaultPolicy = new FeaturePolicy(); |
|
53 | - foreach ($this->policies as $policy) { |
|
54 | - $defaultPolicy = $this->mergePolicies($defaultPolicy, $policy); |
|
55 | - } |
|
56 | - return $defaultPolicy; |
|
57 | - } |
|
52 | + $defaultPolicy = new FeaturePolicy(); |
|
53 | + foreach ($this->policies as $policy) { |
|
54 | + $defaultPolicy = $this->mergePolicies($defaultPolicy, $policy); |
|
55 | + } |
|
56 | + return $defaultPolicy; |
|
57 | + } |
|
58 | 58 | |
59 | - /** |
|
60 | - * Merges the first given policy with the second one |
|
61 | - * |
|
62 | - */ |
|
63 | - public function mergePolicies(FeaturePolicy $defaultPolicy, |
|
64 | - EmptyFeaturePolicy $originalPolicy): FeaturePolicy { |
|
65 | - foreach ((object)(array)$originalPolicy as $name => $value) { |
|
66 | - $setter = 'set' . ucfirst($name); |
|
67 | - if (\is_array($value)) { |
|
68 | - $getter = 'get' . ucfirst($name); |
|
69 | - $currentValues = \is_array($defaultPolicy->$getter()) ? $defaultPolicy->$getter() : []; |
|
70 | - $defaultPolicy->$setter(\array_values(\array_unique(\array_merge($currentValues, $value)))); |
|
71 | - } elseif (\is_bool($value)) { |
|
72 | - $defaultPolicy->$setter($value); |
|
73 | - } |
|
74 | - } |
|
59 | + /** |
|
60 | + * Merges the first given policy with the second one |
|
61 | + * |
|
62 | + */ |
|
63 | + public function mergePolicies(FeaturePolicy $defaultPolicy, |
|
64 | + EmptyFeaturePolicy $originalPolicy): FeaturePolicy { |
|
65 | + foreach ((object)(array)$originalPolicy as $name => $value) { |
|
66 | + $setter = 'set' . ucfirst($name); |
|
67 | + if (\is_array($value)) { |
|
68 | + $getter = 'get' . ucfirst($name); |
|
69 | + $currentValues = \is_array($defaultPolicy->$getter()) ? $defaultPolicy->$getter() : []; |
|
70 | + $defaultPolicy->$setter(\array_values(\array_unique(\array_merge($currentValues, $value)))); |
|
71 | + } elseif (\is_bool($value)) { |
|
72 | + $defaultPolicy->$setter($value); |
|
73 | + } |
|
74 | + } |
|
75 | 75 | |
76 | - return $defaultPolicy; |
|
77 | - } |
|
76 | + return $defaultPolicy; |
|
77 | + } |
|
78 | 78 | } |
@@ -139,42 +139,42 @@ |
||
139 | 139 | if (empty($this->autoplayDomains)) { |
140 | 140 | $policy .= "autoplay 'none';"; |
141 | 141 | } else { |
142 | - $policy .= 'autoplay ' . implode(' ', $this->autoplayDomains); |
|
142 | + $policy .= 'autoplay '.implode(' ', $this->autoplayDomains); |
|
143 | 143 | $policy .= ';'; |
144 | 144 | } |
145 | 145 | |
146 | 146 | if (empty($this->cameraDomains)) { |
147 | 147 | $policy .= "camera 'none';"; |
148 | 148 | } else { |
149 | - $policy .= 'camera ' . implode(' ', $this->cameraDomains); |
|
149 | + $policy .= 'camera '.implode(' ', $this->cameraDomains); |
|
150 | 150 | $policy .= ';'; |
151 | 151 | } |
152 | 152 | |
153 | 153 | if (empty($this->fullscreenDomains)) { |
154 | 154 | $policy .= "fullscreen 'none';"; |
155 | 155 | } else { |
156 | - $policy .= 'fullscreen ' . implode(' ', $this->fullscreenDomains); |
|
156 | + $policy .= 'fullscreen '.implode(' ', $this->fullscreenDomains); |
|
157 | 157 | $policy .= ';'; |
158 | 158 | } |
159 | 159 | |
160 | 160 | if (empty($this->geolocationDomains)) { |
161 | 161 | $policy .= "geolocation 'none';"; |
162 | 162 | } else { |
163 | - $policy .= 'geolocation ' . implode(' ', $this->geolocationDomains); |
|
163 | + $policy .= 'geolocation '.implode(' ', $this->geolocationDomains); |
|
164 | 164 | $policy .= ';'; |
165 | 165 | } |
166 | 166 | |
167 | 167 | if (empty($this->microphoneDomains)) { |
168 | 168 | $policy .= "microphone 'none';"; |
169 | 169 | } else { |
170 | - $policy .= 'microphone ' . implode(' ', $this->microphoneDomains); |
|
170 | + $policy .= 'microphone '.implode(' ', $this->microphoneDomains); |
|
171 | 171 | $policy .= ';'; |
172 | 172 | } |
173 | 173 | |
174 | 174 | if (empty($this->paymentDomains)) { |
175 | 175 | $policy .= "payment 'none';"; |
176 | 176 | } else { |
177 | - $policy .= 'payment ' . implode(' ', $this->paymentDomains); |
|
177 | + $policy .= 'payment '.implode(' ', $this->paymentDomains); |
|
178 | 178 | $policy .= ';'; |
179 | 179 | } |
180 | 180 |
@@ -36,147 +36,147 @@ |
||
36 | 36 | * @since 17.0.0 |
37 | 37 | */ |
38 | 38 | class EmptyFeaturePolicy { |
39 | - /** @var string[] of allowed domains to autoplay media */ |
|
40 | - protected $autoplayDomains = null; |
|
41 | - |
|
42 | - /** @var string[] of allowed domains that can access the camera */ |
|
43 | - protected $cameraDomains = null; |
|
44 | - |
|
45 | - /** @var string[] of allowed domains that can use fullscreen */ |
|
46 | - protected $fullscreenDomains = null; |
|
47 | - |
|
48 | - /** @var string[] of allowed domains that can use the geolocation of the device */ |
|
49 | - protected $geolocationDomains = null; |
|
50 | - |
|
51 | - /** @var string[] of allowed domains that can use the microphone */ |
|
52 | - protected $microphoneDomains = null; |
|
53 | - |
|
54 | - /** @var string[] of allowed domains that can use the payment API */ |
|
55 | - protected $paymentDomains = null; |
|
56 | - |
|
57 | - /** |
|
58 | - * Allows to use autoplay from a specific domain. Use * to allow from all domains. |
|
59 | - * |
|
60 | - * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized. |
|
61 | - * @return $this |
|
62 | - * @since 17.0.0 |
|
63 | - */ |
|
64 | - public function addAllowedAutoplayDomain(string $domain): self { |
|
65 | - $this->autoplayDomains[] = $domain; |
|
66 | - return $this; |
|
67 | - } |
|
68 | - |
|
69 | - /** |
|
70 | - * Allows to use the camera on a specific domain. Use * to allow from all domains |
|
71 | - * |
|
72 | - * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized. |
|
73 | - * @return $this |
|
74 | - * @since 17.0.0 |
|
75 | - */ |
|
76 | - public function addAllowedCameraDomain(string $domain): self { |
|
77 | - $this->cameraDomains[] = $domain; |
|
78 | - return $this; |
|
79 | - } |
|
80 | - |
|
81 | - /** |
|
82 | - * Allows the full screen functionality to be used on a specific domain. Use * to allow from all domains |
|
83 | - * |
|
84 | - * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized. |
|
85 | - * @return $this |
|
86 | - * @since 17.0.0 |
|
87 | - */ |
|
88 | - public function addAllowedFullScreenDomain(string $domain): self { |
|
89 | - $this->fullscreenDomains[] = $domain; |
|
90 | - return $this; |
|
91 | - } |
|
92 | - |
|
93 | - /** |
|
94 | - * Allows to use the geolocation on a specific domain. Use * to allow from all domains |
|
95 | - * |
|
96 | - * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized. |
|
97 | - * @return $this |
|
98 | - * @since 17.0.0 |
|
99 | - */ |
|
100 | - public function addAllowedGeoLocationDomain(string $domain): self { |
|
101 | - $this->geolocationDomains[] = $domain; |
|
102 | - return $this; |
|
103 | - } |
|
104 | - |
|
105 | - /** |
|
106 | - * Allows to use the microphone on a specific domain. Use * to allow from all domains |
|
107 | - * |
|
108 | - * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized. |
|
109 | - * @return $this |
|
110 | - * @since 17.0.0 |
|
111 | - */ |
|
112 | - public function addAllowedMicrophoneDomain(string $domain): self { |
|
113 | - $this->microphoneDomains[] = $domain; |
|
114 | - return $this; |
|
115 | - } |
|
116 | - |
|
117 | - /** |
|
118 | - * Allows to use the payment API on a specific domain. Use * to allow from all domains |
|
119 | - * |
|
120 | - * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized. |
|
121 | - * @return $this |
|
122 | - * @since 17.0.0 |
|
123 | - */ |
|
124 | - public function addAllowedPaymentDomain(string $domain): self { |
|
125 | - $this->paymentDomains[] = $domain; |
|
126 | - return $this; |
|
127 | - } |
|
128 | - |
|
129 | - /** |
|
130 | - * Get the generated Feature-Policy as a string |
|
131 | - * |
|
132 | - * @return string |
|
133 | - * @since 17.0.0 |
|
134 | - */ |
|
135 | - public function buildPolicy(): string { |
|
136 | - $policy = ''; |
|
137 | - |
|
138 | - if (empty($this->autoplayDomains)) { |
|
139 | - $policy .= "autoplay 'none';"; |
|
140 | - } else { |
|
141 | - $policy .= 'autoplay ' . implode(' ', $this->autoplayDomains); |
|
142 | - $policy .= ';'; |
|
143 | - } |
|
144 | - |
|
145 | - if (empty($this->cameraDomains)) { |
|
146 | - $policy .= "camera 'none';"; |
|
147 | - } else { |
|
148 | - $policy .= 'camera ' . implode(' ', $this->cameraDomains); |
|
149 | - $policy .= ';'; |
|
150 | - } |
|
151 | - |
|
152 | - if (empty($this->fullscreenDomains)) { |
|
153 | - $policy .= "fullscreen 'none';"; |
|
154 | - } else { |
|
155 | - $policy .= 'fullscreen ' . implode(' ', $this->fullscreenDomains); |
|
156 | - $policy .= ';'; |
|
157 | - } |
|
158 | - |
|
159 | - if (empty($this->geolocationDomains)) { |
|
160 | - $policy .= "geolocation 'none';"; |
|
161 | - } else { |
|
162 | - $policy .= 'geolocation ' . implode(' ', $this->geolocationDomains); |
|
163 | - $policy .= ';'; |
|
164 | - } |
|
165 | - |
|
166 | - if (empty($this->microphoneDomains)) { |
|
167 | - $policy .= "microphone 'none';"; |
|
168 | - } else { |
|
169 | - $policy .= 'microphone ' . implode(' ', $this->microphoneDomains); |
|
170 | - $policy .= ';'; |
|
171 | - } |
|
172 | - |
|
173 | - if (empty($this->paymentDomains)) { |
|
174 | - $policy .= "payment 'none';"; |
|
175 | - } else { |
|
176 | - $policy .= 'payment ' . implode(' ', $this->paymentDomains); |
|
177 | - $policy .= ';'; |
|
178 | - } |
|
179 | - |
|
180 | - return rtrim($policy, ';'); |
|
181 | - } |
|
39 | + /** @var string[] of allowed domains to autoplay media */ |
|
40 | + protected $autoplayDomains = null; |
|
41 | + |
|
42 | + /** @var string[] of allowed domains that can access the camera */ |
|
43 | + protected $cameraDomains = null; |
|
44 | + |
|
45 | + /** @var string[] of allowed domains that can use fullscreen */ |
|
46 | + protected $fullscreenDomains = null; |
|
47 | + |
|
48 | + /** @var string[] of allowed domains that can use the geolocation of the device */ |
|
49 | + protected $geolocationDomains = null; |
|
50 | + |
|
51 | + /** @var string[] of allowed domains that can use the microphone */ |
|
52 | + protected $microphoneDomains = null; |
|
53 | + |
|
54 | + /** @var string[] of allowed domains that can use the payment API */ |
|
55 | + protected $paymentDomains = null; |
|
56 | + |
|
57 | + /** |
|
58 | + * Allows to use autoplay from a specific domain. Use * to allow from all domains. |
|
59 | + * |
|
60 | + * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized. |
|
61 | + * @return $this |
|
62 | + * @since 17.0.0 |
|
63 | + */ |
|
64 | + public function addAllowedAutoplayDomain(string $domain): self { |
|
65 | + $this->autoplayDomains[] = $domain; |
|
66 | + return $this; |
|
67 | + } |
|
68 | + |
|
69 | + /** |
|
70 | + * Allows to use the camera on a specific domain. Use * to allow from all domains |
|
71 | + * |
|
72 | + * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized. |
|
73 | + * @return $this |
|
74 | + * @since 17.0.0 |
|
75 | + */ |
|
76 | + public function addAllowedCameraDomain(string $domain): self { |
|
77 | + $this->cameraDomains[] = $domain; |
|
78 | + return $this; |
|
79 | + } |
|
80 | + |
|
81 | + /** |
|
82 | + * Allows the full screen functionality to be used on a specific domain. Use * to allow from all domains |
|
83 | + * |
|
84 | + * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized. |
|
85 | + * @return $this |
|
86 | + * @since 17.0.0 |
|
87 | + */ |
|
88 | + public function addAllowedFullScreenDomain(string $domain): self { |
|
89 | + $this->fullscreenDomains[] = $domain; |
|
90 | + return $this; |
|
91 | + } |
|
92 | + |
|
93 | + /** |
|
94 | + * Allows to use the geolocation on a specific domain. Use * to allow from all domains |
|
95 | + * |
|
96 | + * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized. |
|
97 | + * @return $this |
|
98 | + * @since 17.0.0 |
|
99 | + */ |
|
100 | + public function addAllowedGeoLocationDomain(string $domain): self { |
|
101 | + $this->geolocationDomains[] = $domain; |
|
102 | + return $this; |
|
103 | + } |
|
104 | + |
|
105 | + /** |
|
106 | + * Allows to use the microphone on a specific domain. Use * to allow from all domains |
|
107 | + * |
|
108 | + * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized. |
|
109 | + * @return $this |
|
110 | + * @since 17.0.0 |
|
111 | + */ |
|
112 | + public function addAllowedMicrophoneDomain(string $domain): self { |
|
113 | + $this->microphoneDomains[] = $domain; |
|
114 | + return $this; |
|
115 | + } |
|
116 | + |
|
117 | + /** |
|
118 | + * Allows to use the payment API on a specific domain. Use * to allow from all domains |
|
119 | + * |
|
120 | + * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized. |
|
121 | + * @return $this |
|
122 | + * @since 17.0.0 |
|
123 | + */ |
|
124 | + public function addAllowedPaymentDomain(string $domain): self { |
|
125 | + $this->paymentDomains[] = $domain; |
|
126 | + return $this; |
|
127 | + } |
|
128 | + |
|
129 | + /** |
|
130 | + * Get the generated Feature-Policy as a string |
|
131 | + * |
|
132 | + * @return string |
|
133 | + * @since 17.0.0 |
|
134 | + */ |
|
135 | + public function buildPolicy(): string { |
|
136 | + $policy = ''; |
|
137 | + |
|
138 | + if (empty($this->autoplayDomains)) { |
|
139 | + $policy .= "autoplay 'none';"; |
|
140 | + } else { |
|
141 | + $policy .= 'autoplay ' . implode(' ', $this->autoplayDomains); |
|
142 | + $policy .= ';'; |
|
143 | + } |
|
144 | + |
|
145 | + if (empty($this->cameraDomains)) { |
|
146 | + $policy .= "camera 'none';"; |
|
147 | + } else { |
|
148 | + $policy .= 'camera ' . implode(' ', $this->cameraDomains); |
|
149 | + $policy .= ';'; |
|
150 | + } |
|
151 | + |
|
152 | + if (empty($this->fullscreenDomains)) { |
|
153 | + $policy .= "fullscreen 'none';"; |
|
154 | + } else { |
|
155 | + $policy .= 'fullscreen ' . implode(' ', $this->fullscreenDomains); |
|
156 | + $policy .= ';'; |
|
157 | + } |
|
158 | + |
|
159 | + if (empty($this->geolocationDomains)) { |
|
160 | + $policy .= "geolocation 'none';"; |
|
161 | + } else { |
|
162 | + $policy .= 'geolocation ' . implode(' ', $this->geolocationDomains); |
|
163 | + $policy .= ';'; |
|
164 | + } |
|
165 | + |
|
166 | + if (empty($this->microphoneDomains)) { |
|
167 | + $policy .= "microphone 'none';"; |
|
168 | + } else { |
|
169 | + $policy .= 'microphone ' . implode(' ', $this->microphoneDomains); |
|
170 | + $policy .= ';'; |
|
171 | + } |
|
172 | + |
|
173 | + if (empty($this->paymentDomains)) { |
|
174 | + $policy .= "payment 'none';"; |
|
175 | + } else { |
|
176 | + $policy .= 'payment ' . implode(' ', $this->paymentDomains); |
|
177 | + $policy .= ';'; |
|
178 | + } |
|
179 | + |
|
180 | + return rtrim($policy, ';'); |
|
181 | + } |
|
182 | 182 | } |