Skip to content

Bump spring-cloud-starter-openfeign to 4.3.1 #2898

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
avgustinmm merged 1 commit into from
Jan 30, 2026
Merged

Bump spring-cloud-starter-openfeign to 4.3.1 #2898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 4 additions & 8 deletions ...tory-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/RandomGeneratedInputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,9 @@
import java.security.SecureRandom;
import java.util.Random;

/**
*
*/
public class RandomGeneratedInputStream extends InputStream {
import org.eclipse.hawkbit.repository.test.util.TestdataFactory;

private final Random random = new SecureRandom();
public class RandomGeneratedInputStream extends InputStream {

/** Target size of the stream. */
private final long size;
Expand All @@ -42,7 +39,6 @@ public int read() throws IOException {

index++;

return random.nextInt(255);
return TestdataFactory.SECURE_RND.nextInt(255);
}

}
}
16 changes: 7 additions & 9 deletions ...epository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/TargetTestData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
*/
package org.eclipse.hawkbit.repository.test.util;

import java.security.SecureRandom;
import java.util.Random;
import static org.eclipse.hawkbit.repository.test.util.TestdataFactory.SECURE_RND;

import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.model.Target;
Expand All @@ -24,20 +23,19 @@ public class TargetTestData {
public static final String ATTRIBUTE_VALUE_VALID;

static {
final Random rand = new SecureRandom();
ATTRIBUTE_KEY_TOO_LONG = generateRandomStringWithLength(Target.CONTROLLER_ATTRIBUTE_MAX_KEY_SIZE + 1, rand);
ATTRIBUTE_KEY_VALID = generateRandomStringWithLength(Target.CONTROLLER_ATTRIBUTE_MAX_KEY_SIZE, rand);
ATTRIBUTE_VALUE_TOO_LONG = generateRandomStringWithLength(Target.CONTROLLER_ATTRIBUTE_MAX_VALUE_SIZE + 1, rand);
ATTRIBUTE_VALUE_VALID = generateRandomStringWithLength(Target.CONTROLLER_ATTRIBUTE_MAX_VALUE_SIZE, rand);
ATTRIBUTE_KEY_TOO_LONG = generateRandomStringWithLength(Target.CONTROLLER_ATTRIBUTE_MAX_KEY_SIZE + 1);
ATTRIBUTE_KEY_VALID = generateRandomStringWithLength(Target.CONTROLLER_ATTRIBUTE_MAX_KEY_SIZE);
ATTRIBUTE_VALUE_TOO_LONG = generateRandomStringWithLength(Target.CONTROLLER_ATTRIBUTE_MAX_VALUE_SIZE + 1);
ATTRIBUTE_VALUE_VALID = generateRandomStringWithLength(Target.CONTROLLER_ATTRIBUTE_MAX_VALUE_SIZE);
}

private static String generateRandomStringWithLength(final int length, final Random rand) {
private static String generateRandomStringWithLength(final int length) {
final StringBuilder randomStringBuilder = new StringBuilder(length);
final int lowercaseACode = 97;
final int lowercaseZCode = 122;

for (int i = 0; i < length; i++) {
final char randomCharacter = (char) (rand.nextInt(lowercaseZCode - lowercaseACode + 1) + lowercaseACode);
final char randomCharacter = (char) (SECURE_RND.nextInt(lowercaseZCode - lowercaseACode + 1) + lowercaseACode);
randomStringBuilder.append(randomCharacter);
}
return randomStringBuilder.toString();
Expand Down
7 changes: 4 additions & 3 deletions ...pository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/TestdataFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ public class TestdataFactory {

@SuppressWarnings("java:S2245") // used for tests only, no need of secure random
public static final Random RND = new Random();
public static final SecureRandom SECURE_RND = new SecureRandom();

public static final String VISIBLE_SM_MD_KEY = "visibleMetdataKey";
public static final String VISIBLE_SM_MD_VALUE = "visibleMetdataValue";
Expand Down Expand Up @@ -309,22 +310,22 @@ public DistributionSet createDistributionSet(final String prefix, final String v
SoftwareModuleManagement.Create.builder()
.type(findOrCreateSoftwareModuleType(SM_TYPE_APP, Integer.MAX_VALUE))
.name(prefix + SM_TYPE_APP)
.version(version + "." + new SecureRandom().nextInt(100))
.version(version + "." + SECURE_RND.nextInt(100))
.description(randomDescriptionLong())
.vendor(prefix + " vendor Limited, California")
.build());
final SoftwareModule runtimeMod = softwareModuleManagement
.create(SoftwareModuleManagement.Create.builder()
.type(findOrCreateSoftwareModuleType(SM_TYPE_RT))
.name(prefix + "app runtime")
.version(version + "." + new SecureRandom().nextInt(100))
.version(version + "." + SECURE_RND.nextInt(100))
.description(randomDescriptionLong()).vendor(prefix + " vendor GmbH, Stuttgart, Germany")
.build());
final SoftwareModule osMod = softwareModuleManagement
.create(SoftwareModuleManagement.Create.builder()
.type(findOrCreateSoftwareModuleType(SM_TYPE_OS))
.name(prefix + " Firmware")
.version(version + "." + new SecureRandom().nextInt(100))
.version(version + "." + SECURE_RND.nextInt(100))
.description(randomDescriptionLong()).vendor(prefix + " vendor Limited Inc, California")
.build());

Expand Down
29 changes: 13 additions & 16 deletions hawkbit-sdk/hawkbit-sdk-commons/src/main/java/org/eclipse/hawkbit/sdk/HawkbitClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Proxy;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URI;
import java.net.URISyntaxException;
import java.nio.charset.StandardCharsets;
import java.security.KeyManagementException;
import java.security.KeyStore;
Expand Down Expand Up @@ -263,7 +264,7 @@ private <T> T proxy(final Class<T> serviceType, final T service, final Tenant te
private Object callMultipartFormDataRequest(
final Method method, final Object[] args,
final Tenant tenant, final Controller controller,
final Class<?>[] parameterTypes, final ObjectMapper objectMapper) throws IOException {
final Class<?>[] parameterTypes, final ObjectMapper objectMapper) throws URISyntaxException, IOException {
final PostMapping postMapping = method.getAnnotation(PostMapping.class);
final Annotation[][] parametersAnnotations = method.getParameterAnnotations();
// build path - replace @PathVariables
Expand All @@ -275,8 +276,8 @@ private Object callMultipartFormDataRequest(
}
}

final HttpURLConnection conn = (HttpURLConnection) new URL(
(controller == null ? hawkBitServer.getMgmtUrl() : hawkBitServer.getDdiUrl()) + path).openConnection();
final HttpURLConnection conn = (HttpURLConnection) new URI(
(controller == null ? hawkBitServer.getMgmtUrl() : hawkBitServer.getDdiUrl()) + path).toURL().openConnection();
conn.setRequestMethod("POST");

// deal with authentication - only from headers1
Expand Down Expand Up @@ -407,15 +408,6 @@ private static <T extends Annotation> T getAnnotation(final Class<T> annotationC
return null;
}

private static final String KEYSTORE_PASSWORD;

static {
final Random random = new SecureRandom();
final byte[] bytes = new byte[16];
random.nextBytes(bytes);
KEYSTORE_PASSWORD = Base64.getEncoder().encodeToString(bytes);
}

private static final Map<HttpClientKey, HttpClientWrapper> HTTP_CLIENTS = new HashMap<>();

private static HttpClient httpClient(final HttpClientKey key) {
Expand All @@ -430,7 +422,7 @@ private static HttpClient httpClient(final HttpClientKey key) {
try {
builder.setConnectionManager(
PoolingHttpClientConnectionManagerBuilder.create()
.setTlsSocketStrategy(getTlsSocketStragegy(key.getClientCertificate(), key.getServerCertificates()))
.setTlsSocketStrategy(getTlsSocketStrategy(key.getClientCertificate(), key.getServerCertificates()))
.build());
} catch (final RuntimeException e) {
throw e;
Expand All @@ -448,12 +440,17 @@ private static HttpClient httpClient(final HttpClientKey key) {
}
}

private static TlsSocketStrategy getTlsSocketStragegy(final Certificate clientCertificate, final X509Certificate[] serverCertificates)
private static final Random SECURE_RND = new SecureRandom();

private static TlsSocketStrategy getTlsSocketStrategy(final Certificate clientCertificate, final X509Certificate[] serverCertificates)
throws KeyStoreException, NoSuchAlgorithmException, UnrecoverableKeyException, KeyManagementException, CertificateException,
IOException {
final SSLContextBuilder sslContextBuilder = SSLContextBuilder.create();
if (clientCertificate != null) {
sslContextBuilder.loadKeyMaterial(clientCertificate.toKeyStore(KEYSTORE_PASSWORD), KEYSTORE_PASSWORD.toCharArray());
final byte[] bytes = new byte[16];
SECURE_RND.nextBytes(bytes);
final String keystorePassword = Base64.getEncoder().encodeToString(bytes);
sslContextBuilder.loadKeyMaterial(clientCertificate.toKeyStore(keystorePassword), keystorePassword.toCharArray());
}
if (serverCertificates == null) {
// trust all
Expand Down
4 changes: 2 additions & 2 deletions ...awkbit-sdk-mgmt/src/main/java/org/eclipse/hawkbit/sdk/mgmt/AuthenticationSetupHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public class AuthenticationSetupHelper {
private static final String AUTHENTICATION_MODE_HEADER_ENABLED = "authentication.header.enabled";
private static final String AUTHENTICATION_MODE_HEADER_AUTHORITY_NAME = "authentication.header.authority";

private static final Random RND = new SecureRandom();
private static final Random SECURE_RND = new SecureRandom();

@NonNull
private final Tenant tenant;
Expand All @@ -53,7 +53,7 @@ public class AuthenticationSetupHelper {

public static String randomToken() {
final byte[] rnd = new byte[24];
RND.nextBytes(rnd);
SECURE_RND.nextBytes(rnd);
return Base64.getEncoder().encodeToString(rnd);
}

Expand Down
2 changes: 1 addition & 1 deletion hawkbit-sdk/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<name>hawkBit :: SDK :: Parent</name>

<properties>
<spring-cloud-starter-openfeign.version>4.3.0</spring-cloud-starter-openfeign.version>
<spring-cloud-starter-openfeign.version>4.3.1</spring-cloud-starter-openfeign.version>
<openfeign-hc5.version>13.6</openfeign-hc5.version>
<bouncycastle.version>1.83</bouncycastle.version>
<java.version>${java.client.version}</java.version>
Expand Down
Loading