fix: bad message in case of account disabled #1027

rejetto · rejetto · commit 2f5c6214fd8e · 2025-07-02T00:20:26.000+02:00
diff --git a/src/api.auth.ts b/src/api.auth.ts
@@ -1,6 +1,8 @@
 // This file is part of HFS - Copyright 2021-2023, Massimo Melina <a@rejetto.com> - License https://www.gnu.org/licenses/gpl-3.0.txt
 
-import { Account, accountCanLogin, changeSrpHelper, expandUsername, getAccount, getFromAccount } from './perm'
+import {
+    Account, accountCanLogin, accountIsDisabled, changeSrpHelper, expandUsername, getAccount, getFromAccount
+} from './perm'
 import { ApiError, ApiHandler } from './apiMiddleware'
 import { SRPServerSessionStep1 } from 'tssrp6a'
 import {
@@ -47,7 +49,7 @@ export const loginSrp1: ApiHandler = async ({ username }, ctx) => {
     if (!account || !accountCanLogin(account)) { // TODO simulate fake account to prevent knowing valid usernames
         ctx.logExtra({ u: username })
         ctx.state.dontLog = false // log even if log_api is false
-        return new ApiError(HTTP_UNAUTHORIZED)
+        return new ApiError(HTTP_UNAUTHORIZED, account && accountIsDisabled(account) ? 'Account disabled' : undefined)
     }
     if (failAllowNet(ctx, account))
         return new ApiError(HTTP_UNAUTHORIZED)
diff --git a/src/langs/hfs-lang-ar.json b/src/langs/hfs-lang-ar.json
@@ -189,6 +189,7 @@
         "Yes": "نعم",
         "No":  "لا",
         "esc_again": "انقر على ESC ثانية لاغلاق",
-        "insufficient storage": "مساحة تخزين غير كافية"
+        "insufficient storage": "مساحة تخزين غير كافية",
+        "Account disabled": "تم تعطيل الحساب"
     }
 }
diff --git a/src/langs/hfs-lang-bg.json b/src/langs/hfs-lang-bg.json
@@ -182,11 +182,12 @@
     "creation": "създаване",
     "required_change_password": "Трябва да смените паролата си",
     "Wildcards": "Заместващи символи",
-    "Considering resume": "Разглеждане на възобновяване",
+    "Considering resume": "Проверка за възобновяване на качването",
 
     "Yes": "Да",
     "No": "Не",
     "esc_again": "Натиснете ESC два пъти за затваряне",
-    "insufficient storage": "недостатъчно пространство"
+    "insufficient storage": "недостатъчно пространство",
+    "Account disabled": "Акаунтът е деактивиран"
   }
 }
diff --git a/src/langs/hfs-lang-de.json b/src/langs/hfs-lang-de.json
@@ -179,6 +179,7 @@
         "Yes": "Ja",
         "No":  "Nein",
         "esc_again": "Drucken Sie ESC zwei Mal, um das Fenster zu schließen.",
-        "insufficient storage": "nicht genügend Speicherplatz"
+        "insufficient storage": "nicht genügend Speicherplatz",
+        "Account disabled": "Konto deaktiviert"
     }
 }
diff --git a/src/langs/hfs-lang-el.json b/src/langs/hfs-lang-el.json
@@ -190,6 +190,7 @@
         "Yes": "Ναι",
         "No":  "Οχι",
         "esc_again": "Πατήστε ESC δυο φορές για να κλειστειτε",
-        "insufficient storage": "ανεπαρκής χώρος αποθήκευσης"
+        "insufficient storage": "ανεπαρκής χώρος αποθήκευσης",
+        "Account disabled": "Ο λογαριασμός έχει απενεργοποιηθεί"
     }
 }
diff --git a/src/langs/hfs-lang-en.json b/src/langs/hfs-lang-en.json
@@ -188,6 +188,7 @@
         "Yes": "Yes",
         "No":  "No",
         "esc_again": "Press ESC twice to close",
-        "insufficient storage": "insufficient storage"
+        "insufficient storage": "insufficient storage",
+        "Account disabled": "Account disabled"
     }
 }
diff --git a/src/langs/hfs-lang-es.json b/src/langs/hfs-lang-es.json
@@ -193,6 +193,7 @@
         "Yes": "Si",
         "No":  "No",
         "esc_again": "Presione ESC dos veces para cerrar",
-        "insufficient storage": "almacenamiento insuficiente"
+        "insufficient storage": "almacenamiento insuficiente",
+        "Account disabled": "Cuenta deshabilitada"
     }
 }
diff --git a/src/langs/hfs-lang-fi.json b/src/langs/hfs-lang-fi.json
@@ -193,6 +193,7 @@
         "Yes": "Kyllä",
         "No":  "Ei",
         "esc_again": "Paina ESC kahdesti sulkeaksesi",
-        "insufficient storage": "riittämätön tallennustila"
+        "insufficient storage": "riittämätön tallennustila",
+        "Account disabled": "Tili on poistettu käytöstä"
     }
 }
diff --git a/src/langs/hfs-lang-fr.json b/src/langs/hfs-lang-fr.json
@@ -193,6 +193,7 @@
 		"Yes": "Oui",
 		"No":  "Non",
 		"esc_again": "Appuyez ESC deux fois pour fermer",
-		"insufficient storage": "espace insuffisant"
+		"insufficient storage": "espace insuffisant",
+		"Account disabled": "Compte désactivé"
 	}
 }
diff --git a/src/langs/hfs-lang-hu.json b/src/langs/hfs-lang-hu.json
@@ -194,6 +194,7 @@
         "Yes": "Igen",
         "No":  "Nem",
         "esc_again": "ESC megadva 2 alkalommal",
-        "insufficient storage": "elégtelen tárhely"
+        "insufficient storage": "elégtelen tárhely",
+        "Account disabled": "A fiók deaktiválva"
     }
 }
diff --git a/src/langs/hfs-lang-it.json b/src/langs/hfs-lang-it.json
@@ -180,6 +180,7 @@
         "Yes": "Sì",
         "No":  "No",
         "esc_again": "Premi ESC due volte per chiudere",
-        "insufficient storage": "spazio insufficiente"
+        "insufficient storage": "spazio insufficiente",
+        "Account disabled": "Account disattivato"
     }
 }
diff --git a/src/langs/hfs-lang-ja.json b/src/langs/hfs-lang-ja.json
@@ -189,6 +189,7 @@
         "Yes": "はい",
         "No":  "いいえ",
         "esc_again": "ESCを2回押して閉じます",
-        "insufficient storage": "ストレージ容量不足"
+        "insufficient storage": "ストレージ容量不足",
+        "Account disabled": "アカウントは無効です"
     }
 }
diff --git a/src/langs/hfs-lang-ko.json b/src/langs/hfs-lang-ko.json
@@ -189,6 +189,7 @@
         "Yes": "영",
         "No":  "안",
         "esc_again": "ESC 두번 페스하기",
-        "insufficient storage": "저장 공간 부족"
+        "insufficient storage": "저장 공간 부족",
+        "Account disabled": "계정이 비활성화되었습니다"
     }
 }
diff --git a/src/langs/hfs-lang-lt.json b/src/langs/hfs-lang-lt.json
@@ -188,6 +188,7 @@
         "Yes": "Taip",
         "No":  "Ne",
         "esc_again": "Paspauskite ESC du kartus, kad uždarytumėte",
-        "insufficient storage": "nepakanka vietos"
+        "insufficient storage": "nepakanka vietos",
+        "Account disabled": "Paskyra išjungta"
     }
 }
diff --git a/src/langs/hfs-lang-ms.json b/src/langs/hfs-lang-ms.json
@@ -150,6 +150,7 @@
         "Yes": "Ya",
         "No":  "Tidak",
         "esc_again": "Tekan ESC dua kali untuk menutup",
-        "insufficient storage": "ruang storan tidak mencukupi"
+        "insufficient storage": "ruang storan tidak mencukupi",
+        "Account disabled": "Akaun dinyahdayakan"
     }
 }
diff --git a/src/langs/hfs-lang-nl.json b/src/langs/hfs-lang-nl.json
@@ -188,6 +188,7 @@
         "Yes": "Ja",
         "No":  "Nee",
         "esc_again": "Druk ESC twee keer om te sluiten",
-        "insufficient storage": "onvoldoende opslagruimte"
+        "insufficient storage": "onvoldoende opslagruimte",
+        "Account disabled": "Account uitgeschakeld"
 	}
 }
diff --git a/src/langs/hfs-lang-pl.json b/src/langs/hfs-lang-pl.json
@@ -188,6 +188,7 @@
         "Yes": "Tak",
         "No":  "Nie",
         "esc_again": "Naciśnij ESC dwukrotnie do zamkniecia",
-        "insufficient storage": "za mało miejsca"
+        "insufficient storage": "za mało miejsca",
+        "Account disabled": "Konto wyłączone"
     }
 }
diff --git a/src/langs/hfs-lang-pt-br.json b/src/langs/hfs-lang-pt-br.json
@@ -188,6 +188,7 @@
         "Yes": "Sim",
         "No":  "Nao",
         "esc_again": "Pressione ESC duas vezes para fechar",
-        "insufficient storage": "armazenamento insuficiente"
+        "insufficient storage": "armazenamento insuficiente",
+        "Account disabled": "Conta foi desativada"
     }
 }
diff --git a/src/langs/hfs-lang-ro.json b/src/langs/hfs-lang-ro.json
@@ -189,6 +189,7 @@
         "Yes": "Da",
         "No":  "Nu",
         "esc_again": "Apasa ESC de doua ori pentru a inchide",
-        "insufficient storage": "spațiu de stocare insuficient"
+        "insufficient storage": "spațiu de stocare insuficient",
+        "Account disabled": "Cont dezactivat"
     }
 }
diff --git a/src/langs/hfs-lang-ru.json b/src/langs/hfs-lang-ru.json
@@ -192,6 +192,7 @@
         "Yes": "Да",
         "No":  "Нет",
         "esc_again": "Нажмите ESC дважды для закрытия",
-        "insufficient storage": "недостаточно места"
+        "insufficient storage": "недостаточно места",
+        "Account disabled": "Учетная запись отключена"
     }
 }
diff --git a/src/langs/hfs-lang-sr.json b/src/langs/hfs-lang-sr.json
@@ -189,6 +189,7 @@
         "Yes": "Да",
         "No":  "Не",
         "esc_again": "Пritisnite ESC два пута за затварање",
-        "insufficient storage": "недовољно простора"
+        "insufficient storage": "недовољно простора",
+        "Account disabled": "Налог је деактивиран"
     } 
 }
diff --git a/src/langs/hfs-lang-th.json b/src/langs/hfs-lang-th.json
@@ -189,6 +189,7 @@
         "Yes": "ใช่",
         "No":  "ไม่",
         "esc_again": "กด ESC สองครั้งเพื่อปิด",
-        "insufficient storage": "พื้นที่จัดเก็บไม่เพียงพอ"
+        "insufficient storage": "พื้นที่จัดเก็บไม่เพียงพอ",
+        "Account disabled": "บัญชีถูกปิดใช้งานแล้ว"
     }
 }
diff --git a/src/langs/hfs-lang-tr.json b/src/langs/hfs-lang-tr.json
@@ -189,6 +189,7 @@
         "Yes": "Evet",
         "No":  "Hayır",
         "esc_again": "ESC'i iki kere basarak kapat",
-        "insufficient storage": "yetersiz depolama alanı"
+        "insufficient storage": "yetersiz depolama alanı",
+        "Account disabled": "Hesap devre dışı bırakıldı"
     }
 }
diff --git a/src/langs/hfs-lang-uk.json b/src/langs/hfs-lang-uk.json
@@ -183,6 +183,7 @@
         "Yes": "Так",
         "No":  "Ні",
         "esc_again": "Натисніть ESC два рази для закриття",
-        "insufficient storage": "недостатньо місця"
+        "insufficient storage": "недостатньо місця",
+        "Account disabled": "Обліковий запис вимкнено"
     }
 }
diff --git a/src/langs/hfs-lang-vi.json b/src/langs/hfs-lang-vi.json
@@ -194,6 +194,7 @@
         "Yes": "Có",
         "No":  "Không",
         "esc_again": "Nhấn ESC hai lần để đóng",
-        "insufficient storage": "không đủ dung lượng"
+        "insufficient storage": "không đủ dung lượng",
+        "Account disabled": "Tài khoản đã bị vô hiệu hóa"
     }
 }
diff --git a/src/langs/hfs-lang-zh-tw.json b/src/langs/hfs-lang-zh-tw.json
@@ -189,6 +189,7 @@
         "Yes": "是",
         "No":  "否",
         "esc_again": "按 ESC 兩次關閉",
-        "insufficient storage": "儲存空間不足"
+        "insufficient storage": "儲存空間不足",
+        "Account disabled": "帳戶已停用"
     }
 }
diff --git a/src/langs/hfs-lang-zh.json b/src/langs/hfs-lang-zh.json
@@ -193,6 +193,7 @@
         "Yes": "是",
         "No":  "否",
         "esc_again": "按 ESC 两次关闭",
-        "insufficient storage": "存储空间不足"
+        "insufficient storage": "存储空间不足",
+        "Account disabled": "账户已禁用"
     }
 }
diff --git a/src/perm.ts b/src/perm.ts
@@ -195,14 +195,14 @@ export function accountHasPassword(account: Account) {
 }
 
 export function accountCanLogin(account: Account) {
-    return (accountHasPassword(account) || account.plugin?.auth) && !allDisabled(account)
+    return (accountHasPassword(account) || account.plugin?.auth) && !accountIsDisabled(account)
 }
 
-function allDisabled(account: Account): boolean {
+export function accountIsDisabled(account: Account): boolean {
     return Boolean(account.disabled
         || account.expire as any < Date.now()
         || account.belongs?.length // don't every() on empty array, as it returns true
-        && account.belongs.map(u => getAccount(u, false)).every(a => a && allDisabled(a)) )
+        && account.belongs.map(u => getAccount(u, false)).every(a => a && accountIsDisabled(a)) )
 }
 
 export function accountCanLoginAdmin(account: Account) {

Original file line number	Diff line number	Diff line change
`@@ -189,6 +189,7 @@`
`189`	`189`	`"Yes": "نعم",`
`190`	`190`	`"No": "لا",`
`191`	`191`	`"esc_again": "انقر على ESC ثانية لاغلاق",`
`192`		`- "insufficient storage": "مساحة تخزين غير كافية"`
	`192`	`+ "insufficient storage": "مساحة تخزين غير كافية",`
	`193`	`+ "Account disabled": "تم تعطيل الحساب"`
`193`	`194`	`}`
`194`	`195`	`}`
Original file line number	Diff line number	Diff line change
`@@ -182,11 +182,12 @@`
`182`	`182`	`"creation": "създаване",`
`183`	`183`	`"required_change_password": "Трябва да смените паролата си",`
`184`	`184`	`"Wildcards": "Заместващи символи",`
`185`		`- "Considering resume": "Разглеждане на възобновяване",`
	`185`	`+ "Considering resume": "Проверка за възобновяване на качването",`
`186`	`186`
`187`	`187`	`"Yes": "Да",`
`188`	`188`	`"No": "Не",`
`189`	`189`	`"esc_again": "Натиснете ESC два пъти за затваряне",`
`190`		`- "insufficient storage": "недостатъчно пространство"`
	`190`	`+ "insufficient storage": "недостатъчно пространство",`
	`191`	`+ "Account disabled": "Акаунтът е деактивиран"`
`191`	`192`	`}`
`192`	`193`	`}`
Original file line number	Diff line number	Diff line change
`@@ -179,6 +179,7 @@`
`179`	`179`	`"Yes": "Ja",`
`180`	`180`	`"No": "Nein",`
`181`	`181`	`"esc_again": "Drucken Sie ESC zwei Mal, um das Fenster zu schließen.",`
`182`		`- "insufficient storage": "nicht genügend Speicherplatz"`
	`182`	`+ "insufficient storage": "nicht genügend Speicherplatz",`
	`183`	`+ "Account disabled": "Konto deaktiviert"`
`183`	`184`	`}`
`184`	`185`	`}`
Original file line number	Diff line number	Diff line change
`@@ -190,6 +190,7 @@`
`190`	`190`	`"Yes": "Ναι",`
`191`	`191`	`"No": "Οχι",`
`192`	`192`	`"esc_again": "Πατήστε ESC δυο φορές για να κλειστειτε",`
`193`		`- "insufficient storage": "ανεπαρκής χώρος αποθήκευσης"`
	`193`	`+ "insufficient storage": "ανεπαρκής χώρος αποθήκευσης",`
	`194`	`+ "Account disabled": "Ο λογαριασμός έχει απενεργοποιηθεί"`
`194`	`195`	`}`
`195`	`196`	`}`
Original file line number	Diff line number	Diff line change
`@@ -188,6 +188,7 @@`
`188`	`188`	`"Yes": "Yes",`
`189`	`189`	`"No": "No",`
`190`	`190`	`"esc_again": "Press ESC twice to close",`
`191`		`- "insufficient storage": "insufficient storage"`
	`191`	`+ "insufficient storage": "insufficient storage",`
	`192`	`+ "Account disabled": "Account disabled"`
`192`	`193`	`}`
`193`	`194`	`}`
Original file line number	Diff line number	Diff line change
`@@ -193,6 +193,7 @@`
`193`	`193`	`"Yes": "Si",`
`194`	`194`	`"No": "No",`
`195`	`195`	`"esc_again": "Presione ESC dos veces para cerrar",`
`196`		`- "insufficient storage": "almacenamiento insuficiente"`
	`196`	`+ "insufficient storage": "almacenamiento insuficiente",`
	`197`	`+ "Account disabled": "Cuenta deshabilitada"`
`197`	`198`	`}`
`198`	`199`	`}`
Original file line number	Diff line number	Diff line change
`@@ -194,6 +194,7 @@`
`194`	`194`	`"Yes": "Igen",`
`195`	`195`	`"No": "Nem",`
`196`	`196`	`"esc_again": "ESC megadva 2 alkalommal",`
`197`		`- "insufficient storage": "elégtelen tárhely"`
	`197`	`+ "insufficient storage": "elégtelen tárhely",`
	`198`	`+ "Account disabled": "A fiók deaktiválva"`
`198`	`199`	`}`
`199`	`200`	`}`