@@ -29,66 +29,66 @@ |
||
29 | 29 | use Sabre\HTTP\ResponseInterface; |
30 | 30 | |
31 | 31 | class BearerAuth extends AbstractBearer { |
32 | - /** @var IUserSession */ |
|
33 | - private $userSession; |
|
34 | - /** @var ISession */ |
|
35 | - private $session; |
|
36 | - /** @var IRequest */ |
|
37 | - private $request; |
|
38 | - /** @var string */ |
|
39 | - private $principalPrefix; |
|
32 | + /** @var IUserSession */ |
|
33 | + private $userSession; |
|
34 | + /** @var ISession */ |
|
35 | + private $session; |
|
36 | + /** @var IRequest */ |
|
37 | + private $request; |
|
38 | + /** @var string */ |
|
39 | + private $principalPrefix; |
|
40 | 40 | |
41 | - /** |
|
42 | - * @param IUserSession $userSession |
|
43 | - * @param ISession $session |
|
44 | - * @param string $principalPrefix |
|
45 | - * @param IRequest $request |
|
46 | - */ |
|
47 | - public function __construct(IUserSession $userSession, |
|
48 | - ISession $session, |
|
49 | - IRequest $request, |
|
50 | - $principalPrefix = 'principals/users/') { |
|
51 | - $this->userSession = $userSession; |
|
52 | - $this->session = $session; |
|
53 | - $this->request = $request; |
|
54 | - $this->principalPrefix = $principalPrefix; |
|
41 | + /** |
|
42 | + * @param IUserSession $userSession |
|
43 | + * @param ISession $session |
|
44 | + * @param string $principalPrefix |
|
45 | + * @param IRequest $request |
|
46 | + */ |
|
47 | + public function __construct(IUserSession $userSession, |
|
48 | + ISession $session, |
|
49 | + IRequest $request, |
|
50 | + $principalPrefix = 'principals/users/') { |
|
51 | + $this->userSession = $userSession; |
|
52 | + $this->session = $session; |
|
53 | + $this->request = $request; |
|
54 | + $this->principalPrefix = $principalPrefix; |
|
55 | 55 | |
56 | - // setup realm |
|
57 | - $defaults = new \OCP\Defaults(); |
|
58 | - $this->realm = $defaults->getName(); |
|
59 | - } |
|
56 | + // setup realm |
|
57 | + $defaults = new \OCP\Defaults(); |
|
58 | + $this->realm = $defaults->getName(); |
|
59 | + } |
|
60 | 60 | |
61 | - private function setupUserFs($userId) { |
|
62 | - \OC_Util::setupFS($userId); |
|
63 | - $this->session->close(); |
|
64 | - return $this->principalPrefix . $userId; |
|
65 | - } |
|
61 | + private function setupUserFs($userId) { |
|
62 | + \OC_Util::setupFS($userId); |
|
63 | + $this->session->close(); |
|
64 | + return $this->principalPrefix . $userId; |
|
65 | + } |
|
66 | 66 | |
67 | - /** |
|
68 | - * {@inheritdoc} |
|
69 | - */ |
|
70 | - public function validateBearerToken($bearerToken) { |
|
71 | - \OC_Util::setupFS(); |
|
67 | + /** |
|
68 | + * {@inheritdoc} |
|
69 | + */ |
|
70 | + public function validateBearerToken($bearerToken) { |
|
71 | + \OC_Util::setupFS(); |
|
72 | 72 | |
73 | - if(!$this->userSession->isLoggedIn()) { |
|
74 | - $this->userSession->tryTokenLogin($this->request); |
|
75 | - } |
|
76 | - if($this->userSession->isLoggedIn()) { |
|
77 | - return $this->setupUserFs($this->userSession->getUser()->getUID()); |
|
78 | - } |
|
73 | + if(!$this->userSession->isLoggedIn()) { |
|
74 | + $this->userSession->tryTokenLogin($this->request); |
|
75 | + } |
|
76 | + if($this->userSession->isLoggedIn()) { |
|
77 | + return $this->setupUserFs($this->userSession->getUser()->getUID()); |
|
78 | + } |
|
79 | 79 | |
80 | - return false; |
|
81 | - } |
|
80 | + return false; |
|
81 | + } |
|
82 | 82 | |
83 | - /** |
|
84 | - * \Sabre\DAV\Auth\Backend\AbstractBearer::challenge sets an WWW-Authenticate |
|
85 | - * header which some DAV clients can't handle. Thus we override this function |
|
86 | - * and make it simply return a 401. |
|
87 | - * |
|
88 | - * @param RequestInterface $request |
|
89 | - * @param ResponseInterface $response |
|
90 | - */ |
|
91 | - public function challenge(RequestInterface $request, ResponseInterface $response) { |
|
92 | - $response->setStatus(401); |
|
93 | - } |
|
83 | + /** |
|
84 | + * \Sabre\DAV\Auth\Backend\AbstractBearer::challenge sets an WWW-Authenticate |
|
85 | + * header which some DAV clients can't handle. Thus we override this function |
|
86 | + * and make it simply return a 401. |
|
87 | + * |
|
88 | + * @param RequestInterface $request |
|
89 | + * @param ResponseInterface $response |
|
90 | + */ |
|
91 | + public function challenge(RequestInterface $request, ResponseInterface $response) { |
|
92 | + $response->setStatus(401); |
|
93 | + } |
|
94 | 94 | } |