upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-10 17:23:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 57

Use 403 instead a 50x response

Browse source
This commit is contained in:
Lukas Reschke 2015-04-20 12:53:40 +02:00
parent 6b31d325d6
commit ed0b465cf9
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/private/connector/sabre/blocklegacyclientplugin.php
View file

@ -21,20 +21,19 @@
namespace OC\Connector\Sabre;
use OC\ServiceUnavailableException;
use OCP\IConfig;
use Sabre\HTTP\RequestInterface;
use Sabre\DAV\ServerPlugin;
use Sabre\DAV\Server;
use Sabre\DAV\Exception;
/**
* Class BlockLegacyClientPlugin is used to detect old legacy sync clients and
* returns a 503 status to those clients.
* returns a 403 status to those clients
*
* @package OC\Connector\Sabre
*/
class BlockLegacyClientPlugin extends ServerPlugin {
/** @var Server */
/** @var \Sabre\DAV\Server */
protected $server;
/** @var IConfig */
protected $config;
@ -47,19 +46,19 @@ class BlockLegacyClientPlugin extends ServerPlugin {
}
/**
* @param Server $server
* @param \Sabre\DAV\ $server
* @return void
*/
public function initialize(Server $server) {
public function initialize(\Sabre\DAV\Server $server) {
$this->server = $server;
$this->server->on('beforeMethod', [$this, 'beforeHandler'], 200);
}
/**
* Detects all unsupported clients and throws a ServiceUnavailableException
* which will result in a 503 to them.
* Detects all unsupported clients and throws a \Sabre\DAV\Exception\Forbidden
* exception which will result in a 403 to them.
* @param RequestInterface $request
* @throws ServiceUnavailableException If the client version is not supported
* @throws \Sabre\DAV\Exception\Forbidden If the client version is not supported
*/
public function beforeHandler(RequestInterface $request) {
$userAgent = $request->getHeader('User-Agent');
@ -70,7 +69,7 @@ class BlockLegacyClientPlugin extends ServerPlugin {
preg_match("/(?:mirall\\/)([\d.]+)/i", $userAgent, $versionMatches);
if(isset($versionMatches[1]) &&
version_compare($versionMatches[1], $minimumSupportedDesktopVersion) === -1) {
throw new ServiceUnavailableException('Unsupported client version.');
throw new \Sabre\DAV\Exception\Forbidden('Unsupported client version.');
}
}
}

3
tests/lib/connector/sabre/BlockLegacyClientPluginTest.php
View file

@ -18,6 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
namespace Test\Connector\Sabre;
use OC\Connector\Sabre\BlockLegacyClientPlugin;
@ -58,7 +59,7 @@ class BlockLegacyClientPluginTest extends TestCase {
/**
* @dataProvider oldDesktopClientProvider
* @param string $userAgent
* @expectedException \OC\ServiceUnavailableException
* @expectedException \Sabre\DAV\Exception\Forbidden
* @expectedExceptionMessage Unsupported client version.
*/
public function testBeforeHandlerException($userAgent) {