Merge pull request #2345 from stefan-ahrefs/main

add LimitRequestLine parameter

Author: david22swan

manifests/init.pp

@@ -428,6 +428,9 @@
 #   The `limitreqfieldsize` parameter sets the maximum ammount of _bytes_ that will
 #   be allowed within a request header.
 #
+# @param limitreqline
+#   The 'limitreqline' parameter sets the limit on the allowed size of a client's HTTP request-line
+#
 # @param ip
 #   Specifies the ip address
 #
@@ -526,6 +529,7 @@
   Integer $max_keepalive_requests                                            = $apache::params::max_keepalive_requests,
   Integer $limitreqfieldsize                                                 = 8190,
   Integer $limitreqfields                                                    = 100,
+  Optional[Integer] $limitreqline                                            = undef,
   Stdlib::Absolutepath $logroot                                              = $apache::params::logroot,
   Optional[Stdlib::Filemode] $logroot_mode                                   = $apache::params::logroot_mode,
   Apache::LogLevel $log_level                                                = $apache::params::log_level,

spec/acceptance/apache_parameters_spec.rb

@@ -562,6 +562,22 @@ class { 'apache':
     end
   end
 
+  describe 'limitreqline' do
+    pp = <<-MANIFEST
+        class { 'apache':
+          limitreqline => 8190,
+        }
+    MANIFEST
+    it 'applys cleanly' do
+      apply_manifest(pp, catch_failures: true)
+    end
+
+    describe file(apache_hash['conf_file']) do
+      it { is_expected.to be_file }
+      it { is_expected.to contain 'LimitRequestLine 8190' }
+    end
+  end
+
   describe 'file_e_tag' do
     pp = <<-MANIFEST
         class { 'apache':

templates/httpd.conf.erb

@@ -15,6 +15,9 @@ MaxKeepAliveRequests <%= @max_keepalive_requests %>
 KeepAliveTimeout <%= @keepalive_timeout %>
 LimitRequestFieldSize <%= @limitreqfieldsize %>
 LimitRequestFields <%= @limitreqfields %>
+<% if @limitreqline -%>
+LimitRequestLine <%= @limitreqline %>
+<% end -%>
 <%# Actually >= 2.4.24, but the minor version is not provided -%>
 <%- if @http_protocol_options and scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
 HttpProtocolOptions <%= @http_protocol_options %>