| @@ -30,47 +30,47 @@ | ||
| 30 | 30 | |
| 31 | 31 |  class AnonymousOptionsPlugin extends ServerPlugin { | 
| 32 | 32 | |
| 33 | - /** | |
| 34 | - * @var \Sabre\DAV\Server | |
| 35 | - */ | |
| 36 | - private $server; | |
| 33 | + /** | |
| 34 | + * @var \Sabre\DAV\Server | |
| 35 | + */ | |
| 36 | + private $server; | |
| 37 | 37 | |
| 38 | - /** | |
| 39 | - * @param \Sabre\DAV\Server $server | |
| 40 | - * @return void | |
| 41 | - */ | |
| 42 | -	public function initialize(\Sabre\DAV\Server $server) { | |
| 43 | - $this->server = $server; | |
| 44 | - // before auth | |
| 45 | -		$this->server->on('beforeMethod', [$this, 'handleAnonymousOptions'], 9); | |
| 46 | - } | |
| 38 | + /** | |
| 39 | + * @param \Sabre\DAV\Server $server | |
| 40 | + * @return void | |
| 41 | + */ | |
| 42 | +    public function initialize(\Sabre\DAV\Server $server) { | |
| 43 | + $this->server = $server; | |
| 44 | + // before auth | |
| 45 | +        $this->server->on('beforeMethod', [$this, 'handleAnonymousOptions'], 9); | |
| 46 | + } | |
| 47 | 47 | |
| 48 | - /** | |
| 49 | - * @return bool | |
| 50 | - */ | |
| 51 | -	public function isRequestInRoot($path) { | |
| 52 | - return $path === '' || (is_string($path) && strpos($path, '/') === FALSE); | |
| 53 | - } | |
| 48 | + /** | |
| 49 | + * @return bool | |
| 50 | + */ | |
| 51 | +    public function isRequestInRoot($path) { | |
| 52 | + return $path === '' || (is_string($path) && strpos($path, '/') === FALSE); | |
| 53 | + } | |
| 54 | 54 | |
| 55 | - /** | |
| 56 | - * @throws \Sabre\DAV\Exception\Forbidden | |
| 57 | - * @return bool | |
| 58 | - */ | |
| 59 | -	public function handleAnonymousOptions(RequestInterface $request, ResponseInterface $response) { | |
| 60 | -		$isOffice = preg_match('/Microsoft Office/i', $request->getHeader('User-Agent')); | |
| 61 | -		$isAnonymousOption = ($request->getMethod() === 'OPTIONS' && ($request->getHeader('Authorization') === null || trim($request->getHeader('Authorization')) === 'Bearer') && $this->isRequestInRoot($request->getPath())); | |
| 62 | -		$isOfficeHead = $request->getMethod() === 'HEAD' && $isOffice && $request->getHeader('Authorization') === 'Bearer'; | |
| 63 | -		if ($isAnonymousOption || $isOfficeHead) { | |
| 64 | - /** @var CorePlugin $corePlugin */ | |
| 65 | -			$corePlugin = $this->server->getPlugin('core'); | |
| 66 | - // setup a fake tree for anonymous access | |
| 67 | -			$this->server->tree = new Tree(new Directory('')); | |
| 68 | - $corePlugin->httpOptions($request, $response); | |
| 69 | -			$this->server->emit('afterMethod', [$request, $response]); | |
| 70 | -			$this->server->emit('afterMethod:OPTIONS', [$request, $response]); | |
| 55 | + /** | |
| 56 | + * @throws \Sabre\DAV\Exception\Forbidden | |
| 57 | + * @return bool | |
| 58 | + */ | |
| 59 | +    public function handleAnonymousOptions(RequestInterface $request, ResponseInterface $response) { | |
| 60 | +        $isOffice = preg_match('/Microsoft Office/i', $request->getHeader('User-Agent')); | |
| 61 | +        $isAnonymousOption = ($request->getMethod() === 'OPTIONS' && ($request->getHeader('Authorization') === null || trim($request->getHeader('Authorization')) === 'Bearer') && $this->isRequestInRoot($request->getPath())); | |
| 62 | +        $isOfficeHead = $request->getMethod() === 'HEAD' && $isOffice && $request->getHeader('Authorization') === 'Bearer'; | |
| 63 | +        if ($isAnonymousOption || $isOfficeHead) { | |
| 64 | + /** @var CorePlugin $corePlugin */ | |
| 65 | +            $corePlugin = $this->server->getPlugin('core'); | |
| 66 | + // setup a fake tree for anonymous access | |
| 67 | +            $this->server->tree = new Tree(new Directory('')); | |
| 68 | + $corePlugin->httpOptions($request, $response); | |
| 69 | +            $this->server->emit('afterMethod', [$request, $response]); | |
| 70 | +            $this->server->emit('afterMethod:OPTIONS', [$request, $response]); | |
| 71 | 71 | |
| 72 | - $this->server->sapi->sendResponse($response); | |
| 73 | - return false; | |
| 74 | - } | |
| 75 | - } | |
| 72 | + $this->server->sapi->sendResponse($response); | |
| 73 | + return false; | |
| 74 | + } | |
| 75 | + } | |
| 76 | 76 | } |