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.

Sign up for GitHub

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

Explicitly specify charset, don't rely on default charset #491

Merged
merged 1 commit into from
Jun 23, 2021
Merged

Explicitly specify charset, don't rely on default charset #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions auth0/src/main/java/com/auth0/android/authentication/storage/CryptoUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

import java.io.IOException;
import java.math.BigInteger;
import java.nio.charset.StandardCharsets;
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
import java.security.KeyPairGenerator;
Expand Down Expand Up @@ -367,7 +368,7 @@ byte[] getAESKey() throws IncompatibleDeviceException, CryptoException {
byte[] aes = keyGen.generateKey().getEncoded();
//Save encrypted encoded version
byte[] encryptedAES = RSAEncrypt(aes);
String encodedEncryptedAESText = new String(Base64.encode(encryptedAES, Base64.DEFAULT));
String encodedEncryptedAESText = new String(Base64.encode(encryptedAES, Base64.DEFAULT), StandardCharsets.UTF_8);
storage.store(KEY_ALIAS, encodedEncryptedAESText);
return aes;
} catch (NoSuchAlgorithmException e) {
Expand Down Expand Up @@ -453,7 +454,7 @@ public byte[] encrypt(byte[] decryptedInput) throws CryptoException, Incompatibl
byte[] encrypted = cipher.doFinal(decryptedInput);
byte[] encodedIV = Base64.encode(cipher.getIV(), Base64.DEFAULT);
//Save IV for Decrypt stage
storage.store(KEY_IV_ALIAS, new String(encodedIV));
storage.store(KEY_IV_ALIAS, new String(encodedIV, StandardCharsets.UTF_8));
return encrypted;
} catch (NoSuchAlgorithmException | NoSuchPaddingException | InvalidKeyException e) {
/*
Expand Down
4 changes: 2 additions & 2 deletions auth0/src/main/java/com/auth0/android/provider/AsymmetricSignatureVerifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.security.PublicKey;
Expand Down Expand Up @@ -39,7 +39,7 @@ class AsymmetricSignatureVerifier extends SignatureVerifier {
@Override
protected void checkSignature(@NonNull String[] tokenParts) throws TokenValidationException {
String content = tokenParts[0] + "." + tokenParts[1];
byte[] contentBytes = content.getBytes(Charset.defaultCharset());
byte[] contentBytes = content.getBytes(StandardCharsets.UTF_8);
boolean valid = false;
try {
byte[] signatureBytes = Base64.decode(tokenParts[2], Base64.URL_SAFE | Base64.NO_WRAP);
Expand Down
4 changes: 2 additions & 2 deletions auth0/src/main/java/com/auth0/android/request/internal/BaseRequest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import com.auth0.android.Auth0Exception
import com.auth0.android.callback.Callback
import com.auth0.android.request.*
import java.io.IOException
import java.nio.charset.Charset
import java.nio.charset.StandardCharsets

/**
* Base class for every request on this library.
Expand Down Expand Up @@ -93,7 +93,7 @@ internal open class BaseRequest<T, U : Auth0Exception>(
throw error
}

val reader = AwareInputStreamReader(response.body, Charset.defaultCharset())
val reader = AwareInputStreamReader(response.body, StandardCharsets.UTF_8)
if (response.isSuccess()) {
//2. Successful scenario. Response of type T
val result: T = resultAdapter.fromJson(reader)
Expand Down
4 changes: 2 additions & 2 deletions auth0/src/test/java/com/auth0/android/provider/JwtTestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ static PrivateKey getPrivateKey() throws Exception {
dis.readFully(keyBytes);
dis.close();

String temp = new String(keyBytes);
String temp = new String(keyBytes, StandardCharsets.UTF_8);
String privKeyPEM = temp.replace("-----BEGIN PRIVATE KEY-----\n", "");
privKeyPEM = privKeyPEM.replace("-----END PRIVATE KEY-----", "");

Expand All @@ -146,7 +146,7 @@ static PublicKey getPublicKey() throws Exception {
dis.readFully(keyBytes);
dis.close();

String temp = new String(keyBytes);
String temp = new String(keyBytes, StandardCharsets.UTF_8);
String pubKeyPEM = temp.replace("-----BEGIN PUBLIC KEY-----\n", "");
pubKeyPEM = pubKeyPEM.replace("-----END PUBLIC KEY-----", "");

Expand Down