upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

Merge pull request #53393 from nextcloud/dependabot/composer/vendor-bin/openapi-extractor/nextcloud/openapi-extractor-1.8.0

Browse source
This commit is contained in:
Kate 2025-06-09 20:04:49 +02:00 committed by GitHub
commit d8a5d31b22
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
16 changed files with 46 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/files_sharing/lib/Controller/PublicPreviewController.php
View file

@ -107,7 +107,7 @@ class PublicPreviewController extends PublicShareController {
$downloadForbidden = $attributes?->getAttribute('permissions', 'download') === false;
// Is this header is set it means our UI is doing a preview for no-download shares
// we check a header so we at least prevent people from using the link directly (obfuscation)
$isPublicPreview = $this->request->getHeader('X-NC-Preview') === 'true';
$isPublicPreview = $this->request->getHeader('x-nc-preview') === 'true';
if ($isPublicPreview && $downloadForbidden) {
// Only cache for 15 minutes on public preview requests to quickly remove from cache

2
apps/files_sharing/openapi.json
View file

@ -1492,7 +1492,7 @@
}
},
{
"name": "X-NC-Preview",
"name": "x-nc-preview",
"in": "header",
"schema": {
"type": "string"

4
apps/files_sharing/tests/Controller/PublicPreviewControllerTest.php
View file

@ -144,7 +144,7 @@ class PublicPreviewControllerTest extends TestCase {
->willReturn($attributes);
$this->request->method('getHeader')
->with('X-NC-Preview')
->with('x-nc-preview')
->willReturn('true');
$file = $this->createMock(File::class);
@ -184,7 +184,7 @@ class PublicPreviewControllerTest extends TestCase {
->willReturn($attributes);
$this->request->method('getHeader')
->with('X-NC-Preview')
->with('x-nc-preview')
->willReturn('true');
$file = $this->createMock(File::class);

6
apps/webhook_listeners/lib/Controller/WebhooksController.php
View file

@ -137,7 +137,7 @@ class WebhooksController extends OCSController {
): DataResponse {
$appId = null;
if ($this->session->get('app_api') === true) {
$appId = $this->request->getHeader('EX-APP-ID');
$appId = $this->request->getHeader('ex-app-id');
}
try {
$authMethod = AuthMethod::from($authMethod ?? AuthMethod::None->value);
@ -206,7 +206,7 @@ class WebhooksController extends OCSController {
): DataResponse {
$appId = null;
if ($this->session->get('app_api') === true) {
$appId = $this->request->getHeader('EX-APP-ID');
$appId = $this->request->getHeader('ex-app-id');
}
try {
$authMethod = AuthMethod::from($authMethod ?? AuthMethod::None->value);
@ -271,7 +271,7 @@ class WebhooksController extends OCSController {
/**
* Remove all existing webhook registration mapped to an AppAPI app id
*
* @param string $appid id of the app, as in the EX-APP-ID for creation
* @param string $appid id of the app, as in the ex-app-id for creation
*
* @return DataResponse<Http::STATUS_OK, int, array{}>
*

6
apps/webhook_listeners/openapi.json
View file

@ -256,7 +256,7 @@
},
"parameters": [
{
"name": "EX-APP-ID",
"name": "ex-app-id",
"in": "header",
"schema": {
"type": "string"
@ -556,7 +556,7 @@
}
},
{
"name": "EX-APP-ID",
"name": "ex-app-id",
"in": "header",
"schema": {
"type": "string"
@ -809,7 +809,7 @@
{
"name": "appid",
"in": "path",
"description": "id of the app, as in the EX-APP-ID for creation",
"description": "id of the app, as in the ex-app-id for creation",
"required": true,
"schema": {
"type": "string"

2
core/Controller/AppPasswordController.php
View file

@ -77,7 +77,7 @@ class AppPasswordController extends OCSController {
$password = null;
}
$userAgent = $this->request->getHeader('USER_AGENT');
$userAgent = $this->request->getHeader('user-agent');
$token = $this->random->generate(72, ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS);

2
core/Controller/ClientFlowLoginController.php
View file

@ -65,7 +65,7 @@ class ClientFlowLoginController extends Controller {
}
private function getClientName(): string {
$userAgent = $this->request->getHeader('USER_AGENT');
$userAgent = $this->request->getHeader('user-agent');
return $userAgent !== '' ? $userAgent : 'unknown';
}

2
core/Controller/ClientFlowLoginV2Controller.php
View file

@ -293,7 +293,7 @@ class ClientFlowLoginV2Controller extends Controller {
#[OpenAPI(scope: OpenAPI::SCOPE_DEFAULT)]
public function init(): JSONResponse {
// Get client user agent
$userAgent = $this->request->getHeader('USER_AGENT');
$userAgent = $this->request->getHeader('user-agent');
$tokens = $this->loginFlowV2Service->createTokens($userAgent);

2
core/Controller/PreviewController.php
View file

@ -152,7 +152,7 @@ class PreviewController extends Controller {
// Is this header is set it means our UI is doing a preview for no-download shares
// we check a header so we at least prevent people from using the link directly (obfuscation)
$isNextcloudPreview = $this->request->getHeader('X-NC-Preview') === 'true';
$isNextcloudPreview = $this->request->getHeader('x-nc-preview') === 'true';
$storage = $node->getStorage();
if ($isNextcloudPreview === false && $storage->instanceOfStorage(ISharedStorage::class)) {
/** @var ISharedStorage $storage */

4
core/openapi-full.json
View file

@ -1173,7 +1173,7 @@
],
"parameters": [
{
"name": "USER_AGENT",
"name": "user-agent",
"in": "header",
"schema": {
"type": "string"
@ -8066,7 +8066,7 @@
],
"parameters": [
{
"name": "USER_AGENT",
"name": "user-agent",
"in": "header",
"schema": {
"type": "string"

4
core/openapi.json
View file

@ -1173,7 +1173,7 @@
],
"parameters": [
{
"name": "USER_AGENT",
"name": "user-agent",
"in": "header",
"schema": {
"type": "string"
@ -8066,7 +8066,7 @@
],
"parameters": [
{
"name": "USER_AGENT",
"name": "user-agent",
"in": "header",
"schema": {
"type": "string"

12
openapi.json
View file

@ -4645,7 +4645,7 @@
],
"parameters": [
{
"name": "USER_AGENT",
"name": "user-agent",
"in": "header",
"schema": {
"type": "string"
@ -11585,7 +11585,7 @@
],
"parameters": [
{
"name": "USER_AGENT",
"name": "user-agent",
"in": "header",
"schema": {
"type": "string"
@ -19842,7 +19842,7 @@
}
},
{
"name": "X-NC-Preview",
"name": "x-nc-preview",
"in": "header",
"schema": {
"type": "string"
@ -30808,7 +30808,7 @@
},
"parameters": [
{
"name": "EX-APP-ID",
"name": "ex-app-id",
"in": "header",
"schema": {
"type": "string"
@ -31108,7 +31108,7 @@
}
},
{
"name": "EX-APP-ID",
"name": "ex-app-id",
"in": "header",
"schema": {
"type": "string"
@ -31361,7 +31361,7 @@
{
"name": "appid",
"in": "path",
"description": "id of the app, as in the EX-APP-ID for creation",
"description": "id of the app, as in the ex-app-id for creation",
"required": true,
"schema": {
"type": "string"

4
tests/Core/Controller/AppPasswordControllerTest.php
View file

@ -123,7 +123,7 @@ class AppPasswordControllerTest extends TestCase {
$credentials->method('getLoginName')
->willReturn('myLoginName');
$this->request->method('getHeader')
->with('USER_AGENT')
->with('user-agent')
->willReturn('myUA');
$this->random->method('generate')
->with(
@ -164,7 +164,7 @@ class AppPasswordControllerTest extends TestCase {
$credentials->method('getLoginName')
->willReturn('myLoginName');
$this->request->method('getHeader')
->with('USER_AGENT')
->with('user-agent')
->willReturn('myUA');
$this->random->method('generate')
->with(

14
tests/Core/Controller/ClientFlowLoginControllerTest.php
View file

@ -119,7 +119,7 @@ class ClientFlowLoginControllerTest extends TestCase {
$this->request
->method('getHeader')
->willReturnMap([
['USER_AGENT', 'Mac OS X Sync Client'],
['user-agent', 'Mac OS X Sync Client'],
['OCS-APIREQUEST', 'true'],
]);
$this->random
@ -178,7 +178,7 @@ class ClientFlowLoginControllerTest extends TestCase {
$this->request
->method('getHeader')
->willReturnMap([
['USER_AGENT', 'Mac OS X Sync Client'],
['user-agent', 'Mac OS X Sync Client'],
['OCS-APIREQUEST', 'false'],
]);
$client = new Client();
@ -555,7 +555,7 @@ class ClientFlowLoginControllerTest extends TestCase {
[
['X-Forwarded-Proto', 'http'],
['X-Forwarded-Ssl', 'off'],
['USER_AGENT', ''],
['user-agent', ''],
],
'http',
'http',
@ -564,7 +564,7 @@ class ClientFlowLoginControllerTest extends TestCase {
[
['X-Forwarded-Proto', 'http'],
['X-Forwarded-Ssl', 'off'],
['USER_AGENT', ''],
['user-agent', ''],
],
'https',
'https',
@ -573,7 +573,7 @@ class ClientFlowLoginControllerTest extends TestCase {
[
['X-Forwarded-Proto', 'https'],
['X-Forwarded-Ssl', 'off'],
['USER_AGENT', ''],
['user-agent', ''],
],
'http',
'https',
@ -582,7 +582,7 @@ class ClientFlowLoginControllerTest extends TestCase {
[
['X-Forwarded-Proto', 'https'],
['X-Forwarded-Ssl', 'on'],
['USER_AGENT', ''],
['user-agent', ''],
],
'http',
'https',
@ -591,7 +591,7 @@ class ClientFlowLoginControllerTest extends TestCase {
[
['X-Forwarded-Proto', 'http'],
['X-Forwarded-Ssl', 'on'],
['USER_AGENT', ''],
['user-agent', ''],
],
'http',
'https',

2
tests/Core/Controller/PreviewControllerTest.php
View file

@ -265,7 +265,7 @@ class PreviewControllerTest extends \Test\TestCase {
$this->request
->method('getHeader')
->with('X-NC-Preview')
->with('x-nc-preview')
->willReturn('true');
$preview = $this->createMock(ISimpleFile::class);

24
vendor-bin/openapi-extractor/composer.lock generated
View file

@ -81,16 +81,16 @@
},
{
"name": "nextcloud/openapi-extractor",
"version": "v1.7.0",
"version": "v1.8.0",
"source": {
"type": "git",
"url": "https://github.com/nextcloud-releases/openapi-extractor.git",
"reference": "50391ff00656b88a9ca0d934c386c3e20642f24a"
"reference": "4c7a66afce9938279473fc08cadf011de41150f8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nextcloud-releases/openapi-extractor/zipball/50391ff00656b88a9ca0d934c386c3e20642f24a",
"reference": "50391ff00656b88a9ca0d934c386c3e20642f24a",
"url": "https://api.github.com/repos/nextcloud-releases/openapi-extractor/zipball/4c7a66afce9938279473fc08cadf011de41150f8",
"reference": "4c7a66afce9938279473fc08cadf011de41150f8",
"shasum": ""
},
"require": {
@ -122,22 +122,22 @@
"description": "A tool for extracting OpenAPI specifications from Nextcloud source code",
"support": {
"issues": "https://github.com/nextcloud-releases/openapi-extractor/issues",
"source": "https://github.com/nextcloud-releases/openapi-extractor/tree/v1.7.0"
"source": "https://github.com/nextcloud-releases/openapi-extractor/tree/v1.8.0"
},
"time": "2025-05-15T08:30:31+00:00"
"time": "2025-06-03T13:01:15+00:00"
},
{
"name": "nikic/php-parser",
"version": "v5.4.0",
"version": "v5.5.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
"reference": "447a020a1f875a434d62f2a401f53b82a396e494"
"reference": "ae59794362fe85e051a58ad36b289443f57be7a9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/447a020a1f875a434d62f2a401f53b82a396e494",
"reference": "447a020a1f875a434d62f2a401f53b82a396e494",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/ae59794362fe85e051a58ad36b289443f57be7a9",
"reference": "ae59794362fe85e051a58ad36b289443f57be7a9",
"shasum": ""
},
"require": {
@ -180,9 +180,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
"source": "https://github.com/nikic/PHP-Parser/tree/v5.4.0"
"source": "https://github.com/nikic/PHP-Parser/tree/v5.5.0"
},
"time": "2024-12-30T11:07:19+00:00"
"time": "2025-05-31T08:24:38+00:00"
},
{
"name": "phpstan/phpdoc-parser",