MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update formatting and resolve warnings/suggestions

This commit is contained in:
Jon Chambers 2023-06-12 15:55:01 -04:00 committed by Jon Chambers
parent 861dc0d021
commit 45be85c5ef
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
service/src/main/java/org/whispersystems/textsecuregcm/auth/TurnTokenGenerator.java
View File

@ -27,21 +27,23 @@ public class TurnTokenGenerator {
private final DynamicConfigurationManager<DynamicConfiguration> dynamicConfiguration; private final DynamicConfigurationManager<DynamicConfiguration> dynamicConfiguration;
private static final String ALGORITHM = "HmacSHA1";
public TurnTokenGenerator(final DynamicConfigurationManager<DynamicConfiguration> config) { public TurnTokenGenerator(final DynamicConfigurationManager<DynamicConfiguration> config) {
this.dynamicConfiguration = config; this.dynamicConfiguration = config;
} }
public TurnToken generate(final String e164) { public TurnToken generate(final String e164) {
try { try {
byte[] key = dynamicConfiguration.getConfiguration().getTurnConfiguration().getSecret().getBytes(); final byte[] key = dynamicConfiguration.getConfiguration().getTurnConfiguration().getSecret().getBytes();
List<String> urls = urls(e164); final List<String> urls = urls(e164);
Mac mac = Mac.getInstance("HmacSHA1"); final Mac mac = Mac.getInstance(ALGORITHM);
long validUntilSeconds = (System.currentTimeMillis() + TimeUnit.DAYS.toMillis(1)) / 1000; final long validUntilSeconds = (System.currentTimeMillis() + TimeUnit.DAYS.toMillis(1)) / 1000;
long user = Util.ensureNonNegativeInt(new SecureRandom().nextInt()); final long user = Util.ensureNonNegativeInt(new SecureRandom().nextInt());
String userTime = validUntilSeconds + ":" + user; final String userTime = validUntilSeconds + ":" + user;
mac.init(new SecretKeySpec(key, "HmacSHA1")); mac.init(new SecretKeySpec(key, ALGORITHM));
String password = Base64.getEncoder().encodeToString(mac.doFinal(userTime.getBytes())); final String password = Base64.getEncoder().encodeToString(mac.doFinal(userTime.getBytes()));
return new TurnToken(userTime, password, urls); return new TurnToken(userTime, password, urls);
} catch (NoSuchAlgorithmException | InvalidKeyException e) { } catch (NoSuchAlgorithmException | InvalidKeyException e) {
@ -64,6 +66,6 @@ public class TurnTokenGenerator {
return WeightedRandomSelect.select(turnConfig return WeightedRandomSelect.select(turnConfig
.getUriConfigs() .getUriConfigs()
.stream() .stream()
.map(c -> new Pair<List<String>, Long>(c.getUris(), c.getWeight())).toList()); .map(c -> new Pair<>(c.getUris(), c.getWeight())).toList());
} }
} }