|
|
|
@ -165,52 +165,52 @@ public class OperationManagerImpl implements OperationManager {
|
|
|
|
if (log.isDebugEnabled()) {
|
|
|
|
if (log.isDebugEnabled()) {
|
|
|
|
log.debug("operation:[" + operation.toString() + "]");
|
|
|
|
log.debug("operation:[" + operation.toString() + "]");
|
|
|
|
for (DeviceIdentifier deviceIdentifier : deviceIds) {
|
|
|
|
for (DeviceIdentifier deviceIdentifier : deviceIds) {
|
|
|
|
log.debug("device identifier id:[" + deviceIdentifier.getId() + "] type:[" +
|
|
|
|
log.debug("device identifier id:[" + deviceIdentifier.getId() + "] type:[" + deviceIdentifier.getType()
|
|
|
|
deviceIdentifier.getType() + "]");
|
|
|
|
+ "]");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
try {
|
|
|
|
|
|
|
|
DeviceIDHolder deviceValidationResult = DeviceManagerUtil.validateDeviceIdentifiers(deviceIds);
|
|
|
|
|
|
|
|
List<DeviceIdentifier> validDeviceIds = deviceValidationResult.getValidDeviceIDList();
|
|
|
|
|
|
|
|
if (validDeviceIds.size() > 0) {
|
|
|
|
|
|
|
|
DeviceIDHolder deviceAuthorizationResult = this.authorizeDevices(operation, validDeviceIds);
|
|
|
|
|
|
|
|
List<DeviceIdentifier> authorizedDeviceIds = deviceAuthorizationResult.getValidDeviceIDList();
|
|
|
|
|
|
|
|
if (authorizedDeviceIds.size() <= 0) {
|
|
|
|
|
|
|
|
log.warn("User : " + getUser() + " is not authorized to perform operations on given device-list.");
|
|
|
|
|
|
|
|
Activity activity = new Activity();
|
|
|
|
|
|
|
|
//Send the operation statuses only for admin triggered operations
|
|
|
|
|
|
|
|
activity.setActivityStatus(this.getActivityStatus(deviceValidationResult,
|
|
|
|
|
|
|
|
deviceAuthorizationResult));
|
|
|
|
|
|
|
|
return activity;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
boolean isScheduledOperation = this.isTaskScheduledOperation(operation);
|
|
|
|
DeviceIDHolder deviceValidationResult = DeviceManagerUtil.validateDeviceIdentifiers(deviceIds);
|
|
|
|
String initiatedBy = PrivilegedCarbonContext.getThreadLocalCarbonContext().getUsername();
|
|
|
|
List<DeviceIdentifier> validDeviceIds = deviceValidationResult.getValidDeviceIDList();
|
|
|
|
if (initiatedBy == null && isScheduledOperation) {
|
|
|
|
if (!validDeviceIds.isEmpty()) {
|
|
|
|
if (log.isDebugEnabled()) {
|
|
|
|
DeviceIDHolder deviceAuthorizationResult = this.authorizeDevices(operation, validDeviceIds);
|
|
|
|
log.debug("initiatedBy : " + SYSTEM);
|
|
|
|
List<DeviceIdentifier> authorizedDeviceIds = deviceAuthorizationResult.getValidDeviceIDList();
|
|
|
|
}
|
|
|
|
if (authorizedDeviceIds.isEmpty()) {
|
|
|
|
operation.setInitiatedBy(SYSTEM);
|
|
|
|
log.warn("User : " + getUser() + " is not authorized to perform operations on given device-list.");
|
|
|
|
} else {
|
|
|
|
Activity activity = new Activity();
|
|
|
|
if (log.isDebugEnabled()) {
|
|
|
|
//Send the operation statuses only for admin triggered operations
|
|
|
|
log.debug("initiatedBy : " + initiatedBy);
|
|
|
|
activity.setActivityStatus(this.getActivityStatus(deviceValidationResult, deviceAuthorizationResult));
|
|
|
|
}
|
|
|
|
return activity;
|
|
|
|
operation.setInitiatedBy(initiatedBy);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
org.wso2.carbon.device.mgt.core.dto.operation.mgt.Operation operationDto =
|
|
|
|
boolean isScheduledOperation = this.isTaskScheduledOperation(operation);
|
|
|
|
OperationDAOUtil.convertOperation(operation);
|
|
|
|
String initiatedBy = PrivilegedCarbonContext.getThreadLocalCarbonContext().getUsername();
|
|
|
|
String operationCode = operationDto.getCode();
|
|
|
|
if (initiatedBy == null && isScheduledOperation) {
|
|
|
|
Map<Integer, Device> enrolments = new HashMap<>();
|
|
|
|
if (log.isDebugEnabled()) {
|
|
|
|
Device device;
|
|
|
|
log.debug("initiatedBy : " + SYSTEM);
|
|
|
|
for (DeviceIdentifier deviceId : authorizedDeviceIds) {
|
|
|
|
}
|
|
|
|
device = getDevice(deviceId);
|
|
|
|
operation.setInitiatedBy(SYSTEM);
|
|
|
|
enrolments.put(device.getEnrolmentInfo().getId(), device);
|
|
|
|
} else {
|
|
|
|
|
|
|
|
if (log.isDebugEnabled()) {
|
|
|
|
|
|
|
|
log.debug("initiatedBy : " + initiatedBy);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
operation.setInitiatedBy(initiatedBy);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
org.wso2.carbon.device.mgt.core.dto.operation.mgt.Operation operationDto = OperationDAOUtil
|
|
|
|
|
|
|
|
.convertOperation(operation);
|
|
|
|
|
|
|
|
String operationCode = operationDto.getCode();
|
|
|
|
|
|
|
|
Map<Integer, Device> enrolments = new HashMap<>();
|
|
|
|
|
|
|
|
Device device;
|
|
|
|
|
|
|
|
for (DeviceIdentifier deviceId : authorizedDeviceIds) {
|
|
|
|
|
|
|
|
device = getDevice(deviceId);
|
|
|
|
|
|
|
|
enrolments.put(device.getEnrolmentInfo().getId(), device);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
try {
|
|
|
|
OperationManagementDAOFactory.beginTransaction();
|
|
|
|
OperationManagementDAOFactory.beginTransaction();
|
|
|
|
if (operationDto.getControl() ==
|
|
|
|
if (operationDto.getControl()
|
|
|
|
org.wso2.carbon.device.mgt.core.dto.operation.mgt.Operation.Control.NO_REPEAT) {
|
|
|
|
== org.wso2.carbon.device.mgt.core.dto.operation.mgt.Operation.Control.NO_REPEAT) {
|
|
|
|
Map<Integer, Integer> pendingOperationIDs = operationDAO
|
|
|
|
Map<Integer, Integer> pendingOperationIDs = operationDAO
|
|
|
|
.getExistingOperationIDs(enrolments.keySet().toArray(new Integer[0]), operationCode);
|
|
|
|
.getExistingOperationIDs(enrolments.keySet().toArray(new Integer[0]), operationCode);
|
|
|
|
for (Integer enrolmentId : pendingOperationIDs.keySet()) {
|
|
|
|
for (Integer enrolmentId : pendingOperationIDs.keySet()) {
|
|
|
|
@ -227,8 +227,8 @@ public class OperationManagerImpl implements OperationManager {
|
|
|
|
+ operationCode);
|
|
|
|
+ operationCode);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Activity activity = new Activity();
|
|
|
|
Activity activity = new Activity();
|
|
|
|
activity.setActivityStatus(this.getActivityStatus(deviceValidationResult,
|
|
|
|
activity.setActivityStatus(
|
|
|
|
deviceAuthorizationResult));
|
|
|
|
this.getActivityStatus(deviceValidationResult, deviceAuthorizationResult));
|
|
|
|
return activity;
|
|
|
|
return activity;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -242,20 +242,20 @@ public class OperationManagerImpl implements OperationManager {
|
|
|
|
activity.setType(Activity.Type.valueOf(operationDto.getType().toString()));
|
|
|
|
activity.setType(Activity.Type.valueOf(operationDto.getType().toString()));
|
|
|
|
//For now set the operation statuses only for admin triggered operations
|
|
|
|
//For now set the operation statuses only for admin triggered operations
|
|
|
|
if (!isScheduledOperation) {
|
|
|
|
if (!isScheduledOperation) {
|
|
|
|
activity.setActivityStatus(this.getActivityStatus(deviceValidationResult,
|
|
|
|
activity.setActivityStatus(
|
|
|
|
deviceAuthorizationResult));
|
|
|
|
this.getActivityStatus(deviceValidationResult, deviceAuthorizationResult));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return activity;
|
|
|
|
return activity;
|
|
|
|
} else {
|
|
|
|
} catch (OperationManagementDAOException e) {
|
|
|
|
throw new InvalidDeviceException("Invalid device Identifiers found.");
|
|
|
|
OperationManagementDAOFactory.rollbackTransaction();
|
|
|
|
|
|
|
|
throw new OperationManagementException("Error occurred while adding operation", e);
|
|
|
|
|
|
|
|
} catch (TransactionManagementException e) {
|
|
|
|
|
|
|
|
throw new OperationManagementException("Error occurred while initiating the transaction", e);
|
|
|
|
|
|
|
|
} finally {
|
|
|
|
|
|
|
|
OperationManagementDAOFactory.closeConnection();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} catch (OperationManagementDAOException e) {
|
|
|
|
} else {
|
|
|
|
OperationManagementDAOFactory.rollbackTransaction();
|
|
|
|
throw new InvalidDeviceException("Invalid device Identifiers found.");
|
|
|
|
throw new OperationManagementException("Error occurred while adding operation", e);
|
|
|
|
|
|
|
|
} catch (TransactionManagementException e) {
|
|
|
|
|
|
|
|
throw new OperationManagementException("Error occurred while initiating the transaction", e);
|
|
|
|
|
|
|
|
} finally {
|
|
|
|
|
|
|
|
OperationManagementDAOFactory.closeConnection();
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
Dharmakeerthi Lasantha
4 years ago