From: yeji01.kim Date: Fri, 6 Apr 2018 04:52:08 +0000 (+0900) Subject: Remove APIs associated with not used fields X-Git-Tag: submit/tizen/20180413.074150~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b652387c97ff1133e0cb78fea01a608d0a6360f8;p=platform%2Fcore%2Fsecurity%2Faudit-trail.git Remove APIs associated with not used fields - Removed fields : object effective user id, object effective group id - Removed API : audit_system_log_get_object_effective_owner Change-Id: I36923a9ae0da29bda0471d4bbbe80bf407257753 Signed-off-by: yeji01.kim --- diff --git a/common/audit/audit-system-log.h b/common/audit/audit-system-log.h index 28022f4..d10105f 100644 --- a/common/audit/audit-system-log.h +++ b/common/audit/audit-system-log.h @@ -44,8 +44,8 @@ struct AuditSystemLog final { struct { int type = NoObject; - uid_t uid = UINT_MAX, euid = UINT_MAX; - gid_t gid = UINT_MAX, egid = UINT_MAX; + uid_t uid = UINT_MAX; + gid_t gid = UINT_MAX; mode_t mode = UINT_MAX; std::string label; std::string name; diff --git a/lib/audit-trail/system-log.cpp b/lib/audit-trail/system-log.cpp index 557b002..af213c3 100644 --- a/lib/audit-trail/system-log.cpp +++ b/lib/audit-trail/system-log.cpp @@ -151,21 +151,6 @@ int audit_system_log_get_object_owner(audit_system_log_h handle, return AUDIT_TRAIL_ERROR_NONE; } -int audit_system_log_get_object_effective_owner(audit_system_log_h handle, - uid_t *euid, gid_t *egid) - -{ - RET_ON_FAILURE(handle, AUDIT_TRAIL_ERROR_INVALID_PARAMETER); - RET_ON_FAILURE(euid, AUDIT_TRAIL_ERROR_INVALID_PARAMETER); - RET_ON_FAILURE(egid, AUDIT_TRAIL_ERROR_INVALID_PARAMETER); - - const auto &log = GetSystemLog(handle).log; - *euid = log.object.euid; - *egid = log.object.egid; - - return AUDIT_TRAIL_ERROR_NONE; -} - int audit_system_log_get_object_permission(audit_system_log_h handle, mode_t *mode) { RET_ON_FAILURE(handle, AUDIT_TRAIL_ERROR_INVALID_PARAMETER); diff --git a/lib/audit-trail/system-log.h b/lib/audit-trail/system-log.h index 70a2e6d..5459ba6 100644 --- a/lib/audit-trail/system-log.h +++ b/lib/audit-trail/system-log.h @@ -174,22 +174,6 @@ AUDIT_TRAIL_API int audit_system_log_get_object_type(audit_system_log_h handle, AUDIT_TRAIL_API int audit_system_log_get_object_owner(audit_system_log_h handle, uid_t *uid, gid_t *gid); -/** - * @brief Get the object effective owner's user and group ID from the system audit log - * @details This API can be used to get the object effective owner's user ID and group ID in - * each system audit logs. - * @since_tizen 5.0 - * @param[in] handle The system audit log handle - * @param[out] euid The object effective user ID - * @param[out] egid The object effective group ID - * @return #AUDIT_TRAIL_ERROR_NONE on success, otherwise a negative value - * @retval #AUDIT_TRAIL_ERROR_NONE Successful - * @retval #AUDIT_TRAIL_ERROR_TIMED_OUT Time out - * @retval #AUDIT_TRAIL_ERROR_INVALID_PARAMETER Invalid parameter - */ -AUDIT_TRAIL_API int audit_system_log_get_object_effective_owner(audit_system_log_h handle, - uid_t *euid, gid_t *egid); - /** * @brief Get the object permission from the system audit log * @details This API can be used to get the object effective owner's user ID and group ID in diff --git a/rmi/log-management.h b/rmi/log-management.h index 93c7c88..07d906f 100644 --- a/rmi/log-management.h +++ b/rmi/log-management.h @@ -31,8 +31,7 @@ struct SystemLog { log.subject.uid, log.subject.euid, log.subject.gid, log.subject.egid, log.subject.label, log.subject.name, log.subject.pid, - log.object.type, log.object.uid, log.object.euid, - log.object.gid, log.object.egid, + log.object.type, log.object.uid, log.object.gid, log.object.mode, log.object.label, log.object.name, log.object.socketAddr, log.object.pid, log.object.inode, diff --git a/tools/cli/audit-trail-admin-cli.cpp b/tools/cli/audit-trail-admin-cli.cpp index e8c8709..ea89ec2 100644 --- a/tools/cli/audit-trail-admin-cli.cpp +++ b/tools/cli/audit-trail-admin-cli.cpp @@ -155,8 +155,8 @@ std::string printSystemLog(audit_system_log_h log) str << "},object={"; { int obj_type, sock_family; - uid_t obj_uid, obj_euid; - gid_t obj_gid, obj_egid; + uid_t obj_uid; + gid_t obj_gid; mode_t obj_mode; char *obj_label, *obj_name; pid_t obj_pid; @@ -168,7 +168,6 @@ std::string printSystemLog(audit_system_log_h log) audit_system_log_get_object_name(log, &obj_name); audit_system_log_get_object_smack_label(log, &obj_label); audit_system_log_get_object_owner(log, &obj_uid, &obj_gid); - audit_system_log_get_object_effective_owner(log, &obj_euid, &obj_egid); audit_system_log_get_object_pid(log, &obj_pid); audit_system_log_get_object_permission(log, &obj_mode); audit_system_log_get_object_inode(log, &obj_inode);