Fix regression where multiple certificates caused most of them to be ignored.

slapos/libnetworkcache.py

@@ -110,7 +110,13 @@ class NetworkcacheClient(object):
 
     self.signature_private_key_file = signature_private_key_file
     if type(signature_certificate_list) is str:
-      self.signature_certificate_list = [signature_certificate_list]
+      # If signature_certificate_list is a string, parse it to a list of
+      # certificates
+      cert_marker = "-----BEGIN CERTIFICATE-----"
+      parsed_signature_certificate_list = [cert_marker + '\n' + q.strip() \
+        for q in signature_certificate_list.split(cert_marker) \
+          if q.strip()]
+      self.signature_certificate_list = parsed_signature_certificate_list
     else:
       self.signature_certificate_list = signature_certificate_list
 

slapos/libnetworkcachetests.py

@@ -269,6 +269,21 @@ MYZmKV7A3nFehN9A+REz+WU3I7fE6vQRh9jKeuxnQLRv0TdP9CEdPcYcs/EQpIDb
 -----END CERTIFICATE-----
 """
 
+  alternate_certificate = """  -----BEGIN CERTIFICATE-----
+  MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
+  CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
+  MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
+  ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
+  AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
+  boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
+  Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
+  ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
+  mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
+  q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
+  QUUGLQ==
+  -----END CERTIFICATE-----
+"""
+
   ca_cert = """-----BEGIN CERTIFICATE-----
 MIID3zCCAsegAwIBAgIJAK6xwAnLgupDMA0GCSqGSIb3DQEBBQUAMIGFMQswCQYD
 VQQGEwJQTDENMAsGA1UECAwETGFrYTELMAkGA1UEBwwCVWwxEDAOBgNVBAoMB1Bh
@@ -436,6 +451,27 @@ class OnlineTest(OnlineMixin, unittest.TestCase):
     result = signed_nc.select(key)
     self.assertEqual(result.read(), self.test_string)
 
+  def test_select_signed_content_several_certificates(self):
+    key = 'somekey' + str(random.random())
+    urlmd5 = str(random.random())
+    file_name = 'my file'
+    test_data = tempfile.TemporaryFile()
+    test_string = str(random.random())
+    test_data.write(test_string)
+    test_data.seek(0)
+    key_file = tempfile.NamedTemporaryFile()
+    key_file.write(self.key)
+    key_file.flush()
+    key_file.seek(0)
+
+    signed_nc = slapos.libnetworkcache.NetworkcacheClient(
+      self.shacache, self.shadir, key_file.name, [self.alternate_certificate,
+      self.certificate])
+
+    signed_nc.upload(self.test_data, key, urlmd5=urlmd5, file_name=file_name)
+    result = signed_nc.select(key)
+    self.assertEqual(result.read(), self.test_string)
+
   def test_select_signed_content_multiple(self):
     key = 'somekey' + str(random.random())
     urlmd5 = str(random.random())