From 81ff7a57313ca4c94fde7e3c0cfe6fc71dda1c71 Mon Sep 17 00:00:00 2001 From: Joseph Snyder Date: Wed, 28 Feb 2024 16:07:57 -0500 Subject: [PATCH] Backport Project Administration disabling (#2050) Originally was: 3003562cb032b7517d6a97e56fbaad32382b2f06 Add config to disable Project Administrator user registration (#2019) Add a new environment variable that will disable the registration form that is found on the manageProjectRoles page. If the current user is a site administrator, the form will always be shown. Issue: #2007 --- .env.example | 3 + .../ManageProjectRolesController.php | 7 ++ app/cdash/public/manageProjectRoles.xsl | 84 ++++++++++--------- config/auth.php | 2 + 4 files changed, 56 insertions(+), 40 deletions(-) diff --git a/.env.example b/.env.example index 63e9aa2c6b..6df1ea2eb9 100755 --- a/.env.example +++ b/.env.example @@ -190,6 +190,9 @@ MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}" # Whether or not "normal" username+password registration form submission is enabled # USER_REGISTRATION_FORM_ENABLED=true +# Whether or not a Project administrator can register a user +# PROJECT_ADMIN_REGISTRATION_FORM_ENABLED=true + # ldap.php #LDAP_HOSTS= diff --git a/app/Http/Controllers/ManageProjectRolesController.php b/app/Http/Controllers/ManageProjectRolesController.php index d47b6c8a30..e7b8f4a5b1 100644 --- a/app/Http/Controllers/ManageProjectRolesController.php +++ b/app/Http/Controllers/ManageProjectRolesController.php @@ -399,6 +399,9 @@ public function viewPage(): View|RedirectResponse if ($config->get('CDASH_FULL_EMAIL_WHEN_ADDING_USER') == 1) { $xml .= add_XML_value('fullemail', '1'); } + if ((config('auth.project_admin_registration_form_enabled') === true) || $current_user->admin) { + $xml .= add_XML_value('canRegister', '1'); + } $xml .= ''; return view('cdash', [ @@ -413,6 +416,10 @@ private function register_user($projectid, $email, $firstName, $lastName, $repos { $config = Config::getInstance(); + if(config('auth.project_admin_registration_form_enabled') === false) { + return 'Users cannot be registered via this form at the current time.'; + } + $UserProject = new UserProject(); $UserProject->ProjectId = $projectid; diff --git a/app/cdash/public/manageProjectRoles.xsl b/app/cdash/public/manageProjectRoles.xsl index f97db9a6f4..6c09298efe 100644 --- a/app/cdash/public/manageProjectRoles.xsl +++ b/app/cdash/public/manageProjectRoles.xsl @@ -103,8 +103,10 @@ Current users
  • Search for already registered users
    • -
  • - Register a new user
    • + +
  • + Register a new user
    • +
  • Import users from CVS file
    • @@ -230,44 +232,46 @@ -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - -
    User Email:
    		 - -
    First name:
    		 - -
    Last name:
    		 - -
    Repository credential:
    		 - - * email address is automatically added as a credential -
    - -
    -
    -
    + +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + +
    User Email:
    		 + +
    First name:
    		 + +
    Last name:
    		 + +
    Repository credential:
    		 + + * email address is automatically added as a credential +
    + +
    +
    +
    +
    diff --git a/config/auth.php b/config/auth.php index e24c21be2f..e460c37456 100755 --- a/config/auth.php +++ b/config/auth.php @@ -5,6 +5,8 @@ 'username_password_authentication_enabled' => env('USERNAME_PASSWORD_AUTHENTICATION_ENABLED', true), // Whether or not "normal" username+password authentication is enabled 'user_registration_form_enabled' => env('USER_REGISTRATION_FORM_ENABLED', true), + # Whether or not a Project administrator can register a user + 'project_admin_registration_form_enabled' => env('PROJECT_ADMIN_REGISTRATION_FORM_ENABLED', true), /* |--------------------------------------------------------------------------