Mirrored_Repos/docker-atlassian-confluence-server
1
0
Fork 0
mirror of https://bitbucket.org/atlassian-docker/docker-atlassian-confluence-server.git synced 2024-08-30 18:22:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

adding ATL_ACCESS_LOG flag

Browse Source
This commit is contained in:
Karolis Eigelis 2020-02-21 14:24:46 +02:00
parent 6dadcddc80
commit 3dff504b32
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/server.xml.j2
View File

@ -50,8 +50,10 @@
<Manager pathname=""/> <Manager pathname=""/>
<Valve className="org.apache.catalina.valves.StuckThreadDetectionValve" <Valve className="org.apache.catalina.valves.StuckThreadDetectionValve"
threshold="60"/> 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.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_proxy_internal_ips | default('') }}" remoteIpHeader="x-forwarded-for" protocolHeader="x-forwarded-proto" requestAttributesEnabled="true" resolveHosts="false" />
{% endif %}
</Context> </Context>
<Context path="${confluence.context.path}/synchrony-proxy" <Context path="${confluence.context.path}/synchrony-proxy"

18
tests/test_image.py
View File

@ -50,7 +50,6 @@ def test_server_xml_defaults(docker_cli, image):
xml = parse_xml(container, f'{get_app_install_dir(container)}/conf/server.xml') xml = parse_xml(container, f'{get_app_install_dir(container)}/conf/server.xml')
connector = xml.find('.//Connector') connector = xml.find('.//Connector')
context = xml.find('.//Context') context = xml.find('.//Context')
valve = xml.find(".//Context/Valve[@className='org.apache.catalina.valves.RemoteIpValve']")
assert connector.get('port') == '8090' assert connector.get('port') == '8090'
assert connector.get('maxThreads') == '100' assert connector.get('maxThreads') == '100'
@ -63,7 +62,6 @@ def test_server_xml_defaults(docker_cli, image):
assert connector.get('scheme') == 'http' assert connector.get('scheme') == 'http'
assert connector.get('proxyName') == '' assert connector.get('proxyName') == ''
assert connector.get('proxyPort') == '' assert connector.get('proxyPort') == ''
assert valve.get('internalProxies') == ''
def test_server_xml_catalina_fallback(docker_cli, image): def test_server_xml_catalina_fallback(docker_cli, image):
environment = { environment = {
@ -101,7 +99,6 @@ def test_server_xml_params(docker_cli, image):
'ATL_TOMCAT_SCHEME': 'https', 'ATL_TOMCAT_SCHEME': 'https',
'ATL_PROXY_NAME': 'conf.atlassian.com', 'ATL_PROXY_NAME': 'conf.atlassian.com',
'ATL_PROXY_PORT': '443', 'ATL_PROXY_PORT': '443',
'ATL_PROXY_INTERNAL_IPS': '192.168.1.1',
'ATL_TOMCAT_CONTEXTPATH': '/myconf', 'ATL_TOMCAT_CONTEXTPATH': '/myconf',
} }
container = run_image(docker_cli, image, environment=environment) container = run_image(docker_cli, image, environment=environment)
@ -110,7 +107,6 @@ def test_server_xml_params(docker_cli, image):
xml = parse_xml(container, f'{get_app_install_dir(container)}/conf/server.xml') xml = parse_xml(container, f'{get_app_install_dir(container)}/conf/server.xml')
connector = xml.find('.//Connector') connector = xml.find('.//Connector')
context = xml.find('.//Context') 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 xml.get('port') == environment.get('ATL_TOMCAT_MGMT_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('proxyName') == environment.get('ATL_PROXY_NAME')
assert connector.get('proxyPort') == environment.get('ATL_PROXY_PORT') 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') 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.name"]')[0].text == "atl_cluster_name"
assert xml.findall('.//property[@name="confluence.cluster.peers"]')[0].text == "1.1.1.1,99.99.99.99" 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): def test_java_in_run_user_path(docker_cli, image):
RUN_USER = 'confluence' RUN_USER = 'confluence'