Skip to content

Dont rely on default encoding #469

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

Open
zeeshanasghar wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Dont rely on default encoding #469

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 common/src/main/java/org/apache/kylin/common/util/SSHClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.charset.Charset;

import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -89,7 +90,7 @@ public void scpFileToRemote(String localFile, String remoteTargetDirectory) thro
// The access time should be sent here,
// but it is not accessible with JavaAPI ;-<
command += (" " + (_lfile.lastModified() / 1000) + " 0\n");
out.write(command.getBytes());
out.write(command.getBytes(Charset.forName("UTF-8")));
out.flush();
if (checkAck(in) != 0) {
throw new Exception("Error in checkAck()");
Expand Down Expand Up @@ -292,7 +293,7 @@ public SSHClientOutput execCommand(String command, int timeoutSeconds, Logger lo
if (i < 0)
break;

String line = new String(tmp, 0, i);
String line = new String(tmp, 0, i, Charset.forName("UTF-8"));
text.append(line);
if (logAppender != null) {
logAppender.log(line);
Expand Down
6 changes: 4 additions & 2 deletions cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
import java.util.Map.Entry;
import java.util.Set;

import java.nio.charset.Charset;

import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.net.util.Base64;
Expand Down Expand Up @@ -409,8 +411,8 @@ public String calculateSignature() {
StringBuilder sigString = new StringBuilder();
sigString.append(this.name).append("|").append(this.getFactTable()).append("|").append(JsonUtil.writeValueAsString(this.model.getPartitionDesc())).append("|").append(JsonUtil.writeValueAsString(this.dimensions)).append("|").append(JsonUtil.writeValueAsString(this.measures)).append("|").append(JsonUtil.writeValueAsString(this.rowkey)).append("|").append(JsonUtil.writeValueAsString(this.hbaseMapping));

byte[] signature = md.digest(sigString.toString().getBytes());
return new String(Base64.encodeBase64(signature));
byte[] signature = md.digest(sigString.toString().getBytes(Charset.forName("UTF-8")));
return new String(Base64.encodeBase64(signature), Charset.forName("UTF-8"));
} catch (NoSuchAlgorithmException | JsonProcessingException e) {
throw new RuntimeException("Failed to calculate signature");
}
Expand Down
5 changes: 3 additions & 2 deletions cube/src/main/java/org/apache/kylin/cube/model/v1/CubeDesc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

package org.apache.kylin.cube.model.v1;

import java.nio.charset.Charset;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
Expand Down Expand Up @@ -454,8 +455,8 @@ public String calculateSignature() {
StringBuilder sigString = new StringBuilder();
sigString.append(this.name).append("|").append(this.factTable).append("|").append(JsonUtil.writeValueAsString(this.cubePartitionDesc)).append("|").append(JsonUtil.writeValueAsString(this.dimensions)).append("|").append(JsonUtil.writeValueAsString(this.measures)).append("|").append(JsonUtil.writeValueAsString(this.rowkey)).append("|").append(JsonUtil.writeValueAsString(this.hbaseMapping));

byte[] signature = md.digest(sigString.toString().getBytes());
return new String(Base64.encodeBase64(signature));
byte[] signature = md.digest(sigString.toString().getBytes(Charset.forName("UTF-8")));
return new String(Base64.encodeBase64(signature), Charset.forName("UTF-8"));
} catch (NoSuchAlgorithmException e) {
throw new RuntimeException("Failed to calculate signature");
} catch (JsonProcessingException e) {
Expand Down
5 changes: 3 additions & 2 deletions invertedindex/src/main/java/org/apache/kylin/invertedindex/model/IIDesc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

package org.apache.kylin.invertedindex.model;

import java.nio.charset.Charset;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
Expand Down Expand Up @@ -356,8 +357,8 @@ public String calculateSignature() {
StringBuilder sigString = new StringBuilder();
sigString.append(this.name).append("|").append(this.getFactTableName()).append("|").append(timestampDimension).append("|").append(JsonUtil.writeValueAsString(this.bitmapDimensions)).append("|").append(JsonUtil.writeValueAsString(valueDimensions)).append("|").append(JsonUtil.writeValueAsString(this.metricNames)).append("|").append(sharding).append("|").append(sliceSize);

byte[] signature = md.digest(sigString.toString().getBytes());
return new String(Base64.encodeBase64(signature));
byte[] signature = md.digest(sigString.toString().getBytes(Charset.forName("UTF-8")));
return new String(Base64.encodeBase64(signature), Charset.forName("UTF-8"));
} catch (NoSuchAlgorithmException e) {
throw new RuntimeException("Failed to calculate signature");
} catch (JsonProcessingException e) {
Expand Down
3 changes: 2 additions & 1 deletion jdbc/src/main/java/org/apache/kylin/jdbc/KylinConnectionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

package org.apache.kylin.jdbc;

import java.nio.charset.Charset;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
Expand Down Expand Up @@ -99,7 +100,7 @@ public String getBasicAuthHeader() {
String username = this.info.getProperty("user");
String password = this.info.getProperty("password");

return DatatypeConverter.printBase64Binary((username + ":" + password).getBytes());
return DatatypeConverter.printBase64Binary((username + ":" + password).getBytes(Charset.forName("UTF-8")));
}

public String getConnectUrl() {
Expand Down
3 changes: 2 additions & 1 deletion jdbc/src/main/java/org/apache/kylin/jdbc/util/SQLTypeMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
package org.apache.kylin.jdbc.util;

import java.math.BigDecimal;
import java.nio.charset.Charset;
import java.sql.Date;
import java.sql.Time;
import java.sql.Timestamp;
Expand Down Expand Up @@ -169,7 +170,7 @@ public static Object wrapObject(String value, int sqlType) {
case Types.BINARY:
case Types.VARBINARY:
case Types.LONGVARBINARY:
return value.getBytes();
return value.getBytes(Charset.forName("UTF-8"));
case Types.DATE:
return Date.valueOf(value);
case Types.TIME:
Expand Down
5 changes: 3 additions & 2 deletions job/src/main/java/org/apache/kylin/job/tools/GridTableHBaseBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
package org.apache.kylin.job.tools;

import java.io.IOException;
import java.nio.charset.Charset;
import java.util.List;
import java.util.Random;

Expand All @@ -45,8 +46,8 @@
public class GridTableHBaseBenchmark {

private static final String TEST_TABLE = "GridTableTest";
private static final byte[] CF = "F".getBytes();
private static final byte[] QN = "C".getBytes();
private static final byte[] CF = "F".getBytes(Charset.forName("UTF-8"));
private static final byte[] QN = "C".getBytes(Charset.forName("UTF-8"));
private static final int N_ROWS = 10000;
private static final int CELL_SIZE = 128 * 1024; // 128 KB
private static final double DFT_HIT_RATIO = 0.3;
Expand Down
3 changes: 2 additions & 1 deletion metadata/src/main/java/org/apache/kylin/metadata/measure/fixedlen/FixedHLLCodec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.apache.kylin.metadata.measure.fixedlen;

import java.nio.ByteBuffer;
import java.nio.charset.Charset;

import org.apache.kylin.common.hll.HyperLogLogPlusCounter;
import org.apache.kylin.metadata.model.DataType;
Expand Down Expand Up @@ -53,7 +54,7 @@ public HyperLogLogPlusCounter valueOf(String value) {
if (value == null)
current.add("__nUlL__");
else
current.add(value.getBytes());
current.add(value.getBytes(Charset.forName("UTF-8")));
return current;
}

Expand Down
3 changes: 2 additions & 1 deletion server/src/main/java/org/apache/kylin/rest/security/LdapProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

package org.apache.kylin.rest.security;

import java.nio.charset.Charset;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
Expand Down Expand Up @@ -74,7 +75,7 @@ public Authentication authenticate(Authentication authentication) throws Authent
Authentication authed = null;
Cache userCache = cacheManager.getCache("UserCache");
md.reset();
byte[] hashKey = md.digest((authentication.getName() + authentication.getCredentials()).getBytes());
byte[] hashKey = md.digest((authentication.getName() + authentication.getCredentials()).getBytes(Charset.forName("UTF-8")));
String userKey = Arrays.toString(hashKey);

Element authedUser = userCache.get(userKey);
Expand Down
5 changes: 3 additions & 2 deletions server/src/main/java/org/apache/kylin/rest/security/PasswordPlaceholderConfigurer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

package org.apache.kylin.rest.security;

import java.nio.charset.Charset;
import java.util.Properties;

import javax.crypto.Cipher;
Expand Down Expand Up @@ -50,7 +51,7 @@ public static String encrypt(String strToEncrypt) {
Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
final SecretKeySpec secretKey = new SecretKeySpec(key, "AES");
cipher.init(Cipher.ENCRYPT_MODE, secretKey);
final String encryptedString = Base64.encodeBase64String(cipher.doFinal(strToEncrypt.getBytes()));
final String encryptedString = Base64.encodeBase64String(cipher.doFinal(strToEncrypt.getBytes(Charset.forName("UTF-8"))));
return encryptedString;
} catch (Exception e) {
throw new RuntimeException(e.getMessage(), e);
Expand All @@ -62,7 +63,7 @@ public static String decrypt(String strToDecrypt) {
Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5PADDING");
final SecretKeySpec secretKey = new SecretKeySpec(key, "AES");
cipher.init(Cipher.DECRYPT_MODE, secretKey);
final String decryptedString = new String(cipher.doFinal(Base64.decodeBase64(strToDecrypt)));
final String decryptedString = new String(cipher.doFinal(Base64.decodeBase64(strToDecrypt)), Charset.forName("UTF-8"));
return decryptedString;
} catch (Exception e) {
throw new RuntimeException(e.getMessage(), e);
Expand Down
7 changes: 6 additions & 1 deletion server/src/main/java/org/apache/kylin/rest/service/AdminService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.util.Map;
import java.util.Properties;

Expand Down Expand Up @@ -74,7 +75,11 @@ public String getEnv() {

// do save
tempConfig.save(baos);
content = baos.toString();
try {
content = baos.toString("UTF-8");
} catch (UnsupportedEncodingException e) {
content = baos.toString();
}
return content;
} catch (ConfigurationException e) {
throw new InternalErrorException("Failed to get Kylin env Config", e);
Expand Down