Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Optmise cipher and logs #210

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Added ability to provide custom/user-specific cipher via Supplier<Cip…
…her>

enhanced logs - dont create corresponding arrays in case when log is disabled
  • Loading branch information
troshanin committed Feb 13, 2024
commit ba03902baa77e1393684fdfc7d46970578ac0bd2
78 changes: 67 additions & 11 deletions src/main/java/nl/martijndwars/webpush/HttpEce.java
Original file line number Diff line number Diff line change
@@ -13,8 +13,9 @@
import java.security.*;
import java.util.Arrays;
import java.util.Base64;
import java.util.HashMap;
import java.util.Collections;
import java.util.Map;
import java.util.function.Supplier;

import static java.nio.charset.StandardCharsets.UTF_8;
import static javax.crypto.Cipher.DECRYPT_MODE;
@@ -39,17 +40,65 @@ public class HttpEce {
public static final int TAG_SIZE = 16;
public static final int TWO_BYTE_MAX = 65_536;
public static final String WEB_PUSH_INFO = "WebPush: info\0";
public static final String ECE_KEYLOG_PROP = "ECE_KEYLOG";
private static final boolean LOG_ENABLED = "1".equals(System.getenv(ECE_KEYLOG_PROP)) || "1".equals(System.getProperty(ECE_KEYLOG_PROP));
public static final Supplier<Cipher> DEFAULT_CIPHER_SUPPLIER = HttpEce::createCipher;
public static final ThreadLocal<Cipher> THREAD_LOCAL_CIPHER = ThreadLocal.withInitial(DEFAULT_CIPHER_SUPPLIER);
public static final Supplier<Cipher> THREAD_LOCAL_CIPHER_SUPPLIER = HttpEce::getThreadLocalCipher;

private Map<String, KeyPair> keys;
private Map<String, String> labels;
private final Map<String, KeyPair> keys;
private final Map<String, String> labels;
private final Supplier<Cipher> cipherSupplier;

public HttpEce() {
this(new HashMap<String, KeyPair>(), new HashMap<String, String>());
this(Collections.emptyMap(), Collections.emptyMap());
}

public HttpEce(Map<String, KeyPair> keys, Map<String, String> labels) {
this(keys, labels, DEFAULT_CIPHER_SUPPLIER);
}

public HttpEce(Map<String, KeyPair> keys, Map<String, String> labels, Supplier<Cipher> cipherSupplier) {
this.keys = keys;
this.labels = labels;
this.cipherSupplier = cipherSupplier;

}

public static HttpEce createWithDefaultCipher() {
return createWithDefaultCipher(Collections.emptyMap(), Collections.emptyMap());
}

public static HttpEce createWithDefaultCipher(Map<String, KeyPair> keys, Map<String, String> labels) {
return createWithCipher(keys, labels, DEFAULT_CIPHER_SUPPLIER);
}

public static HttpEce createWithThreadLocalCipher() {
return createWithThreadLocalCipher(Collections.emptyMap(), Collections.emptyMap());
}

public static HttpEce createWithThreadLocalCipher(Map<String, KeyPair> keys, Map<String, String> labels) {
return createWithCipher(keys, labels, THREAD_LOCAL_CIPHER_SUPPLIER);
}

public static HttpEce createWithCipher(Supplier<Cipher> cipherSupplier) {
return createWithCipher(Collections.emptyMap(), Collections.emptyMap(), cipherSupplier);
}

public static HttpEce createWithCipher(Map<String, KeyPair> keys, Map<String, String> labels, Supplier<Cipher> cipherSupplier) {
return new HttpEce(keys, labels, cipherSupplier);
}

private static Cipher getThreadLocalCipher() {
return THREAD_LOCAL_CIPHER.get();
}

private static Cipher createCipher() {
try {
return Cipher.getInstance("AES/GCM/NoPadding", "BC");
} catch (GeneralSecurityException e) {
throw new RuntimeException(e);
}
}

/**
@@ -73,7 +122,7 @@ public byte[] encrypt(byte[] plaintext, byte[] salt, byte[] privateKey, String k
byte[] nonce = keyAndNonce[1];

// Note: Cipher adds the tag to the end of the ciphertext
Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding", "BC");
Cipher cipher = cipherSupplier.get();
GCMParameterSpec params = new GCMParameterSpec(TAG_SIZE * 8, nonce);
cipher.init(ENCRYPT_MODE, new SecretKeySpec(key, "AES"), params);

@@ -86,9 +135,11 @@ public byte[] encrypt(byte[] plaintext, byte[] salt, byte[] privateKey, String k
log("padding", padding);

byte[][] encrypted = {cipher.update(plaintext), cipher.update(padding), cipher.doFinal()};
log("encrypted", concat(encrypted));
log("encrypted", () -> concat(encrypted));

return log("ciphertext", concat(header, concat(encrypted)));
byte[] result = concat(header, concat(encrypted));
log("ciphertext", result);
return result;
} else {
return concat(cipher.update(new byte[2]), cipher.doFinal(plaintext));
}
@@ -138,7 +189,7 @@ public byte[][] parseHeader(byte[] payload) {
}

public byte[] decryptRecord(byte[] ciphertext, byte[] key, byte[] nonce, Encoding version) throws NoSuchPaddingException, NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException, InvalidKeyException, BadPaddingException, IllegalBlockSizeException {
Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding", "BC");
Cipher cipher = cipherSupplier.get();
GCMParameterSpec params = new GCMParameterSpec(TAG_SIZE * 8, nonce);
cipher.init(DECRYPT_MODE, new SecretKeySpec(key, "AES"), params);

@@ -437,10 +488,15 @@ private static byte[] intToBytes(int number) {
* @return
*/
private static byte[] log(String info, byte[] array) {
if ("1".equals(System.getenv("ECE_KEYLOG"))) {
log(info, () -> array);
return array;
}

private static void log(String info, Supplier<byte[]> arraySupplier) {
if (LOG_ENABLED) {
byte [] array = arraySupplier.get();
System.out.println(info + " [" + array.length + "]: " + Base64.getUrlEncoder().withoutPadding().encodeToString(array));
}

return array;
}

}