Merge pull request #554 from YangSen-qn/master

support non utf-8 env

Author: Mei-Zhao

src/main/java/com/qiniu/http/Response.java

@@ -1,6 +1,7 @@
 package com.qiniu.http;
 
 
+import com.qiniu.common.Constants;
 import com.qiniu.common.QiniuException;
 import com.qiniu.util.Json;
 import com.qiniu.util.StringMap;
@@ -96,7 +97,7 @@ public static Response create(okhttp3.Response response, String address, double
             try {
                 body = response.body().bytes();
                 if (response.code() >= 400 && !StringUtils.isNullOrEmpty(reqId) && body != null) {
-                    ErrorBody errorBody = Json.decode(new String(body), ErrorBody.class);
+                    ErrorBody errorBody = Json.decode(new String(body, Constants.UTF_8), ErrorBody.class);
                     error = errorBody.error;
                 }
             } catch (Exception e) {
@@ -123,7 +124,7 @@ public static Response createError(okhttp3.Response response, String address, do
             try {
                 body = response.body().bytes();
                 if (response.code() >= 400 && !StringUtils.isNullOrEmpty(reqId) && body != null) {
-                    ErrorBody errorBody = Json.decode(new String(body), ErrorBody.class);
+                    ErrorBody errorBody = Json.decode(new String(body, Constants.UTF_8), ErrorBody.class);
                     error = errorBody.error;
                 }
             } catch (Exception e) {

src/main/java/com/qiniu/storage/ApiUploadV2CompleteUpload.java

@@ -1,11 +1,13 @@
 package com.qiniu.storage;
 
+import com.qiniu.common.Constants;
 import com.qiniu.common.QiniuException;
 import com.qiniu.http.Client;
 import com.qiniu.http.MethodType;
 import com.qiniu.util.Json;
 import com.qiniu.util.StringUtils;
 
+import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -214,7 +216,7 @@ protected void buildBodyInfo() throws QiniuException {
             }
 
             String bodyString = Json.encode(bodyMap);
-            byte[] body = bodyString.getBytes();
+            byte[] body = bodyString.getBytes(Constants.UTF_8);
             setBody(body, 0, body.length, null);
         }
     }

src/main/java/com/qiniu/storage/BucketManager.java

@@ -908,7 +908,7 @@ public Response getBucketEventsResponse(String bucket) throws QiniuException {
      */
     public Response putCorsRules(String bucket, CorsRule[] rules) throws QiniuException {
         String url = String.format("%s/corsRules/set/%s", configHelper.ucHost(), bucket);
-        Response res = post(url, Json.encode(rules).getBytes());
+        Response res = post(url, Json.encode(rules).getBytes(Constants.UTF_8));
         if (!res.isOK()) {
             throw new QiniuException(res);
         }

src/main/java/com/qiniu/storage/FixBlockUploader.java

@@ -1,6 +1,7 @@
 package com.qiniu.storage;
 
 import com.google.gson.Gson;
+import com.qiniu.common.Constants;
 import com.qiniu.common.QiniuException;
 import com.qiniu.http.Client;
 import com.qiniu.http.Response;
@@ -443,7 +444,7 @@ Response makeFile(String bucket, String base64Key, Token token, String uploadId,
         final StringMap headers = new StringMap().put("Authorization", "UpToken " + token.getUpToken());
         sortAsc(etags);
         byte[] data = new MakefileBody(etags, fileName, params)
-                .json().getBytes(Charset.forName("UTF-8"));
+                .json().getBytes(Constants.UTF_8);
 
         // 1
         Response res = makeFile1(url, data, headers, true);
@@ -494,7 +495,7 @@ private String parseBucket(String upToken) throws QiniuException {
         try {
             String part3 = upToken.split(":")[2];
             byte[] b = UrlSafeBase64.decode(part3);
-            StringMap m = Json.decode(new String(b, Charset.forName("UTF-8")));
+            StringMap m = Json.decode(new String(b, Constants.UTF_8));
             String scope = m.get("scope").toString();
             return scope.split(":")[0];
         } catch (Exception e) {
@@ -909,7 +910,7 @@ public Record reloadRecord() {
             if (recorder != null) {
                 try {
                     byte[] data = recorder.get(recordFileKey);
-                    record = new Gson().fromJson(new String(data, Charset.forName("UTF-8")), Record.class);
+                    record = new Gson().fromJson(new String(data, Constants.UTF_8), Record.class);
                     if (!record.isValid()) {
                         record = null;
                     }
@@ -930,7 +931,7 @@ public void delRecord() {
         public void syncRecord(Record record) {
             if (needRecord && recorder != null && record.etagIdxes.size() > 0) {
                 sortAsc(record.etagIdxes);
-                recorder.set(recordFileKey, new Gson().toJson(record).getBytes(Charset.forName("UTF-8")));
+                recorder.set(recordFileKey, new Gson().toJson(record).getBytes(Constants.UTF_8));
             }
         }
 

src/main/java/com/qiniu/storage/persistent/FileRecorder.java

@@ -1,5 +1,6 @@
 package com.qiniu.storage.persistent;
 
+import com.qiniu.common.Constants;
 import com.qiniu.storage.Recorder;
 import com.qiniu.util.StringUtils;
 

src/main/java/com/qiniu/util/Auth.java

@@ -1,6 +1,7 @@
 package com.qiniu.util;
 
 import com.google.gson.annotations.SerializedName;
+import com.qiniu.common.Constants;
 import com.qiniu.http.Client;
 import com.qiniu.http.Headers;
 
@@ -58,7 +59,7 @@ public final class Auth {
             "asyncOps",
     };
     private static boolean[] isTokenTable = genTokenTable();
-    private static int toLower = 'a' - 'A';
+    private static byte toLower = 'a' - 'A';
     public final String accessKey;
     private final SecretKeySpec secretKey;
 
@@ -104,7 +105,7 @@ public void accept(String key, Object value) {
     // returned without modifications.
     private static String canonicalMIMEHeaderKey(String name) {
         // com.qiniu.http.Headers 已确保 header name 字符的合法性，直接使用 byte ，否则要使用 char //
-        byte[] a = name.getBytes(Charset.forName("UTF-8"));
+        byte[] a = name.getBytes(Constants.UTF_8);
         for (int i = 0; i < a.length; i++) {
             byte c = a[i];
             if (!validHeaderFieldByte(c)) {
@@ -123,7 +124,7 @@ private static String canonicalMIMEHeaderKey(String name) {
             a[i] = c;
             upper = c == '-'; // for next time
         }
-        return new String(a);
+        return new String(a, Constants.UTF_8);
     }
 
     private static boolean validHeaderFieldByte(byte b) {
@@ -443,7 +444,7 @@ public String signQiniuAuthorization(String url, String method, byte[] body, Hea
 
         if (body != null && body.length > 0 && null != contentType && !"".equals(contentType)
                 && !"application/octet-stream".equals(contentType)) {
-            sb.append(new String(body));
+            sb.append(new String(body, Constants.UTF_8));
         }
         Mac mac = createMac();
         mac.update(StringUtils.utf8Bytes(sb.toString()));

src/main/java/com/qiniu/util/StringUtils.java

@@ -139,7 +139,7 @@ public static String utf8String(byte[] data) {
 
     public static String md5Lower(String src) throws NoSuchAlgorithmException {
         MessageDigest digest = MessageDigest.getInstance("MD5");
-        digest.update(src.getBytes(Charset.forName("UTF-8")));
+        digest.update(src.getBytes(Constants.UTF_8));
         byte[] md5Bytes = digest.digest();
         return Hex.encodeHexString(md5Bytes);
     }