Merge remote-tracking branch 'origin/master' into feature/hsm

# Conflicts: # driver/registry_base.go # driver/registry_sql.go # go.mod
ory · Jan 11, 2022 · af52789 · af52789
2 parents ff11892 + 74da7b6
commit af52789
Show file tree

Hide file tree

Showing 112 changed files with 5,303 additions and 925 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  goreleaser: ory/[email protected].36
+  goreleaser: ory/[email protected].37
   slack: circleci/[email protected]
   sdk: ory/[email protected]
   changelog: ory/[email protected]

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -0,0 +1,268 @@
+# contributors generated by `make contributors`
+
+115100 <[email protected]>
+abusaidm <[email protected]>
+Ackermann Yuriy <[email protected]>
+Aeneas <[email protected]>
+Aeneas <[email protected]>
+Aeneas <[email protected]>
+aeneasr <[email protected]>
+aeneasr <[email protected]>
+aeneasr <[email protected]>
+aeneasr <[email protected]>
+Aeneas Rekkas <[email protected]>
+Aeneas Rekkas (arekkas) <[email protected]>
+Ajanthan <[email protected]>
+Akbar Uddin Kashif <[email protected]>
+Alano Terblanche <[email protected]>
+Alexander Widerberg <[email protected]>
+Alexander Widerberg <[email protected]>
+Allan Simon <[email protected]>
+Amaan Iqbal <[email protected]>
+Amir Aslaminejad <[email protected]>
+Amir Aslaminejad <[email protected]>
+Andreas Litt <[email protected]>
+André Filipe <[email protected]>
+Ankit Singh <[email protected]>
+Ante Mihalj <[email protected]>
+Anton Samoylenko <[email protected]>
+arapaho <[email protected]>
+arekkas <[email protected]>
+arekkas <[email protected]>
+Aritz Berasarte <[email protected]>
+Arkady Bagdasarov <[email protected]>
+Artem Yarmoliuk <[email protected]>
+Arthur Knoepflin <[email protected]>
+arunas-ka <[email protected]>
+aspeteRakete <[email protected]>
+Atallah khedrane <[email protected]>
+BastianHofmann <[email protected]>
+Benjamin Tanone <[email protected]>
+Ben Scholzen <[email protected]>
+Bernat Mut <[email protected]>
+bfrisbie-brex <[email protected]>
+Bhargav SNV <[email protected]>
+Brandon Philips <[email protected]>
+Brian <[email protected]>
+Brian Teller <[email protected]>
+Bruno Bigras <[email protected]>
+Bruno Heridet <[email protected]>
+catper <[email protected]>
+cherrymu <[email protected]>
+Chris Mack <[email protected]>
+Christian Dreier <[email protected]>
+Christian Skovholm <[email protected]>
+clausdenk <[email protected]>
+Corey Burmeister <[email protected]>
+Dallan Quass <[email protected]>
+Damien Bravin <[email protected]>
+Daniel Jiménez <[email protected]>
+Daniel Schellhorn <[email protected]>
+Daniel Shuy <[email protected]>
+Daniel Sutton <[email protected]>
+darron froese <[email protected]>
+Dave Kushner <[email protected]>
+David <[email protected]>
+David Lobe <[email protected]>
+David López <[email protected]>
+David <[email protected]>
+David Wilkins <[email protected]>
+debrutal <[email protected]>
+DennisPattmann5012 <[email protected]>
+Dexter Chua <[email protected]>
+dharmendraImprowised <[email protected]>
+Dibyajyoti Behera <[email protected]>
+Dimitrij Drus <[email protected]>
+Dimitrij Drus <[email protected]>
+Divyansh Bansal <[email protected]>
+Dmitry <[email protected]>
+Dmitry Dolbik <[email protected]>
+ducksecops <[email protected]>
+Edward Wilde <[email protected]>
+emil <[email protected]>
+Eric Douglas <[email protected]>
+Euan Kemp <[email protected]>
+fazal <[email protected]>
+fazal <[email protected]>
+Felix Jung <[email protected]>
+Flavio Leggio <[email protected]>
+Flori <[email protected]>
+Frank Felhoffer <[email protected]>
+Furkan <[email protected]>
+Gajewski Dmitriy <[email protected]>
+Genchi <[email protected]>
+George Bolo <[email protected]>
+Gilbert Gilb's <[email protected]>
+Gorka Lerchundi Osa <[email protected]>
+Grant Zvolsky <[email protected]>
+Grant Zvolský <[email protected]>
+Greg Woodcock <[email protected]>
+Grigory <[email protected]>
+hackerman <[email protected]>
+hackerman <[email protected]>
+Hans <[email protected]>
+Harsimran Singh Maan <[email protected]>
+Helmuth Bederna <[email protected]>
+Hendrik Heil <[email protected]>
+hisamura333 <[email protected]>
+İbrahim Esen <[email protected]>
+Igor Zibarev <[email protected]>
+Imran Ismail <[email protected]>
+Iñigo <[email protected]>
+Iñigo <[email protected]>
+Jacek Symonowicz <[email protected]>
+Jakub Błaszczyk <[email protected]>
+Jakub Błaszczyk <[email protected]>
+James Elliott <[email protected]>
+jamesnicolas <[email protected]>
+Jamie Stackhouse <[email protected]>
+Jan Beckmann <[email protected]>
+Jan <[email protected]>
+Jay Linski <[email protected]>
+jayme-github <[email protected]>
+jess <[email protected]>
+jhuggett <[email protected]>
+JiaLiPassion <[email protected]>
+Jimmy Stridh <[email protected]>
+Joao Carlos <[email protected]>
+Joao Carlos <[email protected]>
+Joel Pickup <[email protected]>
+John <[email protected]>
+John Wu <[email protected]>
+Josh Giles <[email protected]>
+Joshua Obasaju <[email protected]>
+Julian Tescher <[email protected]>
+Justin Clift <[email protected]>
+Kevin Minehart <[email protected]>
+khevse <[email protected]>
+Kim Neunert <[email protected]>
+Kishan B <[email protected]>
+kobayashilin <[email protected]>
+Kostya Lepa <[email protected]>
+Kunal Parikh <[email protected]>
+lauri <[email protected]>
+LemurP <[email protected]>
+Lennart Rosam <[email protected]>
+Louis Laureys <[email protected]>
+Luis Pedrosa <[email protected]>
+Lukasz Jagiello <[email protected]>
+Luke Stoward <[email protected]>
+Marco Hutzsch <[email protected]>
+Masoud Tahmasebi <[email protected]>
+Matheus Moraes <[email protected]>
+Matt Bonnell <[email protected]>
+Matt Bonnell <[email protected]>
+Matt Drollette <[email protected]>
+Matteo Suppo <[email protected]>
+Matthew Fawcett <[email protected]>
+Matt Vinall <[email protected]>
+Matt Vinall <[email protected]>
+Maurizio <[email protected]>
+Maxime Song <[email protected]>
+Max Köhler <[email protected]>
+michaelwagler <[email protected]>
+Mitar <[email protected]>
+Mitar <[email protected]>
+mkontani <[email protected]>
+Moritz Lang <[email protected]>
+MOZGIII <[email protected]>
+Natalia <[email protected]>
+Nathan Mills <[email protected]>
+naveenpaul1 <[email protected]>
+Neeraj <[email protected]>
+Nejcraft <[email protected]>
+nessita <[email protected]>
+Nestor <[email protected]>
+Nick Otter <[email protected]>
+NickUfer <[email protected]>
+Nick Ufer <[email protected]>
+Nikita Puzankov <[email protected]>
+NikolaySl <[email protected]>
+Nikolay Stupak <[email protected]>
+nishanth2143 <[email protected]>
+olFi95 <[email protected]>
+Olivier Deckers <[email protected]>
+Olivier Tremblay <[email protected]>
+ORY Continuous Integration <[email protected]>
+ORY Continuous Integration <[email protected]>
+ORY Continuous Integration <[email protected]>
+Oz Haven <[email protected]>
+Patrick Barker <[email protected]>
+Patrick Tescher <[email protected]>
+Patrik <[email protected]>
+Paul Harman <[email protected]>
+Petr Jediný <[email protected]>
+phi2039 <[email protected]>
+Philip Nicolcev <[email protected]>
+Philip Nicolcev <[email protected]>
+phiremande <[email protected]>
+Pierre-David Bélanger <[email protected]>
+pike1212 <[email protected]>
+pike1212 <[email protected]>
+prateek1192 <[email protected]>
+Prateek Malhotra <[email protected]>
+Quentin Perez <[email protected]>
+Ricardo Iván Vieitez Parra <[email protected]>
+Richard Zana <[email protected]>
+Rich Wareham <[email protected]>
+rickwang7712 <[email protected]>
+RikiyaFujii <[email protected]>
+RNBack <[email protected]>
+robhinds <[email protected]>
+Rob Smith <[email protected]>
+Roman Lytvyn <[email protected]>
+Roman Minkin <[email protected]>
+Saad Tazi <[email protected]>
+sagarshah1983 <[email protected]>
+SaintMalik <[email protected]>
+Samuele Lilli <[email protected]>
+Sawada Shota <[email protected]>
+sawadashota <[email protected]>
+Sawada Shota <[email protected]>
+seremenko-wish <[email protected]>
+Shadaï ALI <[email protected]>
+Shane Starcher <[email protected]>
+Shankar Dhanasekaran <[email protected]>
+Shaurya Dhadwal <[email protected]>
+Shota SAWADA <[email protected]>
+Simon Lipp <[email protected]>
+Simon-Pierre Gingras <[email protected]>
+simpleway <[email protected]>
+Smotrov Dmitriy <[email protected]>
+Stepan Rakitin <[email protected]>
+Stephan Renatus <[email protected]>
+Steve Kaliski <[email protected]>
+Sufijen Bani <[email protected]>
+Sven Neuhaus <[email protected]>
+The Gitter Badger <[email protected]>
+Thibault Doubliez <[email protected]>
+Thomas Aidan Curran <[email protected]>
+Thomas Aidan Curran <[email protected]>
+Thomas Recloux <[email protected]>
+Thomas Stewart <[email protected]>
+Thor Marius Henrichsen <[email protected]>
+TilmanTheile <[email protected]>
+timothyknight <[email protected]>
+Tim Sazon <[email protected]>
+tutman96 <[email protected]>
+T Venu Madhav <[email protected]>
+tyaps <[email protected]>
+Vadim <[email protected]>
+vancity-amir <[email protected]>
+Vincent <[email protected]>
+Vinci Xu <[email protected]>
+vinckr <[email protected]>
+Vishesh Handa <[email protected]>
+Vitaly Migunov <[email protected]>
+Vladimir Kalugin <[email protected]>
+wanderer163 <[email protected]>
+Wei Cheng <[email protected]>
+Wojciech Kuźmiński <[email protected]>
+Wyatt Anderson <[email protected]>
+Yannick Heinrich <[email protected]>
+Yorman ����â€™.͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇͇Ỏ̷͖͈̞̩͎̻̫̫̜͉̠̫͕̭̭̫  ฏ๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎๎ <[email protected]>
+Yuki Hirasawa <[email protected]>
+Zbigniew Mandziejewicz <[email protected]>
+zepatrik <[email protected]>
+zepatrik <[email protected]>
+巢鹏 <[email protected]>
diff --git a/README.md b/README.md
@@ -196,7 +196,7 @@ that your company deserves a spot here, reach out to
             <td>Zero</td>
             <td align="center"><img height="32px" src="https://raw.githubusercontent.com/ory/meta/master/static/adopters/commitzero.svg" alt="Project Zero by Commit"></td>
             <td><a href="https://getzero.dev/">getzero.dev</a></td>
-        </tr>        
+        </tr>
         <tr>
             <td>Adopter *</td>
             <td>Padis</td>
@@ -214,7 +214,7 @@ that your company deserves a spot here, reach out to
             <td>Security Onion Solutions</td>
             <td align="center"><img height="32px" src="https://raw.githubusercontent.com/ory/meta/master/static/adopters/securityonion.svg" alt="Security Onion Solutions"></td>
             <td><a href="https://securityonionsolutions.com/">securityonionsolutions.com</a></td>
-        </tr>        
+        </tr>
         <tr>
             <td>Adopter *</td>
             <td>Factly</td>
@@ -238,7 +238,7 @@ that your company deserves a spot here, reach out to
             <td>Spiri.bo</td>
             <td align="center"><img height="32px" src="https://raw.githubusercontent.com/ory/meta/master/static/adopters/spiribo.svg" alt="Spiri.bo"></td>
             <td><a href="https://spiri.bo/">spiri.bo</a></td>
-        </tr>        
+        </tr>
         <tr>
             <td>Sponsor</td>
             <td>Strivacity</td>
@@ -274,6 +274,8 @@ ORY Hydra implements Open Standards set by the IETF:
 * [OAuth 2.0 Token Revocation](https://tools.ietf.org/html/rfc7009)
 * [OAuth 2.0 Token Introspection](https://tools.ietf.org/html/rfc7662)
 * [OAuth 2.0 for Native Apps](https://tools.ietf.org/html/draft-ietf-oauth-native-apps-10)
+* [OAuth 2.0 Dynamic Client Registration Protocol](https://datatracker.ietf.org/doc/html/rfc7591)
+* [OAuth 2.0 Dynamic Client Registration Management Protocol](https://datatracker.ietf.org/doc/html/rfc7592)
 * [Proof Key for Code Exchange by OAuth Public Clients](https://tools.ietf.org/html/rfc7636)
 * [JSON Web Token (JWT) Profile for OAuth 2.0 Client Authentication and Authorization Grants](https://tools.ietf.org/html/rfc7523)
 

diff --git a/...rect_or_missing_auth-endpoint=selfservice-method=DELETE-with_a_different_client_auth.json b/...rect_or_missing_auth-endpoint=selfservice-method=DELETE-with_a_different_client_auth.json
@@ -0,0 +1,7 @@
+{
+  "body": {
+    "error": "The request could not be authorized",
+    "error_description": "The requested OAuth 2.0 client does not exist or you provided incorrect credentials."
+  },
+  "status": 401
+}
diff --git a/...rvice_with_incorrect_or_missing_auth-endpoint=selfservice-method=DELETE-without_auth.json b/...rvice_with_incorrect_or_missing_auth-endpoint=selfservice-method=DELETE-without_auth.json
@@ -0,0 +1,7 @@
+{
+  "body": {
+    "error": "The request could not be authorized",
+    "error_description": "The requested OAuth 2.0 client does not exist or you provided incorrect credentials."
+  },
+  "status": 401
+}
diff --git a/..._incorrect_or_missing_auth-endpoint=selfservice-method=DELETE-without_incorrect_auth.json b/..._incorrect_or_missing_auth-endpoint=selfservice-method=DELETE-without_incorrect_auth.json
@@ -0,0 +1,7 @@
+{
+  "body": {
+    "error": "The request could not be authorized",
+    "error_description": "The requested OAuth 2.0 client does not exist or you provided incorrect credentials."
+  },
+  "status": 401
+}
diff --git a/...correct_or_missing_auth-endpoint=selfservice-method=GET-with_a_different_client_auth.json b/...correct_or_missing_auth-endpoint=selfservice-method=GET-with_a_different_client_auth.json
@@ -0,0 +1,7 @@
+{
+  "body": {
+    "error": "The request could not be authorized",
+    "error_description": "The requested OAuth 2.0 client does not exist or you provided incorrect credentials."
+  },
+  "status": 401
+}
diff --git a/...fservice_with_incorrect_or_missing_auth-endpoint=selfservice-method=GET-without_auth.json b/...fservice_with_incorrect_or_missing_auth-endpoint=selfservice-method=GET-without_auth.json
@@ -0,0 +1,7 @@
+{
+  "body": {
+    "error": "The request could not be authorized",
+    "error_description": "The requested OAuth 2.0 client does not exist or you provided incorrect credentials."
+  },
+  "status": 401
+}
diff --git a/...ith_incorrect_or_missing_auth-endpoint=selfservice-method=GET-without_incorrect_auth.json b/...ith_incorrect_or_missing_auth-endpoint=selfservice-method=GET-without_incorrect_auth.json
@@ -0,0 +1,7 @@
+{
+  "body": {
+    "error": "The request could not be authorized",
+    "error_description": "The requested OAuth 2.0 client does not exist or you provided incorrect credentials."
+  },
+  "status": 401
+}
diff --git a/...correct_or_missing_auth-endpoint=selfservice-method=PUT-with_a_different_client_auth.json b/...correct_or_missing_auth-endpoint=selfservice-method=PUT-with_a_different_client_auth.json
@@ -0,0 +1,7 @@
+{
+  "body": {
+    "error": "The request could not be authorized",
+    "error_description": "The requested OAuth 2.0 client does not exist or you provided incorrect credentials."
+  },
+  "status": 401
+}
diff --git a/...fservice_with_incorrect_or_missing_auth-endpoint=selfservice-method=PUT-without_auth.json b/...fservice_with_incorrect_or_missing_auth-endpoint=selfservice-method=PUT-without_auth.json
@@ -0,0 +1,7 @@
+{
+  "body": {
+    "error": "The request could not be authorized",
+    "error_description": "The requested OAuth 2.0 client does not exist or you provided incorrect credentials."
+  },
+  "status": 401
+}
diff --git a/...ith_incorrect_or_missing_auth-endpoint=selfservice-method=PUT-without_incorrect_auth.json b/...ith_incorrect_or_missing_auth-endpoint=selfservice-method=PUT-without_incorrect_auth.json
@@ -0,0 +1,7 @@
+{
+  "body": {
+    "error": "The request could not be authorized",
+    "error_description": "The requested OAuth 2.0 client does not exist or you provided incorrect credentials."
+  },
+  "status": 401
+}