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

WIFI-1329: CloudSDK: SSID with Captive Portal Auth can't be configured

Browse Source
This commit is contained in:
Mike Hansen
2021-01-27 16:00:54 -05:00
parent 0ea56397b2
commit b7ab0b973c
6 changed files with 256 additions and 834 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java vendored
View File

@@ -980,6 +980,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
Long captivePortId = ((SsidConfiguration) ssidProfile.getDetails()).getCaptivePortalId();
if (captivePortId != null) {
captiveProfileIds.add(captivePortId);
}
Long bonjourGatewayProfileId = ((SsidConfiguration) ssidProfile.getDetails())
.getBonjourGatewayProfileId();
@@ -1008,6 +1009,9 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
ret.setRadiusProfiles(new ArrayList<>(radiusSet));
ret.setCaptiveProfiles(profileServiceInterface.get(captiveProfileIds));
for (Profile captivePortal : ret.getCaptiveProfiles()) {
radiusSet.addAll(profileContainer.getChildrenOfType(captivePortal.getId(), ProfileType.radius));
}
ret.setBonjourGatewayProfiles(profileServiceInterface.get(bonjourGatewayProfileIds));
List<Client> blockedClients = clientServiceInterface.getBlockedClients(customerId);

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

@@ -1,138 +1,52 @@
[
{
{
"model_type": "Profile",
"id": 5,
"customerId": 2,
"profileType": "captive_portal",
"name": "Captive-portal",
"details": {
"model_type": "CaptivePortalConfiguration",
"name": "Captive-portal",
"browserTitle": "Access the network as Guest",
"headerContent": "Captive Portal",
"userAcceptancePolicy": "Use this network at your own risk. No warranty of any kind.",
"successPageMarkdownText": "Welcome to the network",
"redirectURL": "",
"externalCaptivePortalURL": null,
"sessionTimeoutInMinutes": 60,
"logoFile": null,
"backgroundFile": null,
"walledGardenAllowlist": [
],
"usernamePasswordFile": {
"model_type": "ManagedFileInfo",
"md5checksum": null,
"lastModifiedTimestamp": null,
"apExportUrl": "userList",
"fileCategory": "UsernamePasswordList",
"fileType": "TEXT",
"altSlot": true
},
"authenticationType": "guest",
"radiusAuthMethod": "CHAP",
"maxUsersWithSameCredentials": 42,
"externalPolicyFile": null,
"backgroundPosition": "left_top",
"backgroundRepeat": "no_repeat",
"radiusServiceName": null,
"expiryType": "unlimited",
"userList": [
{
"model_type": "TimedAccessUserRecord",
"username": "customer",
"password": "testing123",
"activationTime": 1611262628973,
"expirationTime": 1611291428973,
"numDevices": 1,
"userDetails": {
"model_type": "TimedAccessUserDetails",
"firstName": "Pac",
"lastName": "Man",
"passwordNeedsReset": false
},
"userMacAddresses": [
{
"model_type": "MacAddress",
"address": "fKtg5upO",
"addressAsString": "7c:ab:60:e6:ea:4e"
}
],
"lastModifiedTimestamp": 0
"model_type": "CaptivePortalConfiguration",
"name": "Default",
"browserTitle": "Captive-portal",
"headerContent": "Captive Portal",
"userAcceptancePolicy": "Please agree to the following terms for using this network:",
"successPageMarkdownText": "You are now authorized and connected to the network.",
"redirectURL": "https://www.google.com",
"externalCaptivePortalURL": null,
"sessionTimeoutInMinutes": 10,
"logoFile": {
"model_type": "ManagedFileInfo",
"md5checksum": null,
"lastModifiedTimestamp": null,
"apExportUrl": "tip-logo-mobile.png",
"fileCategory": "CaptivePortalLogo",
"fileType": "PNG",
"altSlot": false
},
{
"model_type": "TimedAccessUserRecord",
"username": "customer",
"password": "testing123",
"activationTime": 1611262628974,
"expirationTime": 1611266228974,
"numDevices": 0,
"userDetails": {
"model_type": "TimedAccessUserDetails",
"firstName": "Q",
"lastName": "Bert",
"passwordNeedsReset": false
},
"userMacAddresses": [
{
"model_type": "MacAddress",
"address": "wJrQdqho",
"addressAsString": "c0:9a:d0:76:a8:68"
}
],
"lastModifiedTimestamp": 0
"backgroundFile": {
"model_type": "ManagedFileInfo",
"md5checksum": null,
"lastModifiedTimestamp": null,
"apExportUrl": "tip-logo.png",
"fileCategory": "CaptivePortalBackground",
"fileType": "PNG",
"altSlot": false
},
{
"model_type": "TimedAccessUserRecord",
"username": "customer2",
"password": "testing1234",
"activationTime": 1611262628974,
"expirationTime": 1611867428974,
"numDevices": 1,
"userDetails": {
"model_type": "TimedAccessUserDetails",
"firstName": "Duke",
"lastName": "Nukem",
"passwordNeedsReset": false
},
"userMacAddresses": [
{
"model_type": "MacAddress",
"address": "fKtg5upN",
"addressAsString": "7c:ab:60:e6:ea:4d"
}
],
"lastModifiedTimestamp": 0
},
{
"model_type": "TimedAccessUserRecord",
"username": "customer2",
"password": "testing1234",
"activationTime": 1611262628974,
"expirationTime": 1611349028974,
"numDevices": 0,
"userDetails": {
"model_type": "TimedAccessUserDetails",
"firstName": "Missile",
"lastName": "Commander",
"passwordNeedsReset": false
},
"userMacAddresses": [
{
"model_type": "MacAddress",
"address": "wJrQdqhj",
"addressAsString": "c0:9a:d0:76:a8:63"
}
],
"lastModifiedTimestamp": 0
}
],
"macAllowList": [
],
"profileType": "captive_portal"
"walledGardenAllowlist": [],
"usernamePasswordFile": null,
"authenticationType": "guest",
"radiusAuthMethod": "CHAP",
"maxUsersWithSameCredentials": 3,
"externalPolicyFile": null,
"backgroundPosition": "left_top",
"backgroundRepeat": "no_repeat",
"radiusServiceId": 0,
"expiryType": "time_limited",
"userList": [],
"macAllowList": [],
"profileType": "captive_portal"
},
"createdTimestamp": 1611262628978,
"lastModifiedTimestamp": 1611262628978,
"childProfileIds": [
]
}
]
"createdTimestamp": 1611779680397,
"lastModifiedTimestamp": 1611779680397,
"childProfileIds": []
}

172
opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileCaptive.json
View File

@@ -1,138 +1,52 @@
[
{
{
"model_type": "Profile",
"id": 5,
"customerId": 2,
"profileType": "captive_portal",
"name": "Captive-portal",
"details": {
"model_type": "CaptivePortalConfiguration",
"name": "Captive-portal",
"browserTitle": "Access the network as Guest",
"headerContent": "Captive Portal",
"userAcceptancePolicy": "Use this network at your own risk. No warranty of any kind.",
"successPageMarkdownText": "Welcome to the network",
"redirectURL": "",
"externalCaptivePortalURL": null,
"sessionTimeoutInMinutes": 60,
"logoFile": null,
"backgroundFile": null,
"walledGardenAllowlist": [
],
"usernamePasswordFile": {
"model_type": "ManagedFileInfo",
"md5checksum": null,
"lastModifiedTimestamp": null,
"apExportUrl": "userList",
"fileCategory": "UsernamePasswordList",
"fileType": "TEXT",
"altSlot": true
},
"authenticationType": "guest",
"radiusAuthMethod": "CHAP",
"maxUsersWithSameCredentials": 42,
"externalPolicyFile": null,
"backgroundPosition": "left_top",
"backgroundRepeat": "no_repeat",
"radiusServiceName": null,
"expiryType": "unlimited",
"userList": [
{
"model_type": "TimedAccessUserRecord",
"username": "customer",
"password": "testing123",
"activationTime": 1611262628973,
"expirationTime": 1611291428973,
"numDevices": 1,
"userDetails": {
"model_type": "TimedAccessUserDetails",
"firstName": "Pac",
"lastName": "Man",
"passwordNeedsReset": false
},
"userMacAddresses": [
{
"model_type": "MacAddress",
"address": "fKtg5upO",
"addressAsString": "7c:ab:60:e6:ea:4e"
}
],
"lastModifiedTimestamp": 0
"model_type": "CaptivePortalConfiguration",
"name": "Default",
"browserTitle": "Captive-portal",
"headerContent": "Captive Portal",
"userAcceptancePolicy": "Please agree to the following terms for using this network:",
"successPageMarkdownText": "You are now authorized and connected to the network.",
"redirectURL": "https://www.google.com",
"externalCaptivePortalURL": null,
"sessionTimeoutInMinutes": 10,
"logoFile": {
"model_type": "ManagedFileInfo",
"md5checksum": null,
"lastModifiedTimestamp": null,
"apExportUrl": "tip-logo-mobile.png",
"fileCategory": "CaptivePortalLogo",
"fileType": "PNG",
"altSlot": false
},
{
"model_type": "TimedAccessUserRecord",
"username": "customer",
"password": "testing123",
"activationTime": 1611262628974,
"expirationTime": 1611266228974,
"numDevices": 0,
"userDetails": {
"model_type": "TimedAccessUserDetails",
"firstName": "Q",
"lastName": "Bert",
"passwordNeedsReset": false
},
"userMacAddresses": [
{
"model_type": "MacAddress",
"address": "wJrQdqho",
"addressAsString": "c0:9a:d0:76:a8:68"
}
],
"lastModifiedTimestamp": 0
"backgroundFile": {
"model_type": "ManagedFileInfo",
"md5checksum": null,
"lastModifiedTimestamp": null,
"apExportUrl": "tip-logo.png",
"fileCategory": "CaptivePortalBackground",
"fileType": "PNG",
"altSlot": false
},
{
"model_type": "TimedAccessUserRecord",
"username": "customer2",
"password": "testing1234",
"activationTime": 1611262628974,
"expirationTime": 1611867428974,
"numDevices": 1,
"userDetails": {
"model_type": "TimedAccessUserDetails",
"firstName": "Duke",
"lastName": "Nukem",
"passwordNeedsReset": false
},
"userMacAddresses": [
{
"model_type": "MacAddress",
"address": "fKtg5upN",
"addressAsString": "7c:ab:60:e6:ea:4d"
}
],
"lastModifiedTimestamp": 0
},
{
"model_type": "TimedAccessUserRecord",
"username": "customer2",
"password": "testing1234",
"activationTime": 1611262628974,
"expirationTime": 1611349028974,
"numDevices": 0,
"userDetails": {
"model_type": "TimedAccessUserDetails",
"firstName": "Missile",
"lastName": "Commander",
"passwordNeedsReset": false
},
"userMacAddresses": [
{
"model_type": "MacAddress",
"address": "wJrQdqhj",
"addressAsString": "c0:9a:d0:76:a8:63"
}
],
"lastModifiedTimestamp": 0
}
],
"macAllowList": [
],
"profileType": "captive_portal"
"walledGardenAllowlist": [],
"usernamePasswordFile": null,
"authenticationType": "guest",
"radiusAuthMethod": "CHAP",
"maxUsersWithSameCredentials": 3,
"externalPolicyFile": null,
"backgroundPosition": "left_top",
"backgroundRepeat": "no_repeat",
"radiusServiceId": 0,
"expiryType": "time_limited",
"userList": [],
"macAllowList": [],
"profileType": "captive_portal"
},
"createdTimestamp": 1611262628978,
"lastModifiedTimestamp": 1611262628978,
"childProfileIds": [
]
}
]
"createdTimestamp": 1611779680397,
"lastModifiedTimestamp": 1611779680397,
"childProfileIds": []
}

172
opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileCaptive.json
View File

@@ -1,138 +1,52 @@
[
{
{
"model_type": "Profile",
"id": 5,
"customerId": 2,
"profileType": "captive_portal",
"name": "Captive-portal",
"details": {
"model_type": "CaptivePortalConfiguration",
"name": "Captive-portal",
"browserTitle": "Access the network as Guest",
"headerContent": "Captive Portal",
"userAcceptancePolicy": "Use this network at your own risk. No warranty of any kind.",
"successPageMarkdownText": "Welcome to the network",
"redirectURL": "",
"externalCaptivePortalURL": null,
"sessionTimeoutInMinutes": 60,
"logoFile": null,
"backgroundFile": null,
"walledGardenAllowlist": [
],
"usernamePasswordFile": {
"model_type": "ManagedFileInfo",
"md5checksum": null,
"lastModifiedTimestamp": null,
"apExportUrl": "userList",
"fileCategory": "UsernamePasswordList",
"fileType": "TEXT",
"altSlot": true
},
"authenticationType": "guest",
"radiusAuthMethod": "CHAP",
"maxUsersWithSameCredentials": 42,
"externalPolicyFile": null,
"backgroundPosition": "left_top",
"backgroundRepeat": "no_repeat",
"radiusServiceName": null,
"expiryType": "unlimited",
"userList": [
{
"model_type": "TimedAccessUserRecord",
"username": "customer",
"password": "testing123",
"activationTime": 1611262628973,
"expirationTime": 1611291428973,
"numDevices": 1,
"userDetails": {
"model_type": "TimedAccessUserDetails",
"firstName": "Pac",
"lastName": "Man",
"passwordNeedsReset": false
},
"userMacAddresses": [
{
"model_type": "MacAddress",
"address": "fKtg5upO",
"addressAsString": "7c:ab:60:e6:ea:4e"
}
],
"lastModifiedTimestamp": 0
"model_type": "CaptivePortalConfiguration",
"name": "Default",
"browserTitle": "Captive-portal",
"headerContent": "Captive Portal",
"userAcceptancePolicy": "Please agree to the following terms for using this network:",
"successPageMarkdownText": "You are now authorized and connected to the network.",
"redirectURL": "https://www.google.com",
"externalCaptivePortalURL": null,
"sessionTimeoutInMinutes": 10,
"logoFile": {
"model_type": "ManagedFileInfo",
"md5checksum": null,
"lastModifiedTimestamp": null,
"apExportUrl": "tip-logo-mobile.png",
"fileCategory": "CaptivePortalLogo",
"fileType": "PNG",
"altSlot": false
},
{
"model_type": "TimedAccessUserRecord",
"username": "customer",
"password": "testing123",
"activationTime": 1611262628974,
"expirationTime": 1611266228974,
"numDevices": 0,
"userDetails": {
"model_type": "TimedAccessUserDetails",
"firstName": "Q",
"lastName": "Bert",
"passwordNeedsReset": false
},
"userMacAddresses": [
{
"model_type": "MacAddress",
"address": "wJrQdqho",
"addressAsString": "c0:9a:d0:76:a8:68"
}
],
"lastModifiedTimestamp": 0
"backgroundFile": {
"model_type": "ManagedFileInfo",
"md5checksum": null,
"lastModifiedTimestamp": null,
"apExportUrl": "tip-logo.png",
"fileCategory": "CaptivePortalBackground",
"fileType": "PNG",
"altSlot": false
},
{
"model_type": "TimedAccessUserRecord",
"username": "customer2",
"password": "testing1234",
"activationTime": 1611262628974,
"expirationTime": 1611867428974,
"numDevices": 1,
"userDetails": {
"model_type": "TimedAccessUserDetails",
"firstName": "Duke",
"lastName": "Nukem",
"passwordNeedsReset": false
},
"userMacAddresses": [
{
"model_type": "MacAddress",
"address": "fKtg5upN",
"addressAsString": "7c:ab:60:e6:ea:4d"
}
],
"lastModifiedTimestamp": 0
},
{
"model_type": "TimedAccessUserRecord",
"username": "customer2",
"password": "testing1234",
"activationTime": 1611262628974,
"expirationTime": 1611349028974,
"numDevices": 0,
"userDetails": {
"model_type": "TimedAccessUserDetails",
"firstName": "Missile",
"lastName": "Commander",
"passwordNeedsReset": false
},
"userMacAddresses": [
{
"model_type": "MacAddress",
"address": "wJrQdqhj",
"addressAsString": "c0:9a:d0:76:a8:63"
}
],
"lastModifiedTimestamp": 0
}
],
"macAllowList": [
],
"profileType": "captive_portal"
"walledGardenAllowlist": [],
"usernamePasswordFile": null,
"authenticationType": "guest",
"radiusAuthMethod": "CHAP",
"maxUsersWithSameCredentials": 3,
"externalPolicyFile": null,
"backgroundPosition": "left_top",
"backgroundRepeat": "no_repeat",
"radiusServiceId": 0,
"expiryType": "time_limited",
"userList": [],
"macAllowList": [],
"profileType": "captive_portal"
},
"createdTimestamp": 1611262628978,
"lastModifiedTimestamp": 1611262628978,
"childProfileIds": [
]
}
]
"createdTimestamp": 1611779680397,
"lastModifiedTimestamp": 1611779680397,
"childProfileIds": []
}

172
opensync-gateway-static-process/src/main/resources/app/opensync/ProfileCaptive.json
View File

@@ -1,138 +1,52 @@
[
{
{
"model_type": "Profile",
"id": 5,
"customerId": 2,
"profileType": "captive_portal",
"name": "Captive-portal",
"details": {
"model_type": "CaptivePortalConfiguration",
"name": "Captive-portal",
"browserTitle": "Access the network as Guest",
"headerContent": "Captive Portal",
"userAcceptancePolicy": "Use this network at your own risk. No warranty of any kind.",
"successPageMarkdownText": "Welcome to the network",
"redirectURL": "",
"externalCaptivePortalURL": null,
"sessionTimeoutInMinutes": 60,
"logoFile": null,
"backgroundFile": null,
"walledGardenAllowlist": [
],
"usernamePasswordFile": {
"model_type": "ManagedFileInfo",
"md5checksum": null,
"lastModifiedTimestamp": null,
"apExportUrl": "userList",
"fileCategory": "UsernamePasswordList",
"fileType": "TEXT",
"altSlot": true
},
"authenticationType": "guest",
"radiusAuthMethod": "CHAP",
"maxUsersWithSameCredentials": 42,
"externalPolicyFile": null,
"backgroundPosition": "left_top",
"backgroundRepeat": "no_repeat",
"radiusServiceName": null,
"expiryType": "unlimited",
"userList": [
{
"model_type": "TimedAccessUserRecord",
"username": "customer",
"password": "testing123",
"activationTime": 1611262628973,
"expirationTime": 1611291428973,
"numDevices": 1,
"userDetails": {
"model_type": "TimedAccessUserDetails",
"firstName": "Pac",
"lastName": "Man",
"passwordNeedsReset": false
},
"userMacAddresses": [
{
"model_type": "MacAddress",
"address": "fKtg5upO",
"addressAsString": "7c:ab:60:e6:ea:4e"
}
],
"lastModifiedTimestamp": 0
"model_type": "CaptivePortalConfiguration",
"name": "Default",
"browserTitle": "Captive-portal",
"headerContent": "Captive Portal",
"userAcceptancePolicy": "Please agree to the following terms for using this network:",
"successPageMarkdownText": "You are now authorized and connected to the network.",
"redirectURL": "https://www.google.com",
"externalCaptivePortalURL": null,
"sessionTimeoutInMinutes": 10,
"logoFile": {
"model_type": "ManagedFileInfo",
"md5checksum": null,
"lastModifiedTimestamp": null,
"apExportUrl": "tip-logo-mobile.png",
"fileCategory": "CaptivePortalLogo",
"fileType": "PNG",
"altSlot": false
},
{
"model_type": "TimedAccessUserRecord",
"username": "customer",
"password": "testing123",
"activationTime": 1611262628974,
"expirationTime": 1611266228974,
"numDevices": 0,
"userDetails": {
"model_type": "TimedAccessUserDetails",
"firstName": "Q",
"lastName": "Bert",
"passwordNeedsReset": false
},
"userMacAddresses": [
{
"model_type": "MacAddress",
"address": "wJrQdqho",
"addressAsString": "c0:9a:d0:76:a8:68"
}
],
"lastModifiedTimestamp": 0
"backgroundFile": {
"model_type": "ManagedFileInfo",
"md5checksum": null,
"lastModifiedTimestamp": null,
"apExportUrl": "tip-logo.png",
"fileCategory": "CaptivePortalBackground",
"fileType": "PNG",
"altSlot": false
},
{
"model_type": "TimedAccessUserRecord",
"username": "customer2",
"password": "testing1234",
"activationTime": 1611262628974,
"expirationTime": 1611867428974,
"numDevices": 1,
"userDetails": {
"model_type": "TimedAccessUserDetails",
"firstName": "Duke",
"lastName": "Nukem",
"passwordNeedsReset": false
},
"userMacAddresses": [
{
"model_type": "MacAddress",
"address": "fKtg5upN",
"addressAsString": "7c:ab:60:e6:ea:4d"
}
],
"lastModifiedTimestamp": 0
},
{
"model_type": "TimedAccessUserRecord",
"username": "customer2",
"password": "testing1234",
"activationTime": 1611262628974,
"expirationTime": 1611349028974,
"numDevices": 0,
"userDetails": {
"model_type": "TimedAccessUserDetails",
"firstName": "Missile",
"lastName": "Commander",
"passwordNeedsReset": false
},
"userMacAddresses": [
{
"model_type": "MacAddress",
"address": "wJrQdqhj",
"addressAsString": "c0:9a:d0:76:a8:63"
}
],
"lastModifiedTimestamp": 0
}
],
"macAllowList": [
],
"profileType": "captive_portal"
"walledGardenAllowlist": [],
"usernamePasswordFile": null,
"authenticationType": "guest",
"radiusAuthMethod": "CHAP",
"maxUsersWithSameCredentials": 3,
"externalPolicyFile": null,
"backgroundPosition": "left_top",
"backgroundRepeat": "no_repeat",
"radiusServiceId": 0,
"expiryType": "time_limited",
"userList": [],
"macAllowList": [],
"profileType": "captive_portal"
},
"createdTimestamp": 1611262628978,
"lastModifiedTimestamp": 1611262628978,
"childProfileIds": [
]
}
]
"createdTimestamp": 1611779680397,
"lastModifiedTimestamp": 1611779680397,
"childProfileIds": []
}

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

@@ -62,14 +62,11 @@ import com.telecominfraproject.wlan.opensync.ovsdb.dao.models.WifiVifConfigInfo;
import com.telecominfraproject.wlan.opensync.ovsdb.dao.models.enumerations.DhcpFpDbStatus;
import com.telecominfraproject.wlan.opensync.ovsdb.dao.models.enumerations.DhcpFpDeviceType;
import com.telecominfraproject.wlan.opensync.ovsdb.dao.models.enumerations.DhcpFpManufId;
import com.telecominfraproject.wlan.opensync.util.OvsdbStringConstants;
import com.telecominfraproject.wlan.opensync.util.OvsdbToWlanCloudTypeMappingUtility;
import com.telecominfraproject.wlan.profile.bonjour.models.BonjourGatewayProfile;
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.metrics.ServiceMetricsChannelUtilizationSurveyType;
import com.telecominfraproject.wlan.profile.metrics.ServiceMetricsStatsReportFormat;
import com.telecominfraproject.wlan.profile.models.Profile;
import com.telecominfraproject.wlan.profile.models.common.ManagedFileInfo;
import com.telecominfraproject.wlan.profile.network.models.ApNetworkConfiguration;
@@ -120,7 +117,6 @@ import com.vmware.ovsdb.protocol.operation.result.OperationResult;
import com.vmware.ovsdb.protocol.operation.result.SelectResult;
import com.vmware.ovsdb.protocol.operation.result.UpdateResult;
import com.vmware.ovsdb.protocol.schema.DatabaseSchema;
import com.vmware.ovsdb.protocol.schema.TableSchema;
import com.vmware.ovsdb.service.OvsdbClient;
@Component
@@ -199,7 +195,7 @@ public class OvsdbDao {
@org.springframework.beans.factory.annotation.Value("${tip.wlan.externalFileStoreURL:https://localhost:9096}")
private String externalFileStoreURL;
public static final String FILESTORE = "/filestore";
public static final String FILESTORE = "filestore/";
public static final String HTTP = "http";
public static final String ovsdbName = "Open_vSwitch";
@@ -2695,26 +2691,19 @@ public class OvsdbDao {
}
updateColumns.put("mode", new Atom<>("ap"));
@SuppressWarnings("unchecked")
com.vmware.ovsdb.protocol.operation.notation.Map<String, String> captivePortalMap = com.vmware.ovsdb.protocol.operation.notation.Map
.of(captiveMap);
updateColumns.put("captive_portal", captivePortalMap);
// TODO: remove when captive portal support available in AP load
DatabaseSchema dbSchema = ovsdbClient.getSchema(ovsdbName).join();
TableSchema tableSchema = dbSchema.getTables().get(wifiVifConfigDbTable);
if (tableSchema.getColumns().containsKey("captive_portal")) {
@SuppressWarnings("unchecked")
com.vmware.ovsdb.protocol.operation.notation.Map<String, String> captivePortalMap = com.vmware.ovsdb.protocol.operation.notation.Map
.of(captiveMap);
updateColumns.put("captive_portal", captivePortalMap);
}
if (tableSchema.getColumns().containsKey("captive_allowlist")) {
if (walledGardenAllowlist != null && !walledGardenAllowlist.isEmpty()) {
Set<Atom<String>> atomMacList = new HashSet<>();
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());
}
if (walledGardenAllowlist != null && !walledGardenAllowlist.isEmpty()) {
Set<Atom<String>> atomMacList = new HashSet<>();
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
@@ -3455,14 +3444,13 @@ public class OvsdbDao {
private void configureGreTunnel(OvsdbClient ovsdbClient, Profile apNetworkConfiguration) {
// NAT false
// if_name gre1
// if_type gre
// gre_local_inet_addr (Not needed): WAN IP shall be used
// gre_remote_inet_addr <Tunnel end point IP address>
// gre_ifname: Not needed
// NAT false
// if_name gre1
// if_type gre
// gre_local_inet_addr (Not needed): WAN IP shall be used
// gre_remote_inet_addr <Tunnel end point IP address>
// gre_ifname: Not needed
try {
LOG.debug("Configure Gre Tunnel {}", apNetworkConfiguration);
List<Operation> operations = new ArrayList<>();
@@ -3553,12 +3541,11 @@ public class OvsdbDao {
private void createVlanInterfaceInGreTunnel(OvsdbClient ovsdbClient, int vlanId, String greTunnel) {
try {
// if_name gre_<vlan id>
// if_type vlan
// parent_ifname gre
// vlan_id <vlan id>
// if_name gre_<vlan id>
// if_type vlan
// parent_ifname gre
// vlan_id <vlan id>
List<Operation> operations = new ArrayList<>();
Map<String, Value> tableColumns = new HashMap<>();
@@ -3823,32 +3810,69 @@ public class OvsdbDao {
&& (profileCaptive.getDetails() != null)) {
CaptivePortalConfiguration captiveProfileDetails = ((CaptivePortalConfiguration) profileCaptive
.getDetails());
// +#define SCHEMA_CONSTS_PAGE_TITLE "page_title"
if (captiveProfileDetails.getBrowserTitle() != null) {
captiveMap.put("session_timeout",
String.valueOf(captiveProfileDetails.getSessionTimeoutInMinutes()));
captiveMap.put("page_title", captiveProfileDetails.getBrowserTitle());
}
if (captiveProfileDetails.getAuthenticationType().equals(CaptivePortalAuthenticationType.radius)) {
Optional<Profile> optional = opensyncApConfig.getRadiusProfiles().stream()
.filter(p -> p.getId() == captiveProfileDetails.getRadiusServiceId()).findFirst();
if (optional != null && optional.isPresent()) {
Profile profile = optional.get();
RadiusProfile radiusProfile = (RadiusProfile) profile.getDetails();
captiveMap.put("radius_server_ip", String.valueOf(
radiusProfile.getPrimaryRadiusAuthServer().getIpAddress().getHostAddress()));
captiveMap.put("radius_server_port",
String.valueOf(radiusProfile.getPrimaryRadiusAuthServer().getPort()));
captiveMap.put("radius_server_secret",
String.valueOf(radiusProfile.getPrimaryRadiusAuthServer().getSecret()));
if (captiveProfileDetails.getRadiusAuthMethod() != null) {
captiveMap.put("radius_auth_type",
String.valueOf(captiveProfileDetails.getRadiusAuthMethod()));
}
}
}
if (captiveProfileDetails.getRedirectURL() != null) {
captiveMap.put("redirect_url", captiveProfileDetails.getRedirectURL());
}
captiveMap.put("session_timeout",
String.valueOf(captiveProfileDetails.getSessionTimeoutInMinutes()));
captiveMap.put("redirect_url", captiveProfileDetails.getRedirectURL());
captiveMap.put("browser_title", captiveProfileDetails.getBrowserTitle());
captiveMap.put("splash_page_title", captiveProfileDetails.getHeaderContent());
captiveMap.put("acceptance_policy", captiveProfileDetails.getUserAcceptancePolicy());
captiveMap.put("login_success_text", captiveProfileDetails.getSuccessPageMarkdownText());
captiveMap.put("authentication",
getCaptiveAuthentication(captiveProfileDetails.getAuthenticationType()));
captiveMap.put("username_password_file", getCaptiveManagedFileUrl("usernamePasswordFileURL",
captiveProfileDetails.getUsernamePasswordFile()));
// captiveMap.put("externalCaptivePortalURL",
// captiveProfileDetails.getExternalCaptivePortalURL());
// captiveMap.put("backgroundPosition",
// captiveProfileDetails.getBackgroundPosition().toString());
// captiveMap.put("backgroundRepeat",
// captiveProfileDetails.getBackgroundRepeat().toString());
if (captiveProfileDetails.getUsernamePasswordFile() != null) {
captiveMap
.put("username_password_file",
ManagedFileInfo
.resolveWithPopulatedHostname(
captiveProfileDetails.getUsernamePasswordFile(), FILESTORE)
.getApExportUrl());
}
if (captiveProfileDetails.getLogoFile() != null) {
captiveMap.put("splash_page_logo",
ManagedFileInfo
.resolveWithPopulatedHostname(captiveProfileDetails.getLogoFile(), FILESTORE)
.getApExportUrl());
}
if (captiveProfileDetails.getBackgroundFile() != null) {
captiveMap.put("splash_page_background_logo", ManagedFileInfo
.resolveWithPopulatedHostname(captiveProfileDetails.getBackgroundFile(), FILESTORE)
.getApExportUrl());
}
LOG.debug("captiveMap {}", captiveMap);
walledGardenAllowlist.addAll(captiveProfileDetails.getWalledGardenAllowlist());
captiveMap.put("splash_page_logo",
getCaptiveManagedFileUrl("logoFileURL", captiveProfileDetails.getLogoFile()));
captiveMap.put("splash_page_background_logo",
getCaptiveManagedFileUrl("backgroundFileURL", captiveProfileDetails.getBackgroundFile()));
LOG.debug("captiveMap {}", captiveMap);
}
}
}
@@ -3902,28 +3926,6 @@ public class OvsdbDao {
}
}
/**
*
* @param fileDesc
* @param fileInfo
* @return Url for captive portal file
*/
String getCaptiveManagedFileUrl(String fileDesc, ManagedFileInfo fileInfo) {
if ((fileInfo == null) || (fileInfo.getApExportUrl() == null)) {
return "";
}
if (fileInfo.getApExportUrl().startsWith(HTTP)) {
return fileInfo.getApExportUrl();
}
if (externalFileStoreURL == null) {
LOG.error("Missing externalFileStoreURL)");
return "";
}
LOG.debug("Captive file {}: {}", fileDesc, externalFileStoreURL + FILESTORE + "/" + fileInfo.getApExportUrl());
return externalFileStoreURL + FILESTORE + "/" + fileInfo.getApExportUrl();
}
/**
* Insert or update Wifi_Inet_Interface for Wifi_VIF_Config table entry
*
@@ -4767,250 +4769,10 @@ public class OvsdbDao {
}
public void configureStatsFromProfile(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncApConfig) {
// TODO: this will be refactored when the opensync profile for stats is
// re-worked
configureStats(ovsdbClient);
// if (opensyncApConfig.getMetricsProfiles() == null ||
// opensyncApConfig.getMetricsProfiles().isEmpty()) {
// configureStats(ovsdbClient);
// } else {
//
// List<Operation> operations = new ArrayList<>();
//
// for (Profile metricsProfile : opensyncApConfig.getMetricsProfiles())
// {
//
// ServiceMetricsCollectionConfigProfile details =
// ((ServiceMetricsCollectionConfigProfile) metricsProfile
// .getDetails());
//
// for (ServiceMetricDataType dataType :
// details.getMetricConfigParameterMap().keySet()) {
//
// if (dataType.equals(ServiceMetricDataType.ApNode)
// || dataType.equals(ServiceMetricDataType.Neighbour)
// || dataType.equals(ServiceMetricDataType.Channel)) {
//
// details.getMetricConfigParameterMap().get(dataType).stream().forEach(c
// -> {
// ServiceMetricSurveyConfigParameters parameters =
// (ServiceMetricSurveyConfigParameters) c;
//
// Map<String, Integer> thresholdMap = new HashMap<>();
// thresholdMap.put("max_delay",
// parameters.getDelayMillisecondsThreshold());
// thresholdMap.put("util",
// parameters.getPercentUtilizationThreshold());
//
// @SuppressWarnings("unchecked")
// com.vmware.ovsdb.protocol.operation.notation.Map<String, Integer>
// thresholds = com.vmware.ovsdb.protocol.operation.notation.Map
// .of(thresholdMap);
//
// RadioType radioType = parameters.getRadioType();
// ServiceMetricsChannelUtilizationSurveyType channelType =
// parameters.getChannelSurveyType();
// int scanInterval = parameters.getScanIntervalMillis();
// ServiceMetricsStatsReportFormat format =
// parameters.getStatsReportFormat();
// int reportingInterval = parameters.getReportingIntervalSeconds();
// int samplingInterval = parameters.getSamplingInterval();
//
// if (dataType.equals(ServiceMetricDataType.ApNode)
// || dataType.equals(ServiceMetricDataType.Channel)) {
// provisionWifiStatsConfigFromProfile("survey",
// getAllowedChannels(ovsdbClient),
// radioType, channelType, scanInterval, format, reportingInterval,
// samplingInterval, operations, thresholds);
// if (dataType.equals(ServiceMetricDataType.ApNode)) {
// // extra reports that are part of ApNode
// // metric
// if
// (channelType.equals(ServiceMetricsChannelUtilizationSurveyType.ON_CHANNEL))
// {
// provisionWifiStatsConfigFromProfile("device", reportingInterval,
// samplingInterval, operations);
// if (((ApNetworkConfiguration)
// opensyncApConfig.getApProfile().getDetails())
// .getSyntheticClientEnabled()) {
// provisionWifiStatsConfigFromProfile("network_probe",
// reportingInterval,
// samplingInterval, operations);
// }
// }
//
// }
// } else if (dataType.equals(ServiceMetricDataType.Neighbour)) {
// provisionWifiStatsConfigFromProfile("neighbor",
// getAllowedChannels(ovsdbClient),
// radioType, channelType, scanInterval, format, reportingInterval,
// samplingInterval, operations, thresholds);
// }
//
// });
//
// } else if (dataType.equals(ServiceMetricDataType.ApSsid)
// || dataType.equals(ServiceMetricDataType.Client)) {
// details.getMetricConfigParameterMap().get(dataType).stream().forEach(c
// -> {
// ServiceMetricRadioConfigParameters parameters =
// (ServiceMetricRadioConfigParameters) c;
//
// RadioType radioType = parameters.getRadioType();
// int reportingInterval = parameters.getReportingIntervalSeconds();
// int samplingInterval = parameters.getSamplingInterval();
//
// provisionWifiStatsConfigFromProfile("client", radioType,
// reportingInterval,
// samplingInterval, operations);
//
// provisionWifiStatsConfigFromProfile("video_voice", reportingInterval,
// samplingInterval,
// operations);
// LOG.debug("{}", BaseJsonModel.toPrettyJsonString(parameters));
// });
// } else {
// details.getMetricConfigParameterMap().get(dataType).stream().forEach(c
// -> {
// ServiceMetricConfigParameters parameters =
// (ServiceMetricConfigParameters) c;
// int reportingInterval = parameters.getReportingIntervalSeconds();
// int samplingInterval = parameters.getSamplingInterval();
// provisionWifiStatsConfigFromProfile("video_voice", reportingInterval,
// samplingInterval,
// operations);
// // TODO: add when schema supports
// // provisionWifiStatsConfigFromProfile("event",
// // reportingInterval,
// // samplingInterval, operations);
//
// LOG.debug("{}", BaseJsonModel.toPrettyJsonString(parameters));
// });
// }
//
// }
//
// }
//
// if (!operations.isEmpty()) {
// LOG.debug("Sending batch of operations : {} ", operations);
//
// try {
// CompletableFuture<OperationResult[]> fResult =
// ovsdbClient.transact(ovsdbName, operations);
// OperationResult[] result = fResult.get(ovsdbTimeoutSec,
// TimeUnit.SECONDS);
//
// if (LOG.isDebugEnabled()) {
// LOG.debug("Updated {}:", wifiStatsConfigDbTable);
//
// for (OperationResult res : result) {
// LOG.debug("Op Result {}", res);
// }
// }
// } catch (OvsdbClientException | TimeoutException | ExecutionException
// | InterruptedException e) {
// throw new RuntimeException(e);
// }
// }
//
// }
}
private void provisionWifiStatsConfigFromProfile(String statsType, RadioType radioType, int reportingInterval,
int samplingInterval, List<Operation> operations) {
Map<String, Value> rowColumns = new HashMap<>();
rowColumns.put("radio_type",
new Atom<>(OvsdbToWlanCloudTypeMappingUtility.getOvsdbRadioFreqBandForRadioType(radioType)));
rowColumns.put("reporting_interval", new Atom<>(reportingInterval));
rowColumns.put("report_type", new Atom<>("raw"));
rowColumns.put("sampling_interval", new Atom<>(samplingInterval));
rowColumns.put("stats_type", new Atom<>(statsType));
Row updateRow = new Row(rowColumns);
Insert newStatConfig = new Insert(wifiStatsConfigDbTable, updateRow);
if (!operations.contains(newStatConfig)) {
operations.add(newStatConfig);
}
}
private void provisionWifiStatsConfigFromProfile(String statsType, int reportingInterval, int samplingInterval,
List<Operation> operations) {
Map<String, Value> rowColumns = new HashMap<>();
rowColumns.put("radio_type", new Atom<>(OvsdbStringConstants.OVSDB_FREQ_BAND_2pt4G));
rowColumns.put("reporting_interval", new Atom<>(reportingInterval));
rowColumns.put("report_type", new Atom<>("raw"));
rowColumns.put("sampling_interval", new Atom<>(samplingInterval));
rowColumns.put("stats_type", new Atom<>(statsType));
Row updateRow = new Row(rowColumns);
Insert newStatConfig = new Insert(wifiStatsConfigDbTable, updateRow);
if (!operations.contains(newStatConfig)) {
// don't want the same stat 2x
operations.add(newStatConfig);
}
}
private void provisionWifiStatsConfigFromProfile(String statsType, Map<String, Set<Integer>> allowedChannels,
RadioType radioType, ServiceMetricsChannelUtilizationSurveyType channelType, int scanInterval,
ServiceMetricsStatsReportFormat format, int reportingInterval, int samplingInterval,
List<Operation> operations, com.vmware.ovsdb.protocol.operation.notation.Map<String, Integer> thresholds) {
if (channelType.equals(ServiceMetricsChannelUtilizationSurveyType.ON_CHANNEL)) {
Map<String, Value> rowColumns = new HashMap<>();
rowColumns.put("radio_type",
new Atom<>(OvsdbToWlanCloudTypeMappingUtility.getOvsdbRadioFreqBandForRadioType(radioType)));
rowColumns.put("reporting_interval", new Atom<>(reportingInterval));
rowColumns.put("report_type", new Atom<>("raw"));
rowColumns.put("sampling_interval", new Atom<>(samplingInterval));
rowColumns.put("stats_type", new Atom<>(statsType));
rowColumns.put("survey_interval_ms", new Atom<>(scanInterval));
rowColumns.put("survey_type", new Atom<>(
OvsdbToWlanCloudTypeMappingUtility.getOvsdbStatsSurveyTypeFromProfileSurveyType(channelType)));
Row updateRow = new Row(rowColumns);
Insert newStatConfig = new Insert(wifiStatsConfigDbTable, updateRow);
if (!operations.contains(newStatConfig)) {
operations.add(newStatConfig);
}
} else {
Map<String, Value> rowColumns = new HashMap<>();
com.vmware.ovsdb.protocol.operation.notation.Set channels = com.vmware.ovsdb.protocol.operation.notation.Set
.of(allowedChannels
.get(OvsdbToWlanCloudTypeMappingUtility.getOvsdbRadioFreqBandForRadioType(radioType)));
if (channels == null) {
channels = com.vmware.ovsdb.protocol.operation.notation.Set.of(Collections.emptySet());
}
rowColumns.put("channel_list", channels);
rowColumns.put("radio_type",
new Atom<>(OvsdbToWlanCloudTypeMappingUtility.getOvsdbRadioFreqBandForRadioType(radioType)));
rowColumns.put("reporting_interval", new Atom<>(reportingInterval));
rowColumns.put("report_type", new Atom<>("raw"));
rowColumns.put("stats_type", new Atom<>(statsType));
rowColumns.put("survey_type", new Atom<>(
OvsdbToWlanCloudTypeMappingUtility.getOvsdbStatsSurveyTypeFromProfileSurveyType(channelType)));
rowColumns.put("sampling_interval", new Atom<>(samplingInterval));
rowColumns.put("survey_interval_ms", new Atom<>(scanInterval));
rowColumns.put("threshold", thresholds);
Row updateRow = new Row(rowColumns);
Insert newStatConfig = new Insert(wifiStatsConfigDbTable, updateRow);
if (!operations.contains(newStatConfig)) {
operations.add(newStatConfig);
}
}
}
public void configureStats(OvsdbClient ovsdbClient) {