feat: Allow registration to be disabled

CommunitySolidServer · Jul 26, 2021 · 6c8e650 · 6c8e650
1 parent 2d1d098
commit 6c8e650
Show file tree

Hide file tree

Showing 14 changed files with 37 additions and 2 deletions.
diff --git a/config/default.json b/config/default.json
@@ -11,6 +11,7 @@
     "files-scs:config/identity/handler/default.json",
     "files-scs:config/identity/ownership/token.json",
     "files-scs:config/identity/pod/static.json",
+    "files-scs:config/identity/registration/enabled.json",
     "files-scs:config/ldp/authentication/dpop-bearer.json",
     "files-scs:config/ldp/authorization/webacl.json",
     "files-scs:config/ldp/handler/default.json",

diff --git a/config/dynamic.json b/config/dynamic.json
@@ -11,6 +11,7 @@
     "files-scs:config/identity/handler/default.json",
     "files-scs:config/identity/ownership/token.json",
     "files-scs:config/identity/pod/dynamic.json",
+    "files-scs:config/identity/registration/enabled.json",
     "files-scs:config/ldp/authentication/dpop-bearer.json",
     "files-scs:config/ldp/authorization/webacl.json",
     "files-scs:config/ldp/handler/default.json",

diff --git a/config/example-https-file.json b/config/example-https-file.json
@@ -11,6 +11,7 @@
     "files-scs:config/identity/handler/default.json",
     "files-scs:config/identity/ownership/token.json",
     "files-scs:config/identity/pod/static.json",
+    "files-scs:config/identity/registration/enabled.json",
     "files-scs:config/ldp/authentication/dpop-bearer.json",
     "files-scs:config/ldp/authorization/webacl.json",
     "files-scs:config/ldp/handler/default.json",

diff --git a/config/file.json b/config/file.json
@@ -11,6 +11,7 @@
     "files-scs:config/identity/handler/default.json",
     "files-scs:config/identity/ownership/token.json",
     "files-scs:config/identity/pod/static.json",
+    "files-scs:config/identity/registration/enabled.json",
     "files-scs:config/ldp/authentication/dpop-bearer.json",
     "files-scs:config/ldp/authorization/webacl.json",
     "files-scs:config/ldp/handler/default.json",

diff --git a/config/identity/README.md b/config/identity/README.md
@@ -23,3 +23,8 @@ What to use for pod creation.
 * *dynamic*: Every created pod has its own Components.js config for its ResourceStore,
   which can differ from the others.
 * *static*: All pod data is stored in separate containers in the same ResourceStore.
+
+## Registration
+If users should be able to register on the server.
+* *enabled*: Enables registration.
+* *disabled*: Disables registration.
diff --git a/config/identity/handler/interaction/handler.json b/config/identity/handler/interaction/handler.json
@@ -4,7 +4,6 @@
     "files-scs:config/identity/handler/interaction/handlers/forgot-password.json",
     "files-scs:config/identity/handler/interaction/handlers/initial.json",
     "files-scs:config/identity/handler/interaction/handlers/login.json",
-    "files-scs:config/identity/handler/interaction/handlers/registration.json",
     "files-scs:config/identity/handler/interaction/handlers/reset-password.json",
     "files-scs:config/identity/handler/interaction/handlers/session.json"
   ],
@@ -15,7 +14,6 @@
       "@type": "WaterfallHandler",
       "handlers": [
         { "@id": "urn:solid-server:auth:password:InitialInteractionHandler" },
-        { "@id": "urn:solid-server:auth:password:RegistrationInteractionHandler" },
         { "@id": "urn:solid-server:auth:password:LoginInteractionHandler" },
         { "@id": "urn:solid-server:auth:password:SessionInteractionHandler" },
         { "@id": "urn:solid-server:auth:password:ForgotPasswordInteractionHandler" },

diff --git a/config/identity/registration/disabled.json b/config/identity/registration/disabled.json
@@ -0,0 +1,8 @@
+{
+  "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^1.0.0/components/context.jsonld",
+  "@graph": [
+    {
+      "comment": "Disable registration by not attaching a registration handler."
+    }
+  ]
+}
diff --git a/config/identity/registration/enabled.json b/config/identity/registration/enabled.json
@@ -0,0 +1,15 @@
+{
+  "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^1.0.0/components/context.jsonld",
+  "import": [
+    "files-scs:config/identity/registration/handler/registration.json"
+  ],
+  "@graph": [
+    {
+      "comment": "Enable registration by adding a registration handler to the list of interaction handlers.",
+      "@id": "urn:solid-server:auth:password:InteractionHttpHandler",
+      "WaterfallHandler:_handlers": [
+        { "@id": "urn:solid-server:auth:password:RegistrationInteractionHandler" }
+      ]
+    }
+  ]
+}
diff --git a/...er/interaction/handlers/registration.json → ...ty/registration/handler/registration.json b/...er/interaction/handlers/registration.json → ...ty/registration/handler/registration.json
diff --git a/config/memory-subdomains.json b/config/memory-subdomains.json
@@ -11,6 +11,7 @@
     "files-scs:config/identity/handler/default.json",
     "files-scs:config/identity/ownership/token.json",
     "files-scs:config/identity/pod/static.json",
+    "files-scs:config/identity/registration/enabled.json",
     "files-scs:config/ldp/authentication/dpop-bearer.json",
     "files-scs:config/ldp/authorization/webacl.json",
     "files-scs:config/ldp/handler/default.json",

diff --git a/config/path-routing.json b/config/path-routing.json
@@ -11,6 +11,7 @@
     "files-scs:config/identity/handler/default.json",
     "files-scs:config/identity/ownership/token.json",
     "files-scs:config/identity/pod/static.json",
+    "files-scs:config/identity/registration/enabled.json",
     "files-scs:config/ldp/authentication/dpop-bearer.json",
     "files-scs:config/ldp/authorization/webacl.json",
     "files-scs:config/ldp/handler/default.json",

diff --git a/test/integration/config/server-dynamic-unsafe.json b/test/integration/config/server-dynamic-unsafe.json
@@ -11,6 +11,7 @@
     "files-scs:config/identity/handler/default.json",
     "files-scs:config/identity/ownership/unsafe-no-check.json",
     "files-scs:config/identity/pod/dynamic.json",
+    "files-scs:config/identity/registration/enabled.json",
     "files-scs:config/ldp/authentication/debug-auth-header.json",
     "files-scs:config/ldp/authorization/webacl.json",
     "files-scs:config/ldp/handler/default.json",

diff --git a/test/integration/config/server-memory.json b/test/integration/config/server-memory.json
@@ -10,6 +10,7 @@
     "files-scs:config/identity/handler/default.json",
     "files-scs:config/identity/ownership/token.json",
     "files-scs:config/identity/pod/static.json",
+    "files-scs:config/identity/registration/enabled.json",
     "files-scs:config/ldp/authentication/dpop-bearer.json",
     "files-scs:config/ldp/authorization/webacl.json",
     "files-scs:config/ldp/handler/default.json",

diff --git a/test/integration/config/server-subdomains-unsafe.json b/test/integration/config/server-subdomains-unsafe.json
@@ -11,6 +11,7 @@
     "files-scs:config/identity/handler/default.json",
     "files-scs:config/identity/ownership/unsafe-no-check.json",
     "files-scs:config/identity/pod/static.json",
+    "files-scs:config/identity/registration/enabled.json",
     "files-scs:config/ldp/authentication/debug-auth-header.json",
     "files-scs:config/ldp/authorization/webacl.json",
     "files-scs:config/ldp/handler/default.json",