midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-5381 System users cannot revoke MFA trusted devices in GardenWorld (FHCA-3824) (#1438)

This commit is contained in:
Carlos Ruiz 2022-08-12 11:13:54 +02:00 committed by GitHub
parent c88e6487f1
commit bc9808eb14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
org.adempiere.base/src/org/compiere/process/MFARevokeDevice.java
View File

@ -32,6 +32,7 @@ import java.util.List;
import java.util.logging.Level; import java.util.logging.Level;
import org.compiere.model.MMFARegisteredDevice; import org.compiere.model.MMFARegisteredDevice;
import org.compiere.model.PO;
import org.compiere.model.Query; import org.compiere.model.Query;
import org.compiere.util.Env; import org.compiere.util.Env;
@ -75,20 +76,25 @@ public class MFARevokeDevice extends SvrProcess {
String where; String where;
List<Object> params = new ArrayList<Object>(); List<Object> params = new ArrayList<Object>();
params.add(Env.getAD_User_ID(getCtx())); params.add(Env.getAD_User_ID(getCtx()));
params.add(getAD_Client_ID());
if (p_MFARevokeAll) { if (p_MFARevokeAll) {
where = "AD_User_ID=?"; where = "AD_User_ID=? AND AD_Client_ID IN (0,?)";
} else { } else {
where = "AD_User_ID=? AND (MFA_RegisteredDevice_ID=? OR Expiration<=SYSDATE)"; where = "AD_User_ID=? AND AD_Client_ID IN (0,?) AND (MFA_RegisteredDevice_ID=? OR Expiration<=SYSDATE)";
params.add(p_MFA_RegisteredDevice_ID); params.add(p_MFA_RegisteredDevice_ID);
} }
List<MMFARegisteredDevice> rds = new Query(getCtx(), MMFARegisteredDevice.Table_Name, where, get_TrxName()) List<MMFARegisteredDevice> rds = new Query(getCtx(), MMFARegisteredDevice.Table_Name, where, get_TrxName())
.setOnlyActiveRecords(true) .setOnlyActiveRecords(true)
.setClient_ID()
.setParameters(params) .setParameters(params)
.list(); .list();
for (MMFARegisteredDevice rd : rds) { for (MMFARegisteredDevice rd : rds) {
rd.setIsActive(false); rd.setIsActive(false);
rd.saveEx(); try {
PO.setCrossTenantSafe();
rd.saveEx();
} finally {
PO.clearCrossTenantSafe();
}
} }
return "@OK@"; return "@OK@";