aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/ajax/appconfig.php70
-rw-r--r--core/js/config.js94
-rw-r--r--core/js/core.json1
-rw-r--r--core/js/files/client.js41
-rw-r--r--core/js/js.js25
-rw-r--r--core/js/public/appconfig.js113
-rw-r--r--core/js/tests/specs/coreSpec.js65
-rw-r--r--core/routes.php3
-rw-r--r--core/shipped.json1
9 files changed, 302 insertions, 111 deletions
diff --git a/core/ajax/appconfig.php b/core/ajax/appconfig.php
deleted file mode 100644
index 6bb70e4c393..00000000000
--- a/core/ajax/appconfig.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <robin@icewind.nl>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-OC_Util::checkAdminUser();
-OCP\JSON::callCheck();
-
-$action=isset($_POST['action'])?$_POST['action']:$_GET['action'];
-
-if(isset($_POST['app']) || isset($_GET['app'])) {
- $app=OC_App::cleanAppId(isset($_POST['app'])? (string)$_POST['app']: (string)$_GET['app']);
-}
-
-// An admin should not be able to add remote and public services
-// on its own. This should only be possible programmatically.
-// This change is due the fact that an admin may not be expected
-// to execute arbitrary code in every environment.
-if($app === 'core' && isset($_POST['key']) &&(substr((string)$_POST['key'],0,7) === 'remote_' || substr((string)$_POST['key'],0,7) === 'public_')) {
- OC_JSON::error(array('data' => array('message' => 'Unexpected error!')));
- return;
-}
-
-$result=false;
-$appConfig = \OC::$server->getAppConfig();
-switch($action) {
- case 'getValue':
- $result=$appConfig->getValue($app, (string)$_GET['key'], (string)$_GET['defaultValue']);
- break;
- case 'setValue':
- $result=$appConfig->setValue($app, (string)$_POST['key'], (string)$_POST['value']);
- break;
- case 'getApps':
- $result=$appConfig->getApps();
- break;
- case 'getKeys':
- $result=$appConfig->getKeys($app);
- break;
- case 'hasKey':
- $result=$appConfig->hasKey($app, (string)$_GET['key']);
- break;
- case 'deleteKey':
- $result=$appConfig->deleteKey($app, (string)$_POST['key']);
- break;
- case 'deleteApp':
- $result=$appConfig->deleteApp($app);
- break;
-}
-OC_JSON::success(array('data'=>$result));
-
diff --git a/core/js/config.js b/core/js/config.js
index b034b7e8cd3..7dc742f7567 100644
--- a/core/js/config.js
+++ b/core/js/config.js
@@ -1,58 +1,80 @@
/**
- * Copyright (c) 2011, Robin Appelman <icewind1991@gmail.com>
- * This file is licensed under the Affero General Public License version 3 or later.
- * See the COPYING-README file.
+ * @copyright Copyright (c) 2016 Joas Schilling <coding@schilljs.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
/**
* @namespace
+ * @deprecated Use OCP.AppConfig instead
*/
OC.AppConfig={
- url:OC.filePath('core','ajax','appconfig.php'),
- getCall:function(action,data,callback){
- data.action=action;
- $.getJSON(OC.AppConfig.url,data,function(result){
- if(result.status==='success'){
- if(callback){
- callback(result.data);
- }
- }
- });
- },
- postCall:function(action,data,callback){
- data.action=action;
- $.post(OC.AppConfig.url,data,function(result){
- if(result.status==='success'){
- if(callback){
- callback(result.data);
- }
- }
- },'json');
- },
+ /**
+ * @deprecated Use OCP.AppConfig.getValue() instead
+ */
getValue:function(app,key,defaultValue,callback){
- if(typeof defaultValue=='function'){
- callback=defaultValue;
- defaultValue=null;
- }
- OC.AppConfig.getCall('getValue',{app:app,key:key,defaultValue:defaultValue},callback);
+ OCP.AppConfig.getValue(app, key, defaultValue, {
+ success: callback
+ });
},
+
+ /**
+ * @deprecated Use OCP.AppConfig.setValue() instead
+ */
setValue:function(app,key,value){
- OC.AppConfig.postCall('setValue',{app:app,key:key,value:value});
+ OCP.AppConfig.setValue(app, key, value);
},
+
+ /**
+ * @deprecated Use OCP.AppConfig.getApps() instead
+ */
getApps:function(callback){
- OC.AppConfig.getCall('getApps',{},callback);
+ OCP.AppConfig.getApps({
+ success: callback
+ });
},
+
+ /**
+ * @deprecated Use OCP.AppConfig.getKeys() instead
+ */
getKeys:function(app,callback){
- OC.AppConfig.getCall('getKeys',{app:app},callback);
+ OCP.AppConfig.getKeys(app, {
+ success: callback
+ });
},
+
+ /**
+ * @deprecated
+ */
hasKey:function(app,key,callback){
- OC.AppConfig.getCall('hasKey',{app:app,key:key},callback);
+ console.error('OC.AppConfig.hasKey is not supported anymore. Use OCP.AppConfig.getValue instead.');
},
+
+ /**
+ * @deprecated Use OCP.AppConfig.deleteKey() instead
+ */
deleteKey:function(app,key){
- OC.AppConfig.postCall('deleteKey',{app:app,key:key});
+ OCP.AppConfig.deleteKey(app, key);
},
+
+ /**
+ * @deprecated
+ */
deleteApp:function(app){
- OC.AppConfig.postCall('deleteApp',{app:app});
+ console.error('OC.AppConfig.deleteApp is not supported anymore.');
}
};
-//TODO OC.Preferences
diff --git a/core/js/core.json b/core/js/core.json
index c98928d0fed..7e72234aaa4 100644
--- a/core/js/core.json
+++ b/core/js/core.json
@@ -39,6 +39,7 @@
"octemplate.js",
"eventsource.js",
"config.js",
+ "public/appconfig.js",
"multiselect.js",
"oc-requesttoken.js",
"setupchecks.js",
diff --git a/core/js/files/client.js b/core/js/files/client.js
index ee3efbd5517..fdc51c4a197 100644
--- a/core/js/files/client.js
+++ b/core/js/files/client.js
@@ -729,8 +729,47 @@
*/
addFileInfoParser: function(parserFunction) {
this._fileInfoParsers.push(parserFunction);
- }
+ },
+ /**
+ * Returns the dav.Client instance used internally
+ *
+ * @since 9.2
+ * @return {dav.Client}
+ */
+ getClient: function() {
+ return this._client;
+ },
+
+ /**
+ * Returns the user name
+ *
+ * @since 9.2
+ * @return {String} userName
+ */
+ getUserName: function() {
+ return this._client.userName;
+ },
+
+ /**
+ * Returns the password
+ *
+ * @since 9.2
+ * @return {String} password
+ */
+ getPassword: function() {
+ return this._client.password;
+ },
+
+ /**
+ * Returns the base URL
+ *
+ * @since 9.2
+ * @return {String} base URL
+ */
+ getBaseUrl: function() {
+ return this._client.baseUrl;
+ }
};
/**
diff --git a/core/js/js.js b/core/js/js.js
index 16da273c8e1..ce55f47894b 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -58,7 +58,8 @@ function fileDownloadPath(dir, file) {
}
/** @namespace */
-var OC={
+var OCP = {},
+ OC = {
PERMISSION_CREATE:4,
PERMISSION_READ:1,
PERMISSION_UPDATE:2,
@@ -423,6 +424,28 @@ var OC={
},
/**
+ * Returns whether the given paths are the same, without
+ * leading, trailing or doubled slashes and also removing
+ * the dot sections.
+ *
+ * @param {String} path1 first path
+ * @param {String} path2 second path
+ * @return {bool} true if the paths are the same
+ *
+ * @since 9.0
+ */
+ isSamePath: function(path1, path2) {
+ var filterDot = function(p) {
+ return p !== '.';
+ };
+ var pathSections1 = _.filter((path1 || '').split('/'), filterDot);
+ var pathSections2 = _.filter((path2 || '').split('/'), filterDot);
+ path1 = OC.joinPaths.apply(OC, pathSections1);
+ path2 = OC.joinPaths.apply(OC, pathSections2);
+ return path1 === path2;
+ },
+
+ /**
* Join path sections
*
* @param {...String} path sections
diff --git a/core/js/public/appconfig.js b/core/js/public/appconfig.js
new file mode 100644
index 00000000000..cde2700c86c
--- /dev/null
+++ b/core/js/public/appconfig.js
@@ -0,0 +1,113 @@
+/**
+ * @copyright Copyright (c) 2016 Joas Schilling <coding@schilljs.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * @namespace
+ * @since 9.2.0
+ */
+OCP.AppConfig = {
+ /**
+ * @param {string} method
+ * @param {string} endpoint
+ * @param {Object} [options]
+ * @param {Object} [options.data]
+ * @param {function} [options.success]
+ * @param {function} [options.error]
+ * @internal
+ */
+ _call: function(method, endpoint, options) {
+
+ $.ajax({
+ type: method.toUpperCase(),
+ url: OC.linkToOCS('apps/provisioning_api/api/v1', 2) + 'config/apps' + endpoint,
+ data: options.data || {},
+ success: options.success,
+ error: options.error
+ });
+ },
+
+ /**
+ * @param {Object} [options]
+ * @param {function} [options.success]
+ * @since 9.2.0
+ */
+ getApps: function(options) {
+ this._call('get', '', options);
+ },
+
+ /**
+ * @param {string} app
+ * @param {Object} [options]
+ * @param {function} [options.success]
+ * @param {function} [options.error]
+ * @since 9.2.0
+ */
+ getKeys: function(app, options) {
+ this._call('get', '/' + app, options);
+ },
+
+ /**
+ * @param {string} app
+ * @param {string} key
+ * @param {string|function} defaultValue
+ * @param {Object} [options]
+ * @param {function} [options.success]
+ * @param {function} [options.error]
+ * @since 9.2.0
+ */
+ getValue: function(app, key, defaultValue, options) {
+ options = options || {};
+ options['data'] = {
+ defaultValue: defaultValue
+ };
+
+ this._call('get', '/' + app + '/' + key, options);
+ },
+
+ /**
+ * @param {string} app
+ * @param {string} key
+ * @param {string} value
+ * @param {Object} [options]
+ * @param {function} [options.success]
+ * @param {function} [options.error]
+ * @since 9.2.0
+ */
+ setValue: function(app, key, value, options) {
+ options = options || {};
+ options['data'] = {
+ value: value
+ };
+
+ this._call('post', '/' + app + '/' + key, options);
+ },
+
+ /**
+ * @param {string} app
+ * @param {string} key
+ * @param {Object} [options]
+ * @param {function} [options.success]
+ * @param {function} [options.error]
+ * @since 9.2.0
+ */
+ deleteKey: function(app, key, options) {
+ this._call('delete', '/' + app + '/' + key, options);
+ }
+};
diff --git a/core/js/tests/specs/coreSpec.js b/core/js/tests/specs/coreSpec.js
index 01a0e6acb6f..5d42f0881d4 100644
--- a/core/js/tests/specs/coreSpec.js
+++ b/core/js/tests/specs/coreSpec.js
@@ -188,6 +188,71 @@ describe('Core base tests', function() {
expect(OC.joinPaths('/', '//', '/')).toEqual('/');
});
});
+ describe('isSamePath', function() {
+ it('recognizes empty paths are equal', function() {
+ expect(OC.isSamePath('', '')).toEqual(true);
+ expect(OC.isSamePath('/', '')).toEqual(true);
+ expect(OC.isSamePath('//', '')).toEqual(true);
+ expect(OC.isSamePath('/', '/')).toEqual(true);
+ expect(OC.isSamePath('/', '//')).toEqual(true);
+ });
+ it('recognizes path with single sections as equal regardless of extra slashes', function() {
+ expect(OC.isSamePath('abc', 'abc')).toEqual(true);
+ expect(OC.isSamePath('/abc', 'abc')).toEqual(true);
+ expect(OC.isSamePath('//abc', 'abc')).toEqual(true);
+ expect(OC.isSamePath('abc', '/abc')).toEqual(true);
+ expect(OC.isSamePath('abc/', 'abc')).toEqual(true);
+ expect(OC.isSamePath('abc/', 'abc/')).toEqual(true);
+ expect(OC.isSamePath('/abc/', 'abc/')).toEqual(true);
+ expect(OC.isSamePath('/abc/', '/abc/')).toEqual(true);
+ expect(OC.isSamePath('//abc/', '/abc/')).toEqual(true);
+ expect(OC.isSamePath('//abc//', '/abc/')).toEqual(true);
+
+ expect(OC.isSamePath('abc', 'def')).toEqual(false);
+ expect(OC.isSamePath('/abc', 'def')).toEqual(false);
+ expect(OC.isSamePath('//abc', 'def')).toEqual(false);
+ expect(OC.isSamePath('abc', '/def')).toEqual(false);
+ expect(OC.isSamePath('abc/', 'def')).toEqual(false);
+ expect(OC.isSamePath('abc/', 'def/')).toEqual(false);
+ expect(OC.isSamePath('/abc/', 'def/')).toEqual(false);
+ expect(OC.isSamePath('/abc/', '/def/')).toEqual(false);
+ expect(OC.isSamePath('//abc/', '/def/')).toEqual(false);
+ expect(OC.isSamePath('//abc//', '/def/')).toEqual(false);
+ });
+ it('recognizes path with multiple sections as equal regardless of extra slashes', function() {
+ expect(OC.isSamePath('abc/def', 'abc/def')).toEqual(true);
+ expect(OC.isSamePath('/abc/def', 'abc/def')).toEqual(true);
+ expect(OC.isSamePath('abc/def', '/abc/def')).toEqual(true);
+ expect(OC.isSamePath('abc/def/', '/abc/def/')).toEqual(true);
+ expect(OC.isSamePath('/abc/def/', '/abc/def/')).toEqual(true);
+ expect(OC.isSamePath('/abc/def/', 'abc/def/')).toEqual(true);
+ expect(OC.isSamePath('//abc/def/', 'abc/def/')).toEqual(true);
+ expect(OC.isSamePath('//abc/def//', 'abc/def/')).toEqual(true);
+
+ expect(OC.isSamePath('abc/def', 'abc/ghi')).toEqual(false);
+ expect(OC.isSamePath('/abc/def', 'abc/ghi')).toEqual(false);
+ expect(OC.isSamePath('abc/def', '/abc/ghi')).toEqual(false);
+ expect(OC.isSamePath('abc/def/', '/abc/ghi/')).toEqual(false);
+ expect(OC.isSamePath('/abc/def/', '/abc/ghi/')).toEqual(false);
+ expect(OC.isSamePath('/abc/def/', 'abc/ghi/')).toEqual(false);
+ expect(OC.isSamePath('//abc/def/', 'abc/ghi/')).toEqual(false);
+ expect(OC.isSamePath('//abc/def//', 'abc/ghi/')).toEqual(false);
+ });
+ it('recognizes path entries with dot', function() {
+ expect(OC.isSamePath('.', '')).toEqual(true);
+ expect(OC.isSamePath('.', '.')).toEqual(true);
+ expect(OC.isSamePath('.', '/')).toEqual(true);
+ expect(OC.isSamePath('/.', '/')).toEqual(true);
+ expect(OC.isSamePath('/./', '/')).toEqual(true);
+ expect(OC.isSamePath('/./', '/.')).toEqual(true);
+ expect(OC.isSamePath('/./', '/./')).toEqual(true);
+ expect(OC.isSamePath('/./', '/./')).toEqual(true);
+
+ expect(OC.isSamePath('a/./b', 'a/b')).toEqual(true);
+ expect(OC.isSamePath('a/b/.', 'a/b')).toEqual(true);
+ expect(OC.isSamePath('./a/b', 'a/b')).toEqual(true);
+ });
+ });
describe('filePath', function() {
beforeEach(function() {
OC.webroot = 'http://localhost';
diff --git a/core/routes.php b/core/routes.php
index 337f6fb27c3..3ca83815ad4 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -66,9 +66,6 @@ $application->registerRoutes($this, [
// Search
$this->create('search_ajax_search', '/core/search')
->actionInclude('core/search/ajax/search.php');
-// AppConfig
-$this->create('core_ajax_appconfig', '/core/ajax/appconfig.php')
- ->actionInclude('core/ajax/appconfig.php');
// oC JS config
$this->create('js_config', '/core/js/oc.js')
->actionInclude('core/js/config.php');
diff --git a/core/shipped.json b/core/shipped.json
index 0ddaf68eb64..ee8a2b05ef6 100644
--- a/core/shipped.json
+++ b/core/shipped.json
@@ -40,6 +40,7 @@
"files",
"dav",
"federatedfilesharing",
+ "provisioning_api",
"twofactor_backupcodes",
"workflowengine"
]
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-06 23:02:58 +0000