sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #34350 from nextcloud/bugfix/34278/add-capability-for-the-reference-api 

Add a capability for the reference API and expose the regex to clients
pull/34378/head
Joas Schilling 2022-10-03 18:23:21 +07:00 committed by GitHub
parent 586d031a53 d434da75bb
commit f888f99b0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/private/OCS/CoreCapabilities.php
Unescape Escape View File

@ -24,6 +24,7 @@ namespace OC\OCS;
use OCP\Capabilities\ICapability;
use OCP\IConfig;
use OCP\IURLGenerator;
/**
* Class Capabilities
@ -52,7 +53,9 @@ class CoreCapabilities implements ICapability {
'core' => [
'pollinterval' => $this->config->getSystemValue('pollinterval', 60),
'webdav-root' => $this->config->getSystemValue('webdav-root', 'remote.php/webdav'),
]
'reference-api' => true,
'reference-regex' => IURLGenerator::URL_REGEX_NO_MODIFIERS,
],
];
}
}

11
lib/public/IURLGenerator.php
Unescape Escape View File

@ -43,7 +43,16 @@ interface IURLGenerator {
*
* @since 25.0.0
*/
public const URL_REGEX = '/(\s|\n|^)(https?:\/\/)((?:[-A-Z0-9+_]+\.)+[-A-Z]+(?:\/[-A-Z0-9+&@#%?=~_|!:,.;()]*)*)(\s|\n|$)/mi';
public const URL_REGEX = '/' . self::URL_REGEX_NO_MODIFIERS . '/mi';
/**
* Regex for matching http(s) urls (without modifiers for client compatibility)
*
* This is a copy of the frontend regex in core/src/OCP/comments.js, make sure to adjust both when changing
*
* @since 25.0.0
*/
public const URL_REGEX_NO_MODIFIERS = '(\s|\n|^)(https?:\/\/)((?:[-A-Z0-9+_]+\.)+[-A-Z]+(?:\/[-A-Z0-9+&@#%?=~_|!:,.;()]*)*)(\s|\n|$)';
/**
* Returns the URL for a route