Skip to content

[stable22] Support redis user password auth and tls encryption #28112

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
juliusknorr merged 3 commits into from
Jul 22, 2021
Merged

[stable22] Support redis user password auth and tls encryption #28112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9d2cf57
Support redis user password auth and tls encryption
skjnldsv Jul 9, 2021
cc34255
Move integration-php7.3 to latest
skjnldsv Jul 20, 2021
8b17f31
Properly support RedisCluster
skjnldsv Jul 21, 2021
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
74 changes: 37 additions & 37 deletions .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -739,7 +739,7 @@ steps:
commands:
- git submodule update --init
- name: integration-capabilities_features
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:integration-php7.3-2
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
Expand All @@ -764,7 +764,7 @@ steps:
commands:
- git submodule update --init
- name: integration-collaboration_features
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:integration-php7.3-2
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
Expand All @@ -789,7 +789,7 @@ steps:
commands:
- git submodule update --init
- name: integration-federation_features
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:integration-php7.3-2
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- ./occ maintenance:install --admin-pass=admin
Expand All @@ -814,7 +814,7 @@ steps:
commands:
- git submodule update --init
- name: integration-auth
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:integration-php7.3-2
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
Expand All @@ -839,7 +839,7 @@ steps:
commands:
- git submodule update --init
- name: integration-avatar
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:integration-php7.3-2
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
Expand All @@ -864,7 +864,7 @@ steps:
commands:
- git submodule update --init
- name: integration-maintenance-mode
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:integration-php7.3-2
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
Expand All @@ -889,7 +889,7 @@ steps:
commands:
- git submodule update --init
- name: integration-ratelimiting
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:integration-php7.3-2
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
Expand Down Expand Up @@ -924,7 +924,7 @@ steps:
commands:
- git submodule update --init
- name: integration-carddav
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:integration-php7.3-2
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
Expand All @@ -949,7 +949,7 @@ steps:
commands:
- git submodule update --init
- name: integration-dav-v2
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:integration-php7.3-2
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
Expand All @@ -974,7 +974,7 @@ steps:
commands:
- git submodule update --init
- name: integration-ocs-v1
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:integration-php7.3-2
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
Expand All @@ -999,7 +999,7 @@ steps:
commands:
- git submodule update --init
- name: integration-checksums-v1
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:integration-php7.3-2
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
Expand All @@ -1024,7 +1024,7 @@ steps:
commands:
- git submodule update --init
- name: integration-external-storage
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:integration-php7.3-2
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
Expand All @@ -1049,7 +1049,7 @@ steps:
commands:
- git submodule update --init
- name: integration-provisioning-v1
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:integration-php7.3-2
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
Expand All @@ -1074,7 +1074,7 @@ steps:
commands:
- git submodule update --init
- name: integration-tags
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:integration-php7.3-2
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
Expand All @@ -1099,7 +1099,7 @@ steps:
commands:
- git submodule update --init
- name: integration-caldav
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:integration-php7.3-2
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
Expand All @@ -1124,7 +1124,7 @@ steps:
commands:
- git submodule update --init
- name: integration-comments
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:integration-php7.3-2
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
Expand All @@ -1149,7 +1149,7 @@ steps:
commands:
- git submodule update --init
- name: integration-comments-search
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:integration-php7.3-2
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
Expand All @@ -1174,7 +1174,7 @@ steps:
commands:
- git submodule update --init
- name: integration-contacts-menu
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:integration-php7.3-2
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
Expand All @@ -1199,7 +1199,7 @@ steps:
commands:
- git submodule update --init
- name: integration-favorites
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:integration-php7.3-2
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
Expand All @@ -1224,7 +1224,7 @@ steps:
commands:
- git submodule update --init
- name: integration-provisioning-v2
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:integration-php7.3-2
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
Expand All @@ -1249,7 +1249,7 @@ steps:
commands:
- git submodule update --init
- name: integration-webdav-related
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:integration-php7.3-2
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
Expand All @@ -1274,7 +1274,7 @@ steps:
commands:
- git submodule update --init
- name: integration-sharees-features
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:integration-php7.3-2
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
Expand All @@ -1299,7 +1299,7 @@ steps:
commands:
- git submodule update --init
- name: integration-sharees-v2-features
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:integration-php7.3-2
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
Expand All @@ -1324,7 +1324,7 @@ steps:
commands:
- git submodule update --init
- name: integration-sharing-v1
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:integration-php7.3-2
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
Expand All @@ -1349,7 +1349,7 @@ steps:
commands:
- git submodule update --init
- name: integration-sharing-v1-part2
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:integration-php7.3-2
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
Expand All @@ -1374,7 +1374,7 @@ steps:
commands:
- git submodule update --init
- name: integration-sharing-v1-part3
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:integration-php7.3-2
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
Expand Down Expand Up @@ -1405,7 +1405,7 @@ steps:
# build them.
- git clone --depth 1 --branch stable22 https://github.com/nextcloud/spreed apps/spreed
- name: integration-sharing-v1-video-verification
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:integration-php7.3-2
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
Expand All @@ -1430,7 +1430,7 @@ steps:
commands:
- git submodule update --init
- name: integration-setup-features
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:integration-php7.3-2
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- cd build/integration
Expand All @@ -1454,7 +1454,7 @@ steps:
commands:
- git submodule update --init
- name: integration-filesdrop-features
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:integration-php7.3-2
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
Expand All @@ -1479,7 +1479,7 @@ steps:
commands:
- git submodule update --init
- name: integration-transfer-ownership-features
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:integration-php7.3-2
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
Expand All @@ -1504,7 +1504,7 @@ steps:
commands:
- git submodule update --init
- name: integration-ldap-features
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:integration-php7.3-2
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
Expand All @@ -1529,7 +1529,7 @@ steps:
commands:
- git submodule update --init
- name: integration-ldap-openldap-features
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:integration-php7.3-2
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
Expand Down Expand Up @@ -1570,7 +1570,7 @@ steps:
commands:
- git submodule update --init
- name: integration-ldap-openldap-uid-features
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:integration-php7.3-2
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
Expand Down Expand Up @@ -1612,7 +1612,7 @@ steps:
commands:
- git submodule update --init
- name: integration-ldap-openldap-numerical-id-features
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:integration-php7.3-2
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
Expand Down Expand Up @@ -1653,7 +1653,7 @@ steps:
commands:
- git submodule update --init
- name: integration-trashbin
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:integration-php7.3-2
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
Expand All @@ -1678,7 +1678,7 @@ steps:
commands:
- git submodule update --init
- name: integration-remote-api
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:integration-php7.3-2
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
Expand All @@ -1703,7 +1703,7 @@ steps:
commands:
- git submodule update --init
- name: integration-download
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:integration-php7.3-2
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
Expand Down
4 changes: 0 additions & 4 deletions build/psalm-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4415,10 +4415,6 @@
</ForbiddenCode>
</file>
<file src="lib/private/RedisFactory.php">
<InvalidPropertyAssignmentValue occurrences="2">
<code>new \RedisCluster(null, $config['seeds'], $timeout, $readTimeout)</code>
<code>new \RedisCluster(null, $config['seeds'], $timeout, $readTimeout, false, $config['password'])</code>
</InvalidPropertyAssignmentValue>
<InvalidScalarArgument occurrences="1">
<code>\RedisCluster::OPT_SLAVE_FAILOVER</code>
</InvalidScalarArgument>
Expand Down
Loading