vecna
/
troll-patrol
mirror of https://git-crysp.uwaterloo.ca/vvecna/troll-patrol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Disallow empty country code in negative reports

This commit is contained in:
Vecna 2024-02-21 15:34:29 -05:00
parent 28233ec8a5
commit cc86baa4b5
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/negative_report.rs
View File

@ -12,6 +12,7 @@ pub enum NegativeReportError {
DateInFuture, DateInFuture,
FailedToDeserialize, // couldn't deserialize to SerializableNegativeReport FailedToDeserialize, // couldn't deserialize to SerializableNegativeReport
InvalidCountryCode, InvalidCountryCode,
MissingCountryCode,
} }
/// A report that the user was unable to connect to the bridge /// A report that the user was unable to connect to the bridge
@ -20,7 +21,7 @@ pub struct NegativeReport {
pub fingerprint: [u8; 20], pub fingerprint: [u8; 20],
/// some way to prove knowledge of bridge /// some way to prove knowledge of bridge
bridge_pok: ProofOfBridgeKnowledge, bridge_pok: ProofOfBridgeKnowledge,
/// user's country code, may be an empty string /// user's country code
pub country: String, pub country: String,
/// today's Julian date /// today's Julian date
pub date: u32, pub date: u32,
@ -116,7 +117,10 @@ pub struct SerializableNegativeReport {
impl SerializableNegativeReport { impl SerializableNegativeReport {
pub fn to_report(self) -> Result<NegativeReport, NegativeReportError> { pub fn to_report(self) -> Result<NegativeReport, NegativeReportError> {
if self.country != "" && !COUNTRY_CODES.contains(self.country.as_str()) { if self.country == "" {
return Err(NegativeReportError::MissingCountryCode);
}
if !COUNTRY_CODES.contains(self.country.as_str()) {
return Err(NegativeReportError::InvalidCountryCode); return Err(NegativeReportError::InvalidCountryCode);
} }
if self.date > get_date().into() { if self.date > get_date().into() {