summaryrefslogtreecommitdiffstats
path: root/utils/utils.go
diff options
context:
space:
mode:
Diffstat (limited to 'utils/utils.go')
-rw-r--r--utils/utils.go11
1 files changed, 10 insertions, 1 deletions
diff --git a/utils/utils.go b/utils/utils.go
index 89ea4377e..dd8bdb2a8 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -8,6 +8,7 @@ import (
"net/http"
"net/url"
"os"
+ "strings"
"github.com/mattermost/platform/model"
)
@@ -55,7 +56,15 @@ func RemoveDuplicatesFromStringArray(arr []string) []string {
}
func GetIpAddress(r *http.Request) string {
- address := r.Header.Get(model.HEADER_FORWARDED)
+ address := ""
+
+ header := r.Header.Get(model.HEADER_FORWARDED)
+ if len(header) > 0 {
+ addresses := strings.Fields(header)
+ if len(addresses) > 0 {
+ address = strings.TrimRight(addresses[0], ",")
+ }
+ }
if len(address) == 0 {
address = r.Header.Get(model.HEADER_REAL_IP)