Mirrors/Stirling-PDF
1
0
Fork 0
mirror of https://github.com/Frooodle/Stirling-PDF.git synced 2026-03-04 02:20:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix split display on zoom

Browse Source
This commit is contained in:
Reece Browne
2025-08-25 18:44:34 +01:00
parent 5025e06289
commit d8f34769aa
5 changed files with 66 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/proprietary/src/main/java/stirling/software/proprietary/security/service/KeyPairCleanupService.java
View File

@@ -8,10 +8,6 @@ import java.time.LocalDateTime;
import java.util.List;
import java.util.concurrent.TimeUnit;
<<<<<<< HEAD
import org.springframework.beans.factory.annotation.Autowired;
=======
>>>>>>> origin
import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
@@ -33,10 +29,6 @@ public class KeyPairCleanupService {
private final KeyPersistenceService keyPersistenceService;
private final ApplicationProperties.Security.Jwt jwtProperties;
<<<<<<< HEAD
@Autowired
=======
>>>>>>> origin
public KeyPairCleanupService(
KeyPersistenceService keyPersistenceService,
ApplicationProperties applicationProperties) {

35
app/proprietary/src/main/java/stirling/software/proprietary/security/service/KeyPersistenceService.java
View File

@@ -1,17 +1,11 @@
package stirling.software.proprietary.security.service;
import java.io.IOException;
<<<<<<< HEAD
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
=======
import java.nio.file.DirectoryStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardCopyOption;
>>>>>>> origin
import java.security.KeyFactory;
import java.security.KeyPair;
import java.security.KeyPairGenerator;
@@ -28,10 +22,6 @@ import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
<<<<<<< HEAD
import org.springframework.beans.factory.annotation.Autowired;
=======
>>>>>>> origin
import org.springframework.cache.Cache;
import org.springframework.cache.CacheManager;
import org.springframework.cache.annotation.CacheEvict;
@@ -54,24 +44,10 @@ public class KeyPersistenceService implements KeyPersistenceServiceInterface {
public static final String KEY_SUFFIX = ".key";
private final ApplicationProperties.Security.Jwt jwtProperties;
<<<<<<< HEAD
private final CacheManager cacheManager;
=======
>>>>>>> origin
private final Cache verifyingKeyCache;
private volatile JwtVerificationKey activeKey;
<<<<<<< HEAD
@Autowired
public KeyPersistenceService(
ApplicationProperties applicationProperties, CacheManager cacheManager) {
this.jwtProperties = applicationProperties.getSecurity().getJwt();
this.cacheManager = cacheManager;
this.verifyingKeyCache = cacheManager.getCache("verifyingKeys");
}
=======
public KeyPersistenceService(
ApplicationProperties applicationProperties, CacheManager cacheManager) {
this.jwtProperties = applicationProperties.getSecurity().getJwt();
@@ -106,7 +82,6 @@ public class KeyPersistenceService implements KeyPersistenceServiceInterface {
}
}
>>>>>>> origin
@PostConstruct
public void initializeKeystore() {
if (!isKeystoreEnabled()) {
@@ -114,10 +89,7 @@ public class KeyPersistenceService implements KeyPersistenceServiceInterface {
}
try {
<<<<<<< HEAD
=======
moveKeysToBackup();
>>>>>>> origin
ensurePrivateKeyDirectoryExists();
loadKeyPair();
} catch (Exception e) {
@@ -214,11 +186,7 @@ public class KeyPersistenceService implements KeyPersistenceServiceInterface {
nativeCache.asMap().size());
return nativeCache.asMap().values().stream()
<<<<<<< HEAD
.filter(value -> value instanceof JwtVerificationKey)
=======
.filter(JwtVerificationKey.class::isInstance)
>>>>>>> origin
.map(value -> (JwtVerificationKey) value)
.filter(
key -> {
@@ -292,10 +260,7 @@ public class KeyPersistenceService implements KeyPersistenceServiceInterface {
return Base64.getEncoder().encodeToString(publicKey.getEncoded());
}
<<<<<<< HEAD
=======
@Override
>>>>>>> origin
public PublicKey decodePublicKey(String encodedKey)
throws NoSuchAlgorithmException, InvalidKeySpecException {
byte[] keyBytes = Base64.getDecoder().decode(encodedKey);