Merge branch 'development'

lmajano · lmajano · commit d48f07504612 · 2021-03-22T11:40:02.000-05:00
diff --git a/box.json b/box.json
@@ -1,6 +1,6 @@
 {
     "name":"ColdBox Security",
-    "version":"2.11.0",
+    "version":"2.12.0",
     "location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbsecurity/@build.version@/cbsecurity-@build.version@.zip",
     "author":"Ortus Solutions.com <info@ortussolutions.com>",
     "slug":"cbsecurity",
diff --git a/changelog.md b/changelog.md
@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ----
 
+## [2.11.1] => 2021-MAR-10
+
+### Fixed
+
+* Fix `getRealIP()` to only return originating user's source IP, if the forwarded ip is a list
+
+----
+
 ## [2.11.0] => 2021-MAR-10
 
 ### Added
diff --git a/interceptors/Security.cfc b/interceptors/Security.cfc
@@ -737,7 +737,7 @@ component accessors="true" extends="coldbox.system.Interceptor" {
 			return headers[ "X-Forwarded-For" ];
 		}
 
-		return len( CGI.REMOTE_ADDR ) ? CGI.REMOTE_ADDR : "127.0.0.1";
+		return len( CGI.REMOTE_ADDR ) ? trim( listFirst( CGI.REMOTE_ADDR ) ) : "127.0.0.1";
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name":"ColdBox Security",`
`3`		`- "version":"2.11.0",`
	`3`	`+ "version":"2.12.0",`
`4`	`4`	`"location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbsecurity/@build.version@/[email protected]@.zip",`
`5`	`5`	`"author":"Ortus Solutions.com <[email protected]>",`
`6`	`6`	`"slug":"cbsecurity",`
Original file line number	Diff line number	Diff line change
`@@ -737,7 +737,7 @@ component accessors="true" extends="coldbox.system.Interceptor" {`
`737`	`737`	`return headers[ "X-Forwarded-For" ];`
`738`	`738`	`}`
`739`	`739`
`740`		`- return len( CGI.REMOTE_ADDR ) ? CGI.REMOTE_ADDR : "127.0.0.1";`
	`740`	`+ return len( CGI.REMOTE_ADDR ) ? trim( listFirst( CGI.REMOTE_ADDR ) ) : "127.0.0.1";`
`741`	`741`	`}`
`742`	`742`
`743`	`743`	`/**`