apache::vhost ProxyPassMatch in Location containers #2222

skylar2-uw · 2022-03-24T21:32:57Z

Apache httpd supports placing ProxyPass and ProxyPassMatch directives either at virtual host scope, or inside a Location/LocationMatch container. When placed inside a container, the path parameter is omitted and inherited from the container's path. For Location containers, this is a simple URI, while LocationMatch allows the path to be regex. While ProxyPass can go into a LocationMatch container, the inherited path is interpreted as a string rather than a regex, which limits its utility.

While the puppetlabs-apache module (via its apache::vhost type) supports both ProxyPass and ProxyPassMatch at virtual host scope, currently it only supports ProxyPass inside a Location/LocationMatch container, which means that it isn't possible to use the regex-aware LocationMatch container type. This pull request enhances the vhost/_directories.erb template to support the same proxy_pass_match dictionary at Location/LocationMatch scope that apache::vhost type supports at virtual host scope.

I couldn't find any documentation for the existing ProxyPass support in apache::vhost's directories array, so I added a short blurb to the apache::vhost Puppet Strings.

I added what I thought would be a decent simple test case, though I confess I'm not a rspec expert so it might bear special review.

…tead of ProxyPass if it is detected

puppet-community-rangefinder · 2022-03-24T21:33:03Z

apache::vhost is a type

Breaking changes to this file WILL impact these 128 modules (exact match):

Breaking changes to this file MAY impact these 35 modules (near match):

This module is declared in 174 of 579 indexed public `Puppetfiles`.

These results were generated with Rangefinder, a tool that helps predict the downstream impact of breaking changes to elements used in Puppet modules. You can run this on the command line to get a full report.

Exact matches are those that we can positively identify via namespace and the declaring modules' metadata. Non-namespaced items, such as Puppet 3.x functions, will always be reported as near matches only.

david22swan · 2022-05-10T14:00:02Z

@skylar2-uw Hey, it look's like you've got some syntax error's that where on the main branch, these have been sorted now so if you rebase it should remove them.

…ectories

It already uses the apache24 package and service names. This aligns the values.

This was dropped in December 2019[1] and thus has no use anymore. [1]: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=872597ae0890e11ac15718f655935f1b0c9e0dbd gentoo/gentoo@872597a

See issue for more information: https://github.com/puppetlabs/iac/issues/336

…equest_target"

This takes the approach of listing the disabling steps once rather than repeating it for every mpm. I wasn't quite sure on the prefork disabling. Does prefork need to stay enabled for itk?

It's safe to assume the version is >= 2.2 so the conditional can be dropped.

The latest passenger include a new option to load ruby bundles earlier, working around deployment issues. See: * phusion/passenger#2410 * phusion/passenger#2409

CentOS Stream verion is just `8`, not `8.foo`.

In 7e233fe a plan was made to change the naming. In 6b2a20a it was already from 6.0.0 to 7.0.0. Now that 7.0.0 has been released, the default isn't going to change. This time I'm suggestion to drop the plan altogether and stop bothering users with this.

This adds support for the GssapiBasicAuth setting which allows to fall back to basic auth if NEGOTIATE fails.

…m:uwgsit/puppetlabs-apache into apache_vhost_proxy_pass_match_directories

CLAassistant · 2022-05-12T14:54:58Z

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
4 out of 5 committers have signed the CLA.

✅ skylar2-uw
✅ smortex
✅ chelnak
✅ kenyon
❌ olifre
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

skylar2-uw · 2022-05-12T14:56:40Z

@david22swan Thanks for the heads-up and taking care of the fix, I've got our forked repo updated.

david22swan · 2022-05-13T08:16:23Z

@skylar2-uw Hey, thx for getting the rebase done so fast, anyway look's like it has uncovered some failures in the spec test's.
Giving them a closer look they all look to be the same, you are getting errors in the spec/defines/vhost_spec.rb file from the new test that you have added.
Anyway, aside from this everything looks good so if you can get it sorted I'll be happy to go ahead and merge.

skylar2-uw · 2022-05-24T17:01:12Z

@david22swan Sorry for the delay, was trying to get rspec working in our environment (we're a bit old on PE 2019 and CentOS 7). Unfortunately couldn't quite get it to work, but eyeballing the test case I think all it needs is proxy_pass to be changed to proxy_pass_match. I've pushed an update so hopefully that does the trick. Thanks for your patience!

david22swan

@skylar2-uw Yeh that fixed it :)

Anyway, everything looks good to me so I'm gonna go ahead and merge.
Thank's for putting in the work :)

david22swan

@skylar2-uw Yeh that fixed it :)

Anyway, everything looks good to me so I'm gonna go ahead and merge.
Thank's for putting in the work :)

skylar2-uw added 3 commits March 24, 2022 14:29

test for proxy_pass_match in proxy dictionary, use ProxyPassMatch ins…

87cc5f0

…tead of ProxyPass if it is detected

Puppet String update

66cef3d

test case

5bff371

skylar2-uw marked this pull request as ready for review March 24, 2022 21:37

skylar2-uw requested a review from a team as a code owner March 24, 2022 21:37

Puppet String

16f9aba

skylar2-uw changed the title ~~Apache vhost proxy pass match directories~~ apache::vhost ProxyPassMatch directories Mar 24, 2022

skylar2-uw changed the title ~~apache::vhost ProxyPassMatch directories~~ apache::vhost ProxyPassMatch in Location containers Mar 24, 2022

chelnak added the community label Mar 25, 2022

skylar2-uw and others added 19 commits May 12, 2022 07:47

Merge branch 'puppetlabs:main' into apache_vhost_proxy_pass_match_dir…

7a29a2a

…ectories

Set the Apache version to 2.4 in FreeBSD acceptance

8b5a39c

It already uses the apache24 package and service names. This aligns the values.

Drop Apache 2.2 support with Gentoo

d6c62d5

This was dropped in December 2019[1] and thus has no use anymore. [1]: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=872597ae0890e11ac15718f655935f1b0c9e0dbd gentoo/gentoo@872597a

(GH-iac-334) Remove code specific to unsupported OSs

c6f11ad

(maint) Temporary disable of syntax checks to allow work to go through

faaa24d

See issue for more information: https://github.com/puppetlabs/iac/issues/336

(MAINT) Add labeller and stale GHA workflows

1530d9a

(MAINT) Fixes no new line at EOF

fdbbe20

"This commit changes the workflow trigger for pull requests to pull_r…

92163f1

…equest_target"

Restructure MPM disabling

74f6e0c

This takes the approach of listing the disabling steps once rather than repeating it for every mpm. I wasn't quite sure on the prefork disabling. Does prefork need to stay enabled for itk?

Drop Apache 2.0 compatibility code

86c852c

It's safe to assume the version is >= 2.2 so the conditional can be dropped.

Add support for PassengerPreloadBundler

395a086

The latest passenger include a new option to load ruby bundles earlier, working around deployment issues. See: * phusion/passenger#2410 * phusion/passenger#2409

Fix CI

722f020

CentOS Stream verion is just `8`, not `8.foo`.

(maint) PDK Update

ce7b59f

(maint) syntax:hiera:yaml fixes

4750870

(maint) Rubocop Fixes

a5b06d3

(GH-cat-9) syntax:hiera:yaml exclusions added

2472c02

init.pp: fix typo in purge_vdir documentation

a3f10e6

mod_auth_gssapi: Add support for GssapiBasicAuth.

6f28430

This adds support for the GssapiBasicAuth setting which allows to fall back to basic auth if NEGOTIATE fails.

olifre and others added 2 commits May 12, 2022 07:53

mod_auth_gssapi: Improve indentation in vhost/_gssapi template.

03d8f76

Merge branch 'apache_vhost_proxy_pass_match_directories' of github.co…

4d1b89a

…m:uwgsit/puppetlabs-apache into apache_vhost_proxy_pass_match_directories

change test case to use proxy_pass_match rather than proxy_pass

65c169e

david22swan added the feature label May 24, 2022

david22swan approved these changes May 24, 2022

View reviewed changes

david22swan merged commit bff20f9 into puppetlabs:main May 24, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

apache::vhost ProxyPassMatch in Location containers #2222

apache::vhost ProxyPassMatch in Location containers #2222

skylar2-uw commented Mar 24, 2022

puppet-community-rangefinder bot commented Mar 24, 2022

david22swan commented May 10, 2022

CLAassistant commented May 12, 2022 •

edited

Loading

skylar2-uw commented May 12, 2022 •

edited

Loading

david22swan commented May 13, 2022

skylar2-uw commented May 24, 2022

david22swan left a comment

david22swan left a comment

apache::vhost ProxyPassMatch in Location containers #2222

apache::vhost ProxyPassMatch in Location containers #2222

Conversation

skylar2-uw commented Mar 24, 2022

puppet-community-rangefinder bot commented Mar 24, 2022

apache::vhost is a type

This module is declared in 174 of 579 indexed public Puppetfiles.

david22swan commented May 10, 2022

CLAassistant commented May 12, 2022 • edited Loading

skylar2-uw commented May 12, 2022 • edited Loading

david22swan commented May 13, 2022

skylar2-uw commented May 24, 2022

david22swan left a comment

Choose a reason for hiding this comment

david22swan left a comment

Choose a reason for hiding this comment

This module is declared in 174 of 579 indexed public `Puppetfiles`.

CLAassistant commented May 12, 2022 •

edited

Loading

skylar2-uw commented May 12, 2022 •

edited

Loading