[Minor] Support authenticated users in CGP helper

1 files changed, 12 insertions, 2 deletions

diff --git a/utils/cgp_rspamd.pl b/utils/cgp_rspamd.pl
index 78ca89462..6851e6dd4 100644
--- a/utils/cgp_rspamd.pl
+++ b/utils/cgp_rspamd.pl
@@ -192,6 +192,7 @@ sub rspamd_scan {
         my $from;
         my @rcpts;
         my $ip;
+        my $user;
 
         foreach my $elt (@envelope) {
           if ( $elt =~ /^P\s[^<]*(<[^>]*>).*$/ ) {
@@ -200,8 +201,13 @@ sub rspamd_scan {
           elsif ( $elt =~ /^R\s[^<]*(<[^>]*>).*$/ ) {
             push @rcpts, $1;
           }
-          elsif ( $elt =~ /^S .*\[(.+)\]/ ) {
-            $ip = $1;
+          elsif ( $elt =~ /^S (?:<([^>]+)>)?\s*S.*\[(.+)\]/ ) {
+            if ($1) {
+              $user = $1;
+            }
+            if ($2) {
+              $ip = $2;
+            }
           }
         }
 
@@ -221,6 +227,10 @@ sub rspamd_scan {
           $headers->{IP} = $ip;
         }
 
+        if ($user) {
+          $headers->{User} = $user;
+        }
+
         http_post(
           "http://$rspamd_host/checkv2", $data,
           timeout => $request_timeout,