Browse Source

Fixes: #1101 - Fixed ModelValidators and validation methods (#1242)

* Extend StringLength attributes for emails to 256 char

* Modified validations to check email lengths > 256
pull/1244/head
Daniel James Smith 5 years ago committed by GitHub
parent
commit
e6902179f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      src/Core/Models/Api/Public/Request/MemberCreateRequestModel.cs
  2. 2
      src/Core/Models/Api/Public/Request/OrganizationImportRequestModel.cs
  3. 2
      src/Core/Models/Api/Request/Accounts/DeleteRecoverRequestModel.cs
  4. 2
      src/Core/Models/Api/Request/Accounts/EmailRequestModel.cs
  5. 2
      src/Core/Models/Api/Request/Accounts/EmailTokenRequestModel.cs
  6. 2
      src/Core/Models/Api/Request/Accounts/PasswordHintRequestModel.cs
  7. 2
      src/Core/Models/Api/Request/Accounts/PreloginRequestModel.cs
  8. 2
      src/Core/Models/Api/Request/Accounts/RegisterRequestModel.cs
  9. 2
      src/Core/Models/Api/Request/EmergencyAccessRequstModels.cs
  10. 2
      src/Core/Models/Api/Request/InstallationRequestModel.cs
  11. 2
      src/Core/Models/Api/Request/Organizations/ImportOrganizationUsersRequestModel.cs
  12. 2
      src/Core/Models/Api/Request/Organizations/OrganizationCreateRequestModel.cs
  13. 2
      src/Core/Models/Api/Request/Organizations/OrganizationUpdateRequestModel.cs
  14. 4
      src/Core/Models/Api/Request/Organizations/OrganizationUserRequestModels.cs
  15. 2
      src/Core/Models/Api/Request/TwoFactorRequestModels.cs

4
src/Core/Models/Api/Public/Request/MemberCreateRequestModel.cs

@ -27,9 +27,9 @@ namespace Bit.Core.Models.Api.Public @@ -27,9 +27,9 @@ namespace Bit.Core.Models.Api.Public
yield return new ValidationResult($"Email is not valid.",
new string[] { nameof(Email) });
}
else if (Email.Length > 50)
else if (Email.Length > 256)
{
yield return new ValidationResult($"Email is longer than 50 characters.",
yield return new ValidationResult($"Email is longer than 256 characters.",
new string[] { nameof(Email) });
}
}

2
src/Core/Models/Api/Public/Request/OrganizationImportRequestModel.cs

@ -66,7 +66,7 @@ namespace Bit.Core.Models.Api.Public @@ -66,7 +66,7 @@ namespace Bit.Core.Models.Api.Public
/// </summary>
/// <example>jsmith@example.com</example>
[EmailAddress]
[StringLength(50)]
[StringLength(256)]
public string Email { get; set; }
/// <summary>
/// External identifier for reference or linking this member to another system, such as a user directory.

2
src/Core/Models/Api/Request/Accounts/DeleteRecoverRequestModel.cs

@ -6,7 +6,7 @@ namespace Bit.Core.Models.Api @@ -6,7 +6,7 @@ namespace Bit.Core.Models.Api
{
[Required]
[EmailAddress]
[StringLength(50)]
[StringLength(256)]
public string Email { get; set; }
}
}

2
src/Core/Models/Api/Request/Accounts/EmailRequestModel.cs

@ -7,7 +7,7 @@ namespace Bit.Core.Models.Api @@ -7,7 +7,7 @@ namespace Bit.Core.Models.Api
{
[Required]
[EmailAddress]
[StringLength(50)]
[StringLength(256)]
public string NewEmail { get; set; }
[Required]
[StringLength(300)]

2
src/Core/Models/Api/Request/Accounts/EmailTokenRequestModel.cs

@ -6,7 +6,7 @@ namespace Bit.Core.Models.Api @@ -6,7 +6,7 @@ namespace Bit.Core.Models.Api
{
[Required]
[EmailAddress]
[StringLength(50)]
[StringLength(256)]
public string NewEmail { get; set; }
[Required]
[StringLength(300)]

2
src/Core/Models/Api/Request/Accounts/PasswordHintRequestModel.cs

@ -6,7 +6,7 @@ namespace Bit.Core.Models.Api @@ -6,7 +6,7 @@ namespace Bit.Core.Models.Api
{
[Required]
[EmailAddress]
[StringLength(50)]
[StringLength(256)]
public string Email { get; set; }
}
}

2
src/Core/Models/Api/Request/Accounts/PreloginRequestModel.cs

@ -7,7 +7,7 @@ namespace Bit.Core.Models.Api @@ -7,7 +7,7 @@ namespace Bit.Core.Models.Api
{
[Required]
[EmailAddress]
[StringLength(50)]
[StringLength(256)]
public string Email { get; set; }
}
}

2
src/Core/Models/Api/Request/Accounts/RegisterRequestModel.cs

@ -14,7 +14,7 @@ namespace Bit.Core.Models.Api @@ -14,7 +14,7 @@ namespace Bit.Core.Models.Api
public string Name { get; set; }
[Required]
[EmailAddress]
[StringLength(50)]
[StringLength(256)]
public string Email { get; set; }
[Required]
[StringLength(1000)]

2
src/Core/Models/Api/Request/EmergencyAccessRequstModels.cs

@ -7,7 +7,7 @@ namespace Bit.Core.Models.Api.Request @@ -7,7 +7,7 @@ namespace Bit.Core.Models.Api.Request
{
[Required]
[EmailAddress]
[StringLength(50)]
[StringLength(256)]
public string Email { get; set; }
[Required]
public Enums.EmergencyAccessType? Type { get; set; }

2
src/Core/Models/Api/Request/InstallationRequestModel.cs

@ -7,7 +7,7 @@ namespace Bit.Core.Models.Api @@ -7,7 +7,7 @@ namespace Bit.Core.Models.Api
{
[Required]
[EmailAddress]
[StringLength(50)]
[StringLength(256)]
public string Email { get; set; }
public Installation ToInstallation()

2
src/Core/Models/Api/Request/Organizations/ImportOrganizationUsersRequestModel.cs

@ -42,7 +42,7 @@ namespace Bit.Core.Models.Api @@ -42,7 +42,7 @@ namespace Bit.Core.Models.Api
public class User : IValidatableObject
{
[EmailAddress]
[StringLength(50)]
[StringLength(256)]
public string Email { get; set; }
public bool Deleted { get; set; }
[Required]

2
src/Core/Models/Api/Request/Organizations/OrganizationCreateRequestModel.cs

@ -15,7 +15,7 @@ namespace Bit.Core.Models.Api @@ -15,7 +15,7 @@ namespace Bit.Core.Models.Api
[StringLength(50)]
public string BusinessName { get; set; }
[Required]
[StringLength(50)]
[StringLength(256)]
[EmailAddress]
public string BillingEmail { get; set; }
public PlanType PlanType { get; set; }

2
src/Core/Models/Api/Request/Organizations/OrganizationUpdateRequestModel.cs

@ -16,7 +16,7 @@ namespace Bit.Core.Models.Api @@ -16,7 +16,7 @@ namespace Bit.Core.Models.Api
public string Identifier { get; set; }
[EmailAddress]
[Required]
[StringLength(50)]
[StringLength(256)]
public string BillingEmail { get; set; }
public Permissions Permissions { get; set; }

4
src/Core/Models/Api/Request/Organizations/OrganizationUserRequestModels.cs

@ -38,9 +38,9 @@ namespace Bit.Core.Models.Api @@ -38,9 +38,9 @@ namespace Bit.Core.Models.Api
yield return new ValidationResult($"Email #{i + 1} is not valid.",
new string[] { nameof(Emails) });
}
else if (email.Length > 50)
else if (email.Length > 256)
{
yield return new ValidationResult($"Email #{i + 1} is longer than 50 characters.",
yield return new ValidationResult($"Email #{i + 1} is longer than 256 characters.",
new string[] { nameof(Emails) });
}
}

2
src/Core/Models/Api/Request/TwoFactorRequestModels.cs

@ -199,7 +199,7 @@ namespace Bit.Core.Models.Api @@ -199,7 +199,7 @@ namespace Bit.Core.Models.Api
{
[Required]
[EmailAddress]
[StringLength(50)]
[StringLength(256)]
public string Email { get; set; }
public User ToUser(User extistingUser)

Loading…
Cancel
Save