fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-02 01:52:10 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'security/rve-2026-4'

Browse source
This commit is contained in:
Kijin Sung 2026-03-31 20:51:08 +09:00
commit f3a08ba8f3
3 changed files with 31 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
classes/module/ModuleObject.class.php
View file

@ -921,7 +921,7 @@ class ModuleObject extends BaseObject
// execute api methods of the module if view action is and result is XMLRPC or JSON
if(isset($this->module_info->module_type) && in_array($this->module_info->module_type, ['view', 'mobile']))
{
if(Context::getResponseMethod() == 'XMLRPC' || Context::getResponseMethod() == 'JSON')
if ($this->getHttpStatusCode() < 400 && in_array(Context::getResponseMethod(), ['JSON', 'XMLRPC']))
{
$oAPI = getAPI($this->module_info->module);
if($oAPI instanceof ModuleObject && method_exists($oAPI, $this->act))

19
modules/board/board.api.php
View file

@ -56,6 +56,8 @@ class BoardAPI extends Board
public function dispBoardContentView($oModule)
{
$oDocument = Context::get('oDocument');
if ($oDocument->isExists() && $oDocument->isAccessible())
{
if ($oDocument->isGranted())
{
$extra_vars = $oDocument->getExtraVars() ?: [];
@ -63,6 +65,11 @@ class BoardAPI extends Board
}
$oModule->add('oDocument', $this->_arrangeContent($oDocument, $oModule->grant));
}
else
{
$oModule->add('oDocument', null);
}
}
/**
* @brief contents file list
@ -70,13 +77,13 @@ class BoardAPI extends Board
public function dispBoardContentFileList($oModule)
{
$oDocument = Context::get('oDocument');
if($oDocument->isAccessible())
if ($oDocument->isExists() && $oDocument->isAccessible())
{
$oModule->add('file_list', $this->_arrangeFiles(Context::get('file_list') ?: []));
}
else
{
$oModule->add('file_list', array());
$oModule->add('file_list', []);
}
}
@ -92,6 +99,9 @@ class BoardAPI extends Board
* @brief comments list
**/
public function dispBoardContentCommentList($oModule)
{
$oDocument = Context::get('oDocument');
if ($oDocument->isExists() && $oDocument->isAccessible())
{
$comment_list = Context::get('comment_list');
if (!is_array($comment_list))
@ -100,6 +110,11 @@ class BoardAPI extends Board
}
$oModule->add('comment_list', $this->_arrangeComments($comment_list));
}
else
{
$oModule->add('comment_list', []);
}
}
/**
* Apply _arrangeContent to a list of documents.

5
modules/board/board.view.php
View file

@ -318,6 +318,8 @@ class BoardView extends Board
{
if (abs($oDocument->get('member_srl')) != $this->user->member_srl)
{
$oDocument = DocumentModel::getDocument(0);
$oDocument->add('module_srl', $this->module_srl);
Context::set('document_srl', null, true);
$this->dispBoardMessage('msg_not_founded', 404);
}
@ -326,6 +328,8 @@ class BoardView extends Board
// if the document is TEMP saved, pretend that it doesn't exist.
if($oDocument->getStatus() == 'TEMP')
{
$oDocument = DocumentModel::getDocument(0);
$oDocument->add('module_srl', $this->module_srl);
Context::set('document_srl', null, true);
$this->dispBoardMessage('msg_not_founded', 404);
}
@ -355,6 +359,7 @@ class BoardView extends Board
if(!$this->grant->view && !$oDocument->isGranted())
{
$oDocument = DocumentModel::getDocument(0);
$oDocument->add('module_srl', $this->module_srl);
Context::set('document_srl', null, true);
$this->dispBoardMessage($this->user->isMember() ? 'msg_not_permitted' : 'msg_not_logged');
}