Skip to content

fix(tomcat): correct RemoteIpValve internalProxies regex and add CGNAT (#35804) #35805

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wezell merged 4 commits into from
May 22, 2026
+3 −2
Merged

fix(tomcat): correct RemoteIpValve internalProxies regex and add CGNAT (#35804) #35805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3583687
fix(tomcat): correct RemoteIpValve internalProxies regex escaping and…
yolabingo May 22, 2026
561d2be
docs(tomcat): explain why server.xml uses \d\d?\d? instead of \d{1,3}
yolabingo May 22, 2026
93ce290
fix(tomcat): add compressed IPv6 loopback (::1) to internalProxies
yolabingo May 22, 2026
8dd7486
fix(tomcat): move XML comment out of Valve start tag
yolabingo May 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dotCMS/src/main/resources/container/tomcat9/bin/setenv.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ export CMS_ACCESSLOG_ROTATABLE=${CMS_ACCESSLOG_ROTATABLE:-"true"}

# Remote IP Valve settings
export CMS_REMOTEIP_REMOTEIPHEADER=${CMS_REMOTEIP_REMOTEIPHEADER:-"x-forwarded-for"}
export CMS_REMOTEIP_INTERNALPROXIES=${CMS_REMOTEIP_INTERNALPROXIES:-"10\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}|192\\.168\\.\\d{1,3}\\.\\d{1,3}|169\\.254\\.\\d{1,3}\\.\\d{1,3}|127\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}|172\\.1[6-9]{1}\\.\\d{1,3}\\.\\d{1,3}|172\\.2[0-9]{1}\\.\\d{1,3}\\.\\d{1,3}|172\\.3[0-1]{1}\\.\\d{1,3}\\.\\d{1,3}|0:0:0:0:0:0:0:1"}
export CMS_REMOTEIP_INTERNALPROXIES=${CMS_REMOTEIP_INTERNALPROXIES:-"(10|127)\.\d{1,3}\.\d{1,3}\.\d{1,3}|192\.168\.\d{1,3}\.\d{1,3}|169\.254\.\d{1,3}\.\d{1,3}|172\.(1[6-9]|2\d|3[01])\.\d{1,3}\.\d{1,3}|100\.(6[4-9]|[7-9]\d|1[01]\d|12[0-7])\.\d{1,3}\.\d{1,3}|0:0:0:0:0:0:0:1|::1"}
# Cookie settings
export DOT_SAMESITE_COOKIES=${DOT_SAMESITE_COOKIES:-"lax"}

Expand Down
3 changes: 2 additions & 1 deletion dotCMS/src/main/resources/container/tomcat9/conf/server.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,12 +163,13 @@
<!-- The remote IP valve picks up the X-FORWARDED-FOR header (by default) and uses it as the source ip
remoteIpHeader and internalProxies may need to change when behind some WAF or proxy servers
Also handles port forwarding for Docker scenarios via X-Forwarded-Port
internalProxies regex uses \d\d?\d? instead of \d{1,3} — bare braces clash with IntrospectionUtils ${...} resolver
-->
<Valve
className="org.apache.catalina.valves.RemoteIpValve"
remoteIpHeader="${CMS_REMOTEIP_REMOTEIPHEADER:-x-forwarded-for}"
remoteIpPortHeader="${CMS_REMOTEIP_PORTHEADER:-x-forwarded-port}"
internalProxies="${CMS_REMOTEIP_INTERNALPROXIES:-10\.\d{1,3}\.\d{1,3}\.\d{1,3}|192\.168\.\d{1,3}\.\d{1,3}|169\.254\.\d{1,3}\.\d{1,3}|127\.\d{1,3}\.\d{1,3}\.\d{1,3}|172\.1[6-9]{1}\.\d{1,3}\.\d{1,3}|172\.2[0-9]{1}\.\d{1,3}\.\d{1,3}|172\.3[0-1]{1}\.\d{1,3}\.\d{1,3}|0:0:0:0:0:0:0:1}"
internalProxies="${CMS_REMOTEIP_INTERNALPROXIES:-(10|127)\.\d\d?\d?\.\d\d?\d?\.\d\d?\d?|192\.168\.\d\d?\d?\.\d\d?\d?|169\.254\.\d\d?\d?\.\d\d?\d?|172\.(1[6-9]|2\d|3[01])\.\d\d?\d?\.\d\d?\d?|100\.(6[4-9]|[7-9]\d|1[01]\d|12[0-7])\.\d\d?\d?\.\d\d?\d?|0:0:0:0:0:0:0:1|::1}"
/>

<!-- Do not show server details up on BadRequest -->
Expand Down
Loading