opensource/graylog2-server
1
0
Fork 0
mirror of https://github.com/Graylog2/graylog2-server.git synced 2026-03-13 09:32:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

OTR Reencryption and Key Storage refactoring for password change (#15668)

Browse Source 
* OTR Reencryption and Key Storage refactoring for password change

* Wrong password was used in reencryption. Fixed.
This commit is contained in:
luk-kaminski
2023-06-02 14:07:54 +02:00
committed by GitHub
parent a88e38066d
commit ea4804b874
13 changed files with 244 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
data-node/src/test/java/org/graylog/datanode/configuration/TruststoreCreatorTest.java
View File

@@ -24,7 +24,9 @@ import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder;
import org.bouncycastle.operator.ContentSigner;
import org.bouncycastle.operator.OperatorCreationException;
import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
import org.graylog.security.certutil.keystore.storage.KeystoreContentMover;
import org.graylog.security.certutil.keystore.storage.KeystoreFileStorage;
import org.graylog.security.certutil.keystore.storage.location.KeystoreFileLocation;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
@@ -47,6 +49,7 @@ import static org.graylog.security.certutil.CertConstants.KEY_GENERATION_ALGORIT
import static org.graylog.security.certutil.CertConstants.SIGNING_ALGORITHM;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
public class TruststoreCreatorTest {
@@ -73,8 +76,8 @@ public class TruststoreCreatorTest {
assertTrue(trustStoreFile.toFile().exists());
KeystoreFileStorage keystoreFileStorage = new KeystoreFileStorage();
final Optional<KeyStore> keyStoreOptional = keystoreFileStorage.readKeyStore(trustStoreFile, truststorePassword);
KeystoreFileStorage keystoreFileStorage = new KeystoreFileStorage(mock(KeystoreContentMover.class));
final Optional<KeyStore> keyStoreOptional = keystoreFileStorage.readKeyStore(new KeystoreFileLocation(trustStoreFile), truststorePassword);
assertTrue(keyStoreOptional.isPresent());