[archiva-redback-core] branch redback-2.6.x updated: add a system property to disable registration

[olamy]

This is an automated email from the ASF dual-hosted git repository.

olamy pushed a commit to branch redback-2.6.x
in repository https://gitbox.apache.org/repos/asf/archiva-redback-core.git


The following commit(s) were added to refs/heads/redback-2.6.x by this push:
     new cc749985 add a system property to disable registration
cc749985 is described below

commit cc74998563c0671a7b1dfd940e01d8a1fae79b6c
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Thu Jun 22 16:38:00 2023 +1000

    add a system property to disable registration
    
    Signed-off-by: Olivier Lamy <ol...@apache.org>
---
 .../apache/archiva/redback/configuration/UserConfiguration.java    | 2 ++
 .../org/apache/archiva/redback/rest/api/services/UserService.java  | 1 +
 .../apache/archiva/redback/rest/services/DefaultUserService.java   | 7 ++++++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git 
a/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java
 
b/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java
index a1a307af..3af0362b 100644
--- 
a/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java
+++ 
b/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java
@@ -31,6 +31,8 @@ import java.util.List;
 public interface UserConfiguration
 {
 
+    String USER_REGISTRATION_DISABLE_KEY = UserConfiguration.class.getName() + 
"USER_REGISTRATION_DISABLE_KEY";
+
     void initialize()
         throws UserConfigurationException;
 
diff --git 
a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/UserService.java
 
b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/UserService.java
index 9d10ff76..aa335859 100644
--- 
a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/UserService.java
+++ 
b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/UserService.java
@@ -41,6 +41,7 @@ import java.util.List;
 @Path( "/userService/" )
 public interface UserService
 {
+
     @Path( "getUser/{userName}" )
     @GET
     @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } )
diff --git 
a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
 
b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
index c11d7102..afbb822a 100644
--- 
a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
+++ 
b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
@@ -70,7 +70,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.Response;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -633,6 +632,12 @@ public class DefaultUserService
     public RegistrationKey registerUser( UserRegistrationRequest 
userRegistrationRequest )
         throws RedbackServiceException
     {
+
+        if 
(Boolean.getBoolean(UserConfiguration.USER_REGISTRATION_DISABLE_KEY))
+        {
+            throw new RedbackServiceException( new ErrorMessage("Registration 
Disabled"));
+        }
+
         User user = userRegistrationRequest.getUser();
         if ( user == null )
         {