imgfloat/server
1
0
Fork 0
mirror of https://github.com/imgfloat/server.git synced 2026-02-05 03:39:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix auth tests

Browse Source
This commit is contained in:
Andreas Krühlmann
2026-01-12 17:40:07 +01:00
parent 8a76ab2fb9
commit 68e3a29268
4 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/dev/kruhlmann/imgfloat/config/OAuth2AuthorizedClientPersistenceConfig.java
View File

@@ -2,6 +2,7 @@ package dev.kruhlmann.imgfloat.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
import org.springframework.jdbc.core.JdbcOperations;
import org.springframework.security.oauth2.client.OAuth2AuthorizedClientService;
import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
@@ -14,9 +15,14 @@ public class OAuth2AuthorizedClientPersistenceConfig {
@Bean
OAuth2AuthorizedClientService oauth2AuthorizedClientService(
JdbcOperations jdbcOperations,
ClientRegistrationRepository clientRegistrationRepository
ClientRegistrationRepository clientRegistrationRepository,
Environment environment
) {
return new SQLiteOAuth2AuthorizedClientService(jdbcOperations, clientRegistrationRepository);
return new SQLiteOAuth2AuthorizedClientService(
jdbcOperations,
clientRegistrationRepository,
OAuthTokenCipher.fromEnvironment(environment)
);
}
@Bean

23
src/main/java/dev/kruhlmann/imgfloat/config/OAuthTokenCipher.java
View File

@@ -12,6 +12,7 @@ import javax.crypto.spec.GCMParameterSpec;
import javax.crypto.spec.SecretKeySpec;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.env.Environment;
public class OAuthTokenCipher {
@@ -52,6 +53,28 @@ public class OAuthTokenCipher {
return new OAuthTokenCipher(primaryKey, keys);
}
public static OAuthTokenCipher fromEnvironment(Environment environment) {
String base64Key = environment.getProperty(KEY_ENV);
if (base64Key == null || base64Key.isBlank()) {
throw new IllegalStateException(KEY_ENV + " is required to encrypt OAuth tokens");
}
SecretKey primaryKey = decodeKey(base64Key, KEY_ENV);
List<SecretKey> keys = new ArrayList<>();
keys.add(primaryKey);
String previousKeys = environment.getProperty(PREVIOUS_KEYS_ENV);
if (previousKeys != null && !previousKeys.isBlank()) {
for (String value : previousKeys.split(",")) {
String trimmed = value.trim();
if (!trimmed.isEmpty()) {
keys.add(decodeKey(trimmed, PREVIOUS_KEYS_ENV));
}
}
}
return new OAuthTokenCipher(primaryKey, keys);
}
public String encrypt(String plaintext) {
if (plaintext == null) {
return null;

2
src/test/java/dev/kruhlmann/imgfloat/ChannelApiIntegrationTest.java
View File

@@ -29,6 +29,8 @@ import org.springframework.test.web.servlet.MockMvc;
properties = {
"spring.security.oauth2.client.registration.twitch.client-id=test-client-id",
"spring.security.oauth2.client.registration.twitch.client-secret=test-client-secret",
"spring.datasource.url=jdbc:sqlite:target/test-${random.uuid}.db",
"IMGFLOAT_TOKEN_ENCRYPTION_KEY=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=",
}
)
@AutoConfigureMockMvc

2
src/test/java/dev/kruhlmann/imgfloat/ChannelDirectoryApiIntegrationTest.java
View File

@@ -18,6 +18,8 @@ import org.springframework.test.web.servlet.MockMvc;
properties = {
"spring.security.oauth2.client.registration.twitch.client-id=test-client-id",
"spring.security.oauth2.client.registration.twitch.client-secret=test-client-secret",
"spring.datasource.url=jdbc:sqlite:target/test-${random.uuid}.db",
"IMGFLOAT_TOKEN_ENCRYPTION_KEY=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=",
}
)
@AutoConfigureMockMvc