mirror of
https://github.com/permissionlesstech/bitchat.git
synced 2026-08-29 07:27:16 +00:00
5034732515
* Simplify validation, compression heuristics, and notification scheduling * Consolidate notification logic and add InputValidator monitoring Follow-up improvements to address PR feedback: 1. Consolidate notification functions - Add interruptionLevel parameter to sendLocalNotification - Refactor sendNetworkAvailableNotification to use consolidated function - Removes 12 lines of duplicate code 2. Add monitoring to InputValidator - Log control character rejections for production monitoring - Privacy-preserving: logs length + count, not actual content - Uses .security category for proper log routing 3. Add comprehensive InputValidator tests - 28 test cases covering validation, control characters, unicode, edge cases - Ensures behavioral changes are well-tested and documented --------- Co-authored-by: jack <jackjackbits@users.noreply.github.com>
63 lines
2.5 KiB
Swift
63 lines
2.5 KiB
Swift
import Foundation
|
|
import BitLogger
|
|
|
|
/// Comprehensive input validation for BitChat protocol
|
|
/// Prevents injection attacks, buffer overflows, and malformed data
|
|
struct InputValidator {
|
|
|
|
// MARK: - Constants
|
|
|
|
struct Limits {
|
|
static let maxNicknameLength = 50
|
|
// BinaryProtocol caps payload length at UInt16.max (65_535). Leave headroom
|
|
// for headers/padding by limiting user content to 60_000 bytes.
|
|
static let maxMessageLength = 60_000
|
|
}
|
|
|
|
// MARK: - String Content Validation
|
|
|
|
/// Validates and sanitizes user-provided strings used in UI
|
|
///
|
|
/// Rejects strings containing control characters to prevent potential security issues
|
|
/// and UI rendering problems. This strict approach ensures data integrity at input time.
|
|
static func validateUserString(_ string: String, maxLength: Int) -> String? {
|
|
let trimmed = string.trimmingCharacters(in: .whitespacesAndNewlines)
|
|
guard !trimmed.isEmpty else { return nil }
|
|
guard trimmed.count <= maxLength else { return nil }
|
|
|
|
// Reject control characters outright instead of rewriting the string.
|
|
// This prevents injection attacks and ensures consistent UI rendering.
|
|
let controlChars = CharacterSet.controlCharacters
|
|
if !trimmed.unicodeScalars.allSatisfy({ !controlChars.contains($0) }) {
|
|
// Log rejection for monitoring, without exposing actual content for privacy
|
|
let controlCharCount = trimmed.unicodeScalars.filter { controlChars.contains($0) }.count
|
|
SecureLogger.debug(
|
|
"Input validation rejected string (length: \(trimmed.count), control chars: \(controlCharCount))",
|
|
category: .security
|
|
)
|
|
return nil
|
|
}
|
|
|
|
return trimmed
|
|
}
|
|
|
|
/// Validates nickname
|
|
static func validateNickname(_ nickname: String) -> String? {
|
|
return validateUserString(nickname, maxLength: Limits.maxNicknameLength)
|
|
}
|
|
|
|
// MARK: - Protocol Field Validation
|
|
|
|
// Note: Message type validation is performed closer to decoding using
|
|
// MessageType/NoisePayloadType enums; keeping validator free of stale lists.
|
|
|
|
/// Validates timestamp is reasonable (not too far in past or future)
|
|
static func validateTimestamp(_ timestamp: Date) -> Bool {
|
|
let now = Date()
|
|
let oneHourAgo = now.addingTimeInterval(-3600)
|
|
let oneHourFromNow = now.addingTimeInterval(3600)
|
|
return timestamp >= oneHourAgo && timestamp <= oneHourFromNow
|
|
}
|
|
|
|
}
|