@@ -109,7 +109,7 @@ |
||
| 109 | 109 | $deployment->deactivate(); |
| 110 | 110 | } |
| 111 | 111 | header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response)) . '#profilebox_' . |
| 112 | - $deployment->identifier); |
|
| 112 | + $deployment->identifier); |
|
| 113 | 113 | exit(0); |
| 114 | 114 | case web\lib\common\FormElements::BUTTON_REMOVESP: |
| 115 | 115 | $deployment->remove(); |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | /* Messages */ |
| 92 | 92 | $messages = [ |
| 93 | 93 | 'WRONG_SUBJECT' => _('Submitted Certificate Signing Request contains subject field that does not start with') . ' ' . |
| 94 | - $subject_prefix . '<br>' . _("See CSR generation rules below."), |
|
| 94 | + $subject_prefix . '<br>' . _("See CSR generation rules below."), |
|
| 95 | 95 | 'WRONG_CRL' => _('Submitted Certificate Signing Request is broken - unable to extract the public key from CSR') |
| 96 | 96 | ]; |
| 97 | 97 | $settings = array(); |
@@ -171,16 +171,16 @@ discard block |
||
| 171 | 171 | $ou = $serverInfo["names"][$langInstance->getLang()]; |
| 172 | 172 | } |
| 173 | 173 | print($ou); |
| 174 | - $modou = 0; |
|
| 175 | - if (str_contains($ou, ',')) { |
|
| 176 | - $modou = 1; |
|
| 177 | - $ou = str_replace(",", "/,", $ou); |
|
| 178 | - } |
|
| 179 | - $ou = preg_replace('/\s+/', ' ', $ou); |
|
| 180 | - if (strlen($ou) >= 64) { |
|
| 181 | - $ou = substr($ou, 0, 64); |
|
| 182 | - $modou += 2; |
|
| 183 | - } |
|
| 174 | + $modou = 0; |
|
| 175 | + if (str_contains($ou, ',')) { |
|
| 176 | + $modou = 1; |
|
| 177 | + $ou = str_replace(",", "/,", $ou); |
|
| 178 | + } |
|
| 179 | + $ou = preg_replace('/\s+/', ' ', $ou); |
|
| 180 | + if (strlen($ou) >= 64) { |
|
| 181 | + $ou = substr($ou, 0, 64); |
|
| 182 | + $modou += 2; |
|
| 183 | + } |
|
| 184 | 184 | $DN[] = "O=".iconv('UTF-8', 'ASCII//TRANSLIT', $ou); |
| 185 | 185 | $serverList = explode(",", $serverInfo["servers"]); |
| 186 | 186 | $DN[] = "CN=" . $serverList[0]; |
@@ -205,20 +205,20 @@ discard block |
||
| 205 | 205 | echo "<p style='font-size: large'>" . _("Requesting a certificate with the following properties"); |
| 206 | 206 | echo "<ul>"; |
| 207 | 207 | echo "<li>" . _("Policy OIDs: ") . implode(", ", $policies) . "</li>"; |
| 208 | - echo "<li>" . _("Distinguished Name: ") . implode(", ", $DN); |
|
| 209 | - if ($modou > 0) { |
|
| 210 | - echo " ("; |
|
| 208 | + echo "<li>" . _("Distinguished Name: ") . implode(", ", $DN); |
|
| 209 | + if ($modou > 0) { |
|
| 210 | + echo " ("; |
|
| 211 | 211 | echo _("Organization field adjusted"). ': '; |
| 212 | - $desc = array(); |
|
| 213 | - if ($modou >= 2) { |
|
| 214 | - $desc[] = _("truncated to 64 chars"); |
|
| 215 | - } |
|
| 216 | - if ($modou == 1 || $modou == 3) { |
|
| 217 | - $desc[] = _("commas escaped"); |
|
| 212 | + $desc = array(); |
|
| 213 | + if ($modou >= 2) { |
|
| 214 | + $desc[] = _("truncated to 64 chars"); |
|
| 215 | + } |
|
| 216 | + if ($modou == 1 || $modou == 3) { |
|
| 217 | + $desc[] = _("commas escaped"); |
|
| 218 | 218 | } |
| 219 | - echo implode(', ', $desc); |
|
| 220 | - echo ")"; |
|
| 221 | - } |
|
| 219 | + echo implode(', ', $desc); |
|
| 220 | + echo ")"; |
|
| 221 | + } |
|
| 222 | 222 | echo "</li>"; |
| 223 | 223 | echo "<li>" . _("subjectAltName:DNS : ") . implode(", ", $serverList) . "</li>"; |
| 224 | 224 | echo "<li>" . _("Requester Contact Details: ") . $firstName . " <" . $firstMail . ">" . "</li>"; |
@@ -373,7 +373,7 @@ discard block |
||
| 373 | 373 | <?php if (empty($policies)) {?> |
| 374 | 374 | eduroam IdP/SP |
| 375 | 375 | <?php } else { |
| 376 | - echo implode(', ', $policies); |
|
| 376 | + echo implode(', ', $policies); |
|
| 377 | 377 | }?> |
| 378 | 378 | </span> |
| 379 | 379 | </h3> |
@@ -348,19 +348,19 @@ |
||
| 348 | 348 | ); |
| 349 | 349 | // Generate a new private (and public) key pair |
| 350 | 350 | $privkey = openssl_pkey_new(array( |
| 351 | - "private_key_bits" => 4096, |
|
| 352 | - "private_key_type" => OPENSSL_KEYTYPE_RSA)); |
|
| 351 | + "private_key_bits" => 4096, |
|
| 352 | + "private_key_type" => OPENSSL_KEYTYPE_RSA)); |
|
| 353 | 353 | // export private key to $clientprivateKey (as string) |
| 354 | 354 | openssl_pkey_export($privkey, $this->radsec_priv); |
| 355 | 355 | // Generate a certificate signing request |
| 356 | 356 | $csr = openssl_csr_new($dn, $privkey, |
| 357 | - array('digest_alg' => 'sha256', 'config' => ROOT . "/config/ManagedSPCerts/openssl.cnf")); |
|
| 357 | + array('digest_alg' => 'sha256', 'config' => ROOT . "/config/ManagedSPCerts/openssl.cnf")); |
|
| 358 | 358 | // get CA certificate and private key |
| 359 | 359 | $caprivkey = array(file_get_contents(ROOT . "/config/ManagedSPCerts/eduroamSP-CA.key"), |
| 360 | 360 | \config\Master::MANAGEDSP['capass']); |
| 361 | 361 | $cacert = file_get_contents(ROOT . "/config/ManagedSPCerts/eduroamSP-CA.pem"); |
| 362 | 362 | $clientcert = openssl_csr_sign($csr, $cacert, $caprivkey, \config\Master::MANAGEDSP['daystoexpiry'], |
| 363 | - array('digest_alg'=>'sha256', 'config' => ROOT . "/config/ManagedSPCerts/openssl.cnf"), rand()); |
|
| 363 | + array('digest_alg'=>'sha256', 'config' => ROOT . "/config/ManagedSPCerts/openssl.cnf"), rand()); |
|
| 364 | 364 | openssl_x509_export($clientcert, $this->radsec_cert); |
| 365 | 365 | } |
| 366 | 366 | /** |