Commit e21d73e5 authored by Côme Bernigaud's avatar Côme Bernigaud Committed by Benoit Mortier
Browse files

Fixes #3511 Fixed ssh keys regexp: comment is not mandatory

parent 1511bcfa
...@@ -22,17 +22,17 @@ ...@@ -22,17 +22,17 @@
class SSHPublicKeyAttribute extends FileTextAreaAttribute class SSHPublicKeyAttribute extends FileTextAreaAttribute
{ {
/* cache for key extracted informations */ /* cache for key extracted informations */
protected $format = '/^([-a-zA-Z0-9]+(=".*")?,?)*\s*(ssh-(dss|rsa))\s+([a-zA-Z0-9+\/.=]+)\s+([[:graph:]]+)\s*$/'; protected $format = '/^([-a-zA-Z0-9]+(=".*")?,?)*\s*(ssh-(dss|rsa))\s+([a-zA-Z0-9+\/.=]+)(\s+([[:graph:]]+))?\s*$/';
function getArrayValue () function getArrayValue ()
{ {
if (preg_match($this->format, $this->value, $match)) { if (preg_match($this->format, $this->value, $match)) {
$fingerprint = $this->fingerprint(base64_decode($match[5])); $fingerprint = $this->fingerprint(base64_decode($match[5]));
$comment = (isset($match[7]) ? $match[7] : '');
return array( return array(
($match[3] == 'ssh-dss'?'DSA':'RSA'), ($match[3] == 'ssh-dss'?'DSA':'RSA'),
$fingerprint, $fingerprint,
$match[6] $comment
); );
} }
return parent::getArrayValue(); return parent::getArrayValue();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment