Переглянути джерело

Merge remote-tracking branch 'TSIT/ST24PRJ-617' into develop

card007 4 роки тому
батько
коміт
ec71d080da

+ 12 - 8
src/main/java/com/style24/core/support/text/TscHtmlCharacterEscapes.java

@@ -25,23 +25,27 @@ public class TscHtmlCharacterEscapes extends CharacterEscapes {
 		asciiEscapes = CharacterEscapes.standardAsciiEscapesForJSON();
 		asciiEscapes['<'] = CharacterEscapes.ESCAPE_CUSTOM;
 		asciiEscapes['>'] = CharacterEscapes.ESCAPE_CUSTOM;
-		asciiEscapes['&'] = CharacterEscapes.ESCAPE_CUSTOM;
-		asciiEscapes['\"'] = CharacterEscapes.ESCAPE_CUSTOM;
+//		asciiEscapes['&'] = CharacterEscapes.ESCAPE_CUSTOM;
+//		asciiEscapes['\"'] = CharacterEscapes.ESCAPE_CUSTOM;
 //		asciiEscapes['('] = CharacterEscapes.ESCAPE_CUSTOM;
 //		asciiEscapes[')'] = CharacterEscapes.ESCAPE_CUSTOM;
 //		asciiEscapes['#'] = CharacterEscapes.ESCAPE_CUSTOM;
-		asciiEscapes['\''] = CharacterEscapes.ESCAPE_CUSTOM;
+//		asciiEscapes['\''] = CharacterEscapes.ESCAPE_CUSTOM;
 
 		Map<CharSequence, CharSequence> lookupMap = new HashMap<>();
-		lookupMap.put("(", "&#40");
-		lookupMap.put(")", "&#41");
-		lookupMap.put("#", "&#35");
-		lookupMap.put("\\", "&#39");
+//		lookupMap.put("(", "&#40");
+//		lookupMap.put(")", "&#41");
+//		lookupMap.put("#", "&#35");
+//		lookupMap.put("\\", "&#39");
+//		lookupMap.put("\"", "&quot;");
+//		lookupMap.put("&", "&amp;");
+		lookupMap.put("<", "&lt;");
+		lookupMap.put(">", "&gt;");
 		Map<CharSequence, CharSequence> CUSTOM_ESCAPE = Collections.unmodifiableMap(lookupMap);
 
 		// XSS 방지 처리 특수문자 인코딩 값 지정
 		this.translator = new AggregateTranslator(
-			new LookupTranslator(EntityArrays.BASIC_ESCAPE), // <, >, &, "는 여기에 포함
+//			new LookupTranslator(EntityArrays.BASIC_ESCAPE), // <, >, &, "는 여기에 포함
 			new LookupTranslator(EntityArrays.ISO8859_1_ESCAPE),
 			new LookupTranslator(EntityArrays.HTML40_EXTENDED_ESCAPE),
 			new LookupTranslator(CUSTOM_ESCAPE));