Merge branch 'main' into feat/task-processing

cloud-py-api · Jun 28, 2024 · 4268d96 · 4268d96
2 parents 26cb328 + a7ecfa7
commit 4268d96
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/analysis-coverage.yml b/.github/workflows/analysis-coverage.yml
@@ -46,14 +46,14 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - nextcloud: "27.1.4"
+          - nextcloud: "27.1.11"
             python: "3.10"
             php-version: "8.1"
     timeout-minutes: 60
 
     services:
       mariadb:
-        image: mariadb:11.3
+        image: mariadb:11.4
         env:
           MARIADB_ROOT_PASSWORD: rootpassword
           MYSQL_DATABASE: nextcloud
@@ -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:
@@ -461,7 +461,7 @@ jobs:
 
     services:
       mariadb:
-        image: mariadb:11.3
+        image: mariadb:11.4
         env:
           MARIADB_ROOT_PASSWORD: rootpassword
           MYSQL_DATABASE: nextcloud

diff --git 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
 

diff --git 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();