Page MenuHomeSoftware Heritage
Differential D4719

varnish: Correctly handle the vhost when the port number is included
ClosedPublic
Actions

Authored by vsellier on Dec 11 2020, 11:42 AM.

Details

Reviewers
ardumont
Group Reviewers
System administrators
Maniphest Tasks
T2877: Investigate spurious deposit logs
Commits
rSPSITE5128dbb7b8d3: varnish: Correctly handle the vhost when the port number is included
Summary

If a vhost is received with :<port>, it was not handled by the regexps
managing the backend selection and forwarded to the default backend.

Related to T2877

Test Plan

octocatalog-diff

  • moma:
diff origin/production/moma.softwareheritage.org current/moma.softwareheritage.org
*******************************************
  File[/etc/varnish/includes/50_vhost_archive.softwareheritage.org.vcl] =>
   parameters =>
     content =>
      @@ -7,8 +7,8 @@
       sub vcl_recv {
           if (
      -        req.http.host ~ "^(?i)base\.softwareheritage\.org$" ||
      -        req.http.host ~ "^(?i)archive\.internal\.softwareheritage\.org$" ||
      -        req.http.host ~ "^(?i)webapp0\.softwareheritage\.org$" ||
      -        req.http.host ~ "^(?i)archive\.softwareheritage\.org$"
      +        req.http.host ~ "^(?i)base\.softwareheritage\.org(:[0-9]+)?$" ||
      +        req.http.host ~ "^(?i)archive\.internal\.softwareheritage\.org(:[0-9]+)?$" ||
      +        req.http.host ~ "^(?i)webapp0\.softwareheritage\.org(:[0-9]+)?$" ||
      +        req.http.host ~ "^(?i)archive\.softwareheritage\.org(:[0-9]+)?$"
           ) {
               if (std.port(server.ip) == 80) {
      @@ -24,8 +24,8 @@
       sub vcl_deliver {
           if (
      -        req.http.host ~ "^(?i)base\.softwareheritage\.org$" ||
      -        req.http.host ~ "^(?i)archive\.internal\.softwareheritage\.org$" ||
      -        req.http.host ~ "^(?i)webapp0\.softwareheritage\.org$" ||
      -        req.http.host ~ "^(?i)archive\.softwareheritage\.org$"
      +        req.http.host ~ "^(?i)base\.softwareheritage\.org(:[0-9]+)?$" ||
      +        req.http.host ~ "^(?i)archive\.internal\.softwareheritage\.org(:[0-9]+)?$" ||
      +        req.http.host ~ "^(?i)webapp0\.softwareheritage\.org(:[0-9]+)?$" ||
      +        req.http.host ~ "^(?i)archive\.softwareheritage\.org(:[0-9]+)?$"
           ) {
               if (std.port(server.ip) != 80) {
*******************************************
  File[/etc/varnish/includes/50_vhost_deposit.softwareheritage.org.vcl] =>
   parameters =>
     content =>
      @@ -7,6 +7,6 @@
       sub vcl_recv {
           if (
      -        req.http.host ~ "^(?i)deposit\.internal\.softwareheritage\.org$" ||
      -        req.http.host ~ "^(?i)deposit\.softwareheritage\.org$"
      +        req.http.host ~ "^(?i)deposit\.internal\.softwareheritage\.org(:[0-9]+)?$" ||
      +        req.http.host ~ "^(?i)deposit\.softwareheritage\.org(:[0-9]+)?$"
           ) {
               if (std.port(server.ip) == 80) {
      @@ -22,6 +22,6 @@
       sub vcl_deliver {
           if (
      -        req.http.host ~ "^(?i)deposit\.internal\.softwareheritage\.org$" ||
      -        req.http.host ~ "^(?i)deposit\.softwareheritage\.org$"
      +        req.http.host ~ "^(?i)deposit\.internal\.softwareheritage\.org(:[0-9]+)?$" ||
      +        req.http.host ~ "^(?i)deposit\.softwareheritage\.org(:[0-9]+)?$"
           ) {
               if (std.port(server.ip) != 80) {
*******************************************
  Profile::Varnish::Vcl_include[vhost_archive.softwareheritage.org] =>
   parameters =>
     content =>
      @@ -7,8 +7,8 @@
       sub vcl_recv {
           if (
      -        req.http.host ~ "^(?i)base\.softwareheritage\.org$" ||
      -        req.http.host ~ "^(?i)archive\.internal\.softwareheritage\.org$" ||
      -        req.http.host ~ "^(?i)webapp0\.softwareheritage\.org$" ||
      -        req.http.host ~ "^(?i)archive\.softwareheritage\.org$"
      +        req.http.host ~ "^(?i)base\.softwareheritage\.org(:[0-9]+)?$" ||
      +        req.http.host ~ "^(?i)archive\.internal\.softwareheritage\.org(:[0-9]+)?$" ||
      +        req.http.host ~ "^(?i)webapp0\.softwareheritage\.org(:[0-9]+)?$" ||
      +        req.http.host ~ "^(?i)archive\.softwareheritage\.org(:[0-9]+)?$"
           ) {
               if (std.port(server.ip) == 80) {
      @@ -24,8 +24,8 @@
       sub vcl_deliver {
           if (
      -        req.http.host ~ "^(?i)base\.softwareheritage\.org$" ||
      -        req.http.host ~ "^(?i)archive\.internal\.softwareheritage\.org$" ||
      -        req.http.host ~ "^(?i)webapp0\.softwareheritage\.org$" ||
      -        req.http.host ~ "^(?i)archive\.softwareheritage\.org$"
      +        req.http.host ~ "^(?i)base\.softwareheritage\.org(:[0-9]+)?$" ||
      +        req.http.host ~ "^(?i)archive\.internal\.softwareheritage\.org(:[0-9]+)?$" ||
      +        req.http.host ~ "^(?i)webapp0\.softwareheritage\.org(:[0-9]+)?$" ||
      +        req.http.host ~ "^(?i)archive\.softwareheritage\.org(:[0-9]+)?$"
           ) {
               if (std.port(server.ip) != 80) {
*******************************************
  Profile::Varnish::Vcl_include[vhost_deposit.softwareheritage.org] =>
   parameters =>
     content =>
      @@ -7,6 +7,6 @@
       sub vcl_recv {
           if (
      -        req.http.host ~ "^(?i)deposit\.internal\.softwareheritage\.org$" ||
      -        req.http.host ~ "^(?i)deposit\.softwareheritage\.org$"
      +        req.http.host ~ "^(?i)deposit\.internal\.softwareheritage\.org(:[0-9]+)?$" ||
      +        req.http.host ~ "^(?i)deposit\.softwareheritage\.org(:[0-9]+)?$"
           ) {
               if (std.port(server.ip) == 80) {
      @@ -22,6 +22,6 @@
       sub vcl_deliver {
           if (
      -        req.http.host ~ "^(?i)deposit\.internal\.softwareheritage\.org$" ||
      -        req.http.host ~ "^(?i)deposit\.softwareheritage\.org$"
      +        req.http.host ~ "^(?i)deposit\.internal\.softwareheritage\.org(:[0-9]+)?$" ||
      +        req.http.host ~ "^(?i)deposit\.softwareheritage\.org(:[0-9]+)?$"
           ) {
               if (std.port(server.ip) != 80) {
*******************************************
  Varnish::Vcl[/etc/varnish/includes/50_vhost_archive.softwareheritage.org.vcl] =>
   parameters =>
     content =>
      @@ -7,8 +7,8 @@
       sub vcl_recv {
           if (
      -        req.http.host ~ "^(?i)base\.softwareheritage\.org$" ||
      -        req.http.host ~ "^(?i)archive\.internal\.softwareheritage\.org$" ||
      -        req.http.host ~ "^(?i)webapp0\.softwareheritage\.org$" ||
      -        req.http.host ~ "^(?i)archive\.softwareheritage\.org$"
      +        req.http.host ~ "^(?i)base\.softwareheritage\.org(:[0-9]+)?$" ||
      +        req.http.host ~ "^(?i)archive\.internal\.softwareheritage\.org(:[0-9]+)?$" ||
      +        req.http.host ~ "^(?i)webapp0\.softwareheritage\.org(:[0-9]+)?$" ||
      +        req.http.host ~ "^(?i)archive\.softwareheritage\.org(:[0-9]+)?$"
           ) {
               if (std.port(server.ip) == 80) {
      @@ -24,8 +24,8 @@
       sub vcl_deliver {
           if (
      -        req.http.host ~ "^(?i)base\.softwareheritage\.org$" ||
      -        req.http.host ~ "^(?i)archive\.internal\.softwareheritage\.org$" ||
      -        req.http.host ~ "^(?i)webapp0\.softwareheritage\.org$" ||
      -        req.http.host ~ "^(?i)archive\.softwareheritage\.org$"
      +        req.http.host ~ "^(?i)base\.softwareheritage\.org(:[0-9]+)?$" ||
      +        req.http.host ~ "^(?i)archive\.internal\.softwareheritage\.org(:[0-9]+)?$" ||
      +        req.http.host ~ "^(?i)webapp0\.softwareheritage\.org(:[0-9]+)?$" ||
      +        req.http.host ~ "^(?i)archive\.softwareheritage\.org(:[0-9]+)?$"
           ) {
               if (std.port(server.ip) != 80) {
*******************************************
  Varnish::Vcl[/etc/varnish/includes/50_vhost_deposit.softwareheritage.org.vcl] =>
   parameters =>
     content =>
      @@ -7,6 +7,6 @@
       sub vcl_recv {
           if (
      -        req.http.host ~ "^(?i)deposit\.internal\.softwareheritage\.org$" ||
      -        req.http.host ~ "^(?i)deposit\.softwareheritage\.org$"
      +        req.http.host ~ "^(?i)deposit\.internal\.softwareheritage\.org(:[0-9]+)?$" ||
      +        req.http.host ~ "^(?i)deposit\.softwareheritage\.org(:[0-9]+)?$"
           ) {
               if (std.port(server.ip) == 80) {
      @@ -22,6 +22,6 @@
       sub vcl_deliver {
           if (
      -        req.http.host ~ "^(?i)deposit\.internal\.softwareheritage\.org$" ||
      -        req.http.host ~ "^(?i)deposit\.softwareheritage\.org$"
      +        req.http.host ~ "^(?i)deposit\.internal\.softwareheritage\.org(:[0-9]+)?$" ||
      +        req.http.host ~ "^(?i)deposit\.softwareheritage\.org(:[0-9]+)?$"
           ) {
               if (std.port(server.ip) != 80) {
*******************************************
*** End octocatalog-diff on moma.softwareheritage.org
  • rp0.staging:
diff origin/production/rp0.internal.staging.swh.network current/rp0.internal.staging.swh.network
*******************************************
  File[/etc/varnish/includes/50_vhost_deposit.staging.swh.network.vcl] =>
   parameters =>
     content =>
      @@ -7,6 +7,6 @@
       sub vcl_recv {
           if (
      -        req.http.host ~ "^(?i)deposit\-rp\.internal\.staging\.swh\.network$" ||
      -        req.http.host ~ "^(?i)deposit\.staging\.swh\.network$"
      +        req.http.host ~ "^(?i)deposit\-rp\.internal\.staging\.swh\.network(:[0-9]+)?$" ||
      +        req.http.host ~ "^(?i)deposit\.staging\.swh\.network(:[0-9]+)?$"
           ) {
               if (std.port(server.ip) == 80) {
      @@ -22,6 +22,6 @@
       sub vcl_deliver {
           if (
      -        req.http.host ~ "^(?i)deposit\-rp\.internal\.staging\.swh\.network$" ||
      -        req.http.host ~ "^(?i)deposit\.staging\.swh\.network$"
      +        req.http.host ~ "^(?i)deposit\-rp\.internal\.staging\.swh\.network(:[0-9]+)?$" ||
      +        req.http.host ~ "^(?i)deposit\.staging\.swh\.network(:[0-9]+)?$"
           ) {
               if (std.port(server.ip) != 80) {
*******************************************
  File[/etc/varnish/includes/50_vhost_webapp.staging.swh.network.vcl] =>
   parameters =>
     content =>
      @@ -7,6 +7,6 @@
       sub vcl_recv {
           if (
      -        req.http.host ~ "^(?i)webapp\-rp\.internal\.staging\.swh\.network$" ||
      -        req.http.host ~ "^(?i)webapp\.staging\.swh\.network$"
      +        req.http.host ~ "^(?i)webapp\-rp\.internal\.staging\.swh\.network(:[0-9]+)?$" ||
      +        req.http.host ~ "^(?i)webapp\.staging\.swh\.network(:[0-9]+)?$"
           ) {
               if (std.port(server.ip) == 80) {
      @@ -22,6 +22,6 @@
       sub vcl_deliver {
           if (
      -        req.http.host ~ "^(?i)webapp\-rp\.internal\.staging\.swh\.network$" ||
      -        req.http.host ~ "^(?i)webapp\.staging\.swh\.network$"
      +        req.http.host ~ "^(?i)webapp\-rp\.internal\.staging\.swh\.network(:[0-9]+)?$" ||
      +        req.http.host ~ "^(?i)webapp\.staging\.swh\.network(:[0-9]+)?$"
           ) {
               if (std.port(server.ip) != 80) {
*******************************************
  Profile::Varnish::Vcl_include[vhost_deposit.staging.swh.network] =>
   parameters =>
     content =>
      @@ -7,6 +7,6 @@
       sub vcl_recv {
           if (
      -        req.http.host ~ "^(?i)deposit\-rp\.internal\.staging\.swh\.network$" ||
      -        req.http.host ~ "^(?i)deposit\.staging\.swh\.network$"
      +        req.http.host ~ "^(?i)deposit\-rp\.internal\.staging\.swh\.network(:[0-9]+)?$" ||
      +        req.http.host ~ "^(?i)deposit\.staging\.swh\.network(:[0-9]+)?$"
           ) {
               if (std.port(server.ip) == 80) {
      @@ -22,6 +22,6 @@
       sub vcl_deliver {
           if (
      -        req.http.host ~ "^(?i)deposit\-rp\.internal\.staging\.swh\.network$" ||
      -        req.http.host ~ "^(?i)deposit\.staging\.swh\.network$"
      +        req.http.host ~ "^(?i)deposit\-rp\.internal\.staging\.swh\.network(:[0-9]+)?$" ||
      +        req.http.host ~ "^(?i)deposit\.staging\.swh\.network(:[0-9]+)?$"
           ) {
               if (std.port(server.ip) != 80) {
*******************************************
  Profile::Varnish::Vcl_include[vhost_webapp.staging.swh.network] =>
   parameters =>
     content =>
      @@ -7,6 +7,6 @@
       sub vcl_recv {
           if (
      -        req.http.host ~ "^(?i)webapp\-rp\.internal\.staging\.swh\.network$" ||
      -        req.http.host ~ "^(?i)webapp\.staging\.swh\.network$"
      +        req.http.host ~ "^(?i)webapp\-rp\.internal\.staging\.swh\.network(:[0-9]+)?$" ||
      +        req.http.host ~ "^(?i)webapp\.staging\.swh\.network(:[0-9]+)?$"
           ) {
               if (std.port(server.ip) == 80) {
      @@ -22,6 +22,6 @@
       sub vcl_deliver {
           if (
      -        req.http.host ~ "^(?i)webapp\-rp\.internal\.staging\.swh\.network$" ||
      -        req.http.host ~ "^(?i)webapp\.staging\.swh\.network$"
      +        req.http.host ~ "^(?i)webapp\-rp\.internal\.staging\.swh\.network(:[0-9]+)?$" ||
      +        req.http.host ~ "^(?i)webapp\.staging\.swh\.network(:[0-9]+)?$"
           ) {
               if (std.port(server.ip) != 80) {
*******************************************
  Varnish::Vcl[/etc/varnish/includes/50_vhost_deposit.staging.swh.network.vcl] =>
   parameters =>
     content =>
      @@ -7,6 +7,6 @@
       sub vcl_recv {
           if (
      -        req.http.host ~ "^(?i)deposit\-rp\.internal\.staging\.swh\.network$" ||
      -        req.http.host ~ "^(?i)deposit\.staging\.swh\.network$"
      +        req.http.host ~ "^(?i)deposit\-rp\.internal\.staging\.swh\.network(:[0-9]+)?$" ||
      +        req.http.host ~ "^(?i)deposit\.staging\.swh\.network(:[0-9]+)?$"
           ) {
               if (std.port(server.ip) == 80) {
      @@ -22,6 +22,6 @@
       sub vcl_deliver {
           if (
      -        req.http.host ~ "^(?i)deposit\-rp\.internal\.staging\.swh\.network$" ||
      -        req.http.host ~ "^(?i)deposit\.staging\.swh\.network$"
      +        req.http.host ~ "^(?i)deposit\-rp\.internal\.staging\.swh\.network(:[0-9]+)?$" ||
      +        req.http.host ~ "^(?i)deposit\.staging\.swh\.network(:[0-9]+)?$"
           ) {
               if (std.port(server.ip) != 80) {
*******************************************
  Varnish::Vcl[/etc/varnish/includes/50_vhost_webapp.staging.swh.network.vcl] =>
   parameters =>
     content =>
      @@ -7,6 +7,6 @@
       sub vcl_recv {
           if (
      -        req.http.host ~ "^(?i)webapp\-rp\.internal\.staging\.swh\.network$" ||
      -        req.http.host ~ "^(?i)webapp\.staging\.swh\.network$"
      +        req.http.host ~ "^(?i)webapp\-rp\.internal\.staging\.swh\.network(:[0-9]+)?$" ||
      +        req.http.host ~ "^(?i)webapp\.staging\.swh\.network(:[0-9]+)?$"
           ) {
               if (std.port(server.ip) == 80) {
      @@ -22,6 +22,6 @@
       sub vcl_deliver {
           if (
      -        req.http.host ~ "^(?i)webapp\-rp\.internal\.staging\.swh\.network$" ||
      -        req.http.host ~ "^(?i)webapp\.staging\.swh\.network$"
      +        req.http.host ~ "^(?i)webapp\-rp\.internal\.staging\.swh\.network(:[0-9]+)?$" ||
      +        req.http.host ~ "^(?i)webapp\.staging\.swh\.network(:[0-9]+)?$"
           ) {
               if (std.port(server.ip) != 80) {
*******************************************
*** End octocatalog-diff on rp0.internal.staging.swh.network

Diff Detail

Repository
rSPSITE puppet-swh-site
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

vsellier created this revision.Dec 11 2020, 11:42 AM
Harbormaster completed remote builds in B17884: Diff 16719.Dec 11 2020, 11:43 AM
ardumont accepted this revision.Dec 11 2020, 11:46 AM
ardumont added a subscriber: ardumont.

Neat, once that gets deployed, no more spurious error logs to the wrong server \m/

This revision is now accepted and ready to land.Dec 11 2020, 11:46 AM
Closed by commit rSPSITE5128dbb7b8d3: varnish: Correctly handle the vhost when the port number is included (authored by vsellier). · Explain WhyDec 11 2020, 2:36 PM
This revision was automatically updated to reflect the committed changes.
vsellier added a commit: rSPSITE5128dbb7b8d3: varnish: Correctly handle the vhost when the port number is included.

Revision Contents
Changeset List

PathSize
site-modules/
profile/
templates/
varnish/
8 lines

Diff 16732

View Options

site-modules/profile/templates/varnish/vhost.vcl.erb

Loading...
About · Developer information · Legal