Merge branch 'main' of https://github.com/PRX/Infrastructure

PRX · Oct 12, 2023 · 8fce858 · 8fce858
2 parents 65c5e36 + 1147c48
commit 8fce858
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 5 deletions.
diff --git a/etc/cdn-log-shipper/log-shipper.yml b/etc/cdn-log-shipper/log-shipper.yml
@@ -92,6 +92,7 @@ Resources:
         const crypto = require('crypto');
 
         const IPV4_MASK = /\.[0-9]{1,3}$/;
+
         const maskIp = (ip, field) => {
           if (ip.match(IPV4_MASK)) {
             return ip.replace(IPV4_MASK, '.0');
@@ -119,6 +120,16 @@ Resources:
           });
         };
 
+        const findIp = (xff, ip) => {
+          if (xff === '-') {
+            return ip;
+          } else if (xff) {
+            return xff.split(',').map(s => s.trim()).filter(s => s)[0];
+          } else {
+            return ip;
+          }
+        };
+
         const PODCAST_IDS = process.env.PODCAST_IDS.split(',').map(s => s.trim()).filter(s => s);
 
         const IGNORE_PATHS = ['/', '/favicon.ico', '/robots.txt'];
@@ -146,6 +157,12 @@ Resources:
             // podcast id and episode guid (only works for dovetail3-cdn requests)
             const datas = mappedRows.filter(data => {
               const parts = data['cs-uri-stem'].split('/').filter(s => s);
+
+              // if the path starts with a region like usw2, shift that off
+              if (parts[0] && parts[0].match(/^[a-z][a-z0-9\-]+$/)) {
+                parts.shift();
+              }
+
               if (parts.length === 4) {
                 data['prx-podcast-id'] = parts[0];
                 data['prx-episode-guid'] = parts[1];
@@ -163,8 +180,7 @@ Resources:
             // calculate listener_ids
             datas.forEach(data => {
               // use leftmost XFF or IP
-              const xffParts = (data['x-forwarded-for'] || '').split(',').map(s => s.trim()).filter(s => s);
-              const leftMostIp = xffParts[0] || data['c-ip'];
+              const leftMostIp = findIp(data['x-forwarded-for'], data['c-ip']);
 
               // truncate ipv6 but not ipv4
               const truncatedIp = leftMostIp.includes(':') ? maskIp(leftMostIp, 'listener-id') : leftMostIp;

diff --git a/spire/templates/apps/augury.yml b/spire/templates/apps/augury.yml
@@ -91,9 +91,21 @@ Resources:
       Conditions:
         - Field: host-header
           Values:
-            - augury.*
+            - inventory.dovetail.*
       ListenerArn: !Ref AlbHttpsListenerArn
       Priority: !Join ["", [!Ref AlbListenerRulePriorityPrefix, "01"]]
+  AltHostHeaderListenerRule:
+    Type: AWS::ElasticLoadBalancingV2::ListenerRule
+    Properties:
+      Actions:
+        - TargetGroupArn: !Ref TargetGroup
+          Type: forward
+      Conditions:
+        - Field: host-header
+          Values:
+            - augury.*
+      ListenerArn: !Ref AlbHttpsListenerArn
+      Priority: !Join ["", [!Ref AlbListenerRulePriorityPrefix, "02"]]
 
   TargetGroup:
     Type: AWS::ElasticLoadBalancingV2::TargetGroup

diff --git a/spire/templates/apps/feeder.yml b/spire/templates/apps/feeder.yml
@@ -90,9 +90,21 @@ Resources:
       Conditions:
         - Field: host-header
           Values:
-            - feeder.*
+            - podcasts.dovetail.*
       ListenerArn: !Ref AlbHttpsListenerArn
       Priority: !Join ["", [!Ref AlbListenerRulePriorityPrefix, "01"]]
+  AltHostHeaderListenerRule:
+    Type: AWS::ElasticLoadBalancingV2::ListenerRule
+    Properties:
+      Actions:
+        - TargetGroupArn: !Ref WebTargetGroup2
+          Type: forward
+      Conditions:
+        - Field: host-header
+          Values:
+            - feeder.*
+      ListenerArn: !Ref AlbHttpsListenerArn
+      Priority: !Join ["", [!Ref AlbListenerRulePriorityPrefix, "02"]]
 
   DefaultJobQueue:
     Type: AWS::SQS::Queue

diff --git a/spire/templates/apps/metrics.yml b/spire/templates/apps/metrics.yml
@@ -41,9 +41,21 @@ Resources:
       Conditions:
         - Field: host-header
           Values:
-            - metrics.*
+            - metrics.dovetail.*
       ListenerArn: !Ref AlbHttpsListenerArn
       Priority: !Join ["", [!Ref AlbListenerRulePriorityPrefix, "00"]]
+  AltHostHeaderListenerRule:
+    Type: AWS::ElasticLoadBalancingV2::ListenerRule
+    Properties:
+      Actions:
+        - TargetGroupArn: !Ref TargetGroup
+          Type: forward
+      Conditions:
+        - Field: host-header
+          Values:
+            - metrics.*
+      ListenerArn: !Ref AlbHttpsListenerArn
+      Priority: !Join ["", [!Ref AlbListenerRulePriorityPrefix, "01"]]
 
   TargetGroup:
     Type: AWS::ElasticLoadBalancingV2::TargetGroup