tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-24 22:24:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

/v1/actions/remove-comment: let users specify themselves

Browse Source
This commit is contained in:
Alexander A. Klimov 2019-11-21 15:53:40 +01:00
parent 7849da0b78
commit d84efecb62
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/icinga/apiactions.cpp
View File

@ -280,12 +280,18 @@ Dictionary::Ptr ApiActions::AddComment(const ConfigObject::Ptr& object,
Dictionary::Ptr ApiActions::RemoveComment(const ConfigObject::Ptr& object, Dictionary::Ptr ApiActions::RemoveComment(const ConfigObject::Ptr& object,
const Dictionary::Ptr& params) const Dictionary::Ptr& params)
{ {
auto author (HttpUtility::GetLastParameter(params, "author"));
Checkable::Ptr checkable = dynamic_pointer_cast<Checkable>(object); Checkable::Ptr checkable = dynamic_pointer_cast<Checkable>(object);
if (checkable) { if (checkable) {
std::set<Comment::Ptr> comments = checkable->GetComments(); std::set<Comment::Ptr> comments = checkable->GetComments();
for (const Comment::Ptr& comment : comments) { for (const Comment::Ptr& comment : comments) {
{
ObjectLock oLock (comment);
comment->SetRemovedBy(author);
}
Comment::RemoveComment(comment->GetName()); Comment::RemoveComment(comment->GetName());
} }
@ -297,6 +303,11 @@ Dictionary::Ptr ApiActions::RemoveComment(const ConfigObject::Ptr& object,
if (!comment) if (!comment)
return ApiActions::CreateResult(404, "Cannot remove non-existent comment object."); return ApiActions::CreateResult(404, "Cannot remove non-existent comment object.");
{
ObjectLock oLock (comment);
comment->SetRemovedBy(author);
}
String commentName = comment->GetName(); String commentName = comment->GetName();
Comment::RemoveComment(commentName); Comment::RemoveComment(commentName);

2
lib/icinga/comment.ti
View File

@ -73,6 +73,8 @@ class Comment : ConfigObject < CommentNameComposer
[config] bool persistent; [config] bool persistent;
[config] Timestamp expire_time; [config] Timestamp expire_time;
[state] int legacy_id; [state] int legacy_id;
[no_user_view, no_user_modify] String removed_by;
}; };
} }

2
lib/icingadb/icingadb-objects.cpp
View File

@ -1485,7 +1485,7 @@ void IcingaDB::SendRemovedComment(const Comment::Ptr& comment)
"comment_id", GetObjectIdentifier(comment), "comment_id", GetObjectIdentifier(comment),
"environment_id", SHA1(GetEnvironment()), "environment_id", SHA1(GetEnvironment()),
"entry_time", Convert::ToString(TimestampToMilliseconds(comment->GetEntryTime())), "entry_time", Convert::ToString(TimestampToMilliseconds(comment->GetEntryTime())),
"author", Utility::ValidateUTF8(comment->GetAuthor()), "author", Utility::ValidateUTF8(comment->GetRemovedBy()),
"comment", Utility::ValidateUTF8(comment->GetText()), "comment", Utility::ValidateUTF8(comment->GetText()),
"entry_type", Convert::ToString(comment->GetEntryType()), "entry_type", Convert::ToString(comment->GetEntryType()),
"is_persistent", Convert::ToString((unsigned short)comment->GetPersistent()), "is_persistent", Convert::ToString((unsigned short)comment->GetPersistent()),