OpenHAB
/
openhab-core
mirror of https://github.com/openhab/openhab-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[REST] Handle IP v6 in X-Forwarded-Host header (#2470) 

Fix #2468

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
pull/2477/head
lolodomo 2021-08-29 20:15:40 +02:00 committed by GitHub
parent 57459ff306
commit b128b2b4ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/item/ItemResource.java
View File

@ -145,8 +145,11 @@ public class ItemResource implements RESTResource {
*/
private static void respectForwarded(final UriBuilder uriBuilder, final @Context HttpHeaders httpHeaders) {
Optional.ofNullable(httpHeaders.getHeaderString("X-Forwarded-Host")).ifPresent(host -> {
final String[] parts = host.split(":");
uriBuilder.host(parts[0]);
final int pos1 = host.indexOf("[");
final int pos2 = host.indexOf("]");
final String hostWithIpv6 = (pos1 >= 0 && pos2 > pos1) ? host.substring(pos1, pos2 + 1) : null;
final String[] parts = hostWithIpv6 == null ? host.split(":") : host.substring(pos2 + 1).split(":");
uriBuilder.host(hostWithIpv6 != null ? hostWithIpv6 : parts[0]);
if (parts.length > 1) {
uriBuilder.port(Integer.parseInt(parts[1]));
}