archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 22:34:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8319332: Security properties files inclusion

Browse source 
Co-authored-by: Francisco Ferrari Bihurriet <fferrari@openjdk.org>
Co-authored-by: Martin Balao <mbalao@openjdk.org>
Reviewed-by: weijun, mullan, kdriver
This commit is contained in:
Francisco Ferrari Bihurriet 2024-09-23 17:45:38 +00:00
parent 0f9f777520
commit c6f1d5f374
6 changed files with 1178 additions and 238 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/java.base/share/classes/sun/security/util/PropertyExpander.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -28,6 +28,7 @@ package sun.security.util;
import java.net.URI;
import java.net.URISyntaxException;
import java.security.GeneralSecurityException;
import java.util.function.UnaryOperator;
/**
* A utility class to expand properties embedded in a string.
@ -51,15 +52,31 @@ public class PropertyExpander {
}
}
public static String expand(String value)
throws ExpandException
{
public static String expand(String value) throws ExpandException {
return expand(value, false);
}
public static String expand(String value, boolean encodeURL)
throws ExpandException
{
public static String expand(String value, boolean encodeURL)
throws ExpandException {
return expand(value, encodeURL, System::getProperty);
}
/*
* In non-strict mode an undefined property is replaced by an empty string.
*/
public static String expandNonStrict(String value) {
try {
return expand(value, false, key -> System.getProperty(key, ""));
} catch (ExpandException e) {
// should not happen
throw new AssertionError("unexpected expansion error: when " +
"expansion is non-strict, undefined properties should " +
"be replaced by an empty string", e);
}
}
private static String expand(String value, boolean encodeURL,
UnaryOperator<String> propertiesGetter) throws ExpandException {
if (value == null)
return null;
@ -105,7 +122,7 @@ public class PropertyExpander {
if (prop.equals("/")) {
sb.append(java.io.File.separatorChar);
} else {
String val = System.getProperty(prop);
String val = propertiesGetter.apply(prop);
if (val != null) {
if (encodeURL) {
// encode 'val' unless it's an absolute URI