release: 0.0.4 (#4)

Author: devxb

src/main/kotlin/org/gitanimals/identity/controller/interceptor/InternalApiInterceptor.kt

@@ -14,8 +14,7 @@ class InternalApiInterceptor(
         response: HttpServletResponse,
         handler: Any,
     ): Boolean {
-        val ip = extractIp(request)
-        return whiteIps.contains(ip)
+        return whiteIps.contains(extractIp(request))
     }
 
     private fun extractIp(request: HttpServletRequest): String {
@@ -25,22 +24,22 @@ class InternalApiInterceptor(
             "X-Real-IP", "X-RealIP", "REMOTE_ADDR"
         )
 
-        var ip: String = request.getHeader("X-Forwarded-For")
+        var ip: String? = request.getHeader("X-Forwarded-For")
 
         for (header in headers) {
-            if (ip.isEmpty() || "unknown".equals(ip, ignoreCase = true)) {
+            if (ip.isNullOrEmpty() || "unknown".equals(ip, ignoreCase = true)) {
                 ip = request.getHeader(header)
             }
         }
 
-        if (ip.isEmpty() || "unknown".equals(ip, ignoreCase = true)) {
+        if (ip.isNullOrEmpty() || "unknown".equals(ip, ignoreCase = true)) {
             ip = request.remoteAddr
         }
 
         if (ip == "0:0:0:0:0:0:0:1") {
             ip = "127.0.0.1"
         }
 
-        return ip
+        return ip ?: throw IllegalStateException("Cannot extract ip")
     }
 }