mirror of
				https://github.com/Ylianst/MeshCentral.git
				synced 2025-10-29 23:35:02 -04:00 
			
		
		
		
	forgot duo and push notifications for force2factor #7045
Signed-off-by: si458 <simonsmith5521@gmail.com>
This commit is contained in:
		
							parent
							
								
									45ec199839
								
							
						
					
					
						commit
						a8ed3464e4
					
				| @ -2300,7 +2300,7 @@ | ||||
|             if (idtype == 'devices') { go(2); } | ||||
|             if (idtype == 'files') { | ||||
|                 // Remind the user to add two factor authentication | ||||
|                 if ((features & 0x00040000) && !((userinfo.otpsecret == 1) || (userinfo.otphkeys > 0) || (userinfo.otpkeys > 0) || ((features & 0x00800000) && (userinfo.otpekey == 1)))) { setDialogMode(2, "Account Security", 1, null, "Unable to access this feature until two-factor authentication is enabled. This is required for extra security. Go to the \"My Account\" and look at the \"Account Security\" section."); return; }   | ||||
|                 if ((features & 0x00040000) && !((userinfo.otpsecret == 1) || (userinfo.otphkeys > 0) || (userinfo.otpkeys > 0) || (userinfo.otpduo > 0) || (userinfo.otpdev > 0) || ((features & 0x00800000) && (userinfo.otpekey == 1)))) { setDialogMode(2, "Account Security", 1, null, "Unable to access this feature until two-factor authentication is enabled. This is required for extra security. Go to the \"My Account\" and look at the \"Account Security\" section."); return; }   | ||||
|                 go(5); | ||||
|             } | ||||
|         } | ||||
| @ -2583,7 +2583,7 @@ | ||||
|             if ((userinfo.emailVerified !== true) && (serverinfo.emailcheck == true) && (userinfo.siteadmin != 0xFFFFFFFF)) { setDialogMode(2, "Account Security", 1, null, "Unable to access a device until a email address is verified. This is required for password recovery. Go to the \"My Account\" to change and verify an email address."); return; } | ||||
| 
 | ||||
|             // Remind the user to add two factor authentication | ||||
|             if ((features & 0x00040000) && !((userinfo.otpsecret == 1) || (userinfo.otphkeys > 0) || (userinfo.otpkeys > 0) || ((features & 0x00800000) && (userinfo.otpekey == 1)))) { setDialogMode(2, "Account Security", 1, null, "Unable to access a device until two-factor authentication is enabled. This is required for extra security. Go to the \"My Account\" and look at the \"Account Security\" section."); return; } | ||||
|             if ((features & 0x00040000) && !((userinfo.otpsecret == 1) || (userinfo.otphkeys > 0) || (userinfo.otpkeys > 0) || (userinfo.otpduo > 0) || (userinfo.otpdev > 0) || ((features & 0x00800000) && (userinfo.otpekey == 1)))) { setDialogMode(2, "Account Security", 1, null, "Unable to access a device until two-factor authentication is enabled. This is required for extra security. Go to the \"My Account\" and look at the \"Account Security\" section."); return; } | ||||
| 
 | ||||
|             // We are allowed, let's prompt to information | ||||
|             var x = addHtmlValue("Name", '<input id=dp3meshname style=width:170px maxlength=64 onchange=account_validateMeshCreate() onkeyup=account_validateMeshCreate() />'); | ||||
| @ -2677,7 +2677,7 @@ | ||||
| 
 | ||||
|         function gotoMesh(meshid) { | ||||
|             // Remind the user to add two factor authentication | ||||
|             if ((features & 0x00040000) && !((userinfo.otpsecret == 1) || (userinfo.otphkeys > 0) || (userinfo.otpkeys > 0) || ((features & 0x00800000) && (userinfo.otpekey == 1)))) { setDialogMode(2, "Account Security", 1, null, "Unable to access this feature until two-factor authentication is enabled. This is required for extra security. Go to the \"My Account\" and look at the \"Account Security\" section."); return; }   | ||||
|             if ((features & 0x00040000) && !((userinfo.otpsecret == 1) || (userinfo.otphkeys > 0) || (userinfo.otpkeys > 0) || (userinfo.otpduo > 0) || (userinfo.otpdev > 0) || ((features & 0x00800000) && (userinfo.otpekey == 1)))) { setDialogMode(2, "Account Security", 1, null, "Unable to access this feature until two-factor authentication is enabled. This is required for extra security. Go to the \"My Account\" and look at the \"Account Security\" section."); return; }   | ||||
|             currentMesh = meshes[meshid]; | ||||
|             if (currentMesh == null) { goBack(); } | ||||
|             p20updateMesh(); | ||||
| @ -3681,7 +3681,7 @@ | ||||
|             if ((userinfo.emailVerified !== true) && (serverinfo.emailcheck == true) && (userinfo.siteadmin != 0xFFFFFFFF)) { setDialogMode(2, "Account Security", 1, null, "Unable to access a device until a email address is verified. This is required for password recovery. Go to the \"My Account\" to change and verify an email address."); return; } | ||||
| 
 | ||||
|             // Remind the user to add two factor authentication | ||||
|             if ((features & 0x00040000) && !((userinfo.otpsecret == 1) || (userinfo.otphkeys > 0) || (userinfo.otpkeys > 0) || ((features & 0x00800000) && (userinfo.otpekey == 1)))) { setDialogMode(2, "Account Security", 1, null, "Unable to access a device until two-factor authentication is enabled. This is required for extra security. Go to the \"My Account\" and look at the \"Account Security\" section."); return; } | ||||
|             if ((features & 0x00040000) && !((userinfo.otpsecret == 1) || (userinfo.otphkeys > 0) || (userinfo.otpkeys > 0) || (userinfo.otpduo > 0) || (userinfo.otpdev > 0) || ((features & 0x00800000) && (userinfo.otpekey == 1)))) { setDialogMode(2, "Account Security", 1, null, "Unable to access a device until two-factor authentication is enabled. This is required for extra security. Go to the \"My Account\" and look at the \"Account Security\" section."); return; } | ||||
| 
 | ||||
|             var node = getNodeFromId(nodeid); | ||||
|             if (node == null) { goBack(); return; } | ||||
|  | ||||
| @ -2368,6 +2368,8 @@ | ||||
|             if (userinfo == null) return -1; | ||||
|             var authFactorCount = 0; | ||||
|             if (userinfo.otpsecret == 1) { authFactorCount++; } // Authenticator time factor | ||||
|             if (userinfo.otpduo == 1) { authFactorCount++; } // Duo factor | ||||
|             if (userinfo.otpdev == 1) { authFactorCount++; } // Push authentication factor | ||||
|             if (userinfo.otphkeys > 0) { authFactorCount += userinfo.otphkeys; } // FIDO hardware factor | ||||
|             if ((features & 0x00800000) && (userinfo.otpekey == 1)) { authFactorCount++; } // EMail factor | ||||
|             if ((features & 0x02000000) && (features & 0x04000000) && (userinfo.phone != null)) { authFactorCount++; } // SMS factor | ||||
|  | ||||
| @ -2818,6 +2818,8 @@ | ||||
|             if (userinfo == null) return -1; | ||||
|             var authFactorCount = 0; | ||||
|             if (userinfo.otpsecret == 1) { authFactorCount++; } // Authenticator time factor | ||||
|             if (userinfo.otpduo == 1) { authFactorCount++; } // Duo factor | ||||
|             if (userinfo.otpdev == 1) { authFactorCount++; } // Push authentication factor | ||||
|             if (userinfo.otphkeys > 0) { authFactorCount += userinfo.otphkeys; } // FIDO hardware factor | ||||
|             if ((features & 0x00800000) && (userinfo.otpekey == 1)) { authFactorCount++; } // EMail factor | ||||
|             if ((features & 0x02000000) && (features & 0x04000000) && (userinfo.phone != null)) { authFactorCount++; } // SMS factor | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user