Browse Source

[master] Ignore certificate file if it starts with file://

tags/v9.1.0beta1
Lukas Reschke 8 years ago
parent
commit
06a4da43ec
No account linked to committer's email address
2 changed files with 15 additions and 0 deletions
  1. 7
    0
      lib/private/Security/Certificate.php
  2. 8
    0
      tests/lib/security/certificate.php

+ 7
- 0
lib/private/Security/Certificate.php View File

@@ -50,6 +50,13 @@ class Certificate implements ICertificate {
public function __construct($data, $name) {
$this->name = $name;
$gmt = new \DateTimeZone('GMT');

// If string starts with "file://" ignore the certificate
$query = 'file://';
if(strtolower(substr($data, 0, strlen($query))) === $query) {
throw new \Exception('Certificate could not get parsed.');
}

$info = openssl_x509_parse($data);
if(!is_array($info)) {
throw new \Exception('Certificate could not get parsed.');

+ 8
- 0
tests/lib/security/certificate.php View File

@@ -50,6 +50,14 @@ class CertificateTest extends \Test\TestCase {
$certificate->getIssueDate();
}

/**
* @expectedException \Exception
* @expectedExceptionMessage Certificate could not get parsed.
*/
function testCertificateStartingWithFileReference() {
new Certificate('file://'.__DIR__ . '/../../data/certificates/goodCertificate.crt', 'bar');
}

public function testGetName() {
$this->assertSame('GoodCertificate', $this->goodCertificate->getName());
$this->assertSame('BadCertificate', $this->invalidCertificate->getName());

Loading…
Cancel
Save