Merge remote-tracking branch 'upstream/master'

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAO.java

@@ -334,6 +334,16 @@ public interface DeviceDAO {
     EnrolmentInfo getEnrolment(DeviceIdentifier deviceId, String currentUser,
                                int tenantId) throws DeviceManagementDAOException;
 
+    /**
+     * This method is used to retrieve current enrollment of a given device.
+     *
+     * @param deviceId    device id.
+     * @param tenantId    tenant id.
+     * @return returns EnrolmentInfo object.
+     * @throws DeviceManagementDAOException
+     */
+    EnrolmentInfo getEnrolment(DeviceIdentifier deviceId, int tenantId) throws DeviceManagementDAOException;
+
     /**
      * This method is used to retrieve current active enrollment of a given device and tenant id.
      *

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractDeviceDAOImpl.java

@@ -794,6 +794,37 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
         }
     }
 
+    @Override
+    public EnrolmentInfo getEnrolment(DeviceIdentifier deviceId, int tenantId) throws DeviceManagementDAOException {
+        Connection conn;
+        PreparedStatement stmt = null;
+        ResultSet rs = null;
+        EnrolmentInfo enrolmentInfo = null;
+        try {
+            conn = this.getConnection();
+            String sql = "SELECT ID AS ENROLMENT_ID, DEVICE_ID, OWNER, OWNERSHIP, STATUS, DATE_OF_ENROLMENT, " +
+                         "DATE_OF_LAST_UPDATE, TENANT_ID FROM DM_ENROLMENT WHERE DEVICE_ID = (SELECT d.ID " +
+                         "FROM DM_DEVICE d, DM_DEVICE_TYPE t WHERE d.DEVICE_TYPE_ID = t.ID " +
+                         "AND d.DEVICE_IDENTIFICATION = ? AND t.NAME = ? AND d.TENANT_ID = ?) " +
+                         "AND TENANT_ID = ?";
+            stmt = conn.prepareStatement(sql);
+            stmt.setString(1, deviceId.getId());
+            stmt.setString(2, deviceId.getType());
+            stmt.setInt(3, tenantId);
+            stmt.setInt(4, tenantId);
+            rs = stmt.executeQuery();
+            if (rs.next()) {
+                enrolmentInfo = DeviceManagementDAOUtil.loadMatchingEnrolment(rs);
+            }
+            return enrolmentInfo;
+        } catch (SQLException e) {
+            throw new DeviceManagementDAOException("Error occurred while retrieving the enrolment " +
+                                                   "of device '" + deviceId + "'", e);
+        } finally {
+            DeviceManagementDAOUtil.cleanupResources(stmt, rs);
+        }
+    }
+
     @Override
     public EnrolmentInfo getActiveEnrolment(DeviceIdentifier deviceId, int tenantId) throws DeviceManagementDAOException {
         Connection conn;

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java

@@ -927,6 +927,13 @@ public class OperationManagerImpl implements OperationManager {
             int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
             String user = this.getUser();
             enrolmentInfo = deviceDAO.getEnrolment(deviceId, user, tenantId);
+            if (enrolmentInfo == null) {
+                boolean isAdminUser = DeviceManagementDataHolder.getInstance().getDeviceAccessAuthorizationService().
+                        isDeviceAdminUser();
+                if (isAdminUser) {
+                    enrolmentInfo = deviceDAO.getEnrolment(deviceId, tenantId);
+                }
+            }
         } catch (DeviceManagementDAOException e) {
             throw new OperationManagementException("Error occurred while retrieving enrollment data of '" +
                                                    deviceId.getType() + "' device carrying the identifier '" +
@@ -934,6 +941,10 @@ public class OperationManagerImpl implements OperationManager {
         } catch (SQLException e) {
             throw new OperationManagementException(
                     "Error occurred while opening a connection to the data source", e);
+        } catch (DeviceAccessAuthorizationException e) {
+            throw new OperationManagementException("Error occurred while checking the device access permissions for '" +
+                                                   deviceId.getType() + "' device carrying the identifier '" +
+                                                   deviceId.getId() + "'", e);
         } finally {
             DeviceManagementDAOFactory.closeConnection();
         }

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationMgtConstants.java

@@ -29,4 +29,11 @@ public class OperationMgtConstants {
         public static final String DEVICE_ID_SERVICE_NOT_FOUND =
                 "Issue in retrieving device management service instance for device found at %s";
     }
+
+    public final class OperationCodes {
+        private OperationCodes() {
+            throw new AssertionError();
+        }
+        public static final String POLICY_REVOKE = "POLICY_REVOKE";
+    }
 }

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/layouts/cdmf.layout.default.hbs

@@ -73,6 +73,7 @@ under the License. --}}
             </div>
         </footer>
 
+        {{defineZone "bottomModalContent"}}
         {{defineZone "bottomLibJs"}}
         {{defineZone "bottomJs"}}
     </body>

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js

@@ -525,9 +525,10 @@ function showPopup() {
  * hide popup function.
  */
 function hidePopup() {
-    $(modalPopupContent).html('');
+    $(modalPopupContent).html("");
+    $(modalPopupContent).removeClass("operation-data");
     $(modalPopup).modal('hide');
-    $('body').removeClass('modal-open').css('padding-right', '0px');
+    $('body').removeClass('modal-open').css('padding-right','0px');
     $('.modal-backdrop').remove();
 }
 

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js

@@ -275,7 +275,8 @@ function showPopup() {
  * hide popup function.
  */
 function hidePopup() {
-    $(modalPopupContent).html('');
+    $(modalPopupContent).html("");
+    $(modalPopupContent).removeClass("operation-data");
     $(modalPopup).modal('hide');
     $('body').removeClass('modal-open').css('padding-right','0px');
     $('.modal-backdrop').remove();

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/public/js/policy-list.js

@@ -91,9 +91,10 @@ function showPopup() {
  * hide popup function.
  */
 function hidePopup() {
-    $(modalPopupContent).html('');
+    $(modalPopupContent).html("");
+    $(modalPopupContent).removeClass("operation-data");
     $(modalPopup).modal('hide');
-    $('body').removeClass('modal-open').css('padding-right', '0px');
+    $('body').removeClass('modal-open').css('padding-right','0px');
     $('.modal-backdrop').remove();
 }
 

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js

@@ -72,7 +72,7 @@ function showPopup() {
 function hidePopup() {
     $(modalPopupContent).html('');
     $(modalPopup).modal('hide');
-    $('body').removeClass('modal-open').css('padding-right', '0px');
+    $('body').removeClass('modal-open').css('padding-right','0px');
     $('.modal-backdrop').remove();
 }
 

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit.permission/public/js/bottomJs.js

@@ -39,7 +39,8 @@ var apiBasePath = "/api/device-mgt/v1.0";
  * hide popup function.
  */
 function hidePopup() {
-    $(modalPopupContent).html('');
+    $(modalPopupContent).html("");
+    $(modalPopupContent).removeClass("operation-data");
     $(modalPopup).modal('hide');
     $('body').removeClass('modal-open').css('padding-right','0px');
     $('.modal-backdrop').remove();

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.modal/modal.hbs

@@ -16,7 +16,7 @@
   under the License.
 }}
 
-{{#zone "content"}}
+{{#zone "bottomModalContent"}}
     <div id="basic-modal-view" class="hidden modal modal-content">
         <div class="modal-header">
             <h3 class="pull-left modal-title">
@@ -43,6 +43,6 @@
     </div>
 {{/zone}}
 
-{{#zone "topJs"}}
+{{#zone "bottomJs"}}
     {{js "js/modal.js"}}
 {{/zone}}

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/PolicyManagerService.java

@@ -77,5 +77,5 @@ public interface PolicyManagerService {
 
     ComplianceData getDeviceCompliance(DeviceIdentifier deviceIdentifier) throws PolicyComplianceException;
 
-    boolean isCompliance(DeviceIdentifier deviceIdentifier) throws PolicyComplianceException;
+    boolean isCompliant(DeviceIdentifier deviceIdentifier) throws PolicyComplianceException;
 }

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/PolicyManagerServiceImpl.java

@@ -201,7 +201,7 @@ public class PolicyManagerServiceImpl implements PolicyManagerService {
     }
 
     @Override
-    public boolean isCompliance(DeviceIdentifier deviceIdentifier) throws PolicyComplianceException {
+    public boolean isCompliant(DeviceIdentifier deviceIdentifier) throws PolicyComplianceException {
-        return monitoringManager.isCompliance(deviceIdentifier);
+        return monitoringManager.isCompliant(deviceIdentifier);
     }
 }

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/enforcement/DelegationTask.java

@@ -64,32 +64,33 @@ public class DelegationTask implements Task {
             if (!deviceTypes.isEmpty()) {
                 DeviceManagementProviderService service = PolicyManagementDataHolder.getInstance()
                         .getDeviceManagementService();
-                List<Device> devices = new ArrayList<>();
+                List<Device> devices;
+                List<Device> toBeNotified;
                 for (String deviceType : deviceTypes) {
                     try {
+                        devices = new ArrayList<>();
+                        toBeNotified = new ArrayList<>();
                         devices.addAll(service.getAllDevices(deviceType));
-                    } catch (DeviceManagementException e) {
+                        //HashMap<Integer, Integer> deviceIdPolicy = policyManager.getAppliedPolicyIdsDeviceIds();
-                        throw new PolicyManagementException("Error occurred while taking the devices", e);
-                    }
-                }
-//                HashMap<Integer, Integer> deviceIdPolicy = policyManager.getAppliedPolicyIdsDeviceIds();
-                List<Device> toBeNotified = new ArrayList<>();
-
                         for (Device device : devices) {
-//                    if (deviceIdPolicy.containsKey(device.getId())) {
+                            // if (deviceIdPolicy.containsKey(device.getId())) {
                             toBeNotified.add(device);
-//                    }
+                            // }
                         }
                         if (!toBeNotified.isEmpty()) {
                             PolicyEnforcementDelegator enforcementDelegator = new PolicyEnforcementDelegatorImpl(toBeNotified);
                             enforcementDelegator.delegate();
                         }
+                    } catch (DeviceManagementException e) {
+                        throw new PolicyManagementException("Error occurred while fetching the devices", e);
+                    } catch (PolicyDelegationException e) {
+                        throw new PolicyManagementException("Error occurred while running the delegation task on " +
+                                                            "device-type : " + deviceType, e);
+                    }
+                }
             }
-
         } catch (PolicyManagementException e) {
             log.error("Error occurred while getting the policies applied to devices.", e);
-        } catch (PolicyDelegationException e) {
-            log.error("Error occurred while running the delegation task.", e);
         }
     }
 }

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/enforcement/PolicyEnforcementDelegator.java

@@ -31,4 +31,6 @@ public interface PolicyEnforcementDelegator {
 
     void addPolicyOperation(List<DeviceIdentifier> deviceIdentifiers, Policy policy) throws PolicyDelegationException;
 
+    void addPolicyRevokeOperation(List<DeviceIdentifier> deviceIdentifiers) throws PolicyDelegationException;
+
 }

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/enforcement/PolicyEnforcementDelegatorImpl.java

@@ -23,14 +23,18 @@ import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.InvalidDeviceException;
+import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
 import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
 import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManager;
+import org.wso2.carbon.device.mgt.core.operation.mgt.CommandOperation;
 import org.wso2.carbon.device.mgt.core.operation.mgt.OperationManagerImpl;
+import org.wso2.carbon.device.mgt.core.operation.mgt.OperationMgtConstants;
 import org.wso2.carbon.policy.mgt.common.Policy;
 import org.wso2.carbon.policy.mgt.common.PolicyEvaluationException;
 import org.wso2.carbon.policy.mgt.common.PolicyManagementException;
 import org.wso2.carbon.policy.mgt.core.PolicyManagerService;
 import org.wso2.carbon.policy.mgt.core.PolicyManagerServiceImpl;
+import org.wso2.carbon.policy.mgt.core.internal.PolicyManagementDataHolder;
 import org.wso2.carbon.policy.mgt.core.util.PolicyManagerUtil;
 
 import java.util.ArrayList;
@@ -58,7 +62,6 @@ public class PolicyEnforcementDelegatorImpl implements PolicyEnforcementDelegato
 
     @Override
     public void delegate() throws PolicyDelegationException {
-
         for (Device device : devices) {
             DeviceIdentifier identifier = new DeviceIdentifier();
             identifier.setId(device.getDeviceIdentifier());
@@ -70,14 +73,17 @@ public class PolicyEnforcementDelegatorImpl implements PolicyEnforcementDelegato
                 List<DeviceIdentifier> deviceIdentifiers = new ArrayList<>();
                 deviceIdentifiers.add(identifier);
                 this.addPolicyOperation(deviceIdentifiers, policy);
+            } else {
+                //This means all the applicable policies have been removed. Hence sending policy-revoke operation.
+                List<DeviceIdentifier> deviceIdentifiers = new ArrayList<>();
+                deviceIdentifiers.add(identifier);
+                this.addPolicyRevokeOperation(deviceIdentifiers);
             }
-
         }
     }
 
     @Override
     public Policy getEffectivePolicy(DeviceIdentifier identifier) throws PolicyDelegationException {
-
         try {
             PolicyManagerService policyManagerService = new PolicyManagerServiceImpl();
             return policyManagerService.getPEP().getEffectivePolicy(identifier);
@@ -96,11 +102,13 @@ public class PolicyEnforcementDelegatorImpl implements PolicyEnforcementDelegato
     @Override
     public void addPolicyOperation(List<DeviceIdentifier> deviceIdentifiers, Policy policy) throws
             PolicyDelegationException {
-
         try {
-            //ToDo Need to fix this to fetch OSGi service
+            String type = null;
-            OperationManager operationManager = new OperationManagerImpl();
+            if (deviceIdentifiers.size() > 0) {
-            operationManager.addOperation(PolicyManagerUtil.transformPolicy(policy), deviceIdentifiers);
+                type = deviceIdentifiers.get(0).getType();
+            }
+            PolicyManagementDataHolder.getInstance().getDeviceManagementService().addOperation(type,
+                                                          PolicyManagerUtil.transformPolicy(policy), deviceIdentifiers);
         } catch (InvalidDeviceException e) {
             String msg = "Invalid DeviceIdentifiers found.";
             log.error(msg, e);
@@ -110,7 +118,33 @@ public class PolicyEnforcementDelegatorImpl implements PolicyEnforcementDelegato
             log.error(msg, e);
             throw new PolicyDelegationException(msg, e);
         }
+    }
 
+    @Override
+    public void addPolicyRevokeOperation(List<DeviceIdentifier> deviceIdentifiers) throws PolicyDelegationException {
+        try {
+            String type = null;
+            if (deviceIdentifiers.size() > 0) {
+                type = deviceIdentifiers.get(0).getType();
+            }
+            PolicyManagementDataHolder.getInstance().getDeviceManagementService().addOperation(type,
+                                                                   this.getPolicyRevokeOperation(), deviceIdentifiers);
+        } catch (InvalidDeviceException e) {
+            String msg = "Invalid DeviceIdentifiers found.";
+            log.error(msg, e);
+            throw new PolicyDelegationException(msg, e);
+        } catch (OperationManagementException e) {
+            String msg = "Error occurred while adding the operation to device.";
+            log.error(msg, e);
+            throw new PolicyDelegationException(msg, e);
+        }
     }
 
+    private Operation getPolicyRevokeOperation() {
+        CommandOperation policyRevokeOperation = new CommandOperation();
+        policyRevokeOperation.setEnabled(true);
+        policyRevokeOperation.setCode(OperationMgtConstants.OperationCodes.POLICY_REVOKE);
+        policyRevokeOperation.setType(Operation.Type.COMMAND);
+        return policyRevokeOperation;
+    }
 }

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/impl/PolicyAdministratorPointImpl.java

@@ -114,7 +114,13 @@ public class PolicyAdministratorPointImpl implements PolicyAdministratorPoint {
     @Override
     public boolean deletePolicy(int policyId) throws PolicyManagementException {
         boolean bool =policyManager.deletePolicy(policyId);
-        PolicyCacheManagerImpl.getInstance().rePopulateCache();
+        PolicyCacheManager policyCacheManager = PolicyCacheManagerImpl.getInstance();
+        policyCacheManager.rePopulateCache();
+        List<Policy> appliedPolicies = policyCacheManager.getAllPolicies();
+        //This means all the policies have been deleted. Hence triggering publishChanges to take immediate effect.
+        if (appliedPolicies.isEmpty()) {
+            this.publishChanges();
+        }
         return bool;
     }
 

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/mgt/MonitoringManager.java

@@ -33,7 +33,7 @@ public interface MonitoringManager {
             throws PolicyComplianceException;
 
 
-    boolean isCompliance(DeviceIdentifier deviceIdentifier) throws PolicyComplianceException;
+    boolean isCompliant(DeviceIdentifier deviceIdentifier) throws PolicyComplianceException;
 
     ComplianceData getDevicePolicyCompliance(DeviceIdentifier deviceIdentifier) throws PolicyComplianceException;
 

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/mgt/impl/MonitoringManagerImpl.java

@@ -171,7 +171,7 @@ public class MonitoringManagerImpl implements MonitoringManager {
     }
 
     @Override
-    public boolean isCompliance(DeviceIdentifier deviceIdentifier) throws PolicyComplianceException {
+    public boolean isCompliant(DeviceIdentifier deviceIdentifier) throws PolicyComplianceException {
         try {
             DeviceManagementProviderService service =
                     PolicyManagementDataHolder.getInstance().getDeviceManagementService();