@@ -236,7 +236,7 @@ |
||
236 | 236 | } |
237 | 237 | |
238 | 238 | if ($ldap_cert_data === $client_cert_data) { |
239 | - if (is_null($this->ldapConfig->getOptionalArray('attributes',null))) { |
|
239 | + if (is_null($this->ldapConfig->getOptionalArray('attributes',null))) { |
|
240 | 240 | $attributes = $entry->getAttributes(); |
241 | 241 | } else { |
242 | 242 | $attributes = array_intersect_key( |
@@ -172,7 +172,7 @@ discard block |
||
172 | 172 | // value is scalar |
173 | 173 | if (array_key_exists($x509_attr, $client_cert_data['subject'])) { |
174 | 174 | $value = $client_cert_data['subject'][$x509_attr]; |
175 | - Logger::info('authX509: cert ' . $x509_attr . ' = ' . $value); |
|
175 | + Logger::info('authX509: cert '.$x509_attr.' = '.$value); |
|
176 | 176 | $entry = $this->findUserByAttribute($attr, $value); |
177 | 177 | if ($entry !== null) { |
178 | 178 | $dn = $attr; |
@@ -191,7 +191,7 @@ discard block |
||
191 | 191 | |
192 | 192 | if ($this->ldapusercert === null) { |
193 | 193 | // do not check for certificate match |
194 | - if (is_null($this->ldapConfig->getOptionalArray('attributes',null))) { |
|
194 | + if (is_null($this->ldapConfig->getOptionalArray('attributes', null))) { |
|
195 | 195 | $attributes = $entry->getAttributes(); |
196 | 196 | } else { |
197 | 197 | $attributes = array_intersect_key( |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | } |
213 | 213 | |
214 | 214 | if (empty($ldap_certs)) { |
215 | - Logger::error('authX509: no certificate found in LDAP for dn=' . $dn); |
|
215 | + Logger::error('authX509: no certificate found in LDAP for dn='.$dn); |
|
216 | 216 | $state['authX509.error'] = "UNKNOWNCERT"; |
217 | 217 | $this->authFailed($state); |
218 | 218 | |
@@ -231,12 +231,12 @@ discard block |
||
231 | 231 | $pem = $cryptoUtils->der2pem($ldap_cert); |
232 | 232 | $ldap_cert_data = openssl_x509_parse($pem); |
233 | 233 | if ($ldap_cert_data === false) { |
234 | - Logger::error('authX509: cert in LDAP is invalid for dn=' . $dn); |
|
234 | + Logger::error('authX509: cert in LDAP is invalid for dn='.$dn); |
|
235 | 235 | continue; |
236 | 236 | } |
237 | 237 | |
238 | 238 | if ($ldap_cert_data === $client_cert_data) { |
239 | - if (is_null($this->ldapConfig->getOptionalArray('attributes',null))) { |
|
239 | + if (is_null($this->ldapConfig->getOptionalArray('attributes', null))) { |
|
240 | 240 | $attributes = $entry->getAttributes(); |
241 | 241 | } else { |
242 | 242 | $attributes = array_intersect_key( |
@@ -251,7 +251,7 @@ discard block |
||
251 | 251 | } |
252 | 252 | } |
253 | 253 | |
254 | - Logger::error('authX509: no matching cert in LDAP for dn=' . $dn); |
|
254 | + Logger::error('authX509: no matching cert in LDAP for dn='.$dn); |
|
255 | 255 | $state['authX509.error'] = "UNKNOWNCERT"; |
256 | 256 | $this->authFailed($state); |
257 | 257 |