Merge branch 'master' into jonas-jonas/fix/verificationIdAfterRegistr…

…ation
ory · Mar 13, 2023 · 5022f35 · 5022f35
2 parents 007145b + 9c3bfe3
commit 5022f35
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 45 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,24 +5,25 @@
 
 **Table of Contents**
 
-- [ (2023-03-09)](#2023-03-09)
+- [ (2023-03-13)](#2023-03-13)
   - [Breaking Changes](#breaking-changes)
     - [Bug Fixes](#bug-fixes)
     - [Code Refactoring](#code-refactoring)
+    - [Documentation](#documentation)
     - [Features](#features)
 - [0.11.1 (2023-01-14)](#0111-2023-01-14)
   - [Breaking Changes](#breaking-changes-1)
     - [Bug Fixes](#bug-fixes-1)
     - [Code Generation](#code-generation)
-    - [Documentation](#documentation)
+    - [Documentation](#documentation-1)
     - [Features](#features-1)
     - [Tests](#tests)
 - [0.11.0 (2022-12-02)](#0110-2022-12-02)
   - [Breaking Changes](#breaking-changes-2)
     - [Bug Fixes](#bug-fixes-2)
     - [Code Generation](#code-generation-1)
     - [Code Refactoring](#code-refactoring-1)
-    - [Documentation](#documentation-1)
+    - [Documentation](#documentation-2)
     - [Features](#features-2)
     - [Reverts](#reverts)
     - [Tests](#tests-1)
@@ -35,15 +36,15 @@
     - [Bug Fixes](#bug-fixes-4)
     - [Code Generation](#code-generation-3)
     - [Code Refactoring](#code-refactoring-2)
-    - [Documentation](#documentation-2)
+    - [Documentation](#documentation-3)
     - [Features](#features-3)
     - [Tests](#tests-2)
     - [Unclassified](#unclassified-1)
 - [0.9.0-alpha.3 (2022-03-25)](#090-alpha3-2022-03-25)
   - [Breaking Changes](#breaking-changes-4)
     - [Bug Fixes](#bug-fixes-5)
     - [Code Generation](#code-generation-4)
-    - [Documentation](#documentation-3)
+    - [Documentation](#documentation-4)
 - [0.9.0-alpha.2 (2022-03-22)](#090-alpha2-2022-03-22)
   - [Bug Fixes](#bug-fixes-6)
   - [Code Generation](#code-generation-5)
@@ -52,7 +53,7 @@
     - [Bug Fixes](#bug-fixes-7)
     - [Code Generation](#code-generation-6)
     - [Code Refactoring](#code-refactoring-3)
-    - [Documentation](#documentation-4)
+    - [Documentation](#documentation-5)
     - [Features](#features-4)
     - [Tests](#tests-3)
     - [Unclassified](#unclassified-2)
@@ -61,24 +62,24 @@
     - [Bug Fixes](#bug-fixes-8)
     - [Code Generation](#code-generation-7)
     - [Code Refactoring](#code-refactoring-4)
-    - [Documentation](#documentation-5)
+    - [Documentation](#documentation-6)
     - [Features](#features-5)
     - [Tests](#tests-4)
 - [0.8.2-alpha.1 (2021-12-17)](#082-alpha1-2021-12-17)
   - [Bug Fixes](#bug-fixes-9)
   - [Code Generation](#code-generation-8)
-  - [Documentation](#documentation-6)
+  - [Documentation](#documentation-7)
 - [0.8.1-alpha.1 (2021-12-13)](#081-alpha1-2021-12-13)
   - [Bug Fixes](#bug-fixes-10)
   - [Code Generation](#code-generation-9)
-  - [Documentation](#documentation-7)
+  - [Documentation](#documentation-8)
   - [Features](#features-6)
   - [Tests](#tests-5)
 - [0.8.0-alpha.4.pre.0 (2021-11-09)](#080-alpha4pre0-2021-11-09)
   - [Breaking Changes](#breaking-changes-7)
     - [Bug Fixes](#bug-fixes-11)
     - [Code Generation](#code-generation-10)
-    - [Documentation](#documentation-8)
+    - [Documentation](#documentation-9)
     - [Features](#features-7)
     - [Tests](#tests-6)
 - [0.8.0-alpha.3 (2021-10-28)](#080-alpha3-2021-10-28)
@@ -91,7 +92,7 @@
     - [Bug Fixes](#bug-fixes-13)
     - [Code Generation](#code-generation-13)
     - [Code Refactoring](#code-refactoring-5)
-    - [Documentation](#documentation-9)
+    - [Documentation](#documentation-10)
     - [Features](#features-8)
     - [Reverts](#reverts-1)
     - [Tests](#tests-7)
@@ -103,25 +104,25 @@
 - [0.7.4-alpha.1 (2021-09-09)](#074-alpha1-2021-09-09)
   - [Bug Fixes](#bug-fixes-14)
   - [Code Generation](#code-generation-16)
-  - [Documentation](#documentation-10)
+  - [Documentation](#documentation-11)
   - [Features](#features-9)
   - [Tests](#tests-8)
 - [0.7.3-alpha.1 (2021-08-28)](#073-alpha1-2021-08-28)
   - [Bug Fixes](#bug-fixes-15)
   - [Code Generation](#code-generation-17)
-  - [Documentation](#documentation-11)
+  - [Documentation](#documentation-12)
   - [Features](#features-10)
 - [0.7.1-alpha.1 (2021-07-22)](#071-alpha1-2021-07-22)
   - [Bug Fixes](#bug-fixes-16)
   - [Code Generation](#code-generation-18)
-  - [Documentation](#documentation-12)
+  - [Documentation](#documentation-13)
   - [Tests](#tests-9)
 - [0.7.0-alpha.1 (2021-07-13)](#070-alpha1-2021-07-13)
   - [Breaking Changes](#breaking-changes-9)
     - [Bug Fixes](#bug-fixes-17)
     - [Code Generation](#code-generation-19)
     - [Code Refactoring](#code-refactoring-6)
-    - [Documentation](#documentation-13)
+    - [Documentation](#documentation-14)
     - [Features](#features-11)
     - [Tests](#tests-10)
     - [Unclassified](#unclassified-4)
@@ -132,7 +133,7 @@
     - [Code Refactoring](#code-refactoring-7)
 - [0.6.2-alpha.1 (2021-05-14)](#062-alpha1-2021-05-14)
   - [Code Generation](#code-generation-21)
-  - [Documentation](#documentation-14)
+  - [Documentation](#documentation-15)
 - [0.6.1-alpha.1 (2021-05-11)](#061-alpha1-2021-05-11)
   - [Code Generation](#code-generation-22)
   - [Features](#features-12)
@@ -145,38 +146,38 @@
     - [Bug Fixes](#bug-fixes-20)
     - [Code Generation](#code-generation-24)
     - [Code Refactoring](#code-refactoring-8)
-    - [Documentation](#documentation-15)
+    - [Documentation](#documentation-16)
     - [Features](#features-14)
     - [Tests](#tests-11)
     - [Unclassified](#unclassified-5)
 - [0.5.5-alpha.1 (2020-12-09)](#055-alpha1-2020-12-09)
   - [Bug Fixes](#bug-fixes-21)
   - [Code Generation](#code-generation-25)
-  - [Documentation](#documentation-16)
+  - [Documentation](#documentation-17)
   - [Features](#features-15)
   - [Tests](#tests-12)
   - [Unclassified](#unclassified-6)
 - [0.5.4-alpha.1 (2020-11-11)](#054-alpha1-2020-11-11)
   - [Bug Fixes](#bug-fixes-22)
   - [Code Generation](#code-generation-26)
   - [Code Refactoring](#code-refactoring-9)
-  - [Documentation](#documentation-17)
+  - [Documentation](#documentation-18)
   - [Features](#features-16)
 - [0.5.3-alpha.1 (2020-10-27)](#053-alpha1-2020-10-27)
   - [Bug Fixes](#bug-fixes-23)
   - [Code Generation](#code-generation-27)
-  - [Documentation](#documentation-18)
+  - [Documentation](#documentation-19)
   - [Features](#features-17)
   - [Tests](#tests-13)
 - [0.5.2-alpha.1 (2020-10-22)](#052-alpha1-2020-10-22)
   - [Bug Fixes](#bug-fixes-24)
   - [Code Generation](#code-generation-28)
-  - [Documentation](#documentation-19)
+  - [Documentation](#documentation-20)
   - [Tests](#tests-14)
 - [0.5.1-alpha.1 (2020-10-20)](#051-alpha1-2020-10-20)
   - [Bug Fixes](#bug-fixes-25)
   - [Code Generation](#code-generation-29)
-  - [Documentation](#documentation-20)
+  - [Documentation](#documentation-21)
   - [Features](#features-18)
   - [Tests](#tests-15)
   - [Unclassified](#unclassified-7)
@@ -185,7 +186,7 @@
     - [Bug Fixes](#bug-fixes-26)
     - [Code Generation](#code-generation-30)
     - [Code Refactoring](#code-refactoring-10)
-    - [Documentation](#documentation-21)
+    - [Documentation](#documentation-22)
     - [Features](#features-19)
     - [Tests](#tests-16)
     - [Unclassified](#unclassified-8)
@@ -198,7 +199,7 @@
 - [0.4.4-alpha.1 (2020-07-10)](#044-alpha1-2020-07-10)
   - [Bug Fixes](#bug-fixes-29)
   - [Code Generation](#code-generation-33)
-  - [Documentation](#documentation-22)
+  - [Documentation](#documentation-23)
 - [0.4.3-alpha.1 (2020-07-08)](#043-alpha1-2020-07-08)
   - [Bug Fixes](#bug-fixes-30)
   - [Code Generation](#code-generation-34)
@@ -210,52 +211,52 @@
     - [Bug Fixes](#bug-fixes-32)
     - [Code Generation](#code-generation-36)
     - [Code Refactoring](#code-refactoring-11)
-    - [Documentation](#documentation-23)
+    - [Documentation](#documentation-24)
     - [Features](#features-20)
     - [Unclassified](#unclassified-9)
 - [0.3.0-alpha.1 (2020-05-15)](#030-alpha1-2020-05-15)
   - [Breaking Changes](#breaking-changes-14)
     - [Bug Fixes](#bug-fixes-33)
     - [Chores](#chores)
     - [Code Refactoring](#code-refactoring-12)
-    - [Documentation](#documentation-24)
+    - [Documentation](#documentation-25)
     - [Features](#features-21)
     - [Unclassified](#unclassified-10)
 - [0.2.1-alpha.1 (2020-05-05)](#021-alpha1-2020-05-05)
   - [Chores](#chores-1)
-  - [Documentation](#documentation-25)
+  - [Documentation](#documentation-26)
 - [0.2.0-alpha.2 (2020-05-04)](#020-alpha2-2020-05-04)
   - [Breaking Changes](#breaking-changes-15)
     - [Bug Fixes](#bug-fixes-34)
     - [Chores](#chores-2)
     - [Code Refactoring](#code-refactoring-13)
-    - [Documentation](#documentation-26)
+    - [Documentation](#documentation-27)
     - [Features](#features-22)
     - [Unclassified](#unclassified-11)
 - [0.1.1-alpha.1 (2020-02-18)](#011-alpha1-2020-02-18)
   - [Bug Fixes](#bug-fixes-35)
   - [Code Refactoring](#code-refactoring-14)
-  - [Documentation](#documentation-27)
+  - [Documentation](#documentation-28)
 - [0.1.0-alpha.6 (2020-02-16)](#010-alpha6-2020-02-16)
   - [Bug Fixes](#bug-fixes-36)
   - [Code Refactoring](#code-refactoring-15)
-  - [Documentation](#documentation-28)
+  - [Documentation](#documentation-29)
   - [Features](#features-23)
 - [0.1.0-alpha.5 (2020-02-06)](#010-alpha5-2020-02-06)
-  - [Documentation](#documentation-29)
+  - [Documentation](#documentation-30)
   - [Features](#features-24)
 - [0.1.0-alpha.4 (2020-02-06)](#010-alpha4-2020-02-06)
   - [Continuous Integration](#continuous-integration)
-  - [Documentation](#documentation-30)
+  - [Documentation](#documentation-31)
 - [0.1.0-alpha.3 (2020-02-06)](#010-alpha3-2020-02-06)
   - [Continuous Integration](#continuous-integration-1)
 - [0.1.0-alpha.2 (2020-02-03)](#010-alpha2-2020-02-03)
   - [Bug Fixes](#bug-fixes-37)
-  - [Documentation](#documentation-31)
+  - [Documentation](#documentation-32)
   - [Features](#features-25)
   - [Unclassified](#unclassified-12)
 - [0.1.0-alpha.1 (2020-01-31)](#010-alpha1-2020-01-31)
-  - [Documentation](#documentation-32)
+  - [Documentation](#documentation-33)
 - [0.0.3-alpha.15 (2020-01-31)](#003-alpha15-2020-01-31)
   - [Unclassified](#unclassified-13)
 - [0.0.3-alpha.14 (2020-01-31)](#003-alpha14-2020-01-31)
@@ -288,12 +289,12 @@
   - [Unclassified](#unclassified-24)
 - [0.0.1-alpha.3 (2020-01-28)](#001-alpha3-2020-01-28)
   - [Continuous Integration](#continuous-integration-6)
-  - [Documentation](#documentation-33)
+  - [Documentation](#documentation-34)
   - [Unclassified](#unclassified-25)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
-# [](https://github.com/ory/kratos/compare/v0.11.1...v) (2023-03-09)
+# [](https://github.com/ory/kratos/compare/v0.11.1...v) (2023-03-13)
 
 ## Breaking Changes
 
@@ -325,6 +326,9 @@ flows.
   ([#3103](https://github.com/ory/kratos/issues/3103))
   ([1193a56](https://github.com/ory/kratos/commit/1193a5681fbc25d03c1e26a4296fa0b9abd2452b)),
   closes [#2950](https://github.com/ory/kratos/issues/2950)
+- Don't reuse ports in courier/SMTP tests
+  ([#3156](https://github.com/ory/kratos/issues/3156))
+  ([e260fcf](https://github.com/ory/kratos/commit/e260fcf06181ce9339edc729ab74826aa4be78cf))
 - Don't treat missing session as error in tracing
   ([290d28a](https://github.com/ory/kratos/commit/290d28ada1a55b599af7e41e638de699a474f1d8))
 - Handle upstream errors in patreon provider
@@ -406,6 +410,11 @@ flows.
 - Identity persistence ([#3101](https://github.com/ory/kratos/issues/3101))
   ([ceb5cc2](https://github.com/ory/kratos/commit/ceb5cc2b8a78be2f5b65d9a026c01ff0afe106af))
 
+### Documentation
+
+- Update security email ([#3164](https://github.com/ory/kratos/issues/3164))
+  ([9252f5a](https://github.com/ory/kratos/commit/9252f5a3c746927a2f537efc39cb1eb0aba167a5))
+
 ### Features
 
 - Add a new admin API to remove a specific 2nd factor credential

diff --git a/README.md b/README.md
@@ -629,8 +629,9 @@ Running identity infrastructure requires
 ### Disclosing vulnerabilities
 
 If you think you found a security vulnerability, please refrain from posting it
-publicly on the forums, the chat, or GitHub and send us an email to
-[hi@ory.am](mailto:hi@ory.sh) instead.
+publicly on the forums, the chat, or GitHub. You can find all info for
+responsible disclosure in our
+[security.txt](https://www.ory.sh/.well-known/security.txt).
 
 ## Telemetry
 

diff --git a/courier/courier_test.go b/courier/courier_test.go
@@ -7,11 +7,9 @@ import (
 	"testing"
 
 	"github.com/ory/kratos/x"
-	dhelper "github.com/ory/x/sqlcon/dockertest"
 )
 
 func TestMain(m *testing.M) {
-	atexit := dhelper.NewOnExit()
-	atexit.Add(x.CleanUpTestSMTP)
-	atexit.Exit(m.Run())
+	m.Run()
+	x.CleanUpTestSMTP()
 }
diff --git a/courier/smtp_test.go b/courier/smtp_test.go
@@ -172,7 +172,7 @@ func TestQueueEmail(t *testing.T) {
 			}
 
 			if total := gjson.GetBytes(body, "total").Int(); total != 3 {
-				return errors.Errorf("expected to have delivered at least 3 messages but got count %d with body: %s", total, body)
+				return errors.Errorf("expected to have delivered exactly 3 messages but got count %d with body: %s", total, body)
 			}
 
 			return nil

diff --git a/x/mailhog.go b/x/mailhog.go
@@ -11,9 +11,11 @@ import (
 	"time"
 
 	"github.com/cenkalti/backoff"
+	"github.com/phayes/freeport"
 	"github.com/pkg/errors"
 
 	"github.com/ory/dockertest/v3"
+	"github.com/ory/dockertest/v3/docker"
 )
 
 var (
@@ -41,6 +43,15 @@ func RunTestSMTP() (smtp, api string, err error) {
 	if err != nil {
 		return "", "", err
 	}
+	if err := pool.Client.Ping(); err != nil {
+		return "", "", err
+	}
+
+	ports, err := freeport.GetFreePorts(2)
+	if err != nil {
+		return "", "", err
+	}
+	smtpPort, apiPort := ports[0], ports[1]
 
 	resource, err := pool.
 		RunWithOptions(&dockertest.RunOptions{
@@ -56,6 +67,10 @@ func RunTestSMTP() (smtp, api string, err error) {
 				"-jim-linkspeed-min=1250",
 				"-jim-linkspeed-max=12500",
 			},
+			PortBindings: map[docker.Port][]docker.PortBinding{
+				"8025/tcp": {{HostPort: fmt.Sprintf("%d/tcp", apiPort)}},
+				"1025/tcp": {{HostPort: fmt.Sprintf("%d/tcp", smtpPort)}},
+			},
 		})
 	if err != nil {
 		return "", "", err
@@ -64,8 +79,8 @@ func RunTestSMTP() (smtp, api string, err error) {
 	resources = append(resources, resource)
 	resourceMux.Unlock()
 
-	smtp = fmt.Sprintf("smtp://test:test@127.0.0.1:%s/?disable_starttls=true", resource.GetPort("1025/tcp"))
-	api = fmt.Sprintf("http://127.0.0.1:%s", resource.GetPort("8025/tcp"))
+	smtp = fmt.Sprintf("smtp://test:test@127.0.0.1:%d/?disable_starttls=true", smtpPort)
+	api = fmt.Sprintf("http://127.0.0.1:%d", apiPort)
 	if err := backoff.Retry(func() error {
 		res, err := http.Get(api + "/api/v2/messages")
 		if err != nil {