From 6dadcddc80458a833b15bd42e4d367988082f330 Mon Sep 17 00:00:00 2001
From: Karolis Eigelis <EIG@danskebank.lt>
Date: Thu, 20 Feb 2020 23:28:11 +0200
Subject: [PATCH 2/4] adding confluence access log

---
 config/server.xml.j2 | 2 ++
 tests/test_image.py  | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/config/server.xml.j2 b/config/server.xml.j2
index ecd5c90..b05651d 100644
--- a/config/server.xml.j2
+++ b/config/server.xml.j2
@@ -50,6 +50,8 @@
           <Manager pathname=""/>
           <Valve className="org.apache.catalina.valves.StuckThreadDetectionValve"
                  threshold="60"/>
+          <Valve className="org.apache.catalina.valves.AccessLogValve" requestAttributesEnabled="true" directory="logs" prefix="confluence_access" suffix=".log" rotatable="true" pattern="%h %{X-AUSERNAME}o %t &quot;%r&quot; %s %b %D %U %I &quot;%{User-Agent}i&quot;" />
+          <Valve className="org.apache.catalina.valves.RemoteIpValve" proxiesHeader="x-forwarded-by" internalProxies="{{ atl_proxy_internal_ips | default('') }}" remoteIpHeader="x-forwarded-for" protocolHeader="x-forwarded-proto" requestAttributesEnabled="true" resolveHosts="false" />
         </Context>
 
         <Context path="${confluence.context.path}/synchrony-proxy"
diff --git a/tests/test_image.py b/tests/test_image.py
index 895e559..82fe971 100644
--- a/tests/test_image.py
+++ b/tests/test_image.py
@@ -50,6 +50,7 @@ def test_server_xml_defaults(docker_cli, image):
     xml = parse_xml(container, f'{get_app_install_dir(container)}/conf/server.xml')
     connector = xml.find('.//Connector')
     context = xml.find('.//Context')
+    valve = xml.find(".//Context/Valve[@className='org.apache.catalina.valves.RemoteIpValve']")
 
     assert connector.get('port') == '8090'
     assert connector.get('maxThreads') == '100'
@@ -62,7 +63,7 @@ def test_server_xml_defaults(docker_cli, image):
     assert connector.get('scheme') == 'http'
     assert connector.get('proxyName') == ''
     assert connector.get('proxyPort') == ''
-
+    assert valve.get('internalProxies') == ''
 
 def test_server_xml_catalina_fallback(docker_cli, image):
     environment = {
@@ -100,6 +101,7 @@ def test_server_xml_params(docker_cli, image):
         'ATL_TOMCAT_SCHEME': 'https',
         'ATL_PROXY_NAME': 'conf.atlassian.com',
         'ATL_PROXY_PORT': '443',
+        'ATL_PROXY_INTERNAL_IPS': '192.168.1.1',
         'ATL_TOMCAT_CONTEXTPATH': '/myconf',
     }
     container = run_image(docker_cli, image, environment=environment)
@@ -108,6 +110,7 @@ def test_server_xml_params(docker_cli, image):
     xml = parse_xml(container, f'{get_app_install_dir(container)}/conf/server.xml')
     connector = xml.find('.//Connector')
     context = xml.find('.//Context')
+    valve = xml.find(".//Context/Valve[@className='org.apache.catalina.valves.RemoteIpValve']")    
 
     assert xml.get('port') == environment.get('ATL_TOMCAT_MGMT_PORT')
 
@@ -123,6 +126,8 @@ def test_server_xml_params(docker_cli, image):
     assert connector.get('proxyName') == environment.get('ATL_PROXY_NAME')
     assert connector.get('proxyPort') == environment.get('ATL_PROXY_PORT')
 
+    assert valve.get('internalProxies') == environment.get('ATL_PROXY_INTERNAL_IPS')
+
     assert context.get('path') == environment.get('ATL_TOMCAT_CONTEXTPATH')
 
 

From 3dff504b32c18a904e5915b36a1c627509d6b7e5 Mon Sep 17 00:00:00 2001
From: Karolis Eigelis <EIG@danskebank.lt>
Date: Fri, 21 Feb 2020 14:24:46 +0200
Subject: [PATCH 3/4] adding ATL_ACCESS_LOG flag

---
 config/server.xml.j2 |  2 ++
 tests/test_image.py  | 24 +++++++++++++++---------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/config/server.xml.j2 b/config/server.xml.j2
index b05651d..6dcb2cf 100644
--- a/config/server.xml.j2
+++ b/config/server.xml.j2
@@ -50,8 +50,10 @@
           <Manager pathname=""/>
           <Valve className="org.apache.catalina.valves.StuckThreadDetectionValve"
                  threshold="60"/>
+        {% if atl_access_log == 'true' %}  
           <Valve className="org.apache.catalina.valves.AccessLogValve" requestAttributesEnabled="true" directory="logs" prefix="confluence_access" suffix=".log" rotatable="true" pattern="%h %{X-AUSERNAME}o %t &quot;%r&quot; %s %b %D %U %I &quot;%{User-Agent}i&quot;" />
           <Valve className="org.apache.catalina.valves.RemoteIpValve" proxiesHeader="x-forwarded-by" internalProxies="{{ atl_proxy_internal_ips | default('') }}" remoteIpHeader="x-forwarded-for" protocolHeader="x-forwarded-proto" requestAttributesEnabled="true" resolveHosts="false" />
+        {% endif %}
         </Context>
 
         <Context path="${confluence.context.path}/synchrony-proxy"
diff --git a/tests/test_image.py b/tests/test_image.py
index 82fe971..f109b13 100644
--- a/tests/test_image.py
+++ b/tests/test_image.py
@@ -50,8 +50,7 @@ def test_server_xml_defaults(docker_cli, image):
     xml = parse_xml(container, f'{get_app_install_dir(container)}/conf/server.xml')
     connector = xml.find('.//Connector')
     context = xml.find('.//Context')
-    valve = xml.find(".//Context/Valve[@className='org.apache.catalina.valves.RemoteIpValve']")
-
+    
     assert connector.get('port') == '8090'
     assert connector.get('maxThreads') == '100'
     assert connector.get('minSpareThreads') == '10'
@@ -63,8 +62,7 @@ def test_server_xml_defaults(docker_cli, image):
     assert connector.get('scheme') == 'http'
     assert connector.get('proxyName') == ''
     assert connector.get('proxyPort') == ''
-    assert valve.get('internalProxies') == ''
-
+    
 def test_server_xml_catalina_fallback(docker_cli, image):
     environment = {
         'CATALINA_CONNECTOR_PROXYNAME': 'PROXYNAME',
@@ -101,7 +99,6 @@ def test_server_xml_params(docker_cli, image):
         'ATL_TOMCAT_SCHEME': 'https',
         'ATL_PROXY_NAME': 'conf.atlassian.com',
         'ATL_PROXY_PORT': '443',
-        'ATL_PROXY_INTERNAL_IPS': '192.168.1.1',
         'ATL_TOMCAT_CONTEXTPATH': '/myconf',
     }
     container = run_image(docker_cli, image, environment=environment)
@@ -110,8 +107,7 @@ def test_server_xml_params(docker_cli, image):
     xml = parse_xml(container, f'{get_app_install_dir(container)}/conf/server.xml')
     connector = xml.find('.//Connector')
     context = xml.find('.//Context')
-    valve = xml.find(".//Context/Valve[@className='org.apache.catalina.valves.RemoteIpValve']")    
-
+    
     assert xml.get('port') == environment.get('ATL_TOMCAT_MGMT_PORT')
 
     assert connector.get('port') == environment.get('ATL_TOMCAT_PORT')
@@ -126,8 +122,6 @@ def test_server_xml_params(docker_cli, image):
     assert connector.get('proxyName') == environment.get('ATL_PROXY_NAME')
     assert connector.get('proxyPort') == environment.get('ATL_PROXY_PORT')
 
-    assert valve.get('internalProxies') == environment.get('ATL_PROXY_INTERNAL_IPS')
-
     assert context.get('path') == environment.get('ATL_TOMCAT_CONTEXTPATH')
 
 
@@ -287,6 +281,18 @@ def test_confluence_xml_cluster_tcp(docker_cli, image, run_user):
     assert xml.findall('.//property[@name="confluence.cluster.name"]')[0].text == "atl_cluster_name"
     assert xml.findall('.//property[@name="confluence.cluster.peers"]')[0].text == "1.1.1.1,99.99.99.99"
 
+def test_confluence_xml_access_log(docker_cli, image, run_user):
+    environment = {
+        'ATL_ACCESS_LOG': 'true',
+        'ATL_PROXY_INTERNAL_IPS': '192.168.1.1',
+    }
+    container = run_image(docker_cli, image, user=run_user, environment=environment)
+    _jvm = wait_for_proc(container, get_bootstrap_proc(container))
+    
+    xml = parse_xml(container, f'{get_app_home(container)}/server.cfg.xml')
+    valve = xml.find(".//Context/Valve[@className='org.apache.catalina.valves.RemoteIpValve']")
+
+    assert valve.get('internalProxies') == environment.get('ATL_PROXY_INTERNAL_IPS')
 
 def test_java_in_run_user_path(docker_cli, image):
     RUN_USER = 'confluence'

From a5237d8ed406154246e35cf969ba651d8d18e165 Mon Sep 17 00:00:00 2001
From: Karolis Eigelis <EIG@danskebank.lt>
Date: Wed, 26 Feb 2020 10:12:18 +0200
Subject: [PATCH 4/4] align with the other tomcat configuration environment
 variables

---
 config/server.xml.j2 | 4 ++--
 tests/test_image.py  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/server.xml.j2 b/config/server.xml.j2
index 6dcb2cf..6835b9a 100644
--- a/config/server.xml.j2
+++ b/config/server.xml.j2
@@ -50,9 +50,9 @@
           <Manager pathname=""/>
           <Valve className="org.apache.catalina.valves.StuckThreadDetectionValve"
                  threshold="60"/>
-        {% if atl_access_log == 'true' %}  
+        {% if atl_tomcat_access_log == 'true' %}  
           <Valve className="org.apache.catalina.valves.AccessLogValve" requestAttributesEnabled="true" directory="logs" prefix="confluence_access" suffix=".log" rotatable="true" pattern="%h %{X-AUSERNAME}o %t &quot;%r&quot; %s %b %D %U %I &quot;%{User-Agent}i&quot;" />
-          <Valve className="org.apache.catalina.valves.RemoteIpValve" proxiesHeader="x-forwarded-by" internalProxies="{{ atl_proxy_internal_ips | default('') }}" remoteIpHeader="x-forwarded-for" protocolHeader="x-forwarded-proto" requestAttributesEnabled="true" resolveHosts="false" />
+          <Valve className="org.apache.catalina.valves.RemoteIpValve" proxiesHeader="x-forwarded-by" internalProxies="{{ atl_tomcat_proxy_internal_ips | default('') }}" remoteIpHeader="x-forwarded-for" protocolHeader="x-forwarded-proto" requestAttributesEnabled="true" resolveHosts="false" />
         {% endif %}
         </Context>
 
diff --git a/tests/test_image.py b/tests/test_image.py
index f109b13..a9bd212 100644
--- a/tests/test_image.py
+++ b/tests/test_image.py
@@ -283,8 +283,8 @@ def test_confluence_xml_cluster_tcp(docker_cli, image, run_user):
 
 def test_confluence_xml_access_log(docker_cli, image, run_user):
     environment = {
-        'ATL_ACCESS_LOG': 'true',
-        'ATL_PROXY_INTERNAL_IPS': '192.168.1.1',
+        'ATL_TOMCAT_ACCESS_LOG': 'true',
+        'ATL_TOMCAT_PROXY_INTERNAL_IPS': '192.168.1.1',
     }
     container = run_image(docker_cli, image, user=run_user, environment=environment)
     _jvm = wait_for_proc(container, get_bootstrap_proc(container))
@@ -292,7 +292,7 @@ def test_confluence_xml_access_log(docker_cli, image, run_user):
     xml = parse_xml(container, f'{get_app_home(container)}/server.cfg.xml')
     valve = xml.find(".//Context/Valve[@className='org.apache.catalina.valves.RemoteIpValve']")
 
-    assert valve.get('internalProxies') == environment.get('ATL_PROXY_INTERNAL_IPS')
+    assert valve.get('internalProxies') == environment.get('ATL_TOMCAT_PROXY_INTERNAL_IPS')
 
 def test_java_in_run_user_path(docker_cli, image):
     RUN_USER = 'confluence'