diff --git a/apps/cloud_federation_api/lib/Capabilities.php b/apps/cloud_federation_api/lib/Capabilities.php
index a3db8530ef00d96cc64099544b8a5f00ef6c3cbc..d614d7d473006b9cd0750cd8cdc08df6a8dfcdbc 100644
--- a/apps/cloud_federation_api/lib/Capabilities.php
+++ b/apps/cloud_federation_api/lib/Capabilities.php
@@ -48,9 +48,10 @@ class Capabilities implements ICapability {
'enabled' => true,
'apiVersion' => '1.0-proposal1',
'endPoint' => substr($url, 0, strrpos($url, '/')),
- 'shareTypes' => [
+ 'resourceTypes' => [
[
'name' => 'file',
+ 'shareTypes' => ['user', 'group'],
'protocols' => [
'webdav' => '/public.php/webdav/',
]
diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js
index 4aa60912c3771bded7e2a574680f5fdc1f747c66..7582b062d52dd3878bf7d4d13ab9cb2c242582ff 100644
--- a/core/js/setupchecks.js
+++ b/core/js/setupchecks.js
@@ -91,6 +91,46 @@
return deferred.promise();
},
+
+ /**
+ * Check whether the .well-known URLs works.
+ *
+ * @param url the URL to test
+ * @param placeholderUrl the placeholder URL - can be found at oc_defaults.docPlaceholderUrl
+ * @param {boolean} runCheck if this is set to false the check is skipped and no error is returned
+ *
+ * @return $.Deferred object resolved with an array of error messages
+ */
+ checkProviderUrl: function(url, placeholderUrl, runCheck) {
+ var expectedStatus = [200];
+ var deferred = $.Deferred();
+
+ if(runCheck === false) {
+ deferred.resolve([]);
+ return deferred.promise();
+ }
+ var afterCall = function(xhr) {
+ var messages = [];
+ if (expectedStatus.indexOf(xhr.status) === -1) {
+ var docUrl = placeholderUrl.replace('PLACEHOLDER', 'admin-nginx');
+ messages.push({
+ msg: t('core', 'Your web server is not properly set up to resolve "{url}". This is most likely related to a web server configuration that was not updated to deliver this folder directly. Please compare your configuration against the shipped rewrite rules in ".htaccess" for Apache or the provided one in the documentation for Nginx at it\'s <a target="_blank" rel="noreferrer noopener" href="{docLink}">documentation page</a>. On Nginx those are typically the lines starting with "location ~" that need an update.', { docLink: docUrl, url: url }),
+ type: OC.SetupChecks.MESSAGE_TYPE_WARNING
+ });
+ }
+ deferred.resolve(messages);
+ };
+
+ $.ajax({
+ type: 'GET',
+ url: url,
+ complete: afterCall,
+ allowAuthErrors: true
+ });
+ return deferred.promise();
+ },
+
+
/**
* Check whether the WOFF2 URLs works.
*
diff --git a/core/js/tests/specs/setupchecksSpec.js b/core/js/tests/specs/setupchecksSpec.js
index 6ea7d812d9a568a872d751d2f3953fc90c059528..e2c0053aa71c28a4886c323a6b0fcad7788b2830 100644
--- a/core/js/tests/specs/setupchecksSpec.js
+++ b/core/js/tests/specs/setupchecksSpec.js
@@ -107,6 +107,42 @@ describe('OC.SetupChecks tests', function() {
});
});
+ describe('checkProviderUrl', function() {
+ it('should fail with another response status code than the expected one', function(done) {
+ var async = OC.SetupChecks.checkProviderUrl('/ocm-provider/', 'http://example.org/PLACEHOLDER', true);
+
+ suite.server.requests[0].respond(302);
+
+ async.done(function( data, s, x ){
+ expect(data).toEqual([{
+ msg: 'Your web server is not properly set up to resolve "/ocm-provider/". This is most likely related to a web server configuration that was not updated to deliver this folder directly. Please compare your configuration against the shipped rewrite rules in ".htaccess" for Apache or the provided one in the documentation for Nginx at it\'s <a href="http://example.org/admin-nginx" rel="noreferrer noopener">documentation page</a>. On Nginx those are typically the lines starting with "location ~" that need an update.',
+ type: OC.SetupChecks.MESSAGE_TYPE_WARNING
+ }]);
+ done();
+ });
+ });
+
+ it('should return no error with the expected response status code', function(done) {
+ var async = OC.SetupChecks.checkProviderUrl('/ocm-provider/', 'http://example.org/PLACEHOLDER', true);
+
+ suite.server.requests[0].respond(200);
+
+ async.done(function( data, s, x ){
+ expect(data).toEqual([]);
+ done();
+ });
+ });
+
+ it('should return no error when no check should be run', function(done) {
+ var async = OC.SetupChecks.checkProviderUrl('/ocm-provider/', 'http://example.org/PLACEHOLDER', false);
+
+ async.done(function( data, s, x ){
+ expect(data).toEqual([]);
+ done();
+ });
+ });
+ });
+
describe('checkWOFF2Loading', function() {
it('should fail with another response status code than the expected one', function(done) {
var async = OC.SetupChecks.checkWOFF2Loading(OC.filePath('core', '', 'fonts/Nunito-Regular.woff2'), 'http://example.org/PLACEHOLDER');
diff --git a/lib/private/Setup.php b/lib/private/Setup.php
index 0278191587ace84d127d24ab0b685eb439c38746..5b2f71e69c5a02b6114c29955aefe7e84a9fa3fb 100644
--- a/lib/private/Setup.php
+++ b/lib/private/Setup.php
@@ -517,6 +517,7 @@ class Setup {
$content .= "\n RewriteCond %{REQUEST_FILENAME} !/robots.txt";
$content .= "\n RewriteCond %{REQUEST_FILENAME} !/updater/";
$content .= "\n RewriteCond %{REQUEST_FILENAME} !/ocs-provider/";
+ $content .= "\n RewriteCond %{REQUEST_FILENAME} !/ocm-provider/";
$content .= "\n RewriteCond %{REQUEST_URI} !^/\\.well-known/(acme-challenge|pki-validation)/.*";
$content .= "\n RewriteRule . index.php [PT,E=PATH_INFO:$1]";
$content .= "\n RewriteBase " . $rewriteBase;
diff --git a/settings/js/admin.js b/settings/js/admin.js
index 1c9b5460eab37e73064f425ccd6548817a64cad8..0ca9b6162e2c34bb289c6eae5052e235c26b7c7e 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -251,12 +251,14 @@ $(document).ready(function(){
OC.SetupChecks.checkWellKnownUrl('/.well-known/webfinger', oc_defaults.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true && !!oc_appconfig.core.public_webfinger, [200, 501]),
OC.SetupChecks.checkWellKnownUrl('/.well-known/caldav', oc_defaults.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true),
OC.SetupChecks.checkWellKnownUrl('/.well-known/carddav', oc_defaults.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true),
+ OC.SetupChecks.checkProviderUrl('/ocm-provider/', oc_defaults.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true),
+ OC.SetupChecks.checkProviderUrl('/ocs-provider/', oc_defaults.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true),
OC.SetupChecks.checkSetup(),
OC.SetupChecks.checkGeneric(),
OC.SetupChecks.checkWOFF2Loading(OC.filePath('core', '', 'fonts/Nunito-Regular.woff2'), oc_defaults.docPlaceholderUrl),
OC.SetupChecks.checkDataProtected()
- ).then(function (check1, check2, check3, check4, check5, check6, check7, check8) {
- var messages = [].concat(check1, check2, check3, check4, check5, check6, check7, check8);
+ ).then(function (check1, check2, check3, check4, check5, check6, check7, check8, check9, check10) {
+ var messages = [].concat(check1, check2, check3, check4, check5, check6, check7, check8, check9, check10);
var $el = $('#postsetupchecks');
$('#security-warning-state-loading').addClass('hidden');