From 7f720eb33da1bd74351c77f1b0abaa7410e537c7 Mon Sep 17 00:00:00 2001
From: "Gerasimos (Makis) Maropoulos" <kataras2006@hotmail.com>
Date: Thu, 19 Dec 2019 07:10:31 +0200
Subject: [PATCH] fix #1407

Former-commit-id: acd8d582aab7b278ea99d0f02d79a33a8b5ee86f
---
 .github/PULL_REQUEST_TEMPLATE.md |  2 +-
 go.mod                           |  1 +
 sessions/cookie.go               | 58 +++++++++++++++++++++-----------
 3 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index df9bcbafb..3e708e67d 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,5 +1,5 @@
 # We'd love to see more contributions
 
-Read how you can [contribute to the project](https://github.com/kataras/blob/master/CONTRIBUTING.md).
+Read how you can [contribute to the project](https://github.com/kataras/iris/blob/master/CONTRIBUTING.md).
 
 > Please attach an [issue](https://github.com/kataras/iris/issues) link which your PR solves otherwise your work may be rejected.
\ No newline at end of file
diff --git a/go.mod b/go.mod
index 845eb1ace..cdfa47756 100644
--- a/go.mod
+++ b/go.mod
@@ -29,6 +29,7 @@ require (
 	github.com/ryanuber/columnize v2.1.0+incompatible
 	github.com/schollz/closestmatch v2.1.0+incompatible
 	golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413
+	golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553
 	golang.org/x/text v0.3.0
 	gopkg.in/ini.v1 v1.51.0
 	gopkg.in/yaml.v2 v2.2.2
diff --git a/sessions/cookie.go b/sessions/cookie.go
index 642d4d74e..a39179bff 100644
--- a/sessions/cookie.go
+++ b/sessions/cookie.go
@@ -8,6 +8,8 @@ import (
 	"time"
 
 	"github.com/kataras/iris/v12/context"
+
+	"golang.org/x/net/publicsuffix"
 )
 
 var (
@@ -90,32 +92,50 @@ func IsValidCookieDomain(domain string) bool {
 	return true
 }
 
+// func formatCookieDomain(ctx context.Context, disableSubdomainPersistence bool) string {
+// 	if disableSubdomainPersistence {
+// 		return ""
+// 	}
+
+// 	requestDomain := ctx.Host()
+// 	if portIdx := strings.IndexByte(requestDomain, ':'); portIdx > 0 {
+// 		requestDomain = requestDomain[0:portIdx]
+// 	}
+
+// 	if !IsValidCookieDomain(requestDomain) {
+// 		return ""
+// 	}
+
+// 	// RFC2109, we allow level 1 subdomains, but no further
+// 	// if we have localhost.com , we want the localhost.com.
+// 	// so if we have something like: mysubdomain.localhost.com we want the localhost here
+// 	// if we have mysubsubdomain.mysubdomain.localhost.com we want the .mysubdomain.localhost.com here
+// 	// slow things here, especially the 'replace' but this is a good and understable( I hope) way to get the be able to set cookies from subdomains & domain with 1-level limit
+// 	if dotIdx := strings.IndexByte(requestDomain, '.'); dotIdx > 0 {
+// 		// is mysubdomain.localhost.com || mysubsubdomain.mysubdomain.localhost.com
+// 		if strings.IndexByte(requestDomain[dotIdx+1:], '.') > 0 {
+// 			requestDomain = requestDomain[dotIdx+1:]
+// 		}
+// 	}
+
+// 	// finally set the .localhost.com (for(1-level) || .mysubdomain.localhost.com (for 2-level subdomain allow)
+// 	return "." + requestDomain // . to allow persistence
+// }
+
 func formatCookieDomain(ctx context.Context, disableSubdomainPersistence bool) string {
 	if disableSubdomainPersistence {
 		return ""
 	}
 
-	requestDomain := ctx.Host()
-	if portIdx := strings.IndexByte(requestDomain, ':'); portIdx > 0 {
-		requestDomain = requestDomain[0:portIdx]
+	host := ctx.Host()
+	if portIdx := strings.IndexByte(host, ':'); portIdx > 0 {
+		host = host[0:portIdx]
 	}
 
-	if !IsValidCookieDomain(requestDomain) {
-		return ""
-	}
-
-	// RFC2109, we allow level 1 subdomains, but no further
-	// if we have localhost.com , we want the localhost.com.
-	// so if we have something like: mysubdomain.localhost.com we want the localhost here
-	// if we have mysubsubdomain.mysubdomain.localhost.com we want the .mysubdomain.localhost.com here
-	// slow things here, especially the 'replace' but this is a good and understable( I hope) way to get the be able to set cookies from subdomains & domain with 1-level limit
-	if dotIdx := strings.IndexByte(requestDomain, '.'); dotIdx > 0 {
-		// is mysubdomain.localhost.com || mysubsubdomain.mysubdomain.localhost.com
-		if strings.IndexByte(requestDomain[dotIdx+1:], '.') > 0 {
-			requestDomain = requestDomain[dotIdx+1:]
-		}
+	domain, err := publicsuffix.EffectiveTLDPlusOne(host)
+	if err != nil {
+		return "." + host
 	}
 
-	// finally set the .localhost.com (for(1-level) || .mysubdomain.localhost.com (for 2-level subdomain allow)
-	return "." + requestDomain // . to allow persistence
+	return "." + domain
 }