Skip to content

Mount configuration handlers for external storages #14174

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
blizzz merged 5 commits into from
Feb 15, 2019
Merged

Mount configuration handlers for external storages #14174

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a26bcd8
files_external: allow to register config handlers for flexible placeh…
blizzz Feb 11, 2019
792bcb8
add LDAP ConfigHandler for external storages and "$home" var
blizzz Feb 12, 2019
f8a133d
reject mounts with unsubstituted placeholders as incompletely configured
blizzz Feb 13, 2019
685c13e
add GUI option to set the $home placeholder
blizzz Feb 13, 2019
173836b
typos in doc, no code changes
blizzz Feb 15, 2019
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
Prev Previous commit
typos in doc, no code changes 
Signed-off-by: Arthur Schiwon <[email protected]>
  • Loading branch information
@blizzz
blizzz committed Feb 15, 2019
commit 173836b95af7cdc87cb603c5d98494b02242a949
4 changes: 2 additions & 2 deletions apps/files_external/lib/Config/SimpleSubstitutionTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* @copyright Copyright (c) 2018 Arthur Schiwon <[email protected]>
* @copyright Copyright (c) 2019 Arthur Schiwon <[email protected]>
*
* @author Arthur Schiwon <[email protected]>
*
Expand Down Expand Up @@ -31,7 +31,7 @@
*/
trait SimpleSubstitutionTrait {
/**
* @var string the placeholder without @ prefix
* @var string the placeholder without $ prefix
* @since 16.0.0
*/
private $placeholder;
Expand Down
5 changes: 3 additions & 2 deletions apps/files_external/lib/Service/BackendService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
*
* @author Morris Jobke <[email protected]>
* @author Robin McCorkell <[email protected]>
* @author Arthur Schiwon <[email protected]>
*
* @license AGPL-3.0
*
Expand Down Expand Up @@ -292,8 +293,8 @@ protected function isAllowedAuthMechanism(AuthMechanism $authMechanism) {
*
* The function of the provided $placeholder is mostly to act a sorting
* criteria, so longer placeholders are replaced first. This avoids
* "@user" overwriting parts of "@userMail" and "@userLang", for example.
* The provided value should not contain the @ prefix, only a-z0-9 are
* "$user" overwriting parts of "$userMail" and "$userLang", for example.
* The provided value should not contain the $ prefix, only a-z0-9 are
* allowed. Upper case letters are lower cased, the replacement is case-
* insensitive.
*
Expand Down
1 change: 1 addition & 0 deletions apps/files_external/lib/config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Andreas Fischer <[email protected]>
* @author Arthur Schiwon <[email protected]>
* @author Bart Visscher <[email protected]>
* @author Björn Schießle <[email protected]>
* @author Frank Karlitschek <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion apps/files_external/tests/Config/UserPlaceholderHandlerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* @copyright Copyright (c) 2018 Arthur Schiwon <[email protected]>
* @copyright Copyright (c) 2019 Arthur Schiwon <[email protected]>
*
* @author Arthur Schiwon <[email protected]>
*
Expand Down
1 change: 1 addition & 0 deletions apps/files_external/tests/Service/BackendServiceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ public function testGetAvailableBackends() {
public function invalidConfigPlaceholderProvider() {
return [
[['@user']],
[['$user']],
[['hællo']],
[['spa ce']],
[['yo\o']],
Expand Down