SCHP-126 Fix emoji comments

kir-dev · Mar 6, 2022 · a6df27f · a6df27f
1 parent 7a29f3c
commit a6df27f
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/src/main/kotlin/hu/kirdev/schpincer/service/ChangeOrderProcedure.kt b/src/main/kotlin/hu/kirdev/schpincer/service/ChangeOrderProcedure.kt
@@ -2,6 +2,7 @@ package hu.kirdev.schpincer.service
 
 import hu.kirdev.schpincer.dao.OrderRepository
 import hu.kirdev.schpincer.model.*
+import hu.kirdev.schpincer.web.removeNonPrintable
 
 class ChangeOrderProcedure(
         private val user: UserEntity,
@@ -43,7 +44,7 @@ class ChangeOrderProcedure(
 
     private fun updateDetails() {
         order.room = room
-        order.comment = "[${user.cardType.name}] $comment"
+        order.comment = "[${user.cardType.name}] ${comment.removeNonPrintable()}"
     }
 
 }
diff --git a/src/main/kotlin/hu/kirdev/schpincer/service/MakeOrderProcedure.kt b/src/main/kotlin/hu/kirdev/schpincer/service/MakeOrderProcedure.kt
@@ -8,6 +8,7 @@ import hu.kirdev.schpincer.dto.ManualUserDetails
 import hu.kirdev.schpincer.dto.OrderDetailsDto
 import hu.kirdev.schpincer.model.*
 import hu.kirdev.schpincer.web.component.*
+import hu.kirdev.schpincer.web.removeNonPrintable
 import java.util.*
 
 class FailedOrderException(val response: String) : RuntimeException()
@@ -46,7 +47,7 @@ class MakeOrderProcedure (
             order = OrderEntity(
                     userId = manualUser.id,
                     userName = manualUser.name,
-                    comment = "[${manualUser.card}] @ ${user.name} | $comment",
+                    comment = "[${manualUser.card}] @ ${user.name} | ${comment.removeNonPrintable()}",
                     detailsJson = detailsJson,
                     room = manualUser.room,
                     createdAt = System.currentTimeMillis())

diff --git a/src/main/kotlin/hu/kirdev/schpincer/web/Utility.kt b/src/main/kotlin/hu/kirdev/schpincer/web/Utility.kt
@@ -98,8 +98,7 @@ fun toReadableRole(permissions: Set<String>, circleID: Long): CircleMemberRole {
 val dateFormat: DateFormat by lazy { SimpleDateFormat("yyyy-MM-dd hh:mm") }
 
 fun parseDate(dateToParse: String): Long {
-    val date: Date
-    date = try {
+    val date: Date = try {
         dateFormat.parse(dateToParse)
     } catch (e: ParseException) {
         e.printStackTrace()
@@ -115,3 +114,13 @@ fun formatDate(date: Long): String {
 fun HttpServletRequest.isInInternalNetwork(): Boolean {
     return this.remoteAddr.startsWith("152.66.") || this.remoteAddr == "127.0.0.1"
 }
+
+val nonAscii = Regex("[^\\x00-\\u0170]")
+val controlChars = Regex("[\\p{Cntrl}&&[^\r\n\t]]")
+val nonPrintable = Regex("\\p{C}")
+
+fun String.removeNonPrintable() =
+    this.replace(nonAscii, "")
+        .replace(controlChars, "")
+        .replace(nonPrintable, "")
+        .trim()
diff --git a/src/main/resources/templates/fragments/itemPopup.html b/src/main/resources/templates/fragments/itemPopup.html
@@ -58,7 +58,9 @@ <h5 id="popup-price-tag" th:text="#{lang.items.price}">ÁR</h5>
                                 <option value="3">19:30 - 20:00 (20 db)</option>
                             </select>
                             <label th:text="#{lang.items.comment}">Comment</label>
-                            <input id="popup-comment" type="text" name="comment" autocomplete="off" maxlength="200"/>
+                            <input id="popup-comment" type="text" name="comment" autocomplete="off" maxlength="200"
+                                   onchange="this.value = this.value.replaceAll(/[^\x00-\u0170]/, '')"
+                                   onkeyup="this.value = this.value.replaceAll(/[^\x00-\u0170]/, '')"/>
                             <input type="submit" id="submit-order-button" class="colored-light submit-button" value="Order"
                                    th:value="#{lang.items.buy}" th:unless="${session.user} eq null"/>
                         </div>
@@ -79,4 +81,4 @@ <h5 id="popup-price-tag" th:text="#{lang.items.price}">ÁR</h5>
     </div>
 </div>
 </body>
-</html>
+</html>
diff --git a/src/main/resources/templates/profile.html b/src/main/resources/templates/profile.html
@@ -40,7 +40,9 @@ <h4 th:text="${session.user?.name}" class="user">User Name</h4>
 							<form id="room-form" style="display: none" onsubmit="setRoom(); return false" action="#"
                                   method="GET">
 								<input type="text" id="room-setter" maxlength="8" autocomplete="off"
-                                       onfocusout="setRoom(); return false"/>
+                                       onfocusout="setRoom(); return false"
+                                       onchange="this.value = this.value.replaceAll(/[^A-Za-z0-9 -_()]/, '')"
+                                       onkeyup="this.value = this.value.replaceAll(/[^A-Za-z0-9 -_()]/, '')" />
                                 <ins id="saved" th:text="#{lang.profile.room-number-hint}">(Szám vagy terem neve)</ins>
 							</form>
 							<ins id="saved" th:text="#{lang.profile.saved}">Elmentve</ins>