From ac72cd74268fda28e042de85e325f4f979b00217 Mon Sep 17 00:00:00 2001
From: Iain Learmonth <irl@sr2.uk>
Date: Fri, 12 Aug 2022 11:59:48 +0100
Subject: [PATCH] Revert "portal: update for jinja2 >= 3.0.1"

This reverts commit 9341f7c6a5257ddfaba798ab4cc1e2f7156a9352.
---
 app/terraform/proxy/__init__.py | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/app/terraform/proxy/__init__.py b/app/terraform/proxy/__init__.py
index 8b52d35..32875a6 100644
--- a/app/terraform/proxy/__init__.py
+++ b/app/terraform/proxy/__init__.py
@@ -1,4 +1,3 @@
-import os.path
 from abc import abstractmethod
 from collections import defaultdict
 import datetime
@@ -7,7 +6,6 @@ import string
 import random
 from typing import Dict, Optional, Any, List
 
-import requests
 from sqlalchemy import text
 from tldextract import tldextract
 
@@ -15,7 +13,6 @@ from app import app
 from app.extensions import db
 from app.models.base import Group
 from app.models.mirrors import Proxy, Origin, SmartProxy
-from app.terraform.proxy.lib import all_cdn_prefixes
 from app.terraform.terraform import TerraformAutomation
 
 
@@ -154,15 +151,11 @@ class ProxyAutomation(TerraformAutomation):
             proxies=Proxy.query.filter(
                 Proxy.provider == self.provider, Proxy.destroyed.is_(None)).all(), subgroups=self.get_subgroups(),
             global_namespace=app.config['GLOBAL_NAMESPACE'], bypass_token=app.config['BYPASS_TOKEN'],
-            terraform_modules_path=os.path.join(*list(os.path.split(app.root_path))[:-1], 'terraform-modules'),
             **{k: app.config[k.upper()] for k in self.template_parameters})
         if self.smart_proxies:
             for group in groups:
                 self.sp_config(group)
 
-    def sp_trusted_prefixes(self):
-        return "\n".join([f"geoip2_proxy {p};" for p in all_cdn_prefixes()])
-
     def sp_config(self, group: Group) -> None:
         group_origins: List[Origin] = Origin.query.filter(
             Origin.group_id == group.id,
@@ -170,32 +163,17 @@ class ProxyAutomation(TerraformAutomation):
             Origin.smart.is_(True)
         ).all()
         self.tmpl_write(f"smart_proxy.{group.id}.conf", """
-        geoip2 /usr/share/GeoIP/GeoIP2-City.mmdb {
-            auto_reload 5m;
-            $geoip2_metadata_country_build metadata build_epoch;
-            $geoip2_data_country_code default=US country iso_code;
-        }
-        """ + self.sp_trusted_prefixes() + """
-        geoip2_proxy_recursive on;
-          map $geoip2_data_country_code $redirect_country {
-          default yes;
-          """ + "\n".join([f"  {cc} no;" for cc in app.config['CENSORED_COUNTRIES']]) + """
-        }
-        
         {% for origin in origins %}
         server {
           listen 443 ssl;
           server_name origin-{{ origin.id }}.{{ provider }}.smart.{{ smart_zone[:-1] }};
-          if ($redirect_country = no) {
-            rewrite ^ https://{{ origin.domain_name }}$request_uri break;
-          }
           location / {
             proxy_set_header Accept-Encoding "";
             proxy_ssl_server_name on;
             proxy_pass https://{{ origin.domain_name }}/;
             subs_filter_types text/html text/css text/xml;
             subs_filter https://{{ origin.domain_name }}/ /;
-            subs_filter "([^:]|)\\\"https://{{ origin.domain_name }}\\\"" \\1\\\"/\\\";
+            subs_filter "\\\"https://{{ origin.domain_name }}\\\"" /;
             {%- for asset_origin in origin.group.origins | selectattr("assets") -%}
             {%- for asset_proxy in asset_origin.proxies | selectattr("provider", "equalto", provider) | selectattr("deprecated", "none") | selectattr("destroyed", "none") -%}
             {%- if loop.first %}