From 7d6dbcf3a7e1b3a58deef34a111901255a7663ad Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Thu, 6 Jan 2022 16:08:10 +0100
Subject: [PATCH] Replace local certs with the ones from our security library
---
.../SimpleSAML/Metadata/SAMLBuilderTest.php | 10 ++++---
.../test-metadata/www.example.com.cert | 18 -------------
.../test-metadata/www.example.com.key | 27 -------------------
.../test-metadata/www.example.com_new.cert | 18 -------------
.../test-metadata/www.example.com_new.key | 27 -------------------
5 files changed, 6 insertions(+), 94 deletions(-)
delete mode 100644 tests/lib/SimpleSAML/Metadata/test-metadata/www.example.com.cert
delete mode 100644 tests/lib/SimpleSAML/Metadata/test-metadata/www.example.com.key
delete mode 100644 tests/lib/SimpleSAML/Metadata/test-metadata/www.example.com_new.cert
delete mode 100644 tests/lib/SimpleSAML/Metadata/test-metadata/www.example.com_new.key
diff --git a/tests/lib/SimpleSAML/Metadata/SAMLBuilderTest.php b/tests/lib/SimpleSAML/Metadata/SAMLBuilderTest.php
index cfb0f173a..4b262560f 100644
--- a/tests/lib/SimpleSAML/Metadata/SAMLBuilderTest.php
+++ b/tests/lib/SimpleSAML/Metadata/SAMLBuilderTest.php
@@ -16,6 +16,8 @@ use SimpleSAML\Module\saml\Auth\Source\SP;
*/
class SAMLBuilderTest extends TestCase
{
+ private const SECURITY = 'vendor/simplesamlphp/xml-security/tests/resources';
+
/**
*/
protected function setUp(): void
@@ -394,8 +396,8 @@ class SAMLBuilderTest extends TestCase
{
$info = ['AuthId' => 'default-sp'];
$metadata = [
- 'certificate' => __DIR__ . '/test-metadata/www.example.com.cert',
- 'privatekey' => __DIR__ . '/test-metadata/www.example.com.key',
+ 'certificate' => '../' . self::SECURITY . '/certificates/rsa-pem/selfsigned.simplesamlphp.org.crt',
+ 'privatekey' => '../' . self::SECURITY . '/certificates/rsa-pem/selfsigned.simplesamlphp.org.key',
];
// Without a key name, it should have KeyDescriptors but no KeyNames.
@@ -423,8 +425,8 @@ class SAMLBuilderTest extends TestCase
$this->assertEquals('my-key-name', $keyNames->item(1)->textContent);
// Add rollover configuration.
- $metadata['new_certificate'] = __DIR__ . '/test-metadata/www.example.com_new.cert';
- $metadata['new_privatekey'] = __DIR__ . '/test-metadata/www.example.com_new.key';
+ $metadata['new_certificate'] = '../' . self::SECURITY . '/certificates/rsa-pem/other.simplesamlphp.org.crt';
+ $metadata['new_privatekey'] = '../' . self::SECURITY . '/certificates/rsa-pem/other.simplesamlphp.org.key';
$metadata['new_key_name'] = 'my-new-key-name';
// It should now have 3 KeyNames.
diff --git a/tests/lib/SimpleSAML/Metadata/test-metadata/www.example.com.cert b/tests/lib/SimpleSAML/Metadata/test-metadata/www.example.com.cert
deleted file mode 100644
index a8ce458e6..000000000
--- a/tests/lib/SimpleSAML/Metadata/test-metadata/www.example.com.cert
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC1TCCAb2gAwIBAgIJAIFrAocUOGOjMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD3d3dy5leGFtcGxlLmNvbTAeFw0yMjAxMDYxMDQ0MTlaFw0zMjAxMDQxMDQ0
-MTlaMBoxGDAWBgNVBAMTD3d3dy5leGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAPLmvsD7GylHLS5Hc7k3H/IVvRDMaX3IjVaqOKOkUCKb
-uN3xncK4NNbOULH0F3BVKP20Yk5icd002WZEs6Qn8MFvnTbMEZRNRljxjZCtVLOC
-7NoIO+biY7APi/Mbd+r/KtYxSqiWYi3O0jysXxtR60oZS+/SNVrkJe/+yV/xUaPl
-tlPp95KUkDKM9qn7QPYpNIjrhYINDujxWmclV5uG7PZZnsnXxwI55XtfMvVe8WbI
-/beDxaXx08P2TZsTDRmp+R/4pBaPp0/j8xU3ASrBeR0CiA/eZYEk2c5pp0LnvVcX
-4cCYP2nVQmxFj+Mlg96zNPhy7Tz3BCuiJxps5gH9mEECAwEAAaMeMBwwGgYDVR0R
-BBMwEYIPd3d3LmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBBQUAA4IBAQAQa91+JNKt
-BD94E3UhUOhquOkN64wDgDeFy14+1mclied/j/4iSe78FjxBSnmQY2F0hGalzBhC
-X7WNyaV450i3al6P+YIpnE19oHjxcGJ0SY9jAn3paQJKlfEZi1V7M/gILFUMKFWW
-S5n8fMTCqLUzfvhrG3VnZU4KYGj+T25/jnPtT1XIB6wFz9/ApQYfRr8QR56cXccC
-D/zbb2hx4C7pLlBM7dv1NdnREoKyCW1kWvu0bajtEYc4D3VZ5kQq/R9tv3t5OjUb
-MpQCoobWwXO/lxbZ1j1rOoKBxxpQWzS3qzuh+6QHcZtQEL2DESRjOWqL0ietS3A1
-A/J6/QSDrRZl
------END CERTIFICATE-----
diff --git a/tests/lib/SimpleSAML/Metadata/test-metadata/www.example.com.key b/tests/lib/SimpleSAML/Metadata/test-metadata/www.example.com.key
deleted file mode 100644
index 9a20bf129..000000000
--- a/tests/lib/SimpleSAML/Metadata/test-metadata/www.example.com.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEA8ua+wPsbKUctLkdzuTcf8hW9EMxpfciNVqo4o6RQIpu43fGd
-wrg01s5QsfQXcFUo/bRiTmJx3TTZZkSzpCfwwW+dNswRlE1GWPGNkK1Us4Ls2gg7
-5uJjsA+L8xt36v8q1jFKqJZiLc7SPKxfG1HrShlL79I1WuQl7/7JX/FRo+W2U+n3
-kpSQMoz2qftA9ik0iOuFgg0O6PFaZyVXm4bs9lmeydfHAjnle18y9V7xZsj9t4PF
-pfHTw/ZNmxMNGan5H/ikFo+nT+PzFTcBKsF5HQKID95lgSTZzmmnQue9VxfhwJg/
-adVCbEWP4yWD3rM0+HLtPPcEK6InGmzmAf2YQQIDAQABAoIBAQDUb3QjSTn/Bu3/
-zKPsN8brrZF2MKCOTqk2Q5dXnywqqHCtQ1RLaVllCHnQuP8K0qAQCwPzM+wLn94G
-sE1AY2IPezNPKnixcEf3IANEpiMvAHFvWsYw7oxq/Z3TV5GwZ8wqGmAGQ8fH8lsy
-jzp6pVGXs7oTG5BoVqLLW9T44RAauudQfYEPa5Wbb6axPx3Be8/d8dDrpCLBX1nR
-CdJBr/BM981FpoWqxq6NTocsHgEFTsv5JlewQk9Tw2F4nEgCJrRJZ3Ues7+hSegL
-mo3T9fz6KXBtiGrNPEYb41Y0NbeBFiRIZvC/SFJO4Y3PqcGgKCJ/XYvmlHcB1ojL
-0mOCpi9VAoGBAP5AMetC+0OvB/uRVZD/4kTAJYyXfYb5kdlAE2T9Xm3K8T8ykj4j
-CXM65jtOXWvL7QekkXX329aPVPU9rOU9gzgOoyv0YgvSSZDTAbLUpq+uY4gAA5y2
-j3VuE4VSnk4Rvx4248BVAdHitvaLa/tU544y7c5X4fHDzsampLIsDTYHAoGBAPSS
-j4tfACIFOy17aKrj1lnQHhOwsaJzIYzlwViQuPCYCxCkGHVcfybK0Y02Ao63B5C5
-E7B1op18cAxw1DWPmCPy18z1XO1i3EL12kZMjCFzWDySm91ldtTe2pZe1tnJRH+H
-vkpggQ3ulTg06UKIUFFxhTss6wbz0DPqlAZPQ+13AoGBAKjHEpw7FbMjkOgF3Uhp
-JNpAt2xx8AlWyOPv7i//Jd06eBVcy8nl1lMhCU7bQZbag5msPEeUZuIyudImxAxV
-XjMrPFRkYWW5jc5O1HTTR2eeG0JfyAYTBn6MuParFp16mGVFSMEXbSLYHl7hxKfN
-//zcgBKXMk0cj7o9S11fctGnAoGARWaVbyIdIopDeauMTvnqKIBDGKlKLuPmwFmu
-HNiscjFi6mz2N89wkWx6PEz4OtE7R1kNekRXScM29IDL5wsBTCosDJAPt5kXEbU8
-JDiyhwd5IW8k5ZVWPB+k/YiaBSD03A+D8w0hcfeixllVW7jcuc+x09HyO33SNfk5
-2fSCPQ8CgYAdhSbWhIT1qKPn3ATzObf8jGESDKtJbxMkzuwvwNyL7oXOX5DO9Wbk
-5YXtVBYGCcl4i/rXlaR778kvtWkEeHLgVAc36g61Aw9fuCDKtSqGK8bMpdFh2tJ1
-FsUzeE92WK3oTEMMvVT3QXuNFTIR4brOk+gukHP1utNzQBjefsKtoA==
------END RSA PRIVATE KEY-----
diff --git a/tests/lib/SimpleSAML/Metadata/test-metadata/www.example.com_new.cert b/tests/lib/SimpleSAML/Metadata/test-metadata/www.example.com_new.cert
deleted file mode 100644
index 97d125929..000000000
--- a/tests/lib/SimpleSAML/Metadata/test-metadata/www.example.com_new.cert
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC1TCCAb2gAwIBAgIJAOEDanQk6EwRMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD3d3dy5leGFtcGxlLmNvbTAeFw0yMjAxMDYxMTI5MjRaFw0zMjAxMDQxMTI5
-MjRaMBoxGDAWBgNVBAMTD3d3dy5leGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAMqNZmdRIdThsNTy1uUXafphCK2PIHeeIFXirC5MwxBq
-CFTHORc1i8fKme4QNJLBw1VlkEdaBOd9rQ0Q+2XDOhsrT2cpFaX2wgVkeqkJfTB7
-OVtZx0S+85Z0VqSiTEjkoSgPF7vf7LRNSAzeK1okT1NpQ2DN4GsKOhe2JugGxbuN
-Lv5lt4U/EpR0C6vaPNcqtLRAOIVY+PeEvWs3v/pz/P0Y+m1yYifDoY1meCPx1hqb
-TaVK0FiRA8vNNTv0GBQX7BsFzAi5K8QcXvkVGXa8nXhtlE2Nmf8Q49IZh3EgK2AX
-ZK7aF0jAst822nM+G6WB0KTmTPMixkk1xSDJvfWAwAECAwEAAaMeMBwwGgYDVR0R
-BBMwEYIPd3d3LmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBBQUAA4IBAQClFX357axP
-0qVxY0pMCT0MJj8K1zY0vDpmNTOrSOy2XpRbIik2tkMw3zHzgzPkCZV3HT7QjzsB
-l0tasEpkeiEdYeDAZeBCC0WQ/hzwCKY7B7BUtg/gpjms0L8m8YJnw/WBzeRhGoen
-iNOReBFDW3xoGt5lzFjT7FWH0wIhDLalGeyEh6VzTNix0xD7uFWWpf2vELBYfmPL
-ErUiEfx/kLirc2JbzE7PZ/uoTYrolLlxbvvMW6WzK8PfrCFC2n6Zkd9YKbm7yZA7
-NmVD1xN1PMxTRqNXilgdT763BAJM4Etv1Rl9NWcu6ZnYjjR6Sw6GThSKv47ArwIf
-ySvrIzWRtm0A
------END CERTIFICATE-----
diff --git a/tests/lib/SimpleSAML/Metadata/test-metadata/www.example.com_new.key b/tests/lib/SimpleSAML/Metadata/test-metadata/www.example.com_new.key
deleted file mode 100644
index 0a61f40ee..000000000
--- a/tests/lib/SimpleSAML/Metadata/test-metadata/www.example.com_new.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEAyo1mZ1Eh1OGw1PLW5Rdp+mEIrY8gd54gVeKsLkzDEGoIVMc5
-FzWLx8qZ7hA0ksHDVWWQR1oE532tDRD7ZcM6GytPZykVpfbCBWR6qQl9MHs5W1nH
-RL7zlnRWpKJMSOShKA8Xu9/stE1IDN4rWiRPU2lDYM3gawo6F7Ym6AbFu40u/mW3
-hT8SlHQLq9o81yq0tEA4hVj494S9aze/+nP8/Rj6bXJiJ8OhjWZ4I/HWGptNpUrQ
-WJEDy801O/QYFBfsGwXMCLkrxBxe+RUZdrydeG2UTY2Z/xDj0hmHcSArYBdkrtoX
-SMCy3zbacz4bpYHQpOZM8yLGSTXFIMm99YDAAQIDAQABAoIBAAnBDXFkQtDRnYZj
-u12E5yGbkqNpBRM9likMpWYFZE9iC8ypW2J2vah9ZTRFq4J1ukZegbgt6ZaMQs0i
-SDj6Uc4FI+m/3L8FRwqjcBS71D+Fb5mqlSIGYAyaxaFf/3RzLh+Tunzdp7R3FEUq
-XcQVg4xswUXkJC6Da5DAwNbjnJoPeHrI8UzFcs6hU93kqCRu5Q1aIL/4s6US1AYF
-b/Ir4UkjB4Pfb4bmVs61sAlbcScbczFSFjRQheGiGTvZHBdn+4lZNvKA8kMbk/o1
-5v/w96fN0LEYQh5GeAGNSKK5YRnjZ/YKyIgnpvSGRQxIAnJTtE63xqskrSYb0FdR
-9wAYxVECgYEA9LIlpBH2DeEBEjPnTWthPDg5je5nm25ooKvXaGgaY6uwwV9Pw0BI
-MTT0xFZdAmZCPbmasDJPhsLwqfwUCOuc1K81K6XtLZFaWb6bQfZFCoMBLPXuc9gL
-haMsygkZazSbTfWW+/JngYBMUC0+OjyaY41nZW+vIwTbxGzxd1zyUu8CgYEA0+jZ
-ihBtEVk86U8GPOD+4uNFcP1a2K/YNfyUvsg5hXGA1DyeSgfG5l1FWlRGbZ3pQsxv
-mKd+oiw6usmUygGKGju71kT0fQ7q+g05LQKUKMwY+hZT8BYZ8sjwdLnznyJb0Svm
-GiAmAAnO1VdvRiCy+WMWo8npt85+d9meqGqAXA8CgYEAk7hoWOAu9rn69441+Nr2
-XHBk7nYaPg8tQrH63KDcLYecsWBkuq635lzd1xl8FNK+8px18iCtOeG9gCEZxzjV
-+N+87ZjB0lyJetxCxlNx4qKrtwTQ60Zlzktv4pgTrFCZ4Tp956OzMM7PQyfNBUNI
-wQjAftApnq50LeTG8RQ/hikCgYEAxz9YU+Wv97D1gdWI4vMXFdRl9aByq+1jGRfd
-8CipVRxs6qH4n1kCnpWyYQV+lxD0Q5efkmRiwC9gJULmwK2D4biqnASH8ZJ2RBjs
-2rJjBp0pGvSlhcfyLALdfJNfSxBuTpW9LHFv6XdPX+9vM/wI7E5L+kMem3HwHdaj
-xG0nNecCgYEA3+fQzyc0UgmQn/DU1G3RrZLo0r4GL20PqNzB2rgG07bQMZKLGHhZ
-7UYHmvuaOa7bX1wY8YPcu1jMxjfH1gLqwE0/NnMnuBef4ACkunTzk8Zky9mJEx3Q
-2CM7KMQqagBjgIQDzQmpwEjtSI39lJku307ld2HnbqfZ36gqBD/ugTU=
------END RSA PRIVATE KEY-----
--
GitLab