Skip to content

feat: add action_by and environment to privilege escalation email #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 16, 2025
+24 −4
Merged

feat: add action_by and environment to privilege escalation email #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions app/Mail/MonitoredSecurityGroupNotificationEmail.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ final class MonitoredSecurityGroupNotificationEmail extends Mailable
*/
public $action;

/**
* @var string
*/
public $action_by;

/**
* @var int
*/
Expand Down Expand Up @@ -79,6 +84,7 @@ final class MonitoredSecurityGroupNotificationEmail extends Mailable
/**
* @param string $email
* @param string $action
* @param string $action_by
* @param int $user_id
* @param string $user_email
* @param string $user_name
Expand All @@ -90,6 +96,7 @@ public function __construct
(
string $email,
string $action,
string $action_by,
int $user_id,
string $user_email,
string $user_name,
Expand All @@ -100,6 +107,7 @@ public function __construct
{
$this->email = $email;
$this->action = $action;
$this->action_by = $action_by;
$this->user_id = $user_id;
$this->user_email = $user_email;
$this->user_name = $user_name;
Expand All @@ -111,9 +119,10 @@ public function __construct
(
sprintf
(
"MonitoredSecurityGroupNotificationEmail::constructor email %s action %s user_id %s user_email %s user_name %s group_id %s group_name %s group_slug %s",
"MonitoredSecurityGroupNotificationEmail::constructor email %s action %s action_by %s user_id %s user_email %s user_name %s group_id %s group_name %s group_slug %s",
$email,
$action,
$action_by,
$user_id,
$user_email,
$user_name,
Expand All @@ -126,15 +135,19 @@ public function __construct

public function build()
{
$action_by_phrase = $this->action_by ? " by $this->action_by" : "";

$this->subject = sprintf
(
"[%s] Monitored Security Groups - User %s (%s) has been %s - Group %s (%s)"
"[%s] Monitored Security Groups - User %s (%s) has been %s%s - Group %s (%s) - Environment: %s"
,Config::get('app.app_name')
,$this->user_name
,$this->user_email
,$this->action
,$action_by_phrase
,$this->group_name
,$this->group_id
,Config::get('app.env')
);
Log::debug(sprintf("MonitoredSecurityGroupNotificationEmail::build to %s", $this->email));
return $this->from(Config::get("mail.from"))
Expand Down
11 changes: 9 additions & 2 deletions app/Services/OpenId/UserService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
use Illuminate\Support\Facades\Storage;
use models\exceptions\EntityNotFoundException;
use models\exceptions\ValidationException;
use Models\OAuth2\Client;
use models\utils\IEntity;
use OAuth2\IResourceServerContext;
use OAuth2\Models\IClient;
Expand Down Expand Up @@ -483,6 +482,14 @@ public function notifyMonitoredSecurityGroupActivity(string $action, int $user_i
return;
}

$action_by = '';
$current_user = !empty($this->server_ctx->getCurrentUserId()) ?
$this->repository->getById($this->server_ctx->getCurrentUserId()) : null;

if (!is_null($current_user)) {
$action_by = sprintf("%s %s", $current_user->getFirstName(), $current_user->getLastName());
}

$notified_users = [];
foreach ($watcher_groups as $watcher_group_slug) {
Log::debug(sprintf("UserService::notifyMonitoredSecurityGroupActivity processing %s", $watcher_group_slug));
Expand All @@ -504,6 +511,7 @@ public function notifyMonitoredSecurityGroupActivity(string $action, int $user_i
(
$user->getEmail(),
$action,
$action_by,
$user_id,
$user_email,
$user_name,
Expand All @@ -514,6 +522,5 @@ public function notifyMonitoredSecurityGroupActivity(string $action, int $user_i
);
}
}

}
}
Loading