scottk/wlan-cloud-opensync-controller
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-opensync-controller.git synced 2025-11-19 11:25:11 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

WIFI-626: Integration of Captive Portal Profile with AP (embedded portal, 1 SSID)

Browse Source
This commit is contained in:
Lynn Shi
2020-09-08 17:04:20 -04:00
parent 6f99d701f3
commit 0c164e8c6f
2 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
opensync-ext-static/src/main/resources/ProfileCaptive.json
View File

@@ -12,7 +12,7 @@
"headerContent": "Captive Portal", "headerContent": "Captive Portal",
"userAcceptancePolicy": "Use this network at your own risk. No warranty of any kind.", "userAcceptancePolicy": "Use this network at your own risk. No warranty of any kind.",
"successPageMarkdownText": "Welcome to the network", "successPageMarkdownText": "Welcome to the network",
"redirectURL": "", "redirectURL": "www.google.com",
"externalCaptivePortalURL": null, "externalCaptivePortalURL": null,
"sessionTimeoutInMinutes": 60, "sessionTimeoutInMinutes": 60,
"logoFile": { "logoFile": {
@@ -35,8 +35,8 @@
}, },
"walledGardenAllowlist": [ "walledGardenAllowlist": [
"1.2.3.4", "1.2.3.4",
"1.2.3.4-2.3.4.5", "1.2.3.6-2.3.4.5",
"connectus.ai" "netexperience.com"
], ],
"usernamePasswordFile": null, "usernamePasswordFile": null,
"authenticationType": "guest", "authenticationType": "guest",

28
opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java
View File

@@ -53,6 +53,7 @@ import com.telecominfraproject.wlan.opensync.ovsdb.dao.models.WifiStatsConfigInf
import com.telecominfraproject.wlan.opensync.ovsdb.dao.models.WifiVifConfigInfo; import com.telecominfraproject.wlan.opensync.ovsdb.dao.models.WifiVifConfigInfo;
import com.telecominfraproject.wlan.profile.bonjour.models.BonjourGatewayProfile; import com.telecominfraproject.wlan.profile.bonjour.models.BonjourGatewayProfile;
import com.telecominfraproject.wlan.profile.bonjour.models.BonjourServiceSet; import com.telecominfraproject.wlan.profile.bonjour.models.BonjourServiceSet;
import com.telecominfraproject.wlan.profile.captiveportal.models.CaptivePortalAuthenticationType;
import com.telecominfraproject.wlan.profile.captiveportal.models.CaptivePortalConfiguration; import com.telecominfraproject.wlan.profile.captiveportal.models.CaptivePortalConfiguration;
import com.telecominfraproject.wlan.profile.captiveportal.models.ManagedFileInfo; import com.telecominfraproject.wlan.profile.captiveportal.models.ManagedFileInfo;
import com.telecominfraproject.wlan.profile.models.Profile; import com.telecominfraproject.wlan.profile.models.Profile;
@@ -2348,9 +2349,15 @@ public class OvsdbDao {
updateColumns.put("captive_portal", captivePortalMap); updateColumns.put("captive_portal", captivePortalMap);
} }
if (tableSchema.getColumns().containsKey("captive_allowlist")) { if (tableSchema.getColumns().containsKey("captive_allowlist")) {
com.vmware.ovsdb.protocol.operation.notation.Set captiveAllowList = com.vmware.ovsdb.protocol.operation.notation.Set if (walledGardenAllowlist != null && !walledGardenAllowlist.isEmpty()) {
.of(walledGardenAllowlist); Set<Atom<String>> atomMacList = new HashSet<>();
updateColumns.put("captive_allowlist", captiveAllowList); walledGardenAllowlist.stream().forEach(allow -> atomMacList.add(new Atom<>(allow)));
com.vmware.ovsdb.protocol.operation.notation.Set allowListSet = com.vmware.ovsdb.protocol.operation.notation.Set
.of(atomMacList);
updateColumns.put("captive_allowlist", allowListSet);
} else {
updateColumns.put("captive_allowlist", new com.vmware.ovsdb.protocol.operation.notation.Set());
}
} }
// TODO: when AP support for Bonjour Gateway set values // TODO: when AP support for Bonjour Gateway set values
@@ -2927,6 +2934,7 @@ public class OvsdbDao {
captiveMap.put("acceptance_policy", captiveProfileDetails.getUserAcceptancePolicy()); captiveMap.put("acceptance_policy", captiveProfileDetails.getUserAcceptancePolicy());
captiveMap.put("login_success_text", captiveProfileDetails.getSuccessPageMarkdownText()); captiveMap.put("login_success_text", captiveProfileDetails.getSuccessPageMarkdownText());
captiveMap.put("authentication", getCaptiveAuthentication(captiveProfileDetails.getAuthenticationType()));
// captiveMap.put("externalCaptivePortalURL", // captiveMap.put("externalCaptivePortalURL",
// captiveProfileDetails.getExternalCaptivePortalURL()); // captiveProfileDetails.getExternalCaptivePortalURL());
// captiveMap.put("backgroundPosition", // captiveMap.put("backgroundPosition",
@@ -2946,6 +2954,20 @@ public class OvsdbDao {
} }
} }
private String getCaptiveAuthentication(CaptivePortalAuthenticationType authentication) {
switch (authentication) {
case guest:
return "None";
case username:
return "Captive Portal User List";
case radius:
return "RADIUS";
default:
LOG.error("Unsupported captive portal authentication {}", authentication);
return "None";
}
}
private void getBonjourGatewayConfiguration(OpensyncAPConfig opensyncApConfig, SsidConfiguration ssidConfig, private void getBonjourGatewayConfiguration(OpensyncAPConfig opensyncApConfig, SsidConfiguration ssidConfig,
Map<Short, Set<String>> bonjourServiceMap) { Map<Short, Set<String>> bonjourServiceMap) {
if ((ssidConfig.getBonjourGatewayProfileId() != null) if ((ssidConfig.getBonjourGatewayProfileId() != null)