Cache details and include migration

owncloud · Jul 25, 2022 · b86e444 · b86e444
1 parent 9f7a03a
commit b86e444
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 2 deletions.
diff --git a/appinfo/Migrations/Version20220725070804.php b/appinfo/Migrations/Version20220725070804.php
@@ -0,0 +1,37 @@
+<?php
+namespace OCA\User_LDAP\Migrations;
+
+use OCP\Migration\ISimpleMigration;
+use OCP\Migration\IOutput;
+use OCP\IConfig;
+use OCA\User_LDAP\Helper;
+
+class Version20220725070804 implements ISimpleMigration {
+ /** @var IConfig */
+ private $config;
+ /** @var $helper */
+ private $helper;
+
+ /**
+ * @param IConfig $config
+ */
+ public function __construct(IConfig $config, Helper $helper) {
+ $this->config = $config;
+ $this->helper = $helper;
+ }
+ /**
+ * @param IOutput $out
+ */
+ public function run(IOutput $out) {
+ $prefixes = $this->helper->getServerConfigurationPrefixes();
+ foreach ($prefixes as $prefix) {
+ $groupnameValue = $this->config->getAppValue('user_ldap', "{$prefix}ldap_expert_groupname_attr", null);
+ if ($groupnameValue === null) {
+ $groupDisplaynameValue = $this->config->getAppValue('user_ldap', "{$prefix}ldap_group_display_name", null);
+ if ($groupDisplaynameValue !== null) {
+ $this->config->setAppValue('user_ldap', "{$prefix}ldap_expert_groupname_attr", $groupDisplaynameValue);
+ }
+ }
+ }
+ }
+}
diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -14,7 +14,7 @@ More information is available in the [LDAP User and Group Backend documentation]
  </description>
  <licence>AGPL</licence>
  <author>Jörn Friedrich Dreyer, Tom Needham, Juan Pablo Villafañez Ramos, Dominik Schmidt and Arthur Schiwon</author>
- <version>0.16.0</version>
+ <version>0.17.0</version>
  <types>
  <authentication/>
  </types>

diff --git a/lib/Group_LDAP.php b/lib/Group_LDAP.php
@@ -1002,6 +1002,12 @@ public function groupExists($gid) {
  }
 
  public function getGroupDetails($gid) {
+ $cacheKey = "groupDetails-$gid";
+ $details = $this->access->getConnection()->getFromCache($cacheKey);
+ if ($details !== null) {
+ return $details;
+ }
+
  $dn = $this->access->groupname2dn($gid);
  if ($dn === false) {
  // FIXME: It seems local groups also end up going through here...
@@ -1010,10 +1016,13 @@ public function getGroupDetails($gid) {
 
  $attr = $this->access->getConnection()->ldapGroupDisplayName;
  $displayname = $this->access->readAttribute($dn, $attr);
- return [
+
+ $details = [
  'gid' => $gid,
  'displayName' => $displayname[0],
  ];
+ $this->access->getConnection()->writeToCache($cacheKey, $details);
+ return $details;
  }
 
  /**