Skip to content

[stable9] Use the correct realm for basic authentication - fixes #23427 #26721

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DeepDiver1975 merged 2 commits into from
Nov 29, 2016
Merged

[stable9] Use the correct realm for basic authentication - fixes #23427 #26721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f418d55
Use the correct realm for basic authentication - fixes #23427
DeepDiver1975 Jun 9, 2016
505c5c3
Add test for duplicate 401 headers on DAV
Nov 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions apps/dav/lib/connector/publicauth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@

namespace OCA\DAV\Connector;

use Sabre\DAV\Auth\Backend\AbstractBasic;
Copy link
Member

@DeepDiver1975 DeepDiver1975 Nov 29, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unused - see 36


/**
* Class PublicAuth
*
* @package OCA\DAV\Connector
*/
class PublicAuth extends \Sabre\DAV\Auth\Backend\AbstractBasic {

/**
Expand All @@ -40,6 +47,10 @@ class PublicAuth extends \Sabre\DAV\Auth\Backend\AbstractBasic {
*/
public function __construct($config) {
$this->config = $config;

// setup realm
$defaults = new \OC_Defaults();
$this->realm = $defaults->getName();
}

/**
Expand Down
4 changes: 4 additions & 0 deletions apps/dav/lib/connector/sabre/auth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@ public function __construct(ISession $session,
$this->userSession = $userSession;
$this->request = $request;
$this->principalPrefix = $principalPrefix;

// setup realm
$defaults = new \OC_Defaults();
$this->realm = $defaults->getName();
}

/**
Expand Down
3 changes: 1 addition & 2 deletions apps/dav/lib/connector/sabre/serverfactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,9 @@ public function createServer($baseUri,
$server->setBaseUri($baseUri);

// Load plugins
$defaults = new \OC_Defaults();
$server->addPlugin(new \OCA\DAV\Connector\Sabre\MaintenancePlugin($this->config));
$server->addPlugin(new \OCA\DAV\Connector\Sabre\BlockLegacyClientPlugin($this->config));
$server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend, $defaults->getName()));
$server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend));
// FIXME: The following line is a workaround for legacy components relying on being able to send a GET to /
$server->addPlugin(new \OCA\DAV\Connector\Sabre\DummyGetResponsePlugin());
$server->addPlugin(new \OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin('webdav', $this->logger));
Expand Down
4 changes: 4 additions & 0 deletions apps/federation/dav/fedauth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ class FedAuth extends AbstractBasic {
public function __construct(DbHandler $db) {
$this->db = $db;
$this->principalPrefix = 'principals/system/';

// setup realm
$defaults = new \OC_Defaults();
$this->realm = $defaults->getName();
}

/**
Expand Down
24 changes: 24 additions & 0 deletions build/integration/features/bootstrap/WebDav.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,4 +617,28 @@ public function checkIfETAGHasChanged($path, $user){
$this->asGetsPropertiesOfFolderWith($user, NULL, $path, $propertiesTable);
PHPUnit_Framework_Assert::assertNotEquals($this->response['{DAV:}getetag'], $this->storedETAG[$user][$path]);
}

/**
* @When Connecting to dav endpoint
*/
public function connectingToDavEndpoint() {
try {
$this->response = $this->makeDavRequest(null, 'PROPFIND', '', []);
} catch (\GuzzleHttp\Exception\ClientException $e) {
$this->response = $e->getResponse();
}
}

/**
* @Then there are no duplicate headers
*/
public function thereAreNoDuplicateHeaders() {
$headers = $this->response->getHeaders();
foreach ($headers as $headerName => $headerValues) {
// if a header has multiple values, they must be different
if (count($headerValues) > 1 && count(array_unique($headerValues)) < count($headerValues)) {
throw new \Exception('Duplicate header found: ' . $headerName);
}
}
}
}
16 changes: 16 additions & 0 deletions build/integration/features/webdav-related.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,22 @@ Feature: webdav-related
Background:
Given using api version "1"

Scenario: Unauthenticated call old dav path
Given using dav path "remote.php/webdav"
When connecting to dav endpoint
Then the HTTP status code should be "401"
And there are no duplicate headers
And The following headers should be set
|WWW-Authenticate|Basic realm="ownCloud"|

Scenario: Unauthenticated call new dav path
Given using dav path "remote.php/dav"
When connecting to dav endpoint
Then the HTTP status code should be "401"
And there are no duplicate headers
And The following headers should be set
|WWW-Authenticate|Basic realm="ownCloud"|

Scenario: Moving a file
Given using old dav path
And As an "admin"
Expand Down