Skip to content

Commit

Permalink
Merge pull request #7018 from hregis/develop_bug_restapi
Browse files Browse the repository at this point in the history 
Fix: missing _cleanObjectDatas function
  • Loading branch information
@eldy
eldy committed Jun 16, 2017
2 parents 492ee13 + c2901ae commit 5a477bd
Show file tree
Hide file tree
Showing 5 changed files with 86 additions and 20 deletions.
3 changes: 2 additions & 1 deletion htdocs/admin/agenda.php
View file
Expand Up @@ -33,6 +33,7 @@

$langs->load("admin");
$langs->load("other");
$langs->load("agenda");

$action = GETPOST('action','alpha');
$cancel = GETPOST('cancel','alpha');
Expand Down Expand Up @@ -172,7 +173,7 @@
if ($trigger['code'] == 'FICHINTER_CLASSIFY_BILLED' && empty($conf->global->FICHINTER_CLASSIFY_BILLED)) continue;
if ($trigger['code'] == 'FICHINTER_CLASSIFY_UNBILLED' && empty($conf->global->FICHINTER_CLASSIFY_BILLED)) continue;


print '<tr class="oddeven">';
print '<td>'.$trigger['code'].'</td>';
print '<td>'.$trigger['label'].'</td>';
Expand Down
1 change: 1 addition & 0 deletions htdocs/admin/agenda_other.php
View file
Expand Up @@ -36,6 +36,7 @@

$langs->load("admin");
$langs->load("other");
$langs->load("agenda");

$action = GETPOST('action','alpha');
$value = GETPOST('value','alpha');
Expand Down
88 changes: 75 additions & 13 deletions htdocs/comm/action/class/api_agendaevents.class.php
View file
Expand Up @@ -63,20 +63,20 @@ function __construct()
*/
function get($id)
{
if(! DolibarrApiAccess::$user->rights->agenda->myactions->read) {
if (! DolibarrApiAccess::$user->rights->agenda->myactions->read) {
throw new RestException(401, "Insuffisant rights to read an event");
}

$result = $this->actioncomm->fetch($id);
if( ! $result ) {
if ( ! $result ) {
throw new RestException(404, 'Agenda Events not found');
}

if(! DolibarrApiAccess::$user->rights->agenda->allactions->read && $this->actioncomm->ownerid != DolibarrApiAccess::$user->id) {
if (! DolibarrApiAccess::$user->rights->agenda->allactions->read && $this->actioncomm->ownerid != DolibarrApiAccess::$user->id) {
throw new RestException(401, "Insuffisant rights to read event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
}

if( ! DolibarrApi::_checkAccessToResource('agenda',$this->actioncomm->id)) {
if ( ! DolibarrApi::_checkAccessToResource('agenda',$this->actioncomm->id)) {
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}

Expand All @@ -102,6 +102,10 @@ function index($sortfield = "t.id", $sortorder = 'ASC', $limit = 100, $page = 0,

$obj_ret = array();

if (! DolibarrApiAccess::$user->rights->agenda->myactions->read) {
throw new RestException(401, "Insuffisant rights to read events");
}

// case of external user
$socid = 0;
if (! empty(DolibarrApiAccess::$user->socid)) $socid = DolibarrApiAccess::$user->socid;
Expand All @@ -111,8 +115,11 @@ function index($sortfield = "t.id", $sortorder = 'ASC', $limit = 100, $page = 0,
if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;

$sql = "SELECT t.id as rowid";
if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
$sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as t";
if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
$sql.= ' WHERE t.entity IN ('.getEntity('agenda').')';
if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
if ($user_ids) $sql.=" AND t.fk_user_action IN (".$user_ids.")";
if ($socid > 0) $sql.= " AND t.fk_soc = ".$socid;
// Insert sale filter
Expand Down Expand Up @@ -152,7 +159,7 @@ function index($sortfield = "t.id", $sortorder = 'ASC', $limit = 100, $page = 0,
{
$obj = $db->fetch_object($result);
$actioncomm_static = new ActionComm($db);
if($actioncomm_static->fetch($obj->rowid)) {
if ($actioncomm_static->fetch($obj->rowid)) {
$obj_ret[] = $this->_cleanObjectDatas($actioncomm_static);
}
$i++;
Expand All @@ -161,7 +168,7 @@ function index($sortfield = "t.id", $sortorder = 'ASC', $limit = 100, $page = 0,
else {
throw new RestException(503, 'Error when retrieve Agenda Event list : '.$db->lasterror());
}
if( ! count($obj_ret)) {
if ( ! count($obj_ret)) {
throw new RestException(404, 'No Agenda Event found');
}
return $obj_ret;
Expand All @@ -175,10 +182,10 @@ function index($sortfield = "t.id", $sortorder = 'ASC', $limit = 100, $page = 0,
*/
function post($request_data = NULL)
{
if(! DolibarrApiAccess::$user->rights->agenda->myactions->create) {
if (! DolibarrApiAccess::$user->rights->agenda->myactions->create) {
throw new RestException(401, "Insuffisant rights to create your Agenda Event");
}
if(! DolibarrApiAccess::$user->rights->agenda->allactions->create && DolibarrApiAccess::$user->id != $request_data['userownerid']) {
if (! DolibarrApiAccess::$user->rights->agenda->allactions->create && DolibarrApiAccess::$user->id != $request_data['userownerid']) {
throw new RestException(401, "Insuffisant rights to create an Agenda Event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
}

Expand Down Expand Up @@ -213,27 +220,27 @@ function post($request_data = NULL)
*/
/*
function put($id, $request_data = NULL) {
if(! DolibarrApiAccess::$user->rights->agenda->myactions->create) {
if (! DolibarrApiAccess::$user->rights->agenda->myactions->create) {
throw new RestException(401, "Insuffisant rights to create your Agenda Event");
}
if(! DolibarrApiAccess::$user->rights->agenda->allactions->create && DolibarrApiAccess::$user->id != $request_data['userownerid']) {
if (! DolibarrApiAccess::$user->rights->agenda->allactions->create && DolibarrApiAccess::$user->id != $request_data['userownerid']) {
throw new RestException(401, "Insuffisant rights to create an Agenda Event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
}
$result = $this->expensereport->fetch($id);
if( ! $result ) {
if ( ! $result ) {
throw new RestException(404, 'expensereport not found');
}
if( ! DolibarrApi::_checkAccessToResource('expensereport',$this->expensereport->id)) {
if ( ! DolibarrApi::_checkAccessToResource('expensereport',$this->expensereport->id)) {
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
foreach($request_data as $field => $value) {
if ($field == 'id') continue;
$this->expensereport->$field = $value;
}
if($this->expensereport->update($id, DolibarrApiAccess::$user,1,'','','update'))
if ($this->expensereport->update($id, DolibarrApiAccess::$user,1,'','','update'))
return $this->get($id);
return false;
Expand Down Expand Up @@ -298,4 +305,59 @@ function _validate($data)
}
return $event;
}

/**
* Clean sensible object datas
*
* @param object $object Object to clean
* @return array Array of cleaned object properties
*/
function _cleanObjectDatas($object) {

$object = parent::_cleanObjectDatas($object);

unset($object->usermod);
unset($object->libelle);
unset($object->import_key);
unset($object->array_options);
unset($object->context);
unset($object->canvas);
unset($object->contact);
unset($object->contact_id);
unset($object->thirdparty);
unset($object->user);
unset($object->origin);
unset($object->origin_id);
unset($object->ref_ext);
unset($object->statut);
unset($object->country);
unset($object->country_id);
unset($object->country_code);
unset($object->barcode_type);
unset($object->barcode_type_code);
unset($object->barcode_type_label);
unset($object->barcode_type_coder);
unset($object->mode_reglement_id);
unset($object->cond_reglement_id);
unset($object->cond_reglement);
unset($object->fk_delivery_address);
unset($object->shipping_method_id);
unset($object->fk_account);
unset($object->total_ht);
unset($object->total_tva);
unset($object->total_localtax1);
unset($object->total_localtax2);
unset($object->total_ttc);
unset($object->fk_incoterms);
unset($object->libelle_incoterms);
unset($object->location_incoterms);
unset($object->name);
unset($object->lastname);
unset($object->firstname);
unset($object->civility_id);
unset($object->contact);
unset($object->societe);

return $object;
}
}
4 changes: 2 additions & 2 deletions htdocs/core/lib/security.lib.php
View file
Expand Up @@ -403,9 +403,9 @@ function checkUserAccessToObject($user, $featuresarray, $objectid=0, $tableandsh
else if (in_array($feature,$checksoc)) // We check feature = checksoc
{
// If external user: Check permission for external users
if ($user->societe_id > 0)
if ($user->socid > 0)
{
if ($user->societe_id <> $objectid) return false;
if ($user->socid <> $objectid) return false;
}
// If internal user: Check permission for internal users that are restricted on their objects
else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
Expand Down
10 changes: 6 additions & 4 deletions htdocs/societe/class/api_contacts.class.php
View file
Expand Up @@ -43,7 +43,8 @@ class Contacts extends DolibarrApi
/**
* Constructor
*/
function __construct() {
function __construct()
{
global $db, $conf;
$this->db = $db;
$this->contact = new Contact($this->db);
Expand All @@ -59,7 +60,8 @@ function __construct() {
*
* @throws RestException
*/
function get($id) {
function get($id)
{
if (!DolibarrApiAccess::$user->rights->societe->contact->lire)
{
throw new RestException(401, 'No permission to read contacts');
Expand Down Expand Up @@ -105,7 +107,7 @@ function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 0, $page = 0
}

// case of external user, $thirdparty_ids param is ignored and replaced by user's socid
$socids = DolibarrApiAccess::$user->societe_id ? DolibarrApiAccess::$user->societe_id : $thirdparty_ids;
$socids = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $thirdparty_ids;

// If the internal user must only see his customers, force searching by him
$search_sale = 0;
Expand Down Expand Up @@ -171,7 +173,7 @@ function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 0, $page = 0
}
}
else {
throw new RestException(503, 'Error when retreive contacts : ' . $sql);
throw new RestException(503, 'Error when retrieve contacts : ' . $sql);
}
if (!count($obj_ret))
{
Expand Down

0 comments on commit 5a477bd

Please sign in to comment.