@@ -21,62 +21,62 @@ |
||
| 21 | 21 | */ |
| 22 | 22 | |
| 23 | 23 | return [ |
| 24 | - 'routes' => [ |
|
| 25 | - [ |
|
| 26 | - 'name' => 'RateLimitTest#userAndAnonProtected', |
|
| 27 | - 'url' => '/userAndAnonProtected', |
|
| 28 | - 'verb' => 'GET', |
|
| 29 | - ], |
|
| 30 | - [ |
|
| 31 | - 'name' => 'RateLimitTest#onlyAnonProtected', |
|
| 32 | - 'url' => '/anonProtected', |
|
| 33 | - 'verb' => 'GET', |
|
| 34 | - ], |
|
| 35 | - ], |
|
| 24 | + 'routes' => [ |
|
| 25 | + [ |
|
| 26 | + 'name' => 'RateLimitTest#userAndAnonProtected', |
|
| 27 | + 'url' => '/userAndAnonProtected', |
|
| 28 | + 'verb' => 'GET', |
|
| 29 | + ], |
|
| 30 | + [ |
|
| 31 | + 'name' => 'RateLimitTest#onlyAnonProtected', |
|
| 32 | + 'url' => '/anonProtected', |
|
| 33 | + 'verb' => 'GET', |
|
| 34 | + ], |
|
| 35 | + ], |
|
| 36 | 36 | |
| 37 | - 'ocs' => [ |
|
| 38 | - [ |
|
| 39 | - 'name' => 'Config#setAppValue', |
|
| 40 | - 'url' => '/api/v1/app/{appid}/{configkey}', |
|
| 41 | - 'verb' => 'POST', |
|
| 42 | - ], |
|
| 43 | - [ |
|
| 44 | - 'name' => 'Config#deleteAppValue', |
|
| 45 | - 'url' => '/api/v1/app/{appid}/{configkey}', |
|
| 46 | - 'verb' => 'DELETE', |
|
| 47 | - ], |
|
| 48 | - [ |
|
| 49 | - 'name' => 'Locking#isLockingEnabled', |
|
| 50 | - 'url' => '/api/v1/lockprovisioning', |
|
| 51 | - 'verb' => 'GET', |
|
| 52 | - ], |
|
| 53 | - [ |
|
| 54 | - 'name' => 'Locking#isLocked', |
|
| 55 | - 'url' => '/api/v1/lockprovisioning/{type}/{user}', |
|
| 56 | - 'verb' => 'GET', |
|
| 57 | - ], |
|
| 58 | - [ |
|
| 59 | - 'name' => 'Locking#acquireLock', |
|
| 60 | - 'url' => '/api/v1/lockprovisioning/{type}/{user}', |
|
| 61 | - 'verb' => 'POST', |
|
| 62 | - ], |
|
| 63 | - [ |
|
| 64 | - 'name' => 'Locking#changeLock', |
|
| 65 | - 'url' => '/api/v1/lockprovisioning/{type}/{user}', |
|
| 66 | - 'verb' => 'PUT', |
|
| 67 | - ], |
|
| 68 | - [ |
|
| 69 | - 'name' => 'Locking#releaseLock', |
|
| 70 | - 'url' => '/api/v1/lockprovisioning/{type}/{user}', |
|
| 71 | - 'verb' => 'DELETE', |
|
| 72 | - ], |
|
| 73 | - [ |
|
| 74 | - 'name' => 'Locking#releaseAll', |
|
| 75 | - 'url' => '/api/v1/lockprovisioning/{type}', |
|
| 76 | - 'verb' => 'DELETE', |
|
| 77 | - 'defaults' => [ |
|
| 78 | - 'type' => null |
|
| 79 | - ] |
|
| 80 | - ], |
|
| 81 | - ], |
|
| 37 | + 'ocs' => [ |
|
| 38 | + [ |
|
| 39 | + 'name' => 'Config#setAppValue', |
|
| 40 | + 'url' => '/api/v1/app/{appid}/{configkey}', |
|
| 41 | + 'verb' => 'POST', |
|
| 42 | + ], |
|
| 43 | + [ |
|
| 44 | + 'name' => 'Config#deleteAppValue', |
|
| 45 | + 'url' => '/api/v1/app/{appid}/{configkey}', |
|
| 46 | + 'verb' => 'DELETE', |
|
| 47 | + ], |
|
| 48 | + [ |
|
| 49 | + 'name' => 'Locking#isLockingEnabled', |
|
| 50 | + 'url' => '/api/v1/lockprovisioning', |
|
| 51 | + 'verb' => 'GET', |
|
| 52 | + ], |
|
| 53 | + [ |
|
| 54 | + 'name' => 'Locking#isLocked', |
|
| 55 | + 'url' => '/api/v1/lockprovisioning/{type}/{user}', |
|
| 56 | + 'verb' => 'GET', |
|
| 57 | + ], |
|
| 58 | + [ |
|
| 59 | + 'name' => 'Locking#acquireLock', |
|
| 60 | + 'url' => '/api/v1/lockprovisioning/{type}/{user}', |
|
| 61 | + 'verb' => 'POST', |
|
| 62 | + ], |
|
| 63 | + [ |
|
| 64 | + 'name' => 'Locking#changeLock', |
|
| 65 | + 'url' => '/api/v1/lockprovisioning/{type}/{user}', |
|
| 66 | + 'verb' => 'PUT', |
|
| 67 | + ], |
|
| 68 | + [ |
|
| 69 | + 'name' => 'Locking#releaseLock', |
|
| 70 | + 'url' => '/api/v1/lockprovisioning/{type}/{user}', |
|
| 71 | + 'verb' => 'DELETE', |
|
| 72 | + ], |
|
| 73 | + [ |
|
| 74 | + 'name' => 'Locking#releaseAll', |
|
| 75 | + 'url' => '/api/v1/lockprovisioning/{type}', |
|
| 76 | + 'verb' => 'DELETE', |
|
| 77 | + 'defaults' => [ |
|
| 78 | + 'type' => null |
|
| 79 | + ] |
|
| 80 | + ], |
|
| 81 | + ], |
|
| 82 | 82 | ]; |
@@ -29,31 +29,31 @@ |
||
| 29 | 29 | */ |
| 30 | 30 | trait PriorityTrait { |
| 31 | 31 | |
| 32 | - /** @var int initial priority */ |
|
| 33 | - protected $priority = BackendService::PRIORITY_DEFAULT; |
|
| 32 | + /** @var int initial priority */ |
|
| 33 | + protected $priority = BackendService::PRIORITY_DEFAULT; |
|
| 34 | 34 | |
| 35 | - /** |
|
| 36 | - * @return int |
|
| 37 | - */ |
|
| 38 | - public function getPriority() { |
|
| 39 | - return $this->priority; |
|
| 40 | - } |
|
| 35 | + /** |
|
| 36 | + * @return int |
|
| 37 | + */ |
|
| 38 | + public function getPriority() { |
|
| 39 | + return $this->priority; |
|
| 40 | + } |
|
| 41 | 41 | |
| 42 | - /** |
|
| 43 | - * @param int $priority |
|
| 44 | - * @return self |
|
| 45 | - */ |
|
| 46 | - public function setPriority($priority) { |
|
| 47 | - $this->priority = $priority; |
|
| 48 | - return $this; |
|
| 49 | - } |
|
| 42 | + /** |
|
| 43 | + * @param int $priority |
|
| 44 | + * @return self |
|
| 45 | + */ |
|
| 46 | + public function setPriority($priority) { |
|
| 47 | + $this->priority = $priority; |
|
| 48 | + return $this; |
|
| 49 | + } |
|
| 50 | 50 | |
| 51 | - /** |
|
| 52 | - * @param PriorityTrait $a |
|
| 53 | - * @param PriorityTrait $b |
|
| 54 | - * @return int |
|
| 55 | - */ |
|
| 56 | - public static function priorityCompare(PriorityTrait $a, PriorityTrait $b) { |
|
| 57 | - return ($a->getPriority() - $b->getPriority()); |
|
| 58 | - } |
|
| 51 | + /** |
|
| 52 | + * @param PriorityTrait $a |
|
| 53 | + * @param PriorityTrait $b |
|
| 54 | + * @return int |
|
| 55 | + */ |
|
| 56 | + public static function priorityCompare(PriorityTrait $a, PriorityTrait $b) { |
|
| 57 | + return ($a->getPriority() - $b->getPriority()); |
|
| 58 | + } |
|
| 59 | 59 | } |
@@ -29,122 +29,122 @@ |
||
| 29 | 29 | use OCP\Files\Notify\INotifyHandler; |
| 30 | 30 | |
| 31 | 31 | class SMBNotifyHandler implements INotifyHandler { |
| 32 | - /** |
|
| 33 | - * @var \Icewind\SMB\INotifyHandler |
|
| 34 | - */ |
|
| 35 | - private $shareNotifyHandler; |
|
| 32 | + /** |
|
| 33 | + * @var \Icewind\SMB\INotifyHandler |
|
| 34 | + */ |
|
| 35 | + private $shareNotifyHandler; |
|
| 36 | 36 | |
| 37 | - /** |
|
| 38 | - * @var string |
|
| 39 | - */ |
|
| 40 | - private $root; |
|
| 37 | + /** |
|
| 38 | + * @var string |
|
| 39 | + */ |
|
| 40 | + private $root; |
|
| 41 | 41 | |
| 42 | - private $oldRenamePath = null; |
|
| 42 | + private $oldRenamePath = null; |
|
| 43 | 43 | |
| 44 | - /** |
|
| 45 | - * SMBNotifyHandler constructor. |
|
| 46 | - * |
|
| 47 | - * @param \Icewind\SMB\INotifyHandler $shareNotifyHandler |
|
| 48 | - * @param string $root |
|
| 49 | - */ |
|
| 50 | - public function __construct(\Icewind\SMB\INotifyHandler $shareNotifyHandler, $root) { |
|
| 51 | - $this->shareNotifyHandler = $shareNotifyHandler; |
|
| 52 | - $this->root = $root; |
|
| 53 | - } |
|
| 44 | + /** |
|
| 45 | + * SMBNotifyHandler constructor. |
|
| 46 | + * |
|
| 47 | + * @param \Icewind\SMB\INotifyHandler $shareNotifyHandler |
|
| 48 | + * @param string $root |
|
| 49 | + */ |
|
| 50 | + public function __construct(\Icewind\SMB\INotifyHandler $shareNotifyHandler, $root) { |
|
| 51 | + $this->shareNotifyHandler = $shareNotifyHandler; |
|
| 52 | + $this->root = $root; |
|
| 53 | + } |
|
| 54 | 54 | |
| 55 | - private function relativePath($fullPath) { |
|
| 56 | - if ($fullPath === $this->root) { |
|
| 57 | - return ''; |
|
| 58 | - } elseif (substr($fullPath, 0, strlen($this->root)) === $this->root) { |
|
| 59 | - return substr($fullPath, strlen($this->root)); |
|
| 60 | - } else { |
|
| 61 | - return null; |
|
| 62 | - } |
|
| 63 | - } |
|
| 55 | + private function relativePath($fullPath) { |
|
| 56 | + if ($fullPath === $this->root) { |
|
| 57 | + return ''; |
|
| 58 | + } elseif (substr($fullPath, 0, strlen($this->root)) === $this->root) { |
|
| 59 | + return substr($fullPath, strlen($this->root)); |
|
| 60 | + } else { |
|
| 61 | + return null; |
|
| 62 | + } |
|
| 63 | + } |
|
| 64 | 64 | |
| 65 | - public function listen(callable $callback) { |
|
| 66 | - $oldRenamePath = null; |
|
| 67 | - $this->shareNotifyHandler->listen(function (\Icewind\SMB\Change $shareChange) use ($callback) { |
|
| 68 | - $change = $this->mapChange($shareChange); |
|
| 69 | - if (!is_null($change)) { |
|
| 70 | - return $callback($change); |
|
| 71 | - } else { |
|
| 72 | - return true; |
|
| 73 | - } |
|
| 74 | - }); |
|
| 75 | - } |
|
| 65 | + public function listen(callable $callback) { |
|
| 66 | + $oldRenamePath = null; |
|
| 67 | + $this->shareNotifyHandler->listen(function (\Icewind\SMB\Change $shareChange) use ($callback) { |
|
| 68 | + $change = $this->mapChange($shareChange); |
|
| 69 | + if (!is_null($change)) { |
|
| 70 | + return $callback($change); |
|
| 71 | + } else { |
|
| 72 | + return true; |
|
| 73 | + } |
|
| 74 | + }); |
|
| 75 | + } |
|
| 76 | 76 | |
| 77 | - /** |
|
| 78 | - * Get all changes detected since the start of the notify process or the last call to getChanges |
|
| 79 | - * |
|
| 80 | - * @return IChange[] |
|
| 81 | - */ |
|
| 82 | - public function getChanges() { |
|
| 83 | - $shareChanges = $this->shareNotifyHandler->getChanges(); |
|
| 84 | - $changes = []; |
|
| 85 | - foreach ($shareChanges as $shareChange) { |
|
| 86 | - $change = $this->mapChange($shareChange); |
|
| 87 | - if ($change) { |
|
| 88 | - $changes[] = $change; |
|
| 89 | - } |
|
| 90 | - } |
|
| 91 | - return $changes; |
|
| 92 | - } |
|
| 77 | + /** |
|
| 78 | + * Get all changes detected since the start of the notify process or the last call to getChanges |
|
| 79 | + * |
|
| 80 | + * @return IChange[] |
|
| 81 | + */ |
|
| 82 | + public function getChanges() { |
|
| 83 | + $shareChanges = $this->shareNotifyHandler->getChanges(); |
|
| 84 | + $changes = []; |
|
| 85 | + foreach ($shareChanges as $shareChange) { |
|
| 86 | + $change = $this->mapChange($shareChange); |
|
| 87 | + if ($change) { |
|
| 88 | + $changes[] = $change; |
|
| 89 | + } |
|
| 90 | + } |
|
| 91 | + return $changes; |
|
| 92 | + } |
|
| 93 | 93 | |
| 94 | - /** |
|
| 95 | - * Stop listening for changes |
|
| 96 | - * |
|
| 97 | - * Note that any pending changes will be discarded |
|
| 98 | - */ |
|
| 99 | - public function stop() { |
|
| 100 | - $this->shareNotifyHandler->stop(); |
|
| 101 | - } |
|
| 94 | + /** |
|
| 95 | + * Stop listening for changes |
|
| 96 | + * |
|
| 97 | + * Note that any pending changes will be discarded |
|
| 98 | + */ |
|
| 99 | + public function stop() { |
|
| 100 | + $this->shareNotifyHandler->stop(); |
|
| 101 | + } |
|
| 102 | 102 | |
| 103 | - /** |
|
| 104 | - * @param \Icewind\SMB\Change $change |
|
| 105 | - * @return IChange|null |
|
| 106 | - */ |
|
| 107 | - private function mapChange(\Icewind\SMB\Change $change) { |
|
| 108 | - $path = $this->relativePath($change->getPath()); |
|
| 109 | - if (is_null($path)) { |
|
| 110 | - return null; |
|
| 111 | - } |
|
| 112 | - if ($change->getCode() === \Icewind\SMB\INotifyHandler::NOTIFY_RENAMED_OLD) { |
|
| 113 | - $this->oldRenamePath = $path; |
|
| 114 | - return null; |
|
| 115 | - } |
|
| 116 | - $type = $this->mapNotifyType($change->getCode()); |
|
| 117 | - if (is_null($type)) { |
|
| 118 | - return null; |
|
| 119 | - } |
|
| 120 | - if ($type === IChange::RENAMED) { |
|
| 121 | - if (!is_null($this->oldRenamePath)) { |
|
| 122 | - $result = new RenameChange($type, $this->oldRenamePath, $path); |
|
| 123 | - $this->oldRenamePath = null; |
|
| 124 | - } else { |
|
| 125 | - $result = null; |
|
| 126 | - } |
|
| 127 | - } else { |
|
| 128 | - $result = new Change($type, $path); |
|
| 129 | - } |
|
| 130 | - return $result; |
|
| 131 | - } |
|
| 103 | + /** |
|
| 104 | + * @param \Icewind\SMB\Change $change |
|
| 105 | + * @return IChange|null |
|
| 106 | + */ |
|
| 107 | + private function mapChange(\Icewind\SMB\Change $change) { |
|
| 108 | + $path = $this->relativePath($change->getPath()); |
|
| 109 | + if (is_null($path)) { |
|
| 110 | + return null; |
|
| 111 | + } |
|
| 112 | + if ($change->getCode() === \Icewind\SMB\INotifyHandler::NOTIFY_RENAMED_OLD) { |
|
| 113 | + $this->oldRenamePath = $path; |
|
| 114 | + return null; |
|
| 115 | + } |
|
| 116 | + $type = $this->mapNotifyType($change->getCode()); |
|
| 117 | + if (is_null($type)) { |
|
| 118 | + return null; |
|
| 119 | + } |
|
| 120 | + if ($type === IChange::RENAMED) { |
|
| 121 | + if (!is_null($this->oldRenamePath)) { |
|
| 122 | + $result = new RenameChange($type, $this->oldRenamePath, $path); |
|
| 123 | + $this->oldRenamePath = null; |
|
| 124 | + } else { |
|
| 125 | + $result = null; |
|
| 126 | + } |
|
| 127 | + } else { |
|
| 128 | + $result = new Change($type, $path); |
|
| 129 | + } |
|
| 130 | + return $result; |
|
| 131 | + } |
|
| 132 | 132 | |
| 133 | - private function mapNotifyType($smbType) { |
|
| 134 | - switch ($smbType) { |
|
| 135 | - case \Icewind\SMB\INotifyHandler::NOTIFY_ADDED: |
|
| 136 | - return IChange::ADDED; |
|
| 137 | - case \Icewind\SMB\INotifyHandler::NOTIFY_REMOVED: |
|
| 138 | - return IChange::REMOVED; |
|
| 139 | - case \Icewind\SMB\INotifyHandler::NOTIFY_MODIFIED: |
|
| 140 | - case \Icewind\SMB\INotifyHandler::NOTIFY_ADDED_STREAM: |
|
| 141 | - case \Icewind\SMB\INotifyHandler::NOTIFY_MODIFIED_STREAM: |
|
| 142 | - case \Icewind\SMB\INotifyHandler::NOTIFY_REMOVED_STREAM: |
|
| 143 | - return IChange::MODIFIED; |
|
| 144 | - case \Icewind\SMB\INotifyHandler::NOTIFY_RENAMED_NEW: |
|
| 145 | - return IChange::RENAMED; |
|
| 146 | - default: |
|
| 147 | - return null; |
|
| 148 | - } |
|
| 149 | - } |
|
| 133 | + private function mapNotifyType($smbType) { |
|
| 134 | + switch ($smbType) { |
|
| 135 | + case \Icewind\SMB\INotifyHandler::NOTIFY_ADDED: |
|
| 136 | + return IChange::ADDED; |
|
| 137 | + case \Icewind\SMB\INotifyHandler::NOTIFY_REMOVED: |
|
| 138 | + return IChange::REMOVED; |
|
| 139 | + case \Icewind\SMB\INotifyHandler::NOTIFY_MODIFIED: |
|
| 140 | + case \Icewind\SMB\INotifyHandler::NOTIFY_ADDED_STREAM: |
|
| 141 | + case \Icewind\SMB\INotifyHandler::NOTIFY_MODIFIED_STREAM: |
|
| 142 | + case \Icewind\SMB\INotifyHandler::NOTIFY_REMOVED_STREAM: |
|
| 143 | + return IChange::MODIFIED; |
|
| 144 | + case \Icewind\SMB\INotifyHandler::NOTIFY_RENAMED_NEW: |
|
| 145 | + return IChange::RENAMED; |
|
| 146 | + default: |
|
| 147 | + return null; |
|
| 148 | + } |
|
| 149 | + } |
|
| 150 | 150 | } |
@@ -36,101 +36,101 @@ |
||
| 36 | 36 | */ |
| 37 | 37 | trait VisibilityTrait { |
| 38 | 38 | |
| 39 | - /** @var int visibility */ |
|
| 40 | - protected $visibility = BackendService::VISIBILITY_DEFAULT; |
|
| 39 | + /** @var int visibility */ |
|
| 40 | + protected $visibility = BackendService::VISIBILITY_DEFAULT; |
|
| 41 | 41 | |
| 42 | - /** @var int allowed visibilities */ |
|
| 43 | - protected $allowedVisibility = BackendService::VISIBILITY_DEFAULT; |
|
| 42 | + /** @var int allowed visibilities */ |
|
| 43 | + protected $allowedVisibility = BackendService::VISIBILITY_DEFAULT; |
|
| 44 | 44 | |
| 45 | - /** |
|
| 46 | - * @return int |
|
| 47 | - */ |
|
| 48 | - public function getVisibility() { |
|
| 49 | - return $this->visibility; |
|
| 50 | - } |
|
| 45 | + /** |
|
| 46 | + * @return int |
|
| 47 | + */ |
|
| 48 | + public function getVisibility() { |
|
| 49 | + return $this->visibility; |
|
| 50 | + } |
|
| 51 | 51 | |
| 52 | - /** |
|
| 53 | - * Check if the backend is visible for a user type |
|
| 54 | - * |
|
| 55 | - * @param int $visibility |
|
| 56 | - * @return bool |
|
| 57 | - */ |
|
| 58 | - public function isVisibleFor($visibility) { |
|
| 59 | - if ($this->visibility & $visibility) { |
|
| 60 | - return true; |
|
| 61 | - } |
|
| 62 | - return false; |
|
| 63 | - } |
|
| 52 | + /** |
|
| 53 | + * Check if the backend is visible for a user type |
|
| 54 | + * |
|
| 55 | + * @param int $visibility |
|
| 56 | + * @return bool |
|
| 57 | + */ |
|
| 58 | + public function isVisibleFor($visibility) { |
|
| 59 | + if ($this->visibility & $visibility) { |
|
| 60 | + return true; |
|
| 61 | + } |
|
| 62 | + return false; |
|
| 63 | + } |
|
| 64 | 64 | |
| 65 | - /** |
|
| 66 | - * @param int $visibility |
|
| 67 | - * @return self |
|
| 68 | - */ |
|
| 69 | - public function setVisibility($visibility) { |
|
| 70 | - $this->visibility = $visibility; |
|
| 71 | - $this->allowedVisibility |= $visibility; |
|
| 72 | - return $this; |
|
| 73 | - } |
|
| 65 | + /** |
|
| 66 | + * @param int $visibility |
|
| 67 | + * @return self |
|
| 68 | + */ |
|
| 69 | + public function setVisibility($visibility) { |
|
| 70 | + $this->visibility = $visibility; |
|
| 71 | + $this->allowedVisibility |= $visibility; |
|
| 72 | + return $this; |
|
| 73 | + } |
|
| 74 | 74 | |
| 75 | - /** |
|
| 76 | - * @param int $visibility |
|
| 77 | - * @return self |
|
| 78 | - */ |
|
| 79 | - public function addVisibility($visibility) { |
|
| 80 | - return $this->setVisibility($this->visibility | $visibility); |
|
| 81 | - } |
|
| 75 | + /** |
|
| 76 | + * @param int $visibility |
|
| 77 | + * @return self |
|
| 78 | + */ |
|
| 79 | + public function addVisibility($visibility) { |
|
| 80 | + return $this->setVisibility($this->visibility | $visibility); |
|
| 81 | + } |
|
| 82 | 82 | |
| 83 | - /** |
|
| 84 | - * @param int $visibility |
|
| 85 | - * @return self |
|
| 86 | - */ |
|
| 87 | - public function removeVisibility($visibility) { |
|
| 88 | - return $this->setVisibility($this->visibility & ~$visibility); |
|
| 89 | - } |
|
| 83 | + /** |
|
| 84 | + * @param int $visibility |
|
| 85 | + * @return self |
|
| 86 | + */ |
|
| 87 | + public function removeVisibility($visibility) { |
|
| 88 | + return $this->setVisibility($this->visibility & ~$visibility); |
|
| 89 | + } |
|
| 90 | 90 | |
| 91 | - /** |
|
| 92 | - * @return int |
|
| 93 | - */ |
|
| 94 | - public function getAllowedVisibility() { |
|
| 95 | - return $this->allowedVisibility; |
|
| 96 | - } |
|
| 91 | + /** |
|
| 92 | + * @return int |
|
| 93 | + */ |
|
| 94 | + public function getAllowedVisibility() { |
|
| 95 | + return $this->allowedVisibility; |
|
| 96 | + } |
|
| 97 | 97 | |
| 98 | - /** |
|
| 99 | - * Check if the backend is allowed to be visible for a user type |
|
| 100 | - * |
|
| 101 | - * @param int $allowedVisibility |
|
| 102 | - * @return bool |
|
| 103 | - */ |
|
| 104 | - public function isAllowedVisibleFor($allowedVisibility) { |
|
| 105 | - if ($this->allowedVisibility & $allowedVisibility) { |
|
| 106 | - return true; |
|
| 107 | - } |
|
| 108 | - return false; |
|
| 109 | - } |
|
| 98 | + /** |
|
| 99 | + * Check if the backend is allowed to be visible for a user type |
|
| 100 | + * |
|
| 101 | + * @param int $allowedVisibility |
|
| 102 | + * @return bool |
|
| 103 | + */ |
|
| 104 | + public function isAllowedVisibleFor($allowedVisibility) { |
|
| 105 | + if ($this->allowedVisibility & $allowedVisibility) { |
|
| 106 | + return true; |
|
| 107 | + } |
|
| 108 | + return false; |
|
| 109 | + } |
|
| 110 | 110 | |
| 111 | - /** |
|
| 112 | - * @param int $allowedVisibility |
|
| 113 | - * @return self |
|
| 114 | - */ |
|
| 115 | - public function setAllowedVisibility($allowedVisibility) { |
|
| 116 | - $this->allowedVisibility = $allowedVisibility; |
|
| 117 | - $this->visibility &= $allowedVisibility; |
|
| 118 | - return $this; |
|
| 119 | - } |
|
| 111 | + /** |
|
| 112 | + * @param int $allowedVisibility |
|
| 113 | + * @return self |
|
| 114 | + */ |
|
| 115 | + public function setAllowedVisibility($allowedVisibility) { |
|
| 116 | + $this->allowedVisibility = $allowedVisibility; |
|
| 117 | + $this->visibility &= $allowedVisibility; |
|
| 118 | + return $this; |
|
| 119 | + } |
|
| 120 | 120 | |
| 121 | - /** |
|
| 122 | - * @param int $allowedVisibility |
|
| 123 | - * @return self |
|
| 124 | - */ |
|
| 125 | - public function addAllowedVisibility($allowedVisibility) { |
|
| 126 | - return $this->setAllowedVisibility($this->allowedVisibility | $allowedVisibility); |
|
| 127 | - } |
|
| 121 | + /** |
|
| 122 | + * @param int $allowedVisibility |
|
| 123 | + * @return self |
|
| 124 | + */ |
|
| 125 | + public function addAllowedVisibility($allowedVisibility) { |
|
| 126 | + return $this->setAllowedVisibility($this->allowedVisibility | $allowedVisibility); |
|
| 127 | + } |
|
| 128 | 128 | |
| 129 | - /** |
|
| 130 | - * @param int $allowedVisibility |
|
| 131 | - * @return self |
|
| 132 | - */ |
|
| 133 | - public function removeAllowedVisibility($allowedVisibility) { |
|
| 134 | - return $this->setAllowedVisibility($this->allowedVisibility & ~$allowedVisibility); |
|
| 135 | - } |
|
| 129 | + /** |
|
| 130 | + * @param int $allowedVisibility |
|
| 131 | + * @return self |
|
| 132 | + */ |
|
| 133 | + public function removeAllowedVisibility($allowedVisibility) { |
|
| 134 | + return $this->setAllowedVisibility($this->allowedVisibility & ~$allowedVisibility); |
|
| 135 | + } |
|
| 136 | 136 | } |
@@ -28,11 +28,11 @@ |
||
| 28 | 28 | * Builtin authentication mechanism, for legacy backends |
| 29 | 29 | */ |
| 30 | 30 | class Builtin extends AuthMechanism { |
| 31 | - public function __construct(IL10N $l) { |
|
| 32 | - $this |
|
| 33 | - ->setIdentifier('builtin::builtin') |
|
| 34 | - ->setScheme(self::SCHEME_BUILTIN) |
|
| 35 | - ->setText($l->t('Builtin')) |
|
| 36 | - ; |
|
| 37 | - } |
|
| 31 | + public function __construct(IL10N $l) { |
|
| 32 | + $this |
|
| 33 | + ->setIdentifier('builtin::builtin') |
|
| 34 | + ->setScheme(self::SCHEME_BUILTIN) |
|
| 35 | + ->setText($l->t('Builtin')) |
|
| 36 | + ; |
|
| 37 | + } |
|
| 38 | 38 | } |
@@ -28,11 +28,11 @@ |
||
| 28 | 28 | * Null authentication mechanism |
| 29 | 29 | */ |
| 30 | 30 | class NullMechanism extends AuthMechanism { |
| 31 | - public function __construct(IL10N $l) { |
|
| 32 | - $this |
|
| 33 | - ->setIdentifier('null::null') |
|
| 34 | - ->setScheme(self::SCHEME_NULL) |
|
| 35 | - ->setText($l->t('None')) |
|
| 36 | - ; |
|
| 37 | - } |
|
| 31 | + public function __construct(IL10N $l) { |
|
| 32 | + $this |
|
| 33 | + ->setIdentifier('null::null') |
|
| 34 | + ->setScheme(self::SCHEME_NULL) |
|
| 35 | + ->setText($l->t('None')) |
|
| 36 | + ; |
|
| 37 | + } |
|
| 38 | 38 | } |
@@ -25,24 +25,24 @@ |
||
| 25 | 25 | |
| 26 | 26 | class Hooks { |
| 27 | 27 | |
| 28 | - /** @var TrustedServers */ |
|
| 29 | - private $trustedServers; |
|
| 28 | + /** @var TrustedServers */ |
|
| 29 | + private $trustedServers; |
|
| 30 | 30 | |
| 31 | - public function __construct(TrustedServers $trustedServers) { |
|
| 32 | - $this->trustedServers = $trustedServers; |
|
| 33 | - } |
|
| 31 | + public function __construct(TrustedServers $trustedServers) { |
|
| 32 | + $this->trustedServers = $trustedServers; |
|
| 33 | + } |
|
| 34 | 34 | |
| 35 | - /** |
|
| 36 | - * add servers to the list of trusted servers once a federated share was established |
|
| 37 | - * |
|
| 38 | - * @param array $params |
|
| 39 | - */ |
|
| 40 | - public function addServerHook($params) { |
|
| 41 | - if ( |
|
| 42 | - $this->trustedServers->getAutoAddServers() === true && |
|
| 43 | - $this->trustedServers->isTrustedServer($params['server']) === false |
|
| 44 | - ) { |
|
| 45 | - $this->trustedServers->addServer($params['server']); |
|
| 46 | - } |
|
| 47 | - } |
|
| 35 | + /** |
|
| 36 | + * add servers to the list of trusted servers once a federated share was established |
|
| 37 | + * |
|
| 38 | + * @param array $params |
|
| 39 | + */ |
|
| 40 | + public function addServerHook($params) { |
|
| 41 | + if ( |
|
| 42 | + $this->trustedServers->getAutoAddServers() === true && |
|
| 43 | + $this->trustedServers->isTrustedServer($params['server']) === false |
|
| 44 | + ) { |
|
| 45 | + $this->trustedServers->addServer($params['server']); |
|
| 46 | + } |
|
| 47 | + } |
|
| 48 | 48 | } |
@@ -29,40 +29,40 @@ |
||
| 29 | 29 | |
| 30 | 30 | class FedAuth extends AbstractBasic { |
| 31 | 31 | |
| 32 | - /** @var DbHandler */ |
|
| 33 | - private $db; |
|
| 32 | + /** @var DbHandler */ |
|
| 33 | + private $db; |
|
| 34 | 34 | |
| 35 | - /** |
|
| 36 | - * FedAuth constructor. |
|
| 37 | - * |
|
| 38 | - * @param DbHandler $db |
|
| 39 | - */ |
|
| 40 | - public function __construct(DbHandler $db) { |
|
| 41 | - $this->db = $db; |
|
| 42 | - $this->principalPrefix = 'principals/system/'; |
|
| 35 | + /** |
|
| 36 | + * FedAuth constructor. |
|
| 37 | + * |
|
| 38 | + * @param DbHandler $db |
|
| 39 | + */ |
|
| 40 | + public function __construct(DbHandler $db) { |
|
| 41 | + $this->db = $db; |
|
| 42 | + $this->principalPrefix = 'principals/system/'; |
|
| 43 | 43 | |
| 44 | - // setup realm |
|
| 45 | - $defaults = new \OCP\Defaults(); |
|
| 46 | - $this->realm = $defaults->getName(); |
|
| 47 | - } |
|
| 44 | + // setup realm |
|
| 45 | + $defaults = new \OCP\Defaults(); |
|
| 46 | + $this->realm = $defaults->getName(); |
|
| 47 | + } |
|
| 48 | 48 | |
| 49 | - /** |
|
| 50 | - * Validates a username and password |
|
| 51 | - * |
|
| 52 | - * This method should return true or false depending on if login |
|
| 53 | - * succeeded. |
|
| 54 | - * |
|
| 55 | - * @param string $username |
|
| 56 | - * @param string $password |
|
| 57 | - * @return bool |
|
| 58 | - */ |
|
| 59 | - protected function validateUserPass($username, $password) { |
|
| 60 | - return $this->db->auth($username, $password); |
|
| 61 | - } |
|
| 49 | + /** |
|
| 50 | + * Validates a username and password |
|
| 51 | + * |
|
| 52 | + * This method should return true or false depending on if login |
|
| 53 | + * succeeded. |
|
| 54 | + * |
|
| 55 | + * @param string $username |
|
| 56 | + * @param string $password |
|
| 57 | + * @return bool |
|
| 58 | + */ |
|
| 59 | + protected function validateUserPass($username, $password) { |
|
| 60 | + return $this->db->auth($username, $password); |
|
| 61 | + } |
|
| 62 | 62 | |
| 63 | - /** |
|
| 64 | - * @inheritdoc |
|
| 65 | - */ |
|
| 66 | - public function challenge(RequestInterface $request, ResponseInterface $response) { |
|
| 67 | - } |
|
| 63 | + /** |
|
| 64 | + * @inheritdoc |
|
| 65 | + */ |
|
| 66 | + public function challenge(RequestInterface $request, ResponseInterface $response) { |
|
| 67 | + } |
|
| 68 | 68 | } |
@@ -29,32 +29,32 @@ |
||
| 29 | 29 | |
| 30 | 30 | class LastUsedController extends Controller { |
| 31 | 31 | |
| 32 | - /** @var IConfig */ |
|
| 33 | - protected $config; |
|
| 32 | + /** @var IConfig */ |
|
| 33 | + protected $config; |
|
| 34 | 34 | |
| 35 | - /** @var IUserSession */ |
|
| 36 | - protected $userSession; |
|
| 35 | + /** @var IUserSession */ |
|
| 36 | + protected $userSession; |
|
| 37 | 37 | |
| 38 | - /** |
|
| 39 | - * @param string $appName |
|
| 40 | - * @param IRequest $request |
|
| 41 | - * @param IConfig $config |
|
| 42 | - * @param IUserSession $userSession |
|
| 43 | - */ |
|
| 44 | - public function __construct($appName, IRequest $request, IConfig $config, IUserSession $userSession) { |
|
| 45 | - parent::__construct($appName, $request); |
|
| 46 | - $this->config = $config; |
|
| 47 | - $this->userSession = $userSession; |
|
| 48 | - } |
|
| 38 | + /** |
|
| 39 | + * @param string $appName |
|
| 40 | + * @param IRequest $request |
|
| 41 | + * @param IConfig $config |
|
| 42 | + * @param IUserSession $userSession |
|
| 43 | + */ |
|
| 44 | + public function __construct($appName, IRequest $request, IConfig $config, IUserSession $userSession) { |
|
| 45 | + parent::__construct($appName, $request); |
|
| 46 | + $this->config = $config; |
|
| 47 | + $this->userSession = $userSession; |
|
| 48 | + } |
|
| 49 | 49 | |
| 50 | - /** |
|
| 51 | - * @NoAdminRequired |
|
| 52 | - */ |
|
| 53 | - public function getLastUsedTagIds() { |
|
| 54 | - $lastUsed = $this->config->getUserValue($this->userSession->getUser()->getUID(), 'systemtags', 'last_used', '[]'); |
|
| 55 | - $tagIds = json_decode($lastUsed, true); |
|
| 56 | - return new DataResponse(array_map(function ($id) { |
|
| 57 | - return (string) $id; |
|
| 58 | - }, $tagIds)); |
|
| 59 | - } |
|
| 50 | + /** |
|
| 51 | + * @NoAdminRequired |
|
| 52 | + */ |
|
| 53 | + public function getLastUsedTagIds() { |
|
| 54 | + $lastUsed = $this->config->getUserValue($this->userSession->getUser()->getUID(), 'systemtags', 'last_used', '[]'); |
|
| 55 | + $tagIds = json_decode($lastUsed, true); |
|
| 56 | + return new DataResponse(array_map(function ($id) { |
|
| 57 | + return (string) $id; |
|
| 58 | + }, $tagIds)); |
|
| 59 | + } |
|
| 60 | 60 | } |