Harden backend auth, validation and error handling
- Rate limit login (5 attempts/min per IP) with a JSON 429 response - Constant-time password comparison; refuse login if no password is configured - Explicit SameSite=Strict auth cookie; log failed logins with client IP - Stop logging door codes (update log lines and the SMS body) - Replace per-action try/catch -> 400 with a global exception handler (JSON 500) - Return proper statuses: 404 for missing person, 502 for failed lock writes - Validate codes as ASCII digits only (int.TryParse accepted +/-/whitespace) - Validate person name and E.164 phone number; reject sending an unset code - Rename TwiloOptions -> TwilioOptions and fix message typos - Expose Program for integration tests
This commit is contained in:
1 parent
768bcc90e4
commit
d0425c8cb2
38 files changed
+189
-487
No files matched your search
@@ -23,119 +23,87 @@ namespace YaleAccess.Controllers
|
||||
[HttpGet("codes")]
|
||||
public async Task<IActionResult> GetUserCodes()
|
||||
{
|
||||
try
|
||||
// Get the home code first
|
||||
YaleUserCode homeCode = await yaleAccessor.GetCodeInformationAsync(codeOptions.Value.Home);
|
||||
homeCode.IsHome = true;
|
||||
|
||||
// Get the guest codes
|
||||
List<YaleUserCode> guestCodes = new();
|
||||
foreach (int code in Enumerable.Range(codeOptions.Value.GuestCodeRangeStart, codeOptions.Value.GuestCodeRangeCount))
|
||||
{
|
||||
// Get the home code first
|
||||
YaleUserCode homeCode = await yaleAccessor.GetCodeInformationAsync(codeOptions.Value.Home);
|
||||
homeCode.IsHome = true;
|
||||
|
||||
// Get the guest codes
|
||||
List<YaleUserCode> guestCodes = new();
|
||||
foreach (int code in Enumerable.Range(codeOptions.Value.GuestCodeRangeStart, codeOptions.Value.GuestCodeRangeCount))
|
||||
{
|
||||
guestCodes.Add(await yaleAccessor.GetCodeInformationAsync(code));
|
||||
}
|
||||
|
||||
// Add the home code to the list
|
||||
guestCodes.Add(homeCode);
|
||||
|
||||
// Return the codes
|
||||
return Ok(new ApiResponse(guestCodes));
|
||||
}
|
||||
catch(Exception ex)
|
||||
{
|
||||
logger.LogError(ex, "An error occurred retriving the codes.");
|
||||
return BadRequest(new ApiResponse("An error occurred retriving the codes."));
|
||||
guestCodes.Add(await yaleAccessor.GetCodeInformationAsync(code));
|
||||
}
|
||||
|
||||
// Add the home code to the list
|
||||
guestCodes.Add(homeCode);
|
||||
|
||||
// Return the codes
|
||||
return Ok(new ApiResponse(guestCodes));
|
||||
}
|
||||
|
||||
[HttpPost("code/{id}")]
|
||||
public async Task<IActionResult> SetUserCode([FromRoute] int id, [FromBody] string newCode)
|
||||
{
|
||||
try
|
||||
// First validate the user code
|
||||
string validCode = YaleAccessor.ValidateCode(newCode);
|
||||
if (validCode != string.Empty)
|
||||
{
|
||||
// First validate the user code
|
||||
string validCode = YaleAccessor.ValidateCode(newCode);
|
||||
if (validCode != string.Empty)
|
||||
{
|
||||
return BadRequest(new ApiResponse(validCode));
|
||||
}
|
||||
|
||||
// Set the new code
|
||||
bool result = await yaleAccessor.SetUserCode(id, newCode);
|
||||
|
||||
// Return the result
|
||||
if (result)
|
||||
{
|
||||
logger.LogInformation("Updated code for user {id} to {code}", id, newCode);
|
||||
return Ok(new ApiResponse(true));
|
||||
}
|
||||
else
|
||||
{
|
||||
logger.LogInformation("Failed to update code for user {id} to {code}", id, newCode);
|
||||
return BadRequest(new ApiResponse("An error occurred setting the code."));
|
||||
}
|
||||
return BadRequest(new ApiResponse(validCode));
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
||||
// Set the new code (the code itself is never logged)
|
||||
bool result = await yaleAccessor.SetUserCode(id, newCode);
|
||||
|
||||
if (!result)
|
||||
{
|
||||
logger.LogError(ex, "An error occurred setting the code.");
|
||||
return BadRequest(new ApiResponse("An error occurred setting the code."));
|
||||
logger.LogWarning("Failed to update code for user {Id}", id);
|
||||
return StatusCode(StatusCodes.Status502BadGateway, new ApiResponse("An error occurred setting the code."));
|
||||
}
|
||||
|
||||
logger.LogInformation("Updated code for user {Id}", id);
|
||||
return Ok(new ApiResponse(true));
|
||||
}
|
||||
|
||||
[HttpPost("code/{id}/status")]
|
||||
public async Task<IActionResult> SetUserCodeStatusAsAvailable([FromRoute] int id)
|
||||
{
|
||||
try
|
||||
// First validate the user code
|
||||
string validCode = YaleAccessor.ValidateClearCode(id, codeOptions.Value.Home);
|
||||
if (validCode != string.Empty)
|
||||
{
|
||||
// First validate the user code
|
||||
string validCode = YaleAccessor.ValidateClearCode(id, codeOptions.Value.Home);
|
||||
if (validCode != string.Empty)
|
||||
{
|
||||
return BadRequest(new ApiResponse(validCode));
|
||||
}
|
||||
|
||||
// Set the available status
|
||||
bool result = await yaleAccessor.SetCodeAsAvailable(id);
|
||||
|
||||
// Return the result
|
||||
if (result)
|
||||
{
|
||||
logger.LogInformation("Updated code status for user {id} to available", id);
|
||||
return Ok(new ApiResponse(true));
|
||||
}
|
||||
else
|
||||
{
|
||||
logger.LogInformation("Failed to update code status for user {id} to available", id);
|
||||
return BadRequest(new ApiResponse("An error occurred setting the code status."));
|
||||
}
|
||||
return BadRequest(new ApiResponse(validCode));
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
||||
// Set the available status
|
||||
bool result = await yaleAccessor.SetCodeAsAvailable(id);
|
||||
|
||||
if (!result)
|
||||
{
|
||||
logger.LogError(ex, "An error occurred setting the code status.");
|
||||
return BadRequest(new ApiResponse("An error occurred setting the code status."));
|
||||
logger.LogWarning("Failed to update code status for user {Id} to available", id);
|
||||
return StatusCode(StatusCodes.Status502BadGateway, new ApiResponse("An error occurred setting the code status."));
|
||||
}
|
||||
|
||||
logger.LogInformation("Updated code status for user {Id} to available", id);
|
||||
return Ok(new ApiResponse(true));
|
||||
}
|
||||
|
||||
[HttpPost("code/{id}/send")]
|
||||
public async Task<IActionResult> SendUserCode([FromRoute] int id, [FromBody] string phoneNumber)
|
||||
{
|
||||
try
|
||||
{
|
||||
// Get the user code
|
||||
YaleUserCode userCode = await yaleAccessor.GetCodeInformationAsync(id);
|
||||
// Get the user code
|
||||
YaleUserCode userCode = await yaleAccessor.GetCodeInformationAsync(id);
|
||||
|
||||
// Send the code via SMS to the phone number
|
||||
await smsService.SendCodeViaSMSAsync(userCode.Code, phoneNumber);
|
||||
|
||||
// Return success
|
||||
return Ok(new ApiResponse(true));
|
||||
}
|
||||
catch (Exception ex)
|
||||
// There is nothing to send if the code isn't set
|
||||
if (string.IsNullOrEmpty(userCode.Code))
|
||||
{
|
||||
logger.LogError(ex, "An error occurred sending the code.");
|
||||
return BadRequest(new ApiResponse("An error occurred sending the code."));
|
||||
return BadRequest(new ApiResponse("This code is not set, so it cannot be sent."));
|
||||
}
|
||||
|
||||
// Send the code via SMS to the phone number
|
||||
await smsService.SendCodeViaSMSAsync(userCode.Code, phoneNumber);
|
||||
|
||||
// Return success
|
||||
return Ok(new ApiResponse(true));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user