SpringCloud/spring-cloud-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: transmit data from spring cloud config server controller to getEncryptor (#2253)

Browse Source 
Fixes gh-2252
This commit is contained in:
Antoine
2023-05-05 02:08:33 +02:00
committed by GitHub
parent 0075653f80
commit 66724a978d
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/EncryptionController.java
View File

@@ -103,12 +103,12 @@ public class EncryptionController {
@PostMapping("/encrypt/{name}/{profiles}")
public String encrypt(@PathVariable String name, @PathVariable String profiles, @RequestBody String data,
@RequestHeader("Content-Type") MediaType type) {
TextEncryptor encryptor = getEncryptor(name, profiles, "");
validateEncryptionWeakness(encryptor);
String input = stripFormData(data, type, false);
TextEncryptor encryptor = getEncryptor(name, profiles, input);
validateEncryptionWeakness(encryptor);
Map<String, String> keys = helper.getEncryptorKeys(name, profiles, input);
String textToEncrypt = helper.stripPrefix(input);
String encrypted = helper.addPrefix(keys, encryptorLocator.locate(keys).encrypt(textToEncrypt));
String encrypted = helper.addPrefix(keys, encryptor.encrypt(textToEncrypt));
if (logger.isInfoEnabled()) {
logger.info("Encrypted data");
}
@@ -123,11 +123,10 @@ public class EncryptionController {
@PostMapping("/decrypt/{name}/{profiles}")
public String decrypt(@PathVariable String name, @PathVariable String profiles, @RequestBody String data,
@RequestHeader("Content-Type") MediaType type) {
TextEncryptor encryptor = getEncryptor(name, profiles, "");
checkDecryptionPossible(encryptor);
validateEncryptionWeakness(encryptor);
try {
encryptor = getEncryptor(name, profiles, data);
TextEncryptor encryptor = getEncryptor(name, profiles, data);
checkDecryptionPossible(encryptor);
validateEncryptionWeakness(encryptor);
String input = stripFormData(helper.stripPrefix(data), type, true);
String decrypted = encryptor.decrypt(input);
if (logger.isInfoEnabled()) {

4
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/encryption/EncryptionControllerTests.java
View File

@@ -145,12 +145,14 @@ public class EncryptionControllerTests {
@Override
public TextEncryptor locate(Map<String, String> keys) {
assertThat(keys.containsKey("key")).as("Missing encryptor key").isTrue();
assertThat(keys.get("key")).as("Bad encryptor key value").isEqualTo("value");
return this.encryptor;
}
};
this.controller = new EncryptionController(locator);
// Add space to input
String cipher = this.controller.encrypt("app", "default", "foo bar", MediaType.TEXT_PLAIN);
String cipher = this.controller.encrypt("app", "default", "{key:value}foo bar", MediaType.TEXT_PLAIN);
assertThat(cipher.contains("{name:app}")).as("Wrong cipher: " + cipher).isFalse();
String decrypt = this.controller.decrypt("app", "default", cipher, MediaType.TEXT_PLAIN);
assertThat(decrypt).as("Wrong decrypted plaintext: " + decrypt).isEqualTo("foo bar");