[stable8.2] Fix LDAP race conditions #24243

Merged
merged 1 commit into from Apr 26, 2016

Projects

None yet

3 participants

@MorrisJobke
Member
  • getFromCache is wrapped in isCached
  • inbetween the two calls the cache entry hits it's TTL
  • getFromCache returns null
  • this fix only checkes if the returned value is null and
    return only non-null values
  • backport of #24052
  • approval in #24052 (comment)
  • I tested this with openLDAP and the setup and login works just fine

@blizzz @nickvergessen @LukasReschke @davitol @owncloud/qa @owncloud/ldap We need some LDAP testing here.

@MorrisJobke MorrisJobke Fix LDAP race conditions
* getFromCache is wrapped in isCached
* inbetween the two calls the cache entry hits it's TTL
* getFromCache returns null
* this fix only checkes if the returned value is null and
  return only non-null values
8005299
@MorrisJobke MorrisJobke added this to the 8.2.4-current-maintenance milestone Apr 25, 2016
@blizzz
Contributor
blizzz commented Apr 25, 2016

looks good and works for me 👍

@davitol
Contributor
davitol commented Apr 26, 2016

👍

@davitol davitol added the tested label Apr 26, 2016
@blizzz blizzz added 4 - To release and removed 3 - To Review labels Apr 26, 2016
@blizzz blizzz merged commit f5f5dff into stable8.2 Apr 26, 2016

23 checks passed

Scrutinizer 1022 new issues, 1 updated code elements
Details
cla-bot-core Build #3485 succeeded in 14 sec
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
core-ci-linux-jsunit/database=sqlite,label=SLAVE Build #61240 succeeded in 2 min 10 sec
Details
core-ci-linux-swift-primary-storage/database=mysql,label=SLAVE Build #55376 succeeded in 13 min
Details
core-ci-linux/database=mysql,label=SLAVE Build #29842 succeeded in 18 min
Details
core-ci-linux/database=oci,label=SLAVE Build #29842 succeeded in 22 min
Details
core-ci-linux/database=pgsql,label=SLAVE Build #29842 succeeded in 16 min
Details
core-ci-linux/database=sqlite,label=SLAVE Build #29842 succeeded in 10 min
Details
ocs-api-integration-tests-ci Build #10054 succeeded in 40 sec
Details
server-master-linux-externals-ci/database=sqlite,external=smb-silvershell,label=SLAVE Build #9686 succeeded in 1 min 26 sec
Details
server-master-linux-externals-ci/database=sqlite,external=swift-ceph,label=SLAVE Build #9686 succeeded in 1 min 23 sec
Details
server-master-linux-externals-ci/database=sqlite,external=webdav-ownCloud,label=SLAVE Build #9686 succeeded in 3 min 56 sec
Details
server-master-linux-externals-smb-windows-ext-ci/database=sqlite,external=smb-windows,label=master Build #12657 succeeded in 2 min 17 sec
Details
server-master-linux-php5.4-ci/database=sqlite,label=SLAVE Build #2782 succeeded in 5 min 39 sec
Details
server-master-linux-php7-ci/database=sqlite,label=SLAVE Build #38074 succeeded in 2 min 54 sec
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=litmus,mirallBranch=v2.0.2,slave=SMASH Build #14018 succeeded in 7 min 7 sec
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_basicSync@0,mirallBranch=v2.0.2,slave=SMASH Build #14018 succeeded in 15 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_basicSync@1,mirallBranch=v2.0.2,slave=SMASH Build #14018 succeeded in 29 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_shareLink,mirallBranch=v2.0.2,slave=SMASH Build #14018 succeeded in 35 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_sharePermissions,mirallBranch=v2.0.2,slave=SMASH Build #14018 succeeded in 27 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_sharePropagationGroups,mirallBranch=v2.0.2,slave=SMASH Build #14018 succeeded in 10 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_sharePropagationInsideGroups,mirallBranch=v2.0.2,slave=SMASH Build #14018 succeeded in 13 min
Details
@blizzz blizzz deleted the stable8.2-backport-24052 branch Apr 26, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment