From 0e5e3f04af6053e308081d44e58b0c51d9255bbe Mon Sep 17 00:00:00 2001 From: Igor I Date: Thu, 19 Dec 2024 09:59:00 +0500 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B2=D1=8B=D0=B9=20=D1=8D?= =?UTF-8?q?=D1=82=D0=B0=D0=BF=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D0=BA?= =?UTF-8?q?=20(=D0=BD=D0=B5=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D1=8F?= =?UTF-8?q?=D0=BB)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/ccalm/jwt/MainController.java | 76 ++++++++++--------- 1 file changed, 39 insertions(+), 37 deletions(-) diff --git a/src/main/java/org/ccalm/jwt/MainController.java b/src/main/java/org/ccalm/jwt/MainController.java index c980c48..26f7347 100644 --- a/src/main/java/org/ccalm/jwt/MainController.java +++ b/src/main/java/org/ccalm/jwt/MainController.java @@ -120,19 +120,21 @@ public class MainController implements ServletContextAware { this.jdbcTemplate = jdbcTemplate; } - public String createStrJSONError(int code, String message, String marker) { + public String createStrJSONError(int code, String message, String setting, String marker) { JSONObject json = new JSONObject(); json.put("error_code", code); - json.put("error_message", message); + json.put("error_message", Arrays.asList(message)); + json.put("error_setting", Arrays.asList(setting)); json.put("error_marker", marker); return json.toString(); } - public JSONObject createJSONError(int code, String message, String marker) { + public JSONObject createJSONError(int code, String message, String setting, String marker) { JSONObject json = new JSONObject(); json.put("error_code", code); - json.put("error_message", message); - json.put("error_marker", marker); + json.put("error_message", Arrays.asList(message)); + json.put("error_setting", Arrays.asList(setting)); + json.put("error_marker", Arrays.asList(setting)); return json; } @@ -292,7 +294,7 @@ public class MainController implements ServletContextAware { .build() .parseClaimsJws(jwt_a); } catch (Exception e) { - return createStrJSONError(10000, trt.trt("JWT_token_verification_error"),null); + return createStrJSONError(10000, trt.trt("JWT_token_verification_error"),(String)null,(String)null); } String sql = """ select @@ -318,11 +320,11 @@ public class MainController implements ServletContextAware { } catch (BadSqlGrammarException e) { String uuid = UUID.randomUUID().toString(); logger.error(uuid,e); - json = createJSONError(10000,trt.trt("Error_executing_SQL_query")+" "+e.getMessage(), uuid); + json = createJSONError(10000,trt.trt("Error_executing_SQL_query"),(String)null, uuid); } catch (Exception e) { String uuid = UUID.randomUUID().toString(); logger.error(uuid,e); - json = createJSONError(10000,trt.trt("Internal_Server_Error")+" "+e.getMessage(), uuid); + json = createJSONError(10000,trt.trt("Internal_Server_Error"),(String)null, uuid); } return json.toString(); } @@ -390,7 +392,7 @@ public class MainController implements ServletContextAware { } catch (Exception e) { String uuid = UUID.randomUUID().toString(); logger.error(uuid,e); - json = createJSONError(10000,trt.trt("Internal_Server_Error")+" "+e.getMessage(), uuid); + json = createJSONError(10000,trt.trt("Internal_Server_Error"),(String)null, uuid); } return json.toString(); } @@ -401,10 +403,10 @@ public class MainController implements ServletContextAware { Translation trt = new Translation(language_id,jdbcTemplate); - String result=createStrJSONError(10000,trt.trt("Request_not_processed"),null); + String result=createStrJSONError(10000,trt.trt("Request_not_processed"), (String)null, (String)null); if(jwt_a.equals("") || countOccurrences(jwt_a, '.')!=2) { - result=createStrJSONError(10000,trt.trt("Please_send_a_valid_JWT_token"),null); + result=createStrJSONError(10000,trt.trt("Please_send_a_valid_JWT_token"), (String)null, (String)null); return result; } @@ -418,7 +420,7 @@ public class MainController implements ServletContextAware { .build() .parseClaimsJws(jwt_a); } catch (Exception e) { - return createStrJSONError(10000, trt.trt("JWT_token_verification_error"),null); + return createStrJSONError(10000, trt.trt("JWT_token_verification_error"),(String)null,(String)null); } String sql = """ select @@ -499,7 +501,7 @@ public class MainController implements ServletContextAware { } catch (Exception e) { String uuid = UUID.randomUUID().toString(); logger.error(uuid,e); - json = createJSONError(10000,trt.trt("Internal_Server_Error")+" "+e.getMessage(), uuid); + json = createJSONError(10000,trt.trt("Internal_Server_Error"), (String)null, uuid); } return json.toString(); } @@ -632,7 +634,7 @@ public class MainController implements ServletContextAware { } catch (Exception e) { String uuid = UUID.randomUUID().toString(); logger.error(uuid,e); - json = createJSONError(10000,trt.trt("Internal_Server_Error")+" "+e.getMessage(), uuid); + json = createJSONError(10000,trt.trt("Internal_Server_Error"), (String)null, uuid); } return json.toString(); } @@ -697,7 +699,7 @@ public class MainController implements ServletContextAware { catch (Exception e) { String uuid = UUID.randomUUID().toString(); logger.error(uuid,e); - json = createJSONError(10000,trt.trt("Internal_Server_Error")+" "+e.getMessage(), uuid); + json = createJSONError(10000,trt.trt("Internal_Server_Error"), (String)null, uuid); } finally { //try { if(conn!=null) conn.close(); } catch (SQLException e) { throw new RuntimeException(e); } } @@ -747,7 +749,7 @@ public class MainController implements ServletContextAware { { throw new CustomException(10000, trt.trt("The_user_account_is_blocked"),null); }else{ - throw new CustomException(10000, trt.trt("The_limit_of_authorization_attempts_has_been_exceeded_please_wait_s_minutes"), json.getInt("limit_duration"),(String)null); + throw new CustomException(10000, trt.trt("The_limit_of_authorization_attempts_has_been_exceeded_please_wait_s_minutes"), String.valueOf(json.getInt("limit_duration")),(String)null); } } if(json.has("count") && json.has("limit_count") && json.has("limit_duration")) { @@ -967,7 +969,7 @@ public class MainController implements ServletContextAware { } catch (Exception e) { String uuid = UUID.randomUUID().toString(); logger.error(uuid,e); - json = createJSONError(10000,trt.trt("Internal_Server_Error"), uuid); + json = createJSONError(10000,trt.trt("Internal_Server_Error"), (String)null, uuid); } finally { //try { if(conn!=null) conn.close(); } catch (SQLException e) { throw new RuntimeException(e); } } @@ -1018,7 +1020,7 @@ public class MainController implements ServletContextAware { { throw new CustomException(10000, trt.trt("The_user_account_is_blocked"),null); }else{ - throw new CustomException(10000, trt.trt("The_limit_of_authorization_attempts_has_been_exceeded_please_wait_s_minutes"), json.getInt("limit_duration"),(String)null); + throw new CustomException(10000, trt.trt("The_limit_of_authorization_attempts_has_been_exceeded_please_wait_s_minutes"), String.valueOf(json.getInt("limit_duration")),(String)null); } } if(json.has("count") && json.has("limit_count") && json.has("limit_duration")) { @@ -1124,7 +1126,7 @@ public class MainController implements ServletContextAware { } catch (Exception e) { String uuid = UUID.randomUUID().toString(); logger.error(uuid,e); - json = createJSONError(10000,trt.trt("Internal_Server_Error"), uuid); + json = createJSONError(10000,trt.trt("Internal_Server_Error"), (String)null, uuid); } finally { //try { if(conn!=null) conn.close(); } catch (SQLException e) { throw new RuntimeException(e); } } @@ -1140,7 +1142,7 @@ public class MainController implements ServletContextAware { setRefreshCookie(response, request, ""); - return createStrJSONError(0,"",null); + return createStrJSONError(0,"",(String)null,(String)null); } //Update refresh token @@ -1187,9 +1189,9 @@ public class MainController implements ServletContextAware { String token_ar_sig = token.getBody().get("sig", String.class); //Она же но уже в токене обновления if(token_aa_sig==null || !token_aa_sig.equals(token_ar_sig)){ logout(response,request); //Удаляю куки чтобы эмулировать выход из приложения - return createStrJSONError(10000,trt.trt("Attempt_to_substitution_tokens"),null); + return createStrJSONError(10000,trt.trt("Attempt_to_substitution_tokens"),(String)null,(String)null); } -+++++++++ + //TODO проверить не заблокирован ли пользователь //if(json.has("block")) { // if(json.getBoolean("block")) @@ -1235,7 +1237,7 @@ public class MainController implements ServletContextAware { } catch (Exception e) { String uuid = UUID.randomUUID().toString(); logger.error(uuid,e); - json = createJSONError(10000,trt.trt("Internal_Server_Error")+" "+e.getMessage(), uuid); + json = createJSONError(10000,trt.trt("Internal_Server_Error"), (String)null, uuid); } finally { } @@ -1301,7 +1303,7 @@ public class MainController implements ServletContextAware { Translation trt = new Translation(language_id,jdbcTemplate); - String result=createStrJSONError(10000,trt.trt("Request_not_processed"),null); + String result=createStrJSONError(10000,trt.trt("Request_not_processed"), (String)null, (String)null); //Connection conn = getConnection(); int index = restore.getToken().indexOf("."); @@ -1314,7 +1316,7 @@ public class MainController implements ServletContextAware { String signature2 = Tools.generateSignature(captchaKey,payload); if(! signature1.equals(signature2)) { - result=createStrJSONError(10000,trt.trt("The_signature_did_not_match"),null); + result=createStrJSONError(10000,trt.trt("The_signature_did_not_match"), (String)null, (String)null); } System.out.println("signature2: " + signature2); @@ -1323,16 +1325,16 @@ public class MainController implements ServletContextAware { JSONObject token = new JSONObject(Tools.decryptText(captchaKey,payload)); if(token==null) - return createStrJSONError(10000,trt.trt("Please_send_a_valid_JSON_string_in_your_token"),null); + return createStrJSONError(10000,trt.trt("Please_send_a_valid_JSON_string_in_your_token"), (String)null,(String)null); if(!restore.getCode().equals(token.getString("code"))){ - return createStrJSONError(10000,trt.trt("The_code_did_not_match"),null); + return createStrJSONError(10000,trt.trt("The_code_did_not_match"),(String)null,(String)null); } if(token.getLong("exp")