mirror of
https://github.com/bitwarden/server.git
synced 2026-02-03 23:53:19 +08:00
* Adjust email address checking to handle unicode * ASCII only in local part * allow unicode in second-level and top-level domain * Add PunyEncoding/Decoding methods and tests * Use PunyEncoding for outbound email recipients * Use MailKit for punycode, handle edge cases * Punyencode all email addresses in mailServices * Remove punyencoding from HandlebarsMailService * Add to punyencoding tests * Use more inclusive e-mail error * Fix comment wording * Apply StrictEmail checking to emergency access invite * Remove punyDecode helper
49 lines
1.5 KiB
C#
49 lines
1.5 KiB
C#
using System.ComponentModel.DataAnnotations;
|
|
using Bit.Core.Utilities;
|
|
using Bit.Core.Models.Table;
|
|
|
|
namespace Bit.Core.Models.Api.Request
|
|
{
|
|
public class EmergencyAccessInviteRequestModel
|
|
{
|
|
[Required]
|
|
[StrictEmailAddress]
|
|
[StringLength(256)]
|
|
public string Email { get; set; }
|
|
[Required]
|
|
public Enums.EmergencyAccessType? Type { get; set; }
|
|
[Required]
|
|
public int WaitTimeDays { get; set; }
|
|
}
|
|
|
|
public class EmergencyAccessUpdateRequestModel
|
|
{
|
|
[Required]
|
|
public Enums.EmergencyAccessType Type { get; set; }
|
|
[Required]
|
|
public int WaitTimeDays { get; set; }
|
|
public string KeyEncrypted { get; set; }
|
|
|
|
public EmergencyAccess ToEmergencyAccess(EmergencyAccess existingEmergencyAccess)
|
|
{
|
|
// Ensure we only set keys for a confirmed emergency access.
|
|
if (!string.IsNullOrWhiteSpace(existingEmergencyAccess.KeyEncrypted) && !string.IsNullOrWhiteSpace(KeyEncrypted))
|
|
{
|
|
existingEmergencyAccess.KeyEncrypted = KeyEncrypted;
|
|
}
|
|
existingEmergencyAccess.Type = Type;
|
|
existingEmergencyAccess.WaitTimeDays = WaitTimeDays;
|
|
return existingEmergencyAccess;
|
|
}
|
|
}
|
|
|
|
public class EmergencyAccessPasswordRequestModel
|
|
{
|
|
[Required]
|
|
[StringLength(300)]
|
|
public string NewMasterPasswordHash { get; set; }
|
|
[Required]
|
|
public string Key { get; set; }
|
|
}
|
|
}
|