Skip to content
Snippets Groups Projects
Commit ae469b67 authored by Jörn Friedrich Dreyer's avatar Jörn Friedrich Dreyer
Browse files

Merge pull request #5637 from owncloud/fix_privatedata 

Fix privatedata
parents b4cdac0a d6ddb12c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
db_structure.xml
+ 63
− 0
View file @ ae469b67
...@@ -1077,4 +1077,67 @@ ...@@ -1077,4 +1077,67 @@
</table> </table>
<table>
<name>*dbprefix*privatedata</name>
<declaration>
<field>
<name>keyid</name>
<type>integer</type>
<default>0</default>
<notnull>true</notnull>
<unsigned>true</unsigned>
<length>4</length>
<autoincrement>1</autoincrement>
</field>
<field>
<name>user</name>
<type>text</type>
<default></default>
<notnull>true</notnull>
<length>255</length>
</field>
<field>
<name>app</name>
<type>text</type>
<default></default>
<notnull>true</notnull>
<length>255</length>
</field>
<field>
<name>key</name>
<type>text</type>
<default></default>
<notnull>true</notnull>
<length>255</length>
</field>
<field>
<name>value</name>
<type>text</type>
<default></default>
<notnull>true</notnull>
<length>255</length>
</field>
<index>
<primary>true</primary>
<unique>true</unique>
<name>keyid_index</name>
<field>
<name>keyid</name>
<sorting>ascending</sorting>
</field>
</index>
</declaration>
</table>
</database> </database>
lib/private/ocs.php
+ 0
− 32
View file @ ae469b67
...@@ -228,36 +228,4 @@ class OC_OCS { ...@@ -228,36 +228,4 @@ class OC_OCS {
} }
} }
} }
/**
* get private data
* @param string $user
* @param string $app
* @param string $key
* @param bool $like use LIKE instead of = when comparing keys
* @return array
*/
public static function getData($user, $app="", $key="") {
if($app) {
$apps=array($app);
}else{
$apps=OC_Preferences::getApps($user);
}
if($key) {
$keys=array($key);
}else{
foreach($apps as $app) {
$keys=OC_Preferences::getKeys($user, $app);
}
}
$result=array();
foreach($apps as $app) {
foreach($keys as $key) {
$value=OC_Preferences::getValue($user, $app, $key);
$result[]=array('app'=>$app, 'key'=>$key, 'value'=>$value);
}
}
return $result;
}
} }
lib/private/ocs/privatedata.php
+ 60
− 18
View file @ ae469b67
...@@ -22,45 +22,87 @@ ...@@ -22,45 +22,87 @@
* *
*/ */
class OC_OCS_Privatedata { class OC_OCS_Privatedata {
/**
* read keys
* test: curl http://login:passwd@oc/core/ocs/v1.php/privatedata/getattribute/testy/123
* test: curl http://login:passwd@oc/core/ocs/v1.php/privatedata/getattribute/testy
* @param array $parameters The OCS parameter
* @return \OC_OCS_Result
*/
public static function get($parameters) { public static function get($parameters) {
OC_Util::checkLoggedIn();
$user = OC_User::getUser(); $user = OC_User::getUser();
$app = addslashes(strip_tags($parameters['app'])); $app = addslashes(strip_tags($parameters['app']));
$key = addslashes(strip_tags($parameters['key'])); $key = isset($parameters['key']) ? addslashes(strip_tags($parameters['key'])) : null;
$result = OC_OCS::getData($user, $app, $key);
if(empty($key)) {
$query = \OCP\DB::prepare('SELECT `key`, `app`, `value` FROM `*PREFIX*privatedata` WHERE `user` = ? AND `app` = ? ');
$result = $query->execute(array($user, $app));
} else {
$query = \OCP\DB::prepare('SELECT `key`, `app`, `value` FROM `*PREFIX*privatedata` WHERE `user` = ? AND `app` = ? AND `key` = ? ');
$result = $query->execute(array($user, $app, $key));
}
$xml = array(); $xml = array();
foreach($result as $i=>$log) { while ($row = $result->fetchRow()) {
$xml[$i]['key']=$log['key']; $data=array();
$xml[$i]['app']=$log['app']; $data['key']=$row['key'];
$xml[$i]['value']=$log['value']; $data['app']=$row['app'];
$data['value']=$row['value'];
$xml[] = $data;
} }
return new OC_OCS_Result($xml); return new OC_OCS_Result($xml);
//TODO: replace 'privatedata' with 'attribute' once a new libattice has been released that works with it
} }
/**
* set a key
* test: curl http://login:passwd@oc/core/ocs/v1.php/privatedata/setattribute/testy/123 --data "value=foobar"
* @param array $parameters The OCS parameter
* @return \OC_OCS_Result
*/
public static function set($parameters) { public static function set($parameters) {
OC_Util::checkLoggedIn();
$user = OC_User::getUser(); $user = OC_User::getUser();
$app = addslashes(strip_tags($parameters['app'])); $app = addslashes(strip_tags($parameters['app']));
$key = addslashes(strip_tags($parameters['key'])); $key = addslashes(strip_tags($parameters['key']));
$value = OC_OCS::readData('post', 'value', 'text'); $value = OC_OCS::readData('post', 'value', 'text');
if(OC_Preferences::setValue($user, $app, $key, $value)) {
return new OC_OCS_Result(null, 100); // update in DB
$query = \OCP\DB::prepare('UPDATE `*PREFIX*privatedata` SET `value` = ? WHERE `user` = ? AND `app` = ? AND `key` = ?');
$numRows = $query->execute(array($value, $user, $app, $key));
if ($numRows === false || $numRows === 0) {
// store in DB
$query = \OCP\DB::prepare('INSERT INTO `*PREFIX*privatedata` (`user`, `app`, `key`, `value`)' . ' VALUES(?, ?, ?, ?)');
$query->execute(array($user, $app, $key, $value));
} }
return new OC_OCS_Result(null, 100);
} }
/**
* delete a key
* test: curl http://login:passwd@oc/core/ocs/v1.php/privatedata/deleteattribute/testy/123 --data "post=1"
* @param array $parameters The OCS parameter
* @return \OC_OCS_Result
*/
public static function delete($parameters) { public static function delete($parameters) {
OC_Util::checkLoggedIn();
$user = OC_User::getUser(); $user = OC_User::getUser();
if (!isset($parameters['app']) or !isset($parameters['key'])) {
//key and app are NOT optional here
return new OC_OCS_Result(null, 101);
}
$app = addslashes(strip_tags($parameters['app'])); $app = addslashes(strip_tags($parameters['app']));
$key = addslashes(strip_tags($parameters['key'])); $key = addslashes(strip_tags($parameters['key']));
if($key==="" or $app==="") {
return new OC_OCS_Result(null, 101); //key and app are NOT optional here // delete in DB
} $query = \OCP\DB::prepare('DELETE FROM `*PREFIX*privatedata` WHERE `user` = ? AND `app` = ? AND `key` = ? ');
if(OC_Preferences::deleteKey($user, $app, $key)) { $query->execute(array($user, $app, $key ));
return new OC_OCS_Result(null, 100);
} return new OC_OCS_Result(null, 100);
} }
} }
tests/lib/ocs/privatedata.php 0 → 100644
+ 141
− 0
View file @ ae469b67
<?php
/**
* ownCloud
*
* @author Thomas Müller
* @copyright 2013 Thomas Müller deepdiver@owncloud.com
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
* License as published by the Free Software Foundation; either
* version 3 of the License, or any later version.
*
* This library 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 library. If not, see <http://www.gnu.org/licenses/>.
*
*/
class Test_OC_OCS_Privatedata extends PHPUnit_Framework_TestCase
{
private $appKey;
public function setUp() {
\OC::$session->set('user_id', 'user1');
$this->appKey = uniqid('app');
}
public function tearDown() {
}
public function testGetEmptyOne() {
$params = array('app' => $this->appKey, 'key' => '123');
$result = OC_OCS_Privatedata::get($params);
$this->assertOcsResult(0, $result);
}
public function testGetEmptyAll() {
$params = array('app' => $this->appKey);
$result = OC_OCS_Privatedata::get($params);
$this->assertOcsResult(0, $result);
}
public function testSetOne() {
$_POST = array('value' => 123456789);
$params = array('app' => $this->appKey, 'key' => 'k-1');
$result = OC_OCS_Privatedata::set($params);
$this->assertEquals(100, $result->getStatusCode());
$result = OC_OCS_Privatedata::get($params);
$this->assertOcsResult(1, $result);
}
public function testSetExisting() {
$_POST = array('value' => 123456789);
$params = array('app' => $this->appKey, 'key' => 'k-10');
$result = OC_OCS_Privatedata::set($params);
$this->assertEquals(100, $result->getStatusCode());
$result = OC_OCS_Privatedata::get($params);
$this->assertOcsResult(1, $result);
$data = $result->getData();
$data = $data[0];
$this->assertEquals('123456789', $data['value']);
$_POST = array('value' => 'updated');
$params = array('app' => $this->appKey, 'key' => 'k-10');
$result = OC_OCS_Privatedata::set($params);
$this->assertEquals(100, $result->getStatusCode());
$result = OC_OCS_Privatedata::get($params);
$this->assertOcsResult(1, $result);
$data = $result->getData();
$data = $data[0];
$this->assertEquals('updated', $data['value']);
}
public function testSetMany() {
$_POST = array('value' => 123456789);
// set key 'k-1'
$params = array('app' => $this->appKey, 'key' => 'k-1');
$result = OC_OCS_Privatedata::set($params);
$this->assertEquals(100, $result->getStatusCode());
// set key 'k-2'
$params = array('app' => $this->appKey, 'key' => 'k-2');
$result = OC_OCS_Privatedata::set($params);
$this->assertEquals(100, $result->getStatusCode());
// query for all
$params = array('app' => $this->appKey);
$result = OC_OCS_Privatedata::get($params);
$this->assertOcsResult(2, $result);
}
public function testDelete() {
$_POST = array('value' => 123456789);
// set key 'k-1'
$params = array('app' => $this->appKey, 'key' => 'k-3');
$result = OC_OCS_Privatedata::set($params);
$this->assertEquals(100, $result->getStatusCode());
$result = OC_OCS_Privatedata::delete($params);
$this->assertEquals(100, $result->getStatusCode());
$result = OC_OCS_Privatedata::get($params);
$this->assertOcsResult(0, $result);
}
/**
* @dataProvider deleteWithEmptyKeysProvider
*/
public function testDeleteWithEmptyKeys($params) {
$result = OC_OCS_Privatedata::delete($params);
$this->assertEquals(101, $result->getStatusCode());
}
public function deleteWithEmptyKeysProvider() {
return array(
array(array()),
array(array('app' => '123')),
array(array('key' => '123')),
);
}
/**
* @param \OC_OCS_Result $result
*/
public function assertOcsResult($expectedArraySize, $result) {
$this->assertEquals(100, $result->getStatusCode());
$data = $result->getData();
$this->assertTrue(is_array($data));
$this->assertEquals($expectedArraySize, sizeof($data));
}
}
version.php
+ 1
− 1
View file @ ae469b67
<?php <?php
// We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel when updating major/minor version number. // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel when updating major/minor version number.
$OC_Version=array(6, 00, 0, 3); $OC_Version=array(6, 00, 0, 4);
// The human readable string // The human readable string
$OC_VersionString='6.0 beta 2'; $OC_VersionString='6.0 beta 2';
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment