From bbbfc473d32963c2a7b52a67bf23573c06d04cdf Mon Sep 17 00:00:00 2001
From: "Jeff R. Allen" <jra@nella.org>
Date: Fri, 19 May 2017 22:54:00 +0200
Subject: [PATCH] Handle mixed case domains in CSRs (#4685)

Lowercase domains from CSR, just like the domains from the
command line are.

Fixes #4684
---
 certbot/cli.py                    |   4 +++-
 certbot/tests/crypto_util_test.py |   4 ++--
 certbot/tests/testdata/csr.der    | Bin 353 -> 281 bytes
 certbot/tests/testdata/csr.pem    |  14 ++++++--------
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/certbot/cli.py b/certbot/cli.py
index b0356db23..5053b77fa 100644
--- a/certbot/cli.py
+++ b/certbot/cli.py
@@ -620,7 +620,9 @@ class HelpfulArgumentParser(object):
                 % parsed_args.csr[0])
 
         parsed_args.actual_csr = (csr, typ)
-        csr_domains, config_domains = set(domains), set(parsed_args.domains)
+
+        csr_domains = set([d.lower() for d in domains])
+        config_domains = set(parsed_args.domains)
         if csr_domains != config_domains:
             raise errors.ConfigurationError(
                 "Inconsistent domain requests:\nFrom the CSR: {0}\nFrom command line/config: {1}"
diff --git a/certbot/tests/crypto_util_test.py b/certbot/tests/crypto_util_test.py
index c83ad96b1..8adf753d6 100644
--- a/certbot/tests/crypto_util_test.py
+++ b/certbot/tests/crypto_util_test.py
@@ -163,7 +163,7 @@ class ImportCSRFileTest(unittest.TestCase):
              util.CSR(file=csrfile,
                       data=data_pem,
                       form="pem"),
-             ["example.com"],),
+             ["Example.com"],),
             self._call(csrfile, data))
 
     def test_pem_csr(self):
@@ -175,7 +175,7 @@ class ImportCSRFileTest(unittest.TestCase):
              util.CSR(file=csrfile,
                       data=data,
                       form="pem"),
-             ["example.com"],),
+             ["Example.com"],),
             self._call(csrfile, data))
 
     def test_bad_csr(self):
diff --git a/certbot/tests/testdata/csr.der b/certbot/tests/testdata/csr.der
index 22900a6125aed31c9cfd1b6fe315c40dbd2fd99f..5c03f3a1114a9d0ad0899670c744efcbf0126685 100644
GIT binary patch
delta 185
zcmaFJG?OXTpovk`pz#0`BZEP-A-4f18*?ZNn=q4OsG+cdAc(`k!xfyLo2naJl30>z
zsAwP$66E5M@XRYoEy_zRQ3%gWNzW`PRtPAmRPZTDF%&Tn0x4nU;dY%^lNrolz{|#|
z)#lOmotKf3o0Wmtk%3(<C~Al9daW#_ExZrT-#J^$(pqek^KIeFwws^V+v)If$d?pd
hndZFg%u;93&r=o_L~OsJmp`rAzur2oO=?%tLjV|JIo1FG

delta 260
zcmbQq^pL6EpouXSh}oGK84M~7xeYkkm_u3EgqcEv4FwJOK^zVq4&Th=jLh`JJVPM^
z0gw<o52s^Zo`PdhQht#kj{z4*jEjfa)y>UN-ar<_<K__y&C4uHEh^3|sZ_{MQ-B*G
zVju)kz|6y)T9KGLF(Iu+(?Fe#Q>)FR?K>|cC!e8|frNn=P>HM{3%>zx6IfY6PO4sV
zey#y8Tp=SjD+9A5Ly`NRca2;0qofT*IS%%v@A=!&;vT8<`n&vXYs=p)dvtP(4>Y_D
gIO4<ovwlZ&F5CR82Ze)cqZb}h@LqfKz5#;<0O1`<lmGw#

diff --git a/certbot/tests/testdata/csr.pem b/certbot/tests/testdata/csr.pem
index b6818e39d..c62224ca7 100644
--- a/certbot/tests/testdata/csr.pem
+++ b/certbot/tests/testdata/csr.pem
@@ -1,10 +1,8 @@
 -----BEGIN CERTIFICATE REQUEST-----
-MIIBXTCCAQcCAQAweTELMAkGA1UEBhMCVVMxETAPBgNVBAgMCE1pY2hpZ2FuMRIw
-EAYDVQQHDAlBbm4gQXJib3IxDDAKBgNVBAoMA0VGRjEfMB0GA1UECwwWVW5pdmVy
-c2l0eSBvZiBNaWNoaWdhbjEUMBIGA1UEAwwLZXhhbXBsZS5jb20wXDANBgkqhkiG
-9w0BAQEFAANLADBIAkEArHVztFHtH92ucFJD/N/HW9AsdRsUuHUBBBDlHwNlRd3f
-p580rv2+6QWE30cWgdmJS86ObRz6lUTor4R0T+3C5QIDAQABoCkwJwYJKoZIhvcN
-AQkOMRowGDAWBgNVHREEDzANggtleGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAANB
-AHJH/O6BtC9aGzEVCMGOZ7z9iIRHWSzr9x/bOzn7hLwsbXPAgO1QxEwL+X+4g20G
-n9XBE1N9W6HCIEut2d8wACg=
+MIIBFTCBwAIBADBbMQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEh
+MB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMRQwEgYDVQQDDAtFeGFt
+cGxlLmNvbTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQCsdXO0Ue0f3a5wUkP838db
+0Cx1GxS4dQEEEOUfA2VF3d+nnzSu/b7pBYTfRxaB2YlLzo5tHPqVROivhHRP7cLl
+AgMBAAGgADANBgkqhkiG9w0BAQsFAANBAAceUlq4La8qaiK0DeDP3M19BIVzMmz2
+oemG2fOvPiwNCB90ctSWQ6bMpUMV85ShcFi31C5vlntPfztehhq6YuE=
 -----END CERTIFICATE REQUEST-----