2015-08-11 20:45:07 +03:00
|
|
|
<?php
|
|
|
|
use \OCA\Files_External\Lib\Backend\Backend;
|
|
|
|
use \OCA\Files_External\Lib\DefinitionParameter;
|
|
|
|
use \OCA\Files_External\Service\BackendService;
|
Authentication mechanisms for external storage backends
A backend can now specify generic authentication schemes that it
supports, instead of specifying the parameters for its authentication
method directly. This allows multiple authentication mechanisms to be
implemented for a single scheme, providing altered functionality.
This commit introduces the backend framework for this feature, and so at
this point the UI will be broken as the frontend does not specify the
required information.
Terminology:
- authentication scheme
Parameter interface for the authentication method. A backend
supporting the 'password' scheme accepts two parameters, 'user' and
'password'.
- authentication mechanism
Specific mechanism implementing a scheme. Basic mechanisms may
forward configuration options directly to the backend, more advanced
ones may lookup parameters or retrieve them from the session
New dropdown selector for external storage configurations to select the
authentication mechanism to be used.
Authentication mechanisms can have visibilities, just like backends.
The API was extended too to make it easier to add/remove visibilities.
In addition, the concept of 'allowed visibility' has been introduced, so
a backend/auth mechanism can force a maximum visibility level (e.g.
Local storage type) that cannot be overridden by configuration in the
web UI.
An authentication mechanism is a fully instantiated implementation. This
allows an implementation to have dependencies injected into it, e.g. an
\OCP\IDB for database operations.
When a StorageConfig is being prepared for mounting, the authentication
mechanism implementation has manipulateStorage() called,
which inserts the relevant authentication method options into the
storage ready for mounting.
2015-08-12 12:54:03 +03:00
|
|
|
|
2015-09-14 15:57:49 +03:00
|
|
|
script('files_external', 'settings');
|
|
|
|
style('files_external', 'settings');
|
|
|
|
|
|
|
|
// load custom JS
|
|
|
|
foreach ($_['backends'] as $backend) {
|
|
|
|
if ($backend->getCustomJs()) {
|
|
|
|
script('files_external', $backend->getCustomJs());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
foreach ($_['authMechanisms'] as $authMechanism) {
|
|
|
|
if ($authMechanism->getCustomJs()) {
|
|
|
|
script('files_external', $authMechanism->getCustomJs());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Authentication mechanisms for external storage backends
A backend can now specify generic authentication schemes that it
supports, instead of specifying the parameters for its authentication
method directly. This allows multiple authentication mechanisms to be
implemented for a single scheme, providing altered functionality.
This commit introduces the backend framework for this feature, and so at
this point the UI will be broken as the frontend does not specify the
required information.
Terminology:
- authentication scheme
Parameter interface for the authentication method. A backend
supporting the 'password' scheme accepts two parameters, 'user' and
'password'.
- authentication mechanism
Specific mechanism implementing a scheme. Basic mechanisms may
forward configuration options directly to the backend, more advanced
ones may lookup parameters or retrieve them from the session
New dropdown selector for external storage configurations to select the
authentication mechanism to be used.
Authentication mechanisms can have visibilities, just like backends.
The API was extended too to make it easier to add/remove visibilities.
In addition, the concept of 'allowed visibility' has been introduced, so
a backend/auth mechanism can force a maximum visibility level (e.g.
Local storage type) that cannot be overridden by configuration in the
web UI.
An authentication mechanism is a fully instantiated implementation. This
allows an implementation to have dependencies injected into it, e.g. an
\OCP\IDB for database operations.
When a StorageConfig is being prepared for mounting, the authentication
mechanism implementation has manipulateStorage() called,
which inserts the relevant authentication method options into the
storage ready for mounting.
2015-08-12 12:54:03 +03:00
|
|
|
function writeParameterInput($parameter, $options, $classes = []) {
|
|
|
|
$value = '';
|
|
|
|
if (isset($options[$parameter->getName()])) {
|
|
|
|
$value = $options[$parameter->getName()];
|
|
|
|
}
|
|
|
|
$placeholder = $parameter->getText();
|
|
|
|
$is_optional = $parameter->isFlagSet(DefinitionParameter::FLAG_OPTIONAL);
|
|
|
|
|
|
|
|
switch ($parameter->getType()) {
|
|
|
|
case DefinitionParameter::VALUE_PASSWORD: ?>
|
|
|
|
<?php if ($is_optional) { $classes[] = 'optional'; } ?>
|
|
|
|
<input type="password"
|
|
|
|
<?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?>
|
|
|
|
data-parameter="<?php p($parameter->getName()); ?>"
|
|
|
|
value="<?php p($value); ?>"
|
|
|
|
placeholder="<?php p($placeholder); ?>"
|
|
|
|
/>
|
|
|
|
<?php
|
|
|
|
break;
|
|
|
|
case DefinitionParameter::VALUE_BOOLEAN: ?>
|
2015-09-17 18:39:27 +03:00
|
|
|
<?php $checkboxId = uniqid("checkbox_"); ?>
|
|
|
|
<input type="checkbox"
|
|
|
|
id="<?php p($checkboxId); ?>"
|
2015-10-13 15:56:55 +03:00
|
|
|
<?php if (!empty($classes)): ?> class="checkbox <?php p(implode(' ', $classes)); ?>"<?php endif; ?>
|
2015-09-17 18:39:27 +03:00
|
|
|
data-parameter="<?php p($parameter->getName()); ?>"
|
|
|
|
<?php if ($value === true): ?> checked="checked"<?php endif; ?>
|
|
|
|
/>
|
|
|
|
<label for="<?php p($checkboxId); ?>"><?php p($placeholder); ?></label>
|
Authentication mechanisms for external storage backends
A backend can now specify generic authentication schemes that it
supports, instead of specifying the parameters for its authentication
method directly. This allows multiple authentication mechanisms to be
implemented for a single scheme, providing altered functionality.
This commit introduces the backend framework for this feature, and so at
this point the UI will be broken as the frontend does not specify the
required information.
Terminology:
- authentication scheme
Parameter interface for the authentication method. A backend
supporting the 'password' scheme accepts two parameters, 'user' and
'password'.
- authentication mechanism
Specific mechanism implementing a scheme. Basic mechanisms may
forward configuration options directly to the backend, more advanced
ones may lookup parameters or retrieve them from the session
New dropdown selector for external storage configurations to select the
authentication mechanism to be used.
Authentication mechanisms can have visibilities, just like backends.
The API was extended too to make it easier to add/remove visibilities.
In addition, the concept of 'allowed visibility' has been introduced, so
a backend/auth mechanism can force a maximum visibility level (e.g.
Local storage type) that cannot be overridden by configuration in the
web UI.
An authentication mechanism is a fully instantiated implementation. This
allows an implementation to have dependencies injected into it, e.g. an
\OCP\IDB for database operations.
When a StorageConfig is being prepared for mounting, the authentication
mechanism implementation has manipulateStorage() called,
which inserts the relevant authentication method options into the
storage ready for mounting.
2015-08-12 12:54:03 +03:00
|
|
|
<?php
|
|
|
|
break;
|
|
|
|
case DefinitionParameter::VALUE_HIDDEN: ?>
|
|
|
|
<input type="hidden"
|
|
|
|
<?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?>
|
|
|
|
data-parameter="<?php p($parameter->getName()); ?>"
|
|
|
|
value="<?php p($value); ?>"
|
|
|
|
/>
|
|
|
|
<?php
|
|
|
|
break;
|
|
|
|
default: ?>
|
|
|
|
<?php if ($is_optional) { $classes[] = 'optional'; } ?>
|
|
|
|
<input type="text"
|
|
|
|
<?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?>
|
|
|
|
data-parameter="<?php p($parameter->getName()); ?>"
|
|
|
|
value="<?php p($value); ?>"
|
|
|
|
placeholder="<?php p($placeholder); ?>"
|
|
|
|
/>
|
|
|
|
<?php
|
|
|
|
}
|
|
|
|
}
|
2015-08-11 20:45:07 +03:00
|
|
|
?>
|
2015-03-31 17:25:33 +03:00
|
|
|
<form id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled']?'true': 'false'; ?>">
|
2013-10-04 19:35:46 +04:00
|
|
|
<h2><?php p($l->t('External Storage')); ?></h2>
|
2014-03-27 19:35:34 +04:00
|
|
|
<?php if (isset($_['dependencies']) and ($_['dependencies']<>'')) print_unescaped(''.$_['dependencies'].''); ?>
|
2015-09-14 15:57:49 +03:00
|
|
|
<table id="externalStorage" class="grid" data-admin='<?php print_unescaped(json_encode($_['visibilityType'] === BackendService::VISIBILITY_ADMIN)); ?>'>
|
2014-03-27 19:35:34 +04:00
|
|
|
<thead>
|
|
|
|
<tr>
|
|
|
|
<th></th>
|
|
|
|
<th><?php p($l->t('Folder name')); ?></th>
|
|
|
|
<th><?php p($l->t('External storage')); ?></th>
|
Authentication mechanisms for external storage backends
A backend can now specify generic authentication schemes that it
supports, instead of specifying the parameters for its authentication
method directly. This allows multiple authentication mechanisms to be
implemented for a single scheme, providing altered functionality.
This commit introduces the backend framework for this feature, and so at
this point the UI will be broken as the frontend does not specify the
required information.
Terminology:
- authentication scheme
Parameter interface for the authentication method. A backend
supporting the 'password' scheme accepts two parameters, 'user' and
'password'.
- authentication mechanism
Specific mechanism implementing a scheme. Basic mechanisms may
forward configuration options directly to the backend, more advanced
ones may lookup parameters or retrieve them from the session
New dropdown selector for external storage configurations to select the
authentication mechanism to be used.
Authentication mechanisms can have visibilities, just like backends.
The API was extended too to make it easier to add/remove visibilities.
In addition, the concept of 'allowed visibility' has been introduced, so
a backend/auth mechanism can force a maximum visibility level (e.g.
Local storage type) that cannot be overridden by configuration in the
web UI.
An authentication mechanism is a fully instantiated implementation. This
allows an implementation to have dependencies injected into it, e.g. an
\OCP\IDB for database operations.
When a StorageConfig is being prepared for mounting, the authentication
mechanism implementation has manipulateStorage() called,
which inserts the relevant authentication method options into the
storage ready for mounting.
2015-08-12 12:54:03 +03:00
|
|
|
<th><?php p($l->t('Authentication')); ?></th>
|
2014-03-27 19:35:34 +04:00
|
|
|
<th><?php p($l->t('Configuration')); ?></th>
|
2015-09-14 15:57:49 +03:00
|
|
|
<?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN) print_unescaped('<th>'.$l->t('Available for').'</th>'); ?>
|
2014-03-27 19:35:34 +04:00
|
|
|
<th> </th>
|
2015-03-16 16:07:53 +03:00
|
|
|
<th> </th>
|
2014-03-27 19:35:34 +04:00
|
|
|
</tr>
|
|
|
|
</thead>
|
2014-07-16 00:33:30 +04:00
|
|
|
<tbody>
|
2015-08-11 20:45:07 +03:00
|
|
|
<tr id="addMountPoint">
|
|
|
|
<td class="status">
|
|
|
|
<span></span>
|
|
|
|
</td>
|
|
|
|
<td class="mountPoint"><input type="text" name="mountPoint" value=""
|
|
|
|
placeholder="<?php p($l->t('Folder name')); ?>">
|
|
|
|
</td>
|
|
|
|
<td class="backend">
|
|
|
|
<select id="selectBackend" class="selectBackend" data-configurations='<?php p(json_encode($_['backends'])); ?>'>
|
|
|
|
<option value="" disabled selected
|
|
|
|
style="display:none;">
|
|
|
|
<?php p($l->t('Add storage')); ?>
|
|
|
|
</option>
|
|
|
|
<?php
|
2015-09-14 15:57:49 +03:00
|
|
|
$sortedBackends = array_filter($_['backends'], function($backend) use ($_) {
|
|
|
|
return $backend->isVisibleFor($_['visibilityType']);
|
|
|
|
});
|
2015-08-11 20:45:07 +03:00
|
|
|
uasort($sortedBackends, function($a, $b) {
|
|
|
|
return strcasecmp($a->getText(), $b->getText());
|
|
|
|
});
|
|
|
|
?>
|
|
|
|
<?php foreach ($sortedBackends as $backend): ?>
|
2015-09-17 19:00:15 +03:00
|
|
|
<?php if ($backend->getDeprecateTo()) continue; // ignore deprecated backends ?>
|
2015-08-12 22:03:11 +03:00
|
|
|
<option value="<?php p($backend->getIdentifier()); ?>"><?php p($backend->getText()); ?></option>
|
2015-08-11 20:45:07 +03:00
|
|
|
<?php endforeach; ?>
|
|
|
|
</select>
|
|
|
|
</td>
|
Authentication mechanisms for external storage backends
A backend can now specify generic authentication schemes that it
supports, instead of specifying the parameters for its authentication
method directly. This allows multiple authentication mechanisms to be
implemented for a single scheme, providing altered functionality.
This commit introduces the backend framework for this feature, and so at
this point the UI will be broken as the frontend does not specify the
required information.
Terminology:
- authentication scheme
Parameter interface for the authentication method. A backend
supporting the 'password' scheme accepts two parameters, 'user' and
'password'.
- authentication mechanism
Specific mechanism implementing a scheme. Basic mechanisms may
forward configuration options directly to the backend, more advanced
ones may lookup parameters or retrieve them from the session
New dropdown selector for external storage configurations to select the
authentication mechanism to be used.
Authentication mechanisms can have visibilities, just like backends.
The API was extended too to make it easier to add/remove visibilities.
In addition, the concept of 'allowed visibility' has been introduced, so
a backend/auth mechanism can force a maximum visibility level (e.g.
Local storage type) that cannot be overridden by configuration in the
web UI.
An authentication mechanism is a fully instantiated implementation. This
allows an implementation to have dependencies injected into it, e.g. an
\OCP\IDB for database operations.
When a StorageConfig is being prepared for mounting, the authentication
mechanism implementation has manipulateStorage() called,
which inserts the relevant authentication method options into the
storage ready for mounting.
2015-08-12 12:54:03 +03:00
|
|
|
<td class="authentication" data-mechanisms='<?php p(json_encode($_['authMechanisms'])); ?>'></td>
|
|
|
|
<td class="configuration"></td>
|
2015-09-14 15:57:49 +03:00
|
|
|
<?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN): ?>
|
2015-08-11 20:45:07 +03:00
|
|
|
<td class="applicable" align="right">
|
|
|
|
<input type="hidden" class="applicableUsers" style="width:20em;" value="" />
|
|
|
|
</td>
|
|
|
|
<?php endif; ?>
|
|
|
|
<td class="mountOptionsToggle hidden">
|
|
|
|
<img class="svg action"
|
|
|
|
title="<?php p($l->t('Advanced settings')); ?>"
|
|
|
|
alt="<?php p($l->t('Advanced settings')); ?>"
|
|
|
|
src="<?php print_unescaped(image_path('core', 'actions/settings.svg')); ?>"
|
|
|
|
/>
|
|
|
|
<input type="hidden" class="mountOptions" value="" />
|
|
|
|
</td>
|
|
|
|
<td class="hidden">
|
|
|
|
<img class="svg action"
|
|
|
|
alt="<?php p($l->t('Delete')); ?>"
|
|
|
|
title="<?php p($l->t('Delete')); ?>"
|
|
|
|
src="<?php print_unescaped(image_path('core', 'actions/delete.svg')); ?>"
|
|
|
|
/>
|
|
|
|
</td>
|
|
|
|
</tr>
|
2014-03-27 19:35:34 +04:00
|
|
|
</tbody>
|
|
|
|
</table>
|
|
|
|
<br />
|
2012-08-29 10:42:49 +04:00
|
|
|
|
2015-09-14 15:57:49 +03:00
|
|
|
<?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN): ?>
|
2014-03-27 19:35:34 +04:00
|
|
|
<br />
|
2015-10-13 15:56:55 +03:00
|
|
|
<input type="checkbox" name="allowUserMounting" id="allowUserMounting" class="checkbox"
|
2014-03-27 19:35:34 +04:00
|
|
|
value="1" <?php if ($_['allowUserMounting'] == 'yes') print_unescaped(' checked="checked"'); ?> />
|
2015-11-03 10:56:15 +03:00
|
|
|
<label for="allowUserMounting"><?php p($l->t('Allow users to mount external storage')); ?></label> <span id="userMountingMsg" class="msg"></span>
|
2014-02-18 19:36:02 +04:00
|
|
|
|
2014-06-16 13:33:51 +04:00
|
|
|
<p id="userMountingBackends"<?php if ($_['allowUserMounting'] != 'yes'): ?> class="hidden"<?php endif; ?>>
|
2014-03-27 19:35:34 +04:00
|
|
|
<?php p($l->t('Allow users to mount the following external storage')); ?><br />
|
2015-09-14 15:57:49 +03:00
|
|
|
<?php
|
|
|
|
$userBackends = array_filter($_['backends'], function($backend) {
|
|
|
|
return $backend->isAllowedVisibleFor(BackendService::VISIBILITY_PERSONAL);
|
|
|
|
});
|
|
|
|
?>
|
|
|
|
<?php $i = 0; foreach ($userBackends as $backend): ?>
|
2015-09-17 19:00:15 +03:00
|
|
|
<?php if ($deprecateTo = $backend->getDeprecateTo()): ?>
|
|
|
|
<input type="hidden" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" data-deprecate-to="<?php p($deprecateTo->getIdentifier()); ?>" />
|
|
|
|
<?php else: ?>
|
2015-10-13 15:56:55 +03:00
|
|
|
<input type="checkbox" id="allowUserMountingBackends<?php p($i); ?>" class="checkbox" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) print_unescaped(' checked="checked"'); ?> />
|
2015-09-17 19:00:15 +03:00
|
|
|
<label for="allowUserMountingBackends<?php p($i); ?>"><?php p($backend->getText()); ?></label> <br />
|
|
|
|
<?php endif; ?>
|
2014-03-27 19:35:34 +04:00
|
|
|
<?php $i++; ?>
|
|
|
|
<?php endforeach; ?>
|
|
|
|
</p>
|
|
|
|
<?php endif; ?>
|
2012-09-25 14:01:09 +04:00
|
|
|
</form>
|