scottk/wlan-cloud-rrm
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-rrm.git synced 2025-11-02 03:28:04 +00:00
Code Issues Packages Projects Releases 6 Wiki Activity

Move SSL validation toggle into RRMConfig (#34)

Browse Source 
Signed-off-by: Jeffrey Han <39203126+elludraon@users.noreply.github.com>
This commit is contained in:
Jeffrey Han
2022-08-17 16:52:49 -07:00
committed by GitHub
parent fb602c8b4b
commit 2f0023e483
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/facebook/openwifirrm/Launcher.java
View File

@@ -158,6 +158,7 @@ public class Launcher implements Callable<Integer> {
UCentralUtils.generateServiceKey(config.serviceConfig);
// Instantiate clients
UCentralClient.verifySsl(config.uCentralConfig.verifySsl);
UCentralClient client = new UCentralClient(
config.serviceConfig.publicEndpoint,
config.uCentralConfig.usePublicEndpoints,

11
src/main/java/com/facebook/openwifirrm/RRMConfig.java
View File

@@ -93,7 +93,13 @@ public class RRMConfig {
public String password = "";
/**
* uCentral socket parameters
* Verify SSL/TLS certificates in HTTPS requests
* ({@code UCENTRALCONFIG_VERIFYSSL})
*/
public boolean verifySsl = false;
/**
* uCentral socket parameters.
*/
public class UCentralSocketParams {
/**
@@ -440,6 +446,9 @@ public class RRMConfig {
if ((v = env.get("UCENTRALCONFIG_PASSWORD")) != null) {
uCentralConfig.password = v;
}
if ((v = env.get("UCENTRALCONFIG_VERIFYSSL")) != null) {
uCentralConfig.verifySsl = Boolean.parseBoolean(v);
}
UCentralConfig.UCentralSocketParams uCentralSocketParams =
config.uCentralConfig.uCentralSocketParams;
if ((v = env.get("UCENTRALSOCKETPARAMS_CONNECTTIMEOUTMS")) != null) {

11
src/main/java/com/facebook/openwifirrm/ucentral/UCentralClient.java
View File

@@ -81,9 +81,6 @@ public class UCentralClient {
static {
Unirest.config()
// TODO currently disabling SSL/TLS cert verification
.verifySsl(false)
// Suppress unchecked exceptions (ex. SocketTimeoutException),
// instead sending a (fake) FailedResponse.
.interceptor(new Interceptor() {
@@ -105,6 +102,14 @@ public class UCentralClient {
});
}
/**
* Toggle verifying SSL/TLS certificates. This should be set only during
* initialization, otherwise it may NOT take effect.
*/
public static void verifySsl(boolean enable) {
Unirest.config().verifySsl(enable);
}
/** Gson instance */
private final Gson gson = new Gson();