mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changed request to not add a prefix to the url (#26256) 

* Changed request to not add a prefix to the url

* Expecting forbidden instead of service unavailable

* Handling login exceptions
This commit is contained in:
Sergio Bertolín 2016-10-04 14:51:54 +02:00 committed by Morris Jobke
parent ed4ed7911a
commit 0417cbafd0
No known key found for this signature in database
GPG Key ID: 9CE5ED29E7FCD38A
4 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build/integration/features/bootstrap/BasicStructure.php
View File

@ -179,6 +179,15 @@ trait BasicStructure {
} }
} }
/**
* @When /^sending "([^"]*)" with exact url to "([^"]*)"$/
* @param string $verb
* @param string $url
*/
public function sendingToDirectUrl($verb, $url) {
$this->sendingToWithDirectUrl($verb, $url, null);
}
public function sendingToWithDirectUrl($verb, $url, $body) { public function sendingToWithDirectUrl($verb, $url, $body) {
$fullUrl = substr($this->baseUrl, 0, -5) . $url; $fullUrl = substr($this->baseUrl, 0, -5) . $url;
$client = new Client(); $client = new Client();

25
build/integration/features/provisioning-v1.feature
View File

@ -497,16 +497,25 @@ Feature: provisioning
And As an "admin" And As an "admin"
And user "subadmin" is disabled And user "subadmin" is disabled
Scenario: Making a web request with an enabled user Scenario: Making a ocs request with an enabled user
Given As an "admin" Given As an "admin"
And user "user0" exists And user "user0" exists
And As an "user0" And As an "user0"
When sending "GET" to "/cloud/capabilities" When sending "GET" to "/cloud/capabilities"
Then the HTTP status code should be "200" Then the HTTP status code should be "200"
And the OCS status code should be "100" And the OCS status code should be "100"
Scenario: Making a web request with a disabled user Scenario: Making a web request with an enabled user
Given As an "admin" Given As an "admin"
And user "user0" exists
And As an "user0"
When sending "GET" to "/cloud/capabilities"
When sending "GET" with exact url to "/index.php/apps/files"
Then the HTTP status code should be "200"
And the OCS status code should be "100"
Scenario: Making a ocs request with a disabled user
Given As an "admin"
And user "user0" exists And user "user0" exists
And assure user "user0" is disabled And assure user "user0" is disabled
And As an "user0" And As an "user0"
@ -514,3 +523,11 @@ Feature: provisioning
Then the OCS status code should be "997" Then the OCS status code should be "997"
And the HTTP status code should be "401" And the HTTP status code should be "401"
Scenario: Making a web request with a disabled user
Given As an "admin"
And user "user0" exists
And assure user "user0" is disabled
And As an "user0"
When sending "GET" with exact url to "/index.php/apps/files"
And the HTTP status code should be "403"

3
index.php
View File

@ -48,6 +48,9 @@ try {
} catch (\OC\HintException $ex) { } catch (\OC\HintException $ex) {
OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE); OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
OC_Template::printErrorPage($ex->getMessage(), $ex->getHint()); OC_Template::printErrorPage($ex->getMessage(), $ex->getHint());
} catch (\OC\User\LoginException $ex) {
OC_Response::setStatus(OC_Response::STATUS_FORBIDDEN);
OC_Template::printErrorPage($ex->getMessage(), $ex->getHint());
} catch (Exception $ex) { } catch (Exception $ex) {
\OC::$server->getLogger()->logException($ex, array('app' => 'index')); \OC::$server->getLogger()->logException($ex, array('app' => 'index'));

1
lib/private/legacy/response.php
View File

@ -33,6 +33,7 @@ class OC_Response {
const STATUS_NOT_MODIFIED = 304; const STATUS_NOT_MODIFIED = 304;
const STATUS_TEMPORARY_REDIRECT = 307; const STATUS_TEMPORARY_REDIRECT = 307;
const STATUS_BAD_REQUEST = 400; const STATUS_BAD_REQUEST = 400;
const STATUS_FORBIDDEN = 403;
const STATUS_NOT_FOUND = 404; const STATUS_NOT_FOUND = 404;
const STATUS_INTERNAL_SERVER_ERROR = 500; const STATUS_INTERNAL_SERVER_ERROR = 500;
const STATUS_SERVICE_UNAVAILABLE = 503; const STATUS_SERVICE_UNAVAILABLE = 503;