Merge branch 'rel-10_1' into issue-#1431-middleware_secure_mode

RotherOSS · Nov 22, 2021 · c3d32a3 · c3d32a3
2 parents b10a574 + 5c662be
commit c3d32a3
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/Kernel/GenericInterface/Requester.pm b/Kernel/GenericInterface/Requester.pm
@@ -233,6 +233,13 @@ sub Run {
     # Extend the data include payload/
     $DataInclude{RequesterRequestPrepareOutput} = $FunctionResult->{Data};
 
+    my %CustomHeader;
+    if ( $FunctionResult->{Header} ) {
+        %CustomHeader = (
+            CustomHeader => $FunctionResult->{Header},
+        );
+    }
+
     #
     # Map the outgoing data.
     #
@@ -317,6 +324,7 @@ sub Run {
     $FunctionResult = $TransportObject->RequesterPerformRequest(
         Operation => $Param{Invoker},
         Data      => $DataOut,
+        %CustomHeader,
     );
 
     my $IsAsynchronousCall = $Param{Asynchronous} ? 1 : 0;

diff --git a/Kernel/GenericInterface/Transport/HTTP/REST.pm b/Kernel/GenericInterface/Transport/HTTP/REST.pm
@@ -662,6 +662,18 @@ sub RequesterPerformRequest {
         );
     }
 
+    if ( $Param{CustomHeader} ) {
+        $Headers = {
+            %{$Headers},
+            %{ $Param{CustomHeader} },
+        };
+
+        $Self->{DebuggerObject}->Debug(
+            Summary => "Custom headers used (might overwrite authorization)",
+            Data    => join( '; ', keys %{ $Param{CustomHeader} } ),
+        );
+    }
+
     my $RestCommand = $Config->{DefaultCommand};
     if ( IsStringWithData( $Config->{InvokerControllerMapping}->{ $Param{Operation} }->{Command} ) )
     {