#11 fix SASL login failures with non-ASCII passwords
iOS CI / Build and Test SwiftUI App (push) Canceled after 0s
Build Unsigned iOS and macOS Apps / Build Unsigned iOS IPA (push) Canceled after 0s
Build Unsigned iOS and macOS Apps / Build macOS ZIP (push) Canceled after 0s

- Normalize SCRAM passwords with RFC 4013 SASLprep before the
  challenge response, so they match SASLprep-compliant servers
  (Martin hashes raw UTF-8) and PLAIN still sends the password
  untouched.
- Capture the raw <failure/> condition with LumaSaslFailureModule and
  map SASL errors to actionable Russian messages instead of the
  cryptic OS-localized "Martin.SaslError, error 5".
- Cover SASLprep and failure message mapping with unit tests and new
  verify.sh invariants.
This commit is contained in:
wt committed 2026-08-29 01:26:03 +07:00
1 parent 2884810ec4
commit fc07855036
13 files changed
+410 -28

No files matched your search

+48
View File
@@ -0,0 +1,48 @@
import XCTest
@testable import Luma
final class SASLprepTests: XCTestCase {
func testASCIIPasswordIsUnchanged() throws {
XCTAssertEqual(try SASLprep.prepare("password123"), "password123")
}
func testCyrillicPasswordIsUnchanged() throws {
XCTAssertEqual(try SASLprep.prepare("пароль123"), "пароль123")
}
func testNonASCIISpacesMapToSpace() throws {
XCTAssertEqual(try SASLprep.prepare("a\u{00A0}b"), "a b")
XCTAssertEqual(try SASLprep.prepare("a\u{202F}b"), "a b")
}
func testMappedToNothingCharactersAreRemoved() throws {
XCTAssertEqual(try SASLprep.prepare("a\u{00AD}b"), "ab")
XCTAssertEqual(try SASLprep.prepare("a\u{FE00}b"), "ab")
}
func testZeroWidthSpaceMapsToSpacePerRFC4013() throws {
// RFC 4013 C.1.2 maps U+200B to SPACE, overriding RFC 3454 B.1.
XCTAssertEqual(try SASLprep.prepare("a\u{200B}b"), "a b")
}
func testFullwidthAndCompatibilityFormsAreNormalized() throws {
XCTAssertEqual(try SASLprep.prepare("ABC"), "ABC")
XCTAssertEqual(try SASLprep.prepare("①"), "1")
}
func testDecomposedAccentIsComposed() throws {
XCTAssertEqual(try SASLprep.prepare("e\u{0301}"), "é")
}
func testMixedPassword() throws {
XCTAssertEqual(try SASLprep.prepare("Пароль\u{00A0}①"), "Пароль 1")
}
func testProhibitedCharactersThrow() {
XCTAssertThrowsError(try SASLprep.prepare("a\u{0007}b"))
XCTAssertThrowsError(try SASLprep.prepare("a\u{007F}b"))
XCTAssertThrowsError(try SASLprep.prepare("a\u{FFFE}b"))
XCTAssertThrowsError(try SASLprep.prepare("a\u{202E}b"))
}
}
+48
View File
@@ -0,0 +1,48 @@
import Martin
import XCTest
@testable import Luma
final class SaslFailureMessageTests: XCTestCase {
func testNotAuthorizedProducesActionableMessage() {
let message = SaslFailureMessage.describe(
error: SaslError.not_authorized, condition: nil, serverText: nil)
XCTAssertEqual(
message,
"Сервер отклонил имя пользователя или пароль. Проверьте JID и пароль.")
}
func testServerTextWinsOverCondition() {
let message = SaslFailureMessage.describe(
error: SaslError.not_authorized,
condition: "not-authorized",
serverText: "Bad password")
XCTAssertEqual(message, "Сервер отклонил вход: Bad password")
}
func testAccountDisabledIsExplained() {
let message = SaslFailureMessage.describe(
error: SaslError.not_authorized,
condition: "account-disabled",
serverText: nil)
XCTAssertEqual(
message,
"Аккаунт отключён на сервере. Обратитесь к администратору сервера.")
}
func testCredentialsExpiredIsExplained() {
let message = SaslFailureMessage.describe(
error: SaslError.not_authorized,
condition: "credentials-expired",
serverText: nil)
XCTAssertEqual(message, "Срок действия пароля истёк. Обновите пароль на сервере.")
}
func testTemporaryAuthFailureIsExplained() {
let message = SaslFailureMessage.describe(
error: SaslError.temporary_auth_failure, condition: nil, serverText: nil)
XCTAssertEqual(
message,
"Сервер временно не может проверить учётные данные. Попробуйте через минуту.")
}
}