fix: use dirac-proxy-init instead of dirac-login

Author: fstagni

integration_tests.py

@@ -378,7 +378,7 @@ def install_server():
     # for the diracx container to use
     # It needs to be started and running before the DIRAC server installation
     # because after installing the databases, the install server script
-    # calls dirac-login.
+    # calls dirac-proxy-init.
     # At this point we need the new CS to have been updated
     # already else the token exchange fails.
 

src/DIRAC/FrameworkSystem/scripts/dirac_proxy_init.py

@@ -6,21 +6,20 @@
   $ dirac-proxy-init -g dirac_user
   Enter Certificate password: **************
 """
+import datetime
+import glob
 import os
 import sys
-import glob
 import time
-import datetime
 
 import DIRAC
-
-from DIRAC import gLogger, gConfig, S_OK, S_ERROR
+from DIRAC import S_ERROR, S_OK, gLogger
+from DIRAC.ConfigurationSystem.Client.Helpers import Registry
 from DIRAC.Core.Base.Script import Script
-from DIRAC.FrameworkSystem.Client import ProxyGeneration, ProxyUpload
-from DIRAC.Core.Security import X509Chain, ProxyInfo, VOMS
+from DIRAC.Core.Security import VOMS, ProxyInfo, X509Chain
 from DIRAC.Core.Security.DiracX import addTokenToPEM
 from DIRAC.Core.Security.Locations import getCAsLocation, getDefaultProxyLocation
-from DIRAC.ConfigurationSystem.Client.Helpers import Registry
+from DIRAC.FrameworkSystem.Client import ProxyGeneration, ProxyUpload
 from DIRAC.FrameworkSystem.Client.BundleDeliveryClient import BundleDeliveryClient
 
 

tests/CI/install_client.sh

@@ -61,7 +61,7 @@ echo -e "*** $(date -u) **** Client INSTALLATION START ****\n"
 installDIRAC
 
 echo -e "*** $(date -u)  Getting a non privileged user\n" |& tee -a clientTestOutputs.txt
-dirac-login -C "${SERVERINSTALLDIR}/user/client.pem" -K "${SERVERINSTALLDIR}/user/client.key" "${DEBUG}" |& tee -a clientTestOutputs.txt
+dirac-proxy-init -C "${SERVERINSTALLDIR}/user/client.pem" -K "${SERVERINSTALLDIR}/user/client.key" "${DEBUG}" |& tee -a clientTestOutputs.txt
 
 #-------------------------------------------------------------------------------#
 echo -e "*** $(date -u) **** Submit a job ****\n"

tests/Jenkins/utilities.sh

@@ -247,6 +247,13 @@ installDIRAC() {
   echo "source \"$PWD/diracos/diracosrc\"" > "$PWD/bashrc"
   echo "export X509_CERT_DIR=\"$PWD/diracos/etc/grid-security/certificates\"" >> "$PWD/bashrc"
   source diracos/diracosrc
+
+  # Copy the user cert and key to the correct directory
+  cp /ca/certs/client.pem "${SERVERINSTALLDIR}/user/"
+  cp /ca/certs/client.key "${SERVERINSTALLDIR}/user/"
+  cp /ca/certs/client.pem /home/dirac/.globus/usercert.pem
+  cp /ca/certs/client.key /home/dirac/.globus/userkey.pem
+
   if [[ -n "${DIRAC_RELEASE+x}" ]]; then
     if [[ -z "${ALTERNATIVE_MODULES}" ]]; then
       pip install DIRAC "${DIRAC_RELEASE}"
@@ -388,8 +395,8 @@ diracCredentials() {
   echo '==> [diracCredentials]'
 
   sed -i 's/commitNewData = CSAdministrator/commitNewData = authenticated/g' "${SERVERINSTALLDIR}/etc/Configuration_Server.cfg"
-  if ! dirac-login dirac_admin --nocs -C "${SERVERINSTALLDIR}/user/client.pem" -K "${SERVERINSTALLDIR}/user/client.key" -T 72 "${DEBUG}"; then
-    echo 'ERROR: dirac-login failed' >&2
+  if ! dirac-proxy-init dirac_admin --nocs -C "${SERVERINSTALLDIR}/user/client.pem" -K "${SERVERINSTALLDIR}/user/client.key" "${DEBUG}"; then
+    echo 'ERROR: dirac-proxy-init failed' >&2
     exit 1
   fi
   sed -i 's/commitNewData = authenticated/commitNewData = CSAdministrator/g' "${SERVERINSTALLDIR}/etc/Configuration_Server.cfg"
@@ -471,21 +478,21 @@ diracProxies() {
   if [[ -n $TEST_DIRACX ]]; then
     echo "Waiting for for DiracX to be available" >&2
     for i in {1..10}; do
-      if dirac-login -C "${SERVERINSTALLDIR}/user/client.pem" -K "${SERVERINSTALLDIR}/user/client.key" -T 72 "${DEBUG}"; then
+      if dirac-proxy-init -C "${SERVERINSTALLDIR}/user/client.pem" -K "${SERVERINSTALLDIR}/user/client.key" "${DEBUG}"; then
         break
       fi
       sleep 5
     done
   fi
 
   # User proxy
-  if ! dirac-login -C "${SERVERINSTALLDIR}/user/client.pem" -K "${SERVERINSTALLDIR}/user/client.key" -T 72 "${DEBUG}"; then
-    echo 'ERROR: dirac-login failed' >&2
+  if ! dirac-proxy-init -C "${SERVERINSTALLDIR}/user/client.pem" -K "${SERVERINSTALLDIR}/user/client.key" "${DEBUG}"; then
+    echo 'ERROR: dirac-init failed' >&2
     exit 1
   fi
   # group proxy
-  if ! dirac-login prod -C "${SERVERINSTALLDIR}/user/client.pem" -K "${SERVERINSTALLDIR}/user/client.key" -T 72 "${DEBUG}"; then
-    echo 'ERROR: dirac-login failed' >&2
+  if ! dirac-proxy-init prod -C "${SERVERINSTALLDIR}/user/client.pem" -K "${SERVERINSTALLDIR}/user/client.key" "${DEBUG}"; then
+    echo 'ERROR: dirac-init failed' >&2
     exit 1
   fi
 }