Skip to content

fix(totp): allow /totp add when the server name contains a colon #3160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Xephi merged 1 commit into from
Oct 8, 2026
Merged

fix(totp): allow /totp add when the server name contains a colon #3160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions authme-core/src/main/java/fr/xephi/authme/security/totp/TotpAuthenticator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,9 @@ public boolean checkCode(String playerName, String totpKey, String inputCode) {

public TotpGenerationResult generateTotpKey(Player player) {
GoogleAuthenticatorKey credentials = authenticator.createCredentials();
String otpAuthUrl = GoogleAuthenticatorQRGenerator.getOtpAuthTotpURL(
settings.getProperty(PluginSettings.SERVER_NAME), player.getName(), credentials);
// The otpauth label is "issuer:account", so the issuer must not contain a colon
String issuer = settings.getProperty(PluginSettings.SERVER_NAME).replace(':', '-');
String otpAuthUrl = GoogleAuthenticatorQRGenerator.getOtpAuthTotpURL(issuer, player.getName(), credentials);
String qrCodeUrl = "https://api.qrserver.com/v1/create-qr-code/?data="
+ URLEncoder.encode(otpAuthUrl, StandardCharsets.UTF_8)
+ "&size=200x200&ecc=M&margin=10";
Expand Down
22 changes: 22 additions & 0 deletions authme-core/src/test/java/fr/xephi/authme/security/totp/TotpAuthenticatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;

import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;

import static fr.xephi.authme.AuthMeMatchers.stringWithLength;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
Expand Down Expand Up @@ -69,6 +72,25 @@ void shouldGenerateTotpKey() {
assertThat(key1.getTotpKey(), not(equalTo(key2.getTotpKey())));
}

@Test
void shouldGenerateTotpKeyForServerNameWithColon() {
// given
totpAuthenticator = new TotpAuthenticator(settings);

Player player = mock(Player.class);
given(player.getName()).willReturn("Bobby");
given(settings.getProperty(PluginSettings.SERVER_NAME)).willReturn("UT:Rebirth");

// when
TotpGenerationResult key = totpAuthenticator.generateTotpKey(player);

// then
assertThat(key.getTotpKey(), stringWithLength(32));
assertThat(key.getAuthenticatorQrCodeUrl(), containsString(URLEncoder.encode(
"otpauth://totp/UT-Rebirth:Bobby?secret=" + key.getTotpKey() + "&issuer=UT-Rebirth&",
StandardCharsets.UTF_8)));
}

@Test
void shouldCheckCodeAndDeclareItValidOnlyOnce() {
// given
Expand Down