move hardwired strings to config-switchable constants

GEANT · Jul 17, 2023 · 645d9fb · 645d9fb
1 parent 138cf08
commit 645d9fb
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/core/CertificationAuthorityEduPkiServer.php b/core/CertificationAuthorityEduPkiServer.php
@@ -24,7 +24,8 @@ class CertificationAuthorityEduPkiServer extends EntityWithDBProperties implemen
     #private const EDUPKI_CERT_PROFILE_IDP = "eduroam IdP";
     #private const EDUPKI_CERT_PROFILE_SP = "eduroam SP";
     #private const EDUPKI_RA_PKEY_PASSPHRASE = "...";
-
+    #private const EDUPKI_ENDPOINT_PUBLIC = "https://pki.edupki.org/edupki-ca/cgi-bin/pub/soap?wsdl=1";
+    #private const EDUPKI_ENDPOINT_RA = "https://ra.edupki.org/edupki-ca/cgi-bin/ra/soap?wsdl=1";
 
     private const LOCATION_RA_CERT = ROOT . "/config/SilverbulletClientCerts/edupki-test-ra.pem";
     private const LOCATION_RA_KEY = ROOT . "/config/SilverbulletClientCerts/edupki-test-ra.clearkey";
@@ -34,6 +35,8 @@ class CertificationAuthorityEduPkiServer extends EntityWithDBProperties implemen
     private const EDUPKI_CERT_PROFILE_IDP = "Radius Server SOAP";
     private const EDUPKI_CERT_PROFILE_SP = "Radius Server SOAP";
     private const EDUPKI_RA_PKEY_PASSPHRASE = "...";
+    private const EDUPKI_ENDPOINT_PUBLIC = "https://pki.edupki.org/edupki-test-ca/cgi-bin/pub/soap?wsdl=1";
+    private const EDUPKI_ENDPOINT_RA = "https://ra.edupki.org/edupki-test-ca/cgi-bin/ra/soap?wsdl=1";
 
     /**
      * sets up the environment so that we can talk to eduPKI
@@ -206,7 +209,7 @@ public function sendRequestToCa($csr, $revocationPin, $expiryDays): int
             // sign the data, using cmdline because openssl_pkcs7_sign produces strange results
             // -binary didn't help, nor switch -md to sha1 sha256 or sha512
             $this->loggerInstance->debug(5, "Actual content to be signed is this:\n  $soapCleartext\n");
-        $execCmd = \config\Master::PATHS['openssl'] . " smime -sign -binary -in " . $tempdir['dir'] . "/content.txt -out " . $tempdir['dir'] . "/signature.txt -outform pem -inkey " . ROOT . "/config/SilverbulletClientCerts/edupki-test-ra.clearkey -signer " . ROOT . "/config/SilverbulletClientCerts/edupki-test-ra.pem";
+        $execCmd = \config\Master::PATHS['openssl'] . " smime -sign -binary -in " . $tempdir['dir'] . "/content.txt -out " . $tempdir['dir'] . "/signature.txt -outform pem -inkey " . ROOT . CertificationAuthorityEduPkiServer::LOCATION_RA_KEY -signer " . ROOT . CertificationAuthorityEduPkiServer::LOCATION_RA_CERT;
             $this->loggerInstance->debug(2, "Calling openssl smime with following cmdline:   $execCmd\n");
             $output = [];
             $return = 999;
@@ -374,11 +377,11 @@ private function initEduPKISoapSession($type)
         $url = "";
         switch ($type) {
             case "PUBLIC":
-                $url = "https://pki.edupki.org/edupki-test-ca/cgi-bin/pub/soap?wsdl=1";
+                $url = CertificationAuthorityEduPkiServer::EDUPKI_ENDPOINT_PUBLIC;
                 $context_params['ssl']['peer_name'] = 'pki.edupki.org';
                 break;
             case "RA":
-                $url = "https://ra.edupki.org/edupki-test-ca/cgi-bin/ra/soap?wsdl=1";
+                $url = CertificationAuthorityEduPkiServer::EDUPKI_ENDPOINT_RA;
                 $context_params['ssl']['peer_name'] = 'ra.edupki.org';
                 break;
             default:
@@ -511,4 +514,4 @@ public function updateFreshness()
     {
         // nothing to be done here.
     }
-}
+}