scottk/wlan-cloud-opensync-controller
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-opensync-controller.git synced 2025-10-31 18:47:57 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

WIFI-2441: RADSEC/PROXY config when done from UI

Browse Source 
Signed-off-by: Mike Hansen <mike.hansen@connectus.ai>
This commit is contained in:
Mike Hansen
2021-06-02 12:14:12 -04:00
parent 663340e749
commit 42ecccee5e
1 changed files with 23 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbSsidConfig.java
View File

@@ -781,15 +781,10 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
RadiusProfile profileDetails = ((RadiusProfile) profileRadius.getDetails()); RadiusProfile profileDetails = ((RadiusProfile) profileRadius.getDetails());
RadiusServer rServer = profileDetails.getPrimaryRadiusAccountingServer(); RadiusServer rServer = profileDetails.getPrimaryRadiusAccountingServer();
if (rServer != null) { if (rServer != null) {
if (ssidConfig.getUseRadiusProxy()) { security.put("radius_acct_ip", rServer.getIpAddress() != null ? rServer.getIpAddress().getHostAddress() : null);
security.put("radius_acct_ip", "127.0.0.1"); security.put("radius_acct_port", rServer.getPort() != null ? String.valueOf(rServer.getPort()) : null);
security.put("radius_acct_port", rServer.getPort() != null ? String.valueOf(rServer.getPort()) : null); security.put("radius_acct_secret", rServer.getSecret());
security.put("radius_acct_secret", "secret");
} else {
security.put("radius_acct_ip", rServer.getIpAddress() != null ? rServer.getIpAddress().getHostAddress() : null);
security.put("radius_acct_port", rServer.getPort() != null ? String.valueOf(rServer.getPort()) : null);
security.put("radius_acct_secret", rServer.getSecret());
}
if (ssidConfig.getRadiusAcountingServiceInterval() != null && ssidConfig.getRadiusAcountingServiceInterval() > 0) { if (ssidConfig.getRadiusAcountingServiceInterval() != null && ssidConfig.getRadiusAcountingServiceInterval() > 0) {
// if the value is present, use the // if the value is present, use the
// radius_acct_interval // radius_acct_interval
@@ -822,18 +817,11 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
Profile profileRadius = radiusProfileList.get(0); Profile profileRadius = radiusProfileList.get(0);
RadiusProfile profileDetails = ((RadiusProfile) profileRadius.getDetails()); RadiusProfile profileDetails = ((RadiusProfile) profileRadius.getDetails());
RadiusServer radiusServer = profileDetails.getPrimaryRadiusAuthServer(); RadiusServer radiusServer = profileDetails.getPrimaryRadiusAuthServer();
if (ssidConfig.getUseRadiusProxy()) { security.put("radius_server_ip", radiusServer.getIpAddress() != null ? radiusServer.getIpAddress().getHostAddress() : null);
security.put("radius_server_ip", "127.0.0.1"); security.put("radius_server_port", radiusServer.getPort() != null ? String.valueOf(radiusServer.getPort()) : null);
security.put("radius_server_port", radiusServer.getPort() != null ? String.valueOf(radiusServer.getPort()) : null); security.put("radius_server_secret", radiusServer.getSecret());
security.put("radius_server_secret", "secret");
} else {
security.put("radius_server_ip", radiusServer.getIpAddress() != null ? radiusServer.getIpAddress().getHostAddress() : null);
security.put("radius_server_port", radiusServer.getPort() != null ? String.valueOf(radiusServer.getPort()) : null);
security.put("radius_server_secret", radiusServer.getSecret());
}
LOG.info("set Radius server attributes radius_server_ip {} radius_server_port {} radius_server_secret {}", security.get("radius_server_ip"), LOG.info("set Radius server attributes radius_server_ip {} radius_server_port {} radius_server_secret {}", security.get("radius_server_ip"),
security.get("radius_server_port"), security.get("radius_server_secret")); security.get("radius_server_port"), security.get("radius_server_secret"));
} else { } else {
LOG.warn("Could not find radius profile {} in {}", ssidConfig.getRadiusServiceId(), opensyncApConfig.getRadiusProfiles()); LOG.warn("Could not find radius profile {} in {}", ssidConfig.getRadiusServiceId(), opensyncApConfig.getRadiusProfiles());
} }
@@ -876,28 +864,34 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
case "wpa2OnlyEAP": case "wpa2OnlyEAP":
case "wpa2OnlyRadius": case "wpa2OnlyRadius":
security.put("mode", "2"); security.put("mode", "2");
getRadiusConfiguration(opensyncApConfig, ssidConfig, security); if (!ssidConfig.getUseRadiusProxy()) {
getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security); getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
}
break; break;
case "wpa3OnlyEAP": case "wpa3OnlyEAP":
security.put("mode", "3"); security.put("mode", "3");
getRadiusConfiguration(opensyncApConfig, ssidConfig, security); if (!ssidConfig.getUseRadiusProxy()) {
getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security); getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
}
break; break;
case "wpa2EAP": case "wpa2EAP":
case "wpa2Radius": case "wpa2Radius":
case "wpa3MixedEAP": case "wpa3MixedEAP":
security.put("mode", "mixed"); security.put("mode", "mixed");
getRadiusConfiguration(opensyncApConfig, ssidConfig, security); if (!ssidConfig.getUseRadiusProxy()) {
getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security); getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
}
break; break;
case "wpaEAP": case "wpaEAP":
case "wpaRadius": case "wpaRadius":
security.put("mode", "1"); security.put("mode", "1");
getRadiusConfiguration(opensyncApConfig, ssidConfig, security); if (!ssidConfig.getUseRadiusProxy()) {
getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security); getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
}
break; break;
} }
} }