@@ -116,16 +116,16 @@ |
||
116 | 116 | 'server_suffix' => '.hosted.eduroam.org', |
117 | 117 | 'gracetime' => 90, |
118 | 118 | 'CA' => ["type" => "embedded"], # OCSP URL needs to be configured in openssl.cnf |
119 | - # 'CA' => ["type" => "DFN", "SOAP_API_ENDPOINT" => "http://no.idea.where/"], |
|
119 | + # 'CA' => ["type" => "DFN", "SOAP_API_ENDPOINT" => "http://no.idea.where/"], |
|
120 | 120 | |
121 | 121 | ], |
122 | 122 | |
123 | 123 | /** |
124 | - * Lists the RADIUS servers. They have a built-in DB to log auth requests. |
|
125 | - * We need to query those to get auth stats for silverbullet admins |
|
126 | - * |
|
127 | - * @var array |
|
128 | - */ |
|
124 | + * Lists the RADIUS servers. They have a built-in DB to log auth requests. |
|
125 | + * We need to query those to get auth stats for silverbullet admins |
|
126 | + * |
|
127 | + * @var array |
|
128 | + */ |
|
129 | 129 | 'DB' => [ |
130 | 130 | // names don't matter - the source code will iterate through |
131 | 131 | // all entries |
@@ -106,7 +106,6 @@ discard block |
||
106 | 106 | * ["my.server.name"] => "my.server.name" |
107 | 107 | * ["foo.bar.de", "baz.bar.ge"] => "e" |
108 | 108 | * ["server1.example.com", "server2.example.com", "serverN.example.com"] => ".example.com" |
109 | - |
|
110 | 109 | * @return string |
111 | 110 | */ |
112 | 111 | public function longestNameSuffix() { |
@@ -340,7 +339,6 @@ discard block |
||
340 | 339 | * |
341 | 340 | * @param string $format only "der" and "pem" are currently allowed |
342 | 341 | * @return array an array of arrays or empty array on error |
343 | - |
|
344 | 342 | */ |
345 | 343 | final protected function saveCertificateFiles($format) { |
346 | 344 | switch ($format) { |
@@ -236,7 +236,7 @@ |
||
236 | 236 | const AUXATTRIB_SB_USERNAME = "ATTRIB-MANAGED-USERNAME"; |
237 | 237 | const AUXATTRIB_SB_USERID = "ATTRIB-MANAGED-USERID"; |
238 | 238 | const AUXATTRIB_SB_CERTSERIAL = "ATTRIB-MANAGED-CERTSERIAL"; |
239 | - const AUXATTRIB_SB_CERTCN = "ATTRIB-MANAGED-CERTCN"; |
|
239 | + const AUXATTRIB_SB_CERTCN = "ATTRIB-MANAGED-CERTCN"; |
|
240 | 240 | const AUXATTRIB_SB_CERTANNOTATION = "ATTRIB-MANAGED-CERTANNOTATION"; |
241 | 241 | const AUXATTRIB_SB_EXPIRY = "ATTRIB-MANAGED-EXPIRY"; /* MySQL timestamp format */ |
242 | 242 | const AUXATTRIB_TOKEN = "ATTRIB-TOKEN"; |
@@ -417,7 +417,7 @@ |
||
417 | 417 | $userId = $adminApi->firstParameterInstance($scrubbedParameters, web\lib\admin\API::AUXATTRIB_SB_USERID); |
418 | 418 | $userName = $adminApi->firstParameterInstance($scrubbedParameters, web\lib\admin\API::AUXATTRIB_SB_USERNAME); |
419 | 419 | $certSerial = $adminApi->firstParameterInstance($scrubbedParameters, web\lib\admin\API::AUXATTRIB_SB_CERTSERIAL); |
420 | - $certCN = $adminApi->firstParameterInstance($scrubbedParameters, web\lib\admin\API::AUXATTRIB_SB_CERTCN); |
|
420 | + $certCN = $adminApi->firstParameterInstance($scrubbedParameters, web\lib\admin\API::AUXATTRIB_SB_CERTCN); |
|
421 | 421 | if ($userId === FALSE && $userName === FALSE && $certSerial === FALSE && $certCN === FALSE) { |
422 | 422 | // we need at least one of those |
423 | 423 | $adminApi->returnError(\web\lib\admin\API::ERROR_MISSING_PARAMETER, "At least one of User ID, Username, certificate serial, or certificate CN is required."); |
@@ -701,7 +701,7 @@ |
||
701 | 701 | \core\common\Entity::$nomenclature_inst, |
702 | 702 | count($this->CAsAccountedFor)+1, |
703 | 703 | ($ca['root'] ? _("Root") : _("Intermediate"))) . |
704 | - "</string> |
|
704 | + "</string> |
|
705 | 705 | <key>PayloadIdentifier</key> |
706 | 706 | <string>" . self::$iPhonePayloadPrefix . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.credential.$this->caSerial</string> |
707 | 707 | <key>PayloadOrganization</key> |
@@ -68,7 +68,7 @@ |
||
68 | 68 | // initialise connection to eduPKI CA / eduroam RA and send the request to them |
69 | 69 | try { |
70 | 70 | $altArray = [# Array mit den Subject Alternative Names |
71 | - "email:" . $csr["USERMAIL"] |
|
71 | + "email:" . $csr["USERMAIL"] |
|
72 | 72 | ]; |
73 | 73 | $soapPub = $this->initEduPKISoapSession("PUBLIC"); |
74 | 74 | $this->loggerInstance->debug(5, "FIRST ACTUAL SOAP REQUEST (Public, newRequest)!\n"); |