diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-09-04 10:36:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-04 10:36:49 +0200 |
| commit | 560b9851e505116bda090d4db53c98a6e6d21fe3 (patch) | |
| tree | 29048ee4163b333fe73747cce0aaae880ff07ea7 | |
| parent | 2fdf946daed8e7086376fd704e7a491ab0cb697a (diff) | |
| parent | 22b141525f94915930e517843847eee403895faa (diff) | |
| download | nextcloud-server-560b9851e505116bda090d4db53c98a6e6d21fe3.tar.gz nextcloud-server-560b9851e505116bda090d4db53c98a6e6d21fe3.zip | |
Merge pull request #16231 from nextcloud/enhancement/noid/nodeinfo
+nodeinfo public service
| -rw-r--r-- | .htaccess | 1 | ||||
| -rw-r--r-- | public.php | 2 | ||||
| -rw-r--r-- | settings/Application.php | 5 | ||||
| -rw-r--r-- | settings/js/admin.js | 7 |
4 files changed, 11 insertions, 4 deletions
diff --git a/.htaccess b/.htaccess index 2a4c8dfe5b6..8b91422755c 100644 --- a/.htaccess +++ b/.htaccess @@ -47,6 +47,7 @@ RewriteRule ^\.well-known/host-meta /public.php?service=host-meta [QSA,L] RewriteRule ^\.well-known/host-meta\.json /public.php?service=host-meta-json [QSA,L] RewriteRule ^\.well-known/webfinger /public.php?service=webfinger [QSA,L] + RewriteRule ^\.well-known/nodeinfo /public.php?service=nodeinfo [QSA,L] RewriteRule ^\.well-known/carddav /remote.php/dav/ [R=301,L] RewriteRule ^\.well-known/caldav /remote.php/dav/ [R=301,L] RewriteRule ^remote/(.*) remote.php [QSA,L] diff --git a/public.php b/public.php index ae95624e8d9..43fbe29815e 100644 --- a/public.php +++ b/public.php @@ -68,7 +68,7 @@ try { OC_App::loadApps(array('filesystem', 'logging')); if (!\OC::$server->getAppManager()->isInstalled($app)) { - http_response_code(501); + http_response_code(404); exit; } OC_App::loadApp($app); diff --git a/settings/Application.php b/settings/Application.php index b76ebda403f..69e1d897c92 100644 --- a/settings/Application.php +++ b/settings/Application.php @@ -220,6 +220,11 @@ class Application extends App { $appConfig['core']['public_webfinger'] = $publicWebFinger; } + $publicNodeInfo = \OC::$server->getConfig()->getAppValue('core', 'public_nodeinfo', ''); + if (!empty($publicNodeInfo)) { + $appConfig['core']['public_nodeinfo'] = $publicNodeInfo; + } + $settings['array']['oc_appconfig'] = json_encode($appConfig); } } diff --git a/settings/js/admin.js b/settings/js/admin.js index 6f3db81655d..b2078862079 100644 --- a/settings/js/admin.js +++ b/settings/js/admin.js @@ -248,7 +248,8 @@ $(document).ready(function(){ // run setup checks then gather error messages $.when( OC.SetupChecks.checkWebDAV(), - OC.SetupChecks.checkWellKnownUrl('/.well-known/webfinger', OC.theme.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true && !!OC.appConfig.core.public_webfinger, [200, 501]), + OC.SetupChecks.checkWellKnownUrl('/.well-known/webfinger', OC.theme.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true && !!OC.appConfig.core.public_webfinger, [200, 404]), + OC.SetupChecks.checkWellKnownUrl('/.well-known/nodeinfo', OC.theme.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true && !!OC.appConfig.core.public_nodeinfo, [200, 404]), OC.SetupChecks.checkWellKnownUrl('/.well-known/caldav', OC.theme.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true), OC.SetupChecks.checkWellKnownUrl('/.well-known/carddav', OC.theme.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true), OC.SetupChecks.checkProviderUrl(OC.getRootPath() + '/ocm-provider/', OC.theme.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true), @@ -257,8 +258,8 @@ $(document).ready(function(){ OC.SetupChecks.checkGeneric(), OC.SetupChecks.checkWOFF2Loading(OC.filePath('core', '', 'fonts/NotoSans-Regular-latin.woff2'), OC.theme.docPlaceholderUrl), OC.SetupChecks.checkDataProtected() - ).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); + ).then(function (check1, check2, check3, check4, check5, check6, check7, check8, check9, check10, check11) { + var messages = [].concat(check1, check2, check3, check4, check5, check6, check7, check8, check9, check10, check11); var $el = $('#postsetupchecks'); $('#security-warning-state-loading').addClass('hidden'); |