android-apps-mirrors/Aegis
0
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-06-28 19:59:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fall back to default values in the FreeOTP importer

Browse source
This commit is contained in:
Alexander Bakker 2025-04-23 15:51:49 +02:00
parent a5dc861336
commit c81e08bf1f
3 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/com/beemdevelopment/aegis/importers/FreeOtpImporter.java
View file

@ -298,8 +298,8 @@ public class FreeOtpImporter extends DatabaseImporter {
private static VaultEntry convertEntry(JSONObject obj) throws DatabaseImporterEntryException { private static VaultEntry convertEntry(JSONObject obj) throws DatabaseImporterEntryException {
try { try {
String type = obj.getString("type").toLowerCase(Locale.ROOT); String type = obj.getString("type").toLowerCase(Locale.ROOT);
String algo = obj.getString("algo"); String algo = obj.optString("algo", OtpInfo.DEFAULT_ALGORITHM);
int digits = obj.getInt("digits"); int digits = obj.optInt("digits", OtpInfo.DEFAULT_DIGITS);
byte[] secret = toBytes(obj.getJSONArray("secret")); byte[] secret = toBytes(obj.getJSONArray("secret"));
String issuer = obj.getString("issuerExt"); String issuer = obj.getString("issuerExt");
@ -308,7 +308,7 @@ public class FreeOtpImporter extends DatabaseImporter {
OtpInfo info; OtpInfo info;
switch (type) { switch (type) {
case "totp": case "totp":
int period = obj.getInt("period"); int period = obj.optInt("period", TotpInfo.DEFAULT_PERIOD);
if (issuer.equals("Steam")) { if (issuer.equals("Steam")) {
info = new SteamInfo(secret, algo, digits, period); info = new SteamInfo(secret, algo, digits, period);
} else { } else {

9
app/src/test/java/com/beemdevelopment/aegis/importers/DatabaseImporterTest.java
View file

@ -257,6 +257,15 @@ public class DatabaseImporterTest {
checkImportedEntries(entries); checkImportedEntries(entries);
} }
@Test
public void testImportFreeOtpV2NullAlgo() throws IOException, DatabaseImporterException, OtpInfoException {
List<VaultEntry> entries = importEncrypted(FreeOtpImporter.class, "freeotp_v2_null_algo.xml", encryptedState -> {
final char[] password = "test".toCharArray();
return ((FreeOtpImporter.EncryptedState) encryptedState).decrypt(password);
});
checkImportedEntries(entries);
}
@Test @Test
public void testImportFreeOtpPlus() throws IOException, DatabaseImporterException, OtpInfoException { public void testImportFreeOtpPlus() throws IOException, DatabaseImporterException, OtpInfoException {
List<VaultEntry> entries = importPlain(FreeOtpPlusImporter.class, "freeotp_plus.json"); List<VaultEntry> entries = importPlain(FreeOtpPlusImporter.class, "freeotp_plus.json");

BIN
app/src/test/resources/com/beemdevelopment/aegis/importers/freeotp_v2_null_algo.xml Normal file
View file

Binary file not shown.