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

unify share settings

This commit is contained in:
Bjoern Schiessle 2014-06-04 11:07:31 +02:00
parent cf9099c788
commit 6578f00b4b
6 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/ajax/share.php
View File

@ -236,7 +236,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
break; break;
case 'getShareWith': case 'getShareWith':
if (isset($_GET['search'])) { if (isset($_GET['search'])) {
$sharePolicy = OC_Appconfig::getValue('core', 'shareapi_share_policy', 'global'); $shareWithinGroupOnly = OC\Share\Share::shareWithGroupMembersOnly();
$shareWith = array(); $shareWith = array();
// if (OC_App::isEnabled('contacts')) { // if (OC_App::isEnabled('contacts')) {
// // TODO Add function to contacts to only get the 'fullname' column to improve performance // // TODO Add function to contacts to only get the 'fullname' column to improve performance
@ -256,7 +256,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
// } // }
// } // }
$groups = OC_Group::getGroups($_GET['search']); $groups = OC_Group::getGroups($_GET['search']);
if ($sharePolicy == 'groups_only') { if ($shareWithinGroupOnly) {
$usergroups = OC_Group::getUserGroups(OC_User::getUser()); $usergroups = OC_Group::getUserGroups(OC_User::getUser());
$groups = array_intersect($groups, $usergroups); $groups = array_intersect($groups, $usergroups);
} }
@ -266,7 +266,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
$offset = 0; $offset = 0;
while ($count < 15 && count($users) == $limit) { while ($count < 15 && count($users) == $limit) {
$limit = 15 - $count; $limit = 15 - $count;
if ($sharePolicy == 'groups_only') { if ($shareWithinGroupOnly) {
$users = OC_Group::DisplayNamesInGroups($usergroups, $_GET['search'], $limit, $offset); $users = OC_Group::DisplayNamesInGroups($usergroups, $_GET['search'], $limit, $offset);
} else { } else {
$users = OC_User::getDisplayNames($_GET['search'], $limit, $offset); $users = OC_User::getDisplayNames($_GET['search'], $limit, $offset);

16
lib/private/share/share.php
View File

@ -478,7 +478,7 @@ class Share extends \OC\Share\Constants {
*/ */
public static function shareItem($itemType, $itemSource, $shareType, $shareWith, $permissions, $itemSourceName = null, \DateTime $expirationDate = null) { public static function shareItem($itemType, $itemSource, $shareType, $shareWith, $permissions, $itemSourceName = null, \DateTime $expirationDate = null) {
$uidOwner = \OC_User::getUser(); $uidOwner = \OC_User::getUser();
$sharingPolicy = \OC_Appconfig::getValue('core', 'shareapi_share_policy', 'global'); $shareWithinGroupOnly = self::shareWithGroupMembersOnly();
$l = \OC_L10N::get('lib'); $l = \OC_L10N::get('lib');
if (is_null($itemSourceName)) { if (is_null($itemSourceName)) {
@ -533,7 +533,7 @@ class Share extends \OC\Share\Constants {
\OC_Log::write('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OC_Log::ERROR); \OC_Log::write('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OC_Log::ERROR);
throw new \Exception($message_t); throw new \Exception($message_t);
} }
if ($sharingPolicy == 'groups_only') { if ($shareWithinGroupOnly) {
$inGroup = array_intersect(\OC_Group::getUserGroups($uidOwner), \OC_Group::getUserGroups($shareWith)); $inGroup = array_intersect(\OC_Group::getUserGroups($uidOwner), \OC_Group::getUserGroups($shareWith));
if (empty($inGroup)) { if (empty($inGroup)) {
$message = 'Sharing %s failed, because the user ' $message = 'Sharing %s failed, because the user '
@ -563,7 +563,7 @@ class Share extends \OC\Share\Constants {
\OC_Log::write('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OC_Log::ERROR); \OC_Log::write('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OC_Log::ERROR);
throw new \Exception($message_t); throw new \Exception($message_t);
} }
if ($sharingPolicy == 'groups_only' && !\OC_Group::inGroup($uidOwner, $shareWith)) { if ($shareWithinGroupOnly && !\OC_Group::inGroup($uidOwner, $shareWith)) {
$message = 'Sharing %s failed, because ' $message = 'Sharing %s failed, because '
.'%s is not a member of the group %s'; .'%s is not a member of the group %s';
$message_t = $l->t('Sharing %s failed, because %s is not a member of the group %s', array($itemSourceName, $uidOwner, $shareWith)); $message_t = $l->t('Sharing %s failed, because %s is not a member of the group %s', array($itemSourceName, $uidOwner, $shareWith));
@ -1829,4 +1829,14 @@ class Share extends \OC\Share\Constants {
return $backend->formatItems($items, $format, $parameters); return $backend->formatItems($items, $format, $parameters);
} }
} }
/**
* check if user can only share with group members
* @return bool
*/
public static function shareWithGroupMembersOnly() {
$value = \OC_Appconfig::getValue('core', 'shareapi_only_share_with_group_members', 'no');
return ($value === 'yes') ? true : false;
}
} }

11
lib/private/updater.php
View File

@ -53,7 +53,7 @@ class Updater extends BasicEmitter {
$version = \OC_Util::getVersion(); $version = \OC_Util::getVersion();
$version['installed'] = \OC_Appconfig::getValue('core', 'installedat'); $version['installed'] = \OC_Appconfig::getValue('core', 'installedat');
$version['updated'] = \OC_Appconfig::getValue('core', 'lastupdatedat'); $version['updated'] = \OC_Appconfig::getValue('core', 'lastupdatedat');
$version['updatechannel'] = \OC_Util::getChannel(); $version['updatechannel'] = \OC_Util::getChannel();
$version['edition'] = \OC_Util::getEditionString(); $version['edition'] = \OC_Util::getEditionString();
$version['build'] = \OC_Util::getBuild(); $version['build'] = \OC_Util::getBuild();
$versionString = implode('x', $version); $versionString = implode('x', $version);
@ -119,7 +119,7 @@ class Updater extends BasicEmitter {
if (!\OC::$CLI && version_compare($installedVersion, '6.90.1', '<')) { if (!\OC::$CLI && version_compare($installedVersion, '6.90.1', '<')) {
// Add the trusted_domains config if it is not existant // Add the trusted_domains config if it is not existant
// This is added to prevent host header poisoning // This is added to prevent host header poisoning
\OC_Config::setValue('trusted_domains', \OC_Config::getValue('trusted_domains', array(\OC_Request::serverHost()))); \OC_Config::setValue('trusted_domains', \OC_Config::getValue('trusted_domains', array(\OC_Request::serverHost())));
} }
/* /*
* STOP CONFIG CHANGES FOR OLDER VERSIONS * STOP CONFIG CHANGES FOR OLDER VERSIONS
@ -151,6 +151,13 @@ class Updater extends BasicEmitter {
$this->emit('\OC\Updater', 'failure', array($exception->getMessage())); $this->emit('\OC\Updater', 'failure', array($exception->getMessage()));
} }
// upgrade from OC6 to OC7
// TODO removed it again for OC8
$sharePolicy = \OC_Appconfig::getValue('core', 'shareapi_share_policy', 'global');
if ($sharePolicy === 'groups_only') {
\OC_Appconfig::setValue('core', 'shareapi_only_share_with_group_members', 'yes');
}
if ($canUpgrade) { if ($canUpgrade) {
// proceed with real upgrade // proceed with real upgrade
try { try {

2
settings/admin.php
View File

@ -83,7 +83,7 @@ $tmpl->assign('enforceLinkPassword', \OCP\Util::isPublicLinkPasswordRequired());
$tmpl->assign('allowPublicUpload', OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes')); $tmpl->assign('allowPublicUpload', OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes'));
$tmpl->assign('allowResharing', OC_Appconfig::getValue('core', 'shareapi_allow_resharing', 'yes')); $tmpl->assign('allowResharing', OC_Appconfig::getValue('core', 'shareapi_allow_resharing', 'yes'));
$tmpl->assign('allowMailNotification', OC_Appconfig::getValue('core', 'shareapi_allow_mail_notification', 'no')); $tmpl->assign('allowMailNotification', OC_Appconfig::getValue('core', 'shareapi_allow_mail_notification', 'no'));
$tmpl->assign('sharePolicy', OC_Appconfig::getValue('core', 'shareapi_share_policy', 'global')); $tmpl->assign('onlyShareWithGroupMembers', \OC\Share\Share::shareWithGroupMembersOnly());
$tmpl->assign('forms', array()); $tmpl->assign('forms', array());
foreach($forms as $form) { foreach($forms as $form) {
$tmpl->append('forms', $form); $tmpl->append('forms', $form);

9
settings/templates/admin.php
View File

@ -278,12 +278,9 @@ if (!$_['internetconnectionworking']) {
</tr> </tr>
<tr> <tr>
<td <?php if ($_['shareAPIEnabled'] === 'no') print_unescaped('class="hidden"');?>> <td <?php if ($_['shareAPIEnabled'] === 'no') print_unescaped('class="hidden"');?>>
<input type="radio" name="shareapi_share_policy" id="sharePolicyGlobal" <input type="checkbox" name="shareapi_only_share_with_group_members" id="onlyShareWithGroupMembers"
value="global" <?php if ($_['sharePolicy'] === 'global') print_unescaped('checked="checked"'); ?> /> value="1" <?php if ($_['onlyShareWithGroupMembers']) print_unescaped('checked="checked"'); ?> />
<label for="sharePolicyGlobal"><?php p($l->t('Allow users to share with anyone')); ?></label><br/> <label for="onlyShareWithGroupMembers"><?php p($l->t('Restrict users to only share with users in their groups'));?></label><br/>
<input type="radio" name="shareapi_share_policy" id="sharePolicyGroupsOnly"
value="groups_only" <?php if ($_['sharePolicy'] === 'groups_only') print_unescaped('checked="checked"'); ?> />
<label for="sharePolicyGroupsOnly"><?php p($l->t('Allow users to only share with users in their groups'));?></label><br/>
</td> </td>
</tr> </tr>
<tr> <tr>

6
tests/lib/share/share.php
View File

@ -384,8 +384,8 @@ class Test_Share extends PHPUnit_Framework_TestCase {
} catch (Exception $exception) { } catch (Exception $exception) {
$this->assertEquals($message, $exception->getMessage()); $this->assertEquals($message, $exception->getMessage());
} }
$policy = OC_Appconfig::getValue('core', 'shareapi_share_policy', 'global'); $policy = OC_Appconfig::getValue('core', 'shareapi_only_share_with_group_members', 'no');
OC_Appconfig::setValue('core', 'shareapi_share_policy', 'groups_only'); OC_Appconfig::setValue('core', 'shareapi_only_share_with_group_members', 'yes');
$message = 'Sharing test.txt failed, because '.$this->user1.' is not a member of the group '.$this->group2; $message = 'Sharing test.txt failed, because '.$this->user1.' is not a member of the group '.$this->group2;
try { try {
OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group2, OCP\PERMISSION_READ); OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group2, OCP\PERMISSION_READ);
@ -393,7 +393,7 @@ class Test_Share extends PHPUnit_Framework_TestCase {
} catch (Exception $exception) { } catch (Exception $exception) {
$this->assertEquals($message, $exception->getMessage()); $this->assertEquals($message, $exception->getMessage());
} }
OC_Appconfig::setValue('core', 'shareapi_share_policy', $policy); OC_Appconfig::setValue('core', 'shareapi_only_share_with_group_members', $policy);
// Valid share // Valid share
$this->shareUserOneTestFileWithGroupOne(); $this->shareUserOneTestFileWithGroupOne();