aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/settings/lib/Controller/CheckSetupController.php11
-rw-r--r--apps/settings/tests/Controller/CheckSetupControllerTest.php37
-rw-r--r--core/openapi.json22
-rw-r--r--lib/l10n/de_DE.js2
-rw-r--r--lib/l10n/de_DE.json2
-rw-r--r--lib/private/Files/Cache/Updater.php4
-rw-r--r--lib/private/ServerContainer.php6
7 files changed, 19 insertions, 65 deletions
diff --git a/apps/settings/lib/Controller/CheckSetupController.php b/apps/settings/lib/Controller/CheckSetupController.php
index be0abe0d75c..59175be6884 100644
--- a/apps/settings/lib/Controller/CheckSetupController.php
+++ b/apps/settings/lib/Controller/CheckSetupController.php
@@ -290,17 +290,6 @@ class CheckSetupController extends Controller {
$features = $this->l10n->t('Federated Cloud Sharing');
}
- // Check if at least OpenSSL after 1.01d or 1.0.2b
- if (strpos($versionString, 'OpenSSL/') === 0) {
- $majorVersion = substr($versionString, 8, 5);
- $patchRelease = substr($versionString, 13, 6);
-
- if (($majorVersion === '1.0.1' && ord($patchRelease) < ord('d')) ||
- ($majorVersion === '1.0.2' && ord($patchRelease) < ord('b'))) {
- return $this->l10n->t('cURL is using an outdated %1$s version (%2$s). Please update your operating system or features such as %3$s will not work reliably.', ['OpenSSL', $versionString, $features]);
- }
- }
-
// Check if NSS and perform heuristic check
if (strpos($versionString, 'NSS/') === 0) {
try {
diff --git a/apps/settings/tests/Controller/CheckSetupControllerTest.php b/apps/settings/tests/Controller/CheckSetupControllerTest.php
index 2b074d24c39..d129850f29e 100644
--- a/apps/settings/tests/Controller/CheckSetupControllerTest.php
+++ b/apps/settings/tests/Controller/CheckSetupControllerTest.php
@@ -716,43 +716,6 @@ class CheckSetupControllerTest extends TestCase {
$this->assertSame('', $this->invokePrivate($this->checkSetupController, 'isUsedTlsLibOutdated'));
}
- public function testIsUsedTlsLibOutdatedWithOlderOpenSsl() {
- $this->config->expects($this->any())
- ->method('getSystemValue')
- ->willReturn(true);
- $this->checkSetupController
- ->expects($this->once())
- ->method('getCurlVersion')
- ->willReturn(['ssl_version' => 'OpenSSL/1.0.1c']);
- $this->assertSame('cURL is using an outdated OpenSSL version (OpenSSL/1.0.1c). Please update your operating system or features such as installing and updating apps via the App Store or Federated Cloud Sharing will not work reliably.', $this->invokePrivate($this->checkSetupController, 'isUsedTlsLibOutdated'));
- }
-
- public function testIsUsedTlsLibOutdatedWithOlderOpenSslAndWithoutAppstore() {
- $this->config
- ->expects($this->any())
- ->method('getSystemValue')
- ->willReturnMap([
- ['has_internet_connection', true, true],
- ['appstoreenabled', true, false],
- ]);
- $this->checkSetupController
- ->expects($this->once())
- ->method('getCurlVersion')
- ->willReturn(['ssl_version' => 'OpenSSL/1.0.1c']);
- $this->assertSame('cURL is using an outdated OpenSSL version (OpenSSL/1.0.1c). Please update your operating system or features such as Federated Cloud Sharing will not work reliably.', $this->invokePrivate($this->checkSetupController, 'isUsedTlsLibOutdated'));
- }
-
- public function testIsUsedTlsLibOutdatedWithOlderOpenSsl1() {
- $this->config->expects($this->any())
- ->method('getSystemValue')
- ->willReturn(true);
- $this->checkSetupController
- ->expects($this->once())
- ->method('getCurlVersion')
- ->willReturn(['ssl_version' => 'OpenSSL/1.0.2a']);
- $this->assertSame('cURL is using an outdated OpenSSL version (OpenSSL/1.0.2a). Please update your operating system or features such as installing and updating apps via the App Store or Federated Cloud Sharing will not work reliably.', $this->invokePrivate($this->checkSetupController, 'isUsedTlsLibOutdated'));
- }
-
public function testIsUsedTlsLibOutdatedWithMatchingOpenSslVersion() {
$this->config->expects($this->any())
->method('getSystemValue')
diff --git a/core/openapi.json b/core/openapi.json
index 2371150caa1..06e0047a190 100644
--- a/core/openapi.json
+++ b/core/openapi.json
@@ -444,7 +444,7 @@
}
},
"paths": {
- "/index.php/core/avatar/{userId}/{size}/dark": {
+ "/index.php/avatar/{userId}/{size}/dark": {
"get": {
"operationId": "avatar-get-avatar-dark",
"summary": "Get the dark avatar",
@@ -520,7 +520,7 @@
}
}
},
- "/index.php/core/avatar/{userId}/{size}": {
+ "/index.php/avatar/{userId}/{size}": {
"get": {
"operationId": "avatar-get-avatar",
"summary": "Get the avatar",
@@ -596,7 +596,7 @@
}
}
},
- "/index.php/core/avatar/guest/{guestName}/{size}/dark": {
+ "/index.php/avatar/guest/{guestName}/{size}/dark": {
"get": {
"operationId": "guest_avatar-get-avatar-dark",
"summary": "Returns a dark guest avatar image response",
@@ -675,7 +675,7 @@
}
}
},
- "/index.php/core/avatar/guest/{guestName}/{size}": {
+ "/index.php/avatar/guest/{guestName}/{size}": {
"get": {
"operationId": "guest_avatar-get-avatar",
"summary": "Returns a guest avatar image response",
@@ -764,7 +764,7 @@
}
}
},
- "/index.php/core/login/v2/poll": {
+ "/index.php/login/v2/poll": {
"post": {
"operationId": "client_flow_login_v2-poll",
"summary": "Poll the login flow credentials",
@@ -816,7 +816,7 @@
}
}
},
- "/index.php/core/login/v2": {
+ "/index.php/login/v2": {
"post": {
"operationId": "client_flow_login_v2-init",
"summary": "Init a login flow",
@@ -846,7 +846,7 @@
}
}
},
- "/index.php/core/core/preview": {
+ "/index.php/core/preview": {
"get": {
"operationId": "preview-get-preview-by-file-id",
"summary": "Get a preview by file ID",
@@ -975,7 +975,7 @@
}
}
},
- "/index.php/core/core/preview.png": {
+ "/index.php/core/preview.png": {
"get": {
"operationId": "preview-get-preview",
"summary": "Get a preview by file ID",
@@ -1103,7 +1103,7 @@
}
}
},
- "/index.php/core/core/references/preview/{referenceId}": {
+ "/index.php/core/references/preview/{referenceId}": {
"get": {
"operationId": "reference-preview",
"summary": "Get a preview for a reference",
@@ -1162,7 +1162,7 @@
}
}
},
- "/index.php/core/core/wipe/check": {
+ "/index.php/core/wipe/check": {
"post": {
"operationId": "wipe-check-wipe",
"summary": "Check if the device should be wiped",
@@ -1222,7 +1222,7 @@
}
}
},
- "/index.php/core/core/wipe/success": {
+ "/index.php/core/wipe/success": {
"post": {
"operationId": "wipe-wipe-done",
"summary": "Finish the wipe",
diff --git a/lib/l10n/de_DE.js b/lib/l10n/de_DE.js
index f69a36d7ab2..a1218c1a407 100644
--- a/lib/l10n/de_DE.js
+++ b/lib/l10n/de_DE.js
@@ -5,7 +5,7 @@ OC.L10N.register(
"This can usually be fixed by giving the web server write access to the config directory." : "Dies kann normalerweise behoben werden, indem dem Webserver Schreibzugriff auf das config-Verzeichnis gegeben wird.",
"But, if you prefer to keep config.php file read only, set the option \"config_is_read_only\" to true in it." : "Wenn Sie jedoch möchten, dass die Datei config.php schreibgeschützt bleiben soll, dann setzen Sie die Option \"config_is_read_only\" in der Datei auf true.",
"See %s" : "Siehe %s",
- "Application %1$s is not present or has a non-compatible version with this server. Please check the apps directory." : "Die Anwendung %1$s ist nicht vorhanden oder hat eine nicht kompatible Version mit diesem Server. Bitte überprüfen Sie das Apps-Verzeichnis.",
+ "Application %1$s is not present or has a non-compatible version with this server. Please check the apps directory." : "Die Anwendung %1$s ist nicht vorhanden oder hat eine mit diesem Server nicht kompatible Version. Bitte überprüfen Sie das App-Verzeichnis.",
"Sample configuration detected" : "Beispielkonfiguration gefunden",
"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Es wurde festgestellt, dass die Beispielkonfiguration kopiert wurde. Dies kann Ihre Installation zerstören und wird nicht unterstützt. Bitte die Dokumentation lesen, bevor Änderungen an der config.php vorgenommen werden.",
"404" : "404",
diff --git a/lib/l10n/de_DE.json b/lib/l10n/de_DE.json
index b782b1c787e..4cb16cdb58d 100644
--- a/lib/l10n/de_DE.json
+++ b/lib/l10n/de_DE.json
@@ -3,7 +3,7 @@
"This can usually be fixed by giving the web server write access to the config directory." : "Dies kann normalerweise behoben werden, indem dem Webserver Schreibzugriff auf das config-Verzeichnis gegeben wird.",
"But, if you prefer to keep config.php file read only, set the option \"config_is_read_only\" to true in it." : "Wenn Sie jedoch möchten, dass die Datei config.php schreibgeschützt bleiben soll, dann setzen Sie die Option \"config_is_read_only\" in der Datei auf true.",
"See %s" : "Siehe %s",
- "Application %1$s is not present or has a non-compatible version with this server. Please check the apps directory." : "Die Anwendung %1$s ist nicht vorhanden oder hat eine nicht kompatible Version mit diesem Server. Bitte überprüfen Sie das Apps-Verzeichnis.",
+ "Application %1$s is not present or has a non-compatible version with this server. Please check the apps directory." : "Die Anwendung %1$s ist nicht vorhanden oder hat eine mit diesem Server nicht kompatible Version. Bitte überprüfen Sie das App-Verzeichnis.",
"Sample configuration detected" : "Beispielkonfiguration gefunden",
"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Es wurde festgestellt, dass die Beispielkonfiguration kopiert wurde. Dies kann Ihre Installation zerstören und wird nicht unterstützt. Bitte die Dokumentation lesen, bevor Änderungen an der config.php vorgenommen werden.",
"404" : "404",
diff --git a/lib/private/Files/Cache/Updater.php b/lib/private/Files/Cache/Updater.php
index d94cff0685d..457dd207e9d 100644
--- a/lib/private/Files/Cache/Updater.php
+++ b/lib/private/Files/Cache/Updater.php
@@ -27,7 +27,7 @@
*/
namespace OC\Files\Cache;
-use OC\DB\Exceptions\DbalException;
+use Doctrine\DBAL\Exception\DeadlockException;
use OC\Files\FileInfo;
use OCP\Files\Cache\ICacheEntry;
use OCP\Files\Cache\IUpdater;
@@ -260,7 +260,7 @@ class Updater implements IUpdater {
if ($mtime !== false) {
try {
$this->cache->update($parentId, ['storage_mtime' => $mtime]);
- } catch (DbalException $e) {
+ } catch (DeadlockException $e) {
// ignore the failure.
// with failures concurrent updates, someone else would have already done it.
// in the worst case the `storage_mtime` isn't updated, which should at most only trigger an extra rescan
diff --git a/lib/private/ServerContainer.php b/lib/private/ServerContainer.php
index a8583bd6875..daa480a75d1 100644
--- a/lib/private/ServerContainer.php
+++ b/lib/private/ServerContainer.php
@@ -154,8 +154,10 @@ class ServerContainer extends SimpleContainer {
try {
return $appContainer->queryNoFallback($name);
} catch (QueryException $e) {
- // Didn't find the service or the respective app container,
- // ignore it and fall back to the core container.
+ // Didn't find the service or the respective app container
+ // In this case the service won't be part of the core container,
+ // so we can throw directly
+ throw $e;
}
} elseif (str_starts_with($name, 'OC\\Settings\\') && substr_count($name, '\\') >= 3) {
$segments = explode('\\', $name);
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-28 21:12:42 +0000