harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

post_activity_item issues

Browse Source
This commit is contained in:
friendica 2013-12-07 23:29:26 -08:00
parent d6d6387a7b
commit b8454cbd1d
3 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/conversation.php
View File

@ -203,6 +203,10 @@ function localize_item(&$item){
} }
if (stristr($item['verb'],ACTIVITY_POKE)) { if (stristr($item['verb'],ACTIVITY_POKE)) {
// FIXME for obscured private posts, until then leave untranslated
return;
$verb = urldecode(substr($item['verb'],strpos($item['verb'],'#')+1)); $verb = urldecode(substr($item['verb'],strpos($item['verb'],'#')+1));
if(! $verb) if(! $verb)
return; return;

2
include/crypto.php
View File

@ -75,6 +75,8 @@ function aes_encapsulate($data,$pubkey) {
} }
function crypto_unencapsulate($data,$prvkey) { function crypto_unencapsulate($data,$prvkey) {
if(! $data)
return;
$alg = ((array_key_exists('alg',$data)) ? $data['alg'] : 'aes256cbc'); $alg = ((array_key_exists('alg',$data)) ? $data['alg'] : 'aes256cbc');
if($alg === 'aes256cbc') if($alg === 'aes256cbc')
return aes_unencapsulate($data,$prvkey); return aes_unencapsulate($data,$prvkey);

28
include/items.php
View File

@ -202,11 +202,29 @@ function post_activity_item($arr) {
return $ret; return $ret;
} }
if(array_key_exists('content_type',$arr) && $arr['content_type'] == 'text/html')
$arr['body'] = purify_html($arr['body']);
else
$arr['body'] = escape_tags($arr['body']);
if(! array_key_exists('mimetype',$arr))
$arr['mimetype'] = 'text/bbcode';
if(array_key_exists('item_private',$arr) && $arr['item_private']) {
$arr['body'] = z_input_filter($arr['uid'],$arr['body'],$arr['mimetype']);
if($channel) {
if($channel['channel_hash'] === $arr['author_xchan']) {
$arr['sig'] = base64url_encode(rsa_sign($arr['body'],$channel['channel_prvkey']));
$arr['item_flags'] = $arr['item_flags'] | ITEM_VERIFIED;
}
}
logger('Encrypting local storage');
$key = get_config('system','pubkey');
$arr['item_flags'] = $arr['item_flags'] | ITEM_OBSCURED;
if($arr['title'])
$arr['title'] = json_encode(aes_encapsulate($arr['title'],$key));
if($arr['body'])
$arr['body'] = json_encode(aes_encapsulate($arr['body'],$key));
}
$arr['mid'] = ((x($arr,'mid')) ? $arr['mid'] : item_message_id()); $arr['mid'] = ((x($arr,'mid')) ? $arr['mid'] : item_message_id());
$arr['parent_mid'] = ((x($arr,'parent_mid')) ? $arr['parent_mid'] : $arr['mid']); $arr['parent_mid'] = ((x($arr,'parent_mid')) ? $arr['parent_mid'] : $arr['mid']);
@ -238,7 +256,7 @@ function post_activity_item($arr) {
$post = item_store($arr); $post = item_store($arr);
if($post['result']) if($post['success'])
$post_id = $post['item_id']; $post_id = $post['item_id'];
if($post_id) { if($post_id) {