From 59c7ae1ebfaae2b165d2c55dcbd7a28d3eb0ae23 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2024 19:33:53 +0300 Subject: [PATCH 1/3] chore(deps): update mariadb docker tag to v11.4 (#261) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | mariadb | service | minor | `11.3` -> `11.4` | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/cloud-py-api/nc_py_api). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/analysis-coverage.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/analysis-coverage.yml b/.github/workflows/analysis-coverage.yml index 37f16595..bda757b6 100644 --- a/.github/workflows/analysis-coverage.yml +++ b/.github/workflows/analysis-coverage.yml @@ -53,7 +53,7 @@ jobs: services: mariadb: - image: mariadb:11.3 + image: mariadb:11.4 env: MARIADB_ROOT_PASSWORD: rootpassword MYSQL_DATABASE: nextcloud @@ -461,7 +461,7 @@ jobs: services: mariadb: - image: mariadb:11.3 + image: mariadb:11.4 env: MARIADB_ROOT_PASSWORD: rootpassword MYSQL_DATABASE: nextcloud From 4d03563075e7936eb71b9c3245d3bb3eacde821d Mon Sep 17 00:00:00 2001 From: Alexander Piskun <13381981+bigcat88@users.noreply.github.com> Date: Thu, 27 Jun 2024 20:21:30 +0300 Subject: [PATCH 2/3] updated "patch" for testing NC reflecting last changes (#266) The patch just stopped working because there was a commit to the master and backports to other versions of the cloud. Reference: https://github.com/nextcloud/server/commit/02313013ad9094ea0ec52f30672971ab03f4ec15 Signed-off-by: Alexander Piskun --- .github/workflows/analysis-coverage.yml | 4 ++-- tests/data/nc_pass_confirm.patch | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/analysis-coverage.yml b/.github/workflows/analysis-coverage.yml index bda757b6..cf1a53e0 100644 --- a/.github/workflows/analysis-coverage.yml +++ b/.github/workflows/analysis-coverage.yml @@ -46,7 +46,7 @@ jobs: fail-fast: false matrix: include: - - nextcloud: "27.1.4" + - nextcloud: "27.1.11" python: "3.10" php-version: "8.1" timeout-minutes: 60 @@ -195,7 +195,7 @@ jobs: fail-fast: false matrix: include: - - nextcloud: "27.1.4" + - nextcloud: "27.1.11" python: "3.11" php-version: "8.2" env: diff --git a/tests/data/nc_pass_confirm.patch b/tests/data/nc_pass_confirm.patch index 7a3a730e..d330f63e 100644 --- a/tests/data/nc_pass_confirm.patch +++ b/tests/data/nc_pass_confirm.patch @@ -1,11 +1,11 @@ diff --git a/lib/private/AppFramework/Middleware/Security/PasswordConfirmationMiddleware.php b/lib/private/AppFramework/Middleware/Security/PasswordConfirmationMiddleware.php -index a72a7a40016..c6738de65df 100644 +index 5ff9d7386da..04edf4e9991 100644 --- a/lib/private/AppFramework/Middleware/Security/PasswordConfirmationMiddleware.php +++ b/lib/private/AppFramework/Middleware/Security/PasswordConfirmationMiddleware.php -@@ -88,7 +88,7 @@ class PasswordConfirmationMiddleware extends Middleware { +@@ -93,7 +93,7 @@ class PasswordConfirmationMiddleware extends Middleware { $lastConfirm = (int) $this->session->get('last-password-confirm'); - // we can't check the password against a SAML backend, so skip password confirmation in this case + // TODO: confirm excludedUserBackEnds can go away and remove it - if (!isset($this->excludedUserBackEnds[$backendClassName]) && $lastConfirm < ($this->timeFactory->getTime() - (30 * 60 + 15))) { // allow 15 seconds delay + if (!isset($this->excludedUserBackEnds[$backendClassName]) && $lastConfirm < ($this->timeFactory->getTime() - 5)) { // allow 5 seconds delay throw new NotConfirmedException(); From a7ecfa767f54290c9f76ac22de236cfbb0858631 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2024 20:47:55 +0300 Subject: [PATCH 3/3] [pre-commit.ci] pre-commit autoupdate (#264) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.4.5 → v0.4.10](https://github.com/astral-sh/ruff-pre-commit/compare/v0.4.5...v0.4.10) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Alexander Piskun <13381981+bigcat88@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 502e619d..e08b8517 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -41,7 +41,7 @@ repos: - id: pyproject-fmt - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.4.5 + rev: v0.4.10 hooks: - id: ruff