luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-04-19 21:39:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make subclasses of TotpInfo override only getOtp(long time)

Browse source 
This fixes an issue where Steam OTP's were displayed in the wrong
format. The underlying issue has been present for a while, but it first
became apparent in e4c9a584f4.
This commit is contained in:
Alexander Bakker 2024-11-17 10:39:33 +01:00
parent 6d8eec0e21
commit 843e5f1ab5
6 changed files with 9 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/beemdevelopment/aegis/crypto/otp/YAOTP.java
View file

@ -25,10 +25,10 @@ public class YAOTP {
public static YAOTP generateOTP(byte[] secret, String pin, int digits, String otpAlgo, long period)
throws NoSuchAlgorithmException, InvalidKeyException, IOException {
long seconds = System.currentTimeMillis() / 1000;
return generateOTP(secret, pin, digits, otpAlgo, seconds, period);
return generateOTP(secret, pin, digits, otpAlgo, period, seconds);
}
public static YAOTP generateOTP(byte[] secret, String pin, int digits, String otpAlgo, long seconds, long period)
public static YAOTP generateOTP(byte[] secret, String pin, int digits, String otpAlgo, long period, long seconds)
throws NoSuchAlgorithmException, InvalidKeyException, IOException {
byte[] pinWithHash;
byte[] pinBytes = pin.getBytes(StandardCharsets.UTF_8);

14
app/src/main/java/com/beemdevelopment/aegis/otp/MotpInfo.java
View file

@ -30,20 +30,6 @@ public class MotpInfo extends TotpInfo {
setPin(pin);
}
@Override
public String getOtp() {
if (_pin == null) {
throw new IllegalStateException("PIN must be set before generating an OTP");
}
try {
MOTP otp = MOTP.generateOTP(getSecret(), getAlgorithm(false), getDigits(), getPeriod(), getPin());
return otp.toString();
} catch (NoSuchAlgorithmException e) {
throw new RuntimeException(e);
}
}
@Override
public String getOtp(long time) {
if (_pin == null) {

4
app/src/main/java/com/beemdevelopment/aegis/otp/SteamInfo.java
View file

@ -20,11 +20,11 @@ public class SteamInfo extends TotpInfo {
}
@Override
public String getOtp() throws OtpInfoException {
public String getOtp(long time) throws OtpInfoException {
checkSecret();
try {
OTP otp = TOTP.generateOTP(getSecret(), getAlgorithm(true), getDigits(), getPeriod());
OTP otp = TOTP.generateOTP(getSecret(), getAlgorithm(true), getDigits(), getPeriod(), time);
return otp.toSteamString();
} catch (InvalidKeyException | NoSuchAlgorithmException e) {
throw new RuntimeException(e);

9
app/src/main/java/com/beemdevelopment/aegis/otp/TotpInfo.java
View file

@ -27,14 +27,7 @@ public class TotpInfo extends OtpInfo {
@Override
public String getOtp() throws OtpInfoException {
checkSecret();
try {
OTP otp = TOTP.generateOTP(getSecret(), getAlgorithm(true), getDigits(), getPeriod());
return otp.toString();
} catch (InvalidKeyException | NoSuchAlgorithmException e) {
throw new RuntimeException(e);
}
return getOtp(System.currentTimeMillis() / 1000);
}
public String getOtp(long time) throws OtpInfoException {

4
app/src/main/java/com/beemdevelopment/aegis/otp/YandexInfo.java
View file

@ -38,13 +38,13 @@ public class YandexInfo extends TotpInfo {
}
@Override
public String getOtp() {
public String getOtp(long time) {
if (_pin == null) {
throw new IllegalStateException("PIN must be set before generating an OTP");
}
try {
YAOTP otp = YAOTP.generateOTP(getSecret(), getPin(), getDigits(), getAlgorithm(true), getPeriod());
YAOTP otp = YAOTP.generateOTP(getSecret(), getPin(), getDigits(), getAlgorithm(true), getPeriod(), time);
return otp.toString();
} catch (InvalidKeyException | NoSuchAlgorithmException | IOException e) {
throw new RuntimeException(e);

4
app/src/test/java/com/beemdevelopment/aegis/crypto/otp/YAOTPTest.java
View file

@ -32,8 +32,8 @@ public class YAOTPTest {
testCase.pin,
8,
"HmacSHA256",
testCase.timestamp,
30
30,
testCase.timestamp
);
assertEquals(testCase.expected, otp.toString());
}