From bd7d85fd601eab333d83bd7264bc5bc2bef4c3e9 Mon Sep 17 00:00:00 2001
From: Maikel <maikel@experius.nl>
Date: Mon, 21 Mar 2016 13:52:56 +0100
Subject: [PATCH] Fix symlink webroot paths

When using symlinks for webroot folders and requesting SSL for same websites with symlink domains.
The challenges files and acme-challenge directory are removed on the first domain and on second domain the
acme-challenge directory is already removed and tries to remove it again.
---
 letsencrypt/plugins/webroot.py      |  3 +++
 letsencrypt/plugins/webroot_test.py | 15 ++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/letsencrypt/plugins/webroot.py b/letsencrypt/plugins/webroot.py
index 6d2899511..6254719ed 100644
--- a/letsencrypt/plugins/webroot.py
+++ b/letsencrypt/plugins/webroot.py
@@ -155,5 +155,8 @@ to serve all files under specified web root ({0})."""
                     elif exc.errno == errno.EACCES:
                         logger.debug("Challenges cleaned up but no permissions for %s",
                                      root_path)
+                    elif exc.errno == errno.ENOENT:
+                        logger.debug("Challenges cleaned up, %s does not exists",
+                                     root_path)
                     else:
                         raise
diff --git a/letsencrypt/plugins/webroot_test.py b/letsencrypt/plugins/webroot_test.py
index ed0326555..b39e3912a 100644
--- a/letsencrypt/plugins/webroot_test.py
+++ b/letsencrypt/plugins/webroot_test.py
@@ -176,12 +176,25 @@ class AuthenticatorTest(unittest.TestCase):
         self.auth.perform([self.achall])
 
         os_error = OSError()
-        os_error.errno = errno.ENOENT
+        os_error.errno = errno.EPERM
         mock_rmdir.side_effect = os_error
 
         self.assertRaises(OSError, self.auth.cleanup, [self.achall])
         self.assertFalse(os.path.exists(self.validation_path))
         self.assertTrue(os.path.exists(self.root_challenge_path))
 
+    @mock.patch('os.rmdir')
+    def test_cleanup_file_not_exists(self, mock_rmdir):
+        self.auth.prepare()
+        self.auth.perform([self.achall])
+
+        os_error = OSError()
+        os_error.errno = errno.ENOENT
+        mock_rmdir.side_effect = os_error
+
+        self.auth.cleanup([self.achall])
+        self.assertFalse(os.path.exists(self.validation_path))
+        self.assertTrue(os.path.exists(self.root_challenge_path))
+
 if __name__ == "__main__":
     unittest.main()  # pragma: no cover