Merge remote-tracking branch 'origin/master' into amazonlinux

.travis.yml

@@ -2,11 +2,12 @@ language: python
 
 services:
   - rabbitmq
+  - mariadb
 
 # http://docs.travis-ci.com/user/ci-environment/#CI-environment-OS
 # gimme has to be kept in sync with Boulder's Go version setting in .travis.yml
 before_install:
-  - sudo apt-get install -y mariadb-server mariadb-server-10.0
+  - 'dpkg -s libaugeas0'
   - '[ "xxx$BOULDER_INTEGRATION" = "xxx" ] || eval "$(gimme 1.5.1)"'
 
 # using separate envs with different TOXENVs creates 4x1 Travis build
@@ -31,9 +32,8 @@ branches:
     - master
     - /^test-.*$/
 
-# enable Trusty beta on travis 
-sudo: required
-dist: trusty
+# container-based infrastructure
+sudo: false
 
 addons:
   # make sure simplehttp simple verification works (custom /etc/hosts)
@@ -41,6 +41,8 @@ addons:
     - le.wtf
   mariadb: "10.0"
   apt:
+    sources:
+    - augeas
     packages:  # keep in sync with bootstrap/ubuntu.sh and Boulder
     - python
     - python-dev

acme/acme/jose/jwa.py

@@ -176,5 +176,5 @@ PS384 = JWASignature.register(_JWAPS('PS384', hashes.SHA384))
 PS512 = JWASignature.register(_JWAPS('PS512', hashes.SHA512))
 
 ES256 = JWASignature.register(_JWAES('ES256'))
-ES256 = JWASignature.register(_JWAES('ES384'))
-ES256 = JWASignature.register(_JWAES('ES512'))
+ES384 = JWASignature.register(_JWAES('ES384'))
+ES512 = JWASignature.register(_JWAES('ES512'))

acme/docs/conf.py

@@ -227,25 +227,25 @@ htmlhelp_basename = 'acme-pythondoc'
 # -- Options for LaTeX output ---------------------------------------------
 
 latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
+    # The paper size ('letterpaper' or 'a4paper').
+    #'papersize': 'letterpaper',
 
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
+    # The font size ('10pt', '11pt' or '12pt').
+    #'pointsize': '10pt',
 
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
+    # Additional stuff for the LaTeX preamble.
+    #'preamble': '',
 
-# Latex figure (float) alignment
-#'figure_align': 'htbp',
+    # Latex figure (float) alignment
+    #'figure_align': 'htbp',
 }
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-  (master_doc, 'acme-python.tex', u'acme-python Documentation',
-   u'Let\'s Encrypt Project', 'manual'),
+    (master_doc, 'acme-python.tex', u'acme-python Documentation',
+     u'Let\'s Encrypt Project', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -289,9 +289,9 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  (master_doc, 'acme-python', u'acme-python Documentation',
-   author, 'acme-python', 'One line description of project.',
-   'Miscellaneous'),
+    (master_doc, 'acme-python', u'acme-python Documentation',
+     author, 'acme-python', 'One line description of project.',
+     'Miscellaneous'),
 ]
 
 # Documents to append as an appendix to all manuals.

bootstrap/_suse_common.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# SLE12 dont have python-virtualenv
+
+zypper -nq in -l git-core \
+  python \
+  python-devel \
+  python-virtualenv \
+  gcc \
+  dialog \
+  augeas-lenses \
+  libopenssl-devel \
+  libffi-devel \
+  ca-certificates \

bootstrap/install-deps.sh

@@ -29,6 +29,9 @@ elif [ -f /etc/gentoo-release ] ; then
 elif uname | grep -iq FreeBSD ; then
   echo "Bootstrapping dependencies for FreeBSD..."
   $SUDO $BOOTSTRAP/freebsd.sh
+elif `grep -qs openSUSE /etc/os-release` ; then
+  echo "Bootstrapping dependencies for openSUSE.."
+  $SUDO $BOOTSTRAP/suse.sh
 elif uname | grep -iq Darwin ; then
   echo "Bootstrapping dependencies for Mac OS X..."
   echo "WARNING: Mac support is very experimental at present..."

bootstrap/suse.sh

@@ -0,0 +1 @@
+_suse_common.sh

docs/conf.py

@@ -230,25 +230,25 @@ htmlhelp_basename = 'LetsEncryptdoc'
 # -- Options for LaTeX output ---------------------------------------------
 
 latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
+    # The paper size ('letterpaper' or 'a4paper').
+    #'papersize': 'letterpaper',
 
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
+    # The font size ('10pt', '11pt' or '12pt').
+    #'pointsize': '10pt',
 
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
+    # Additional stuff for the LaTeX preamble.
+    #'preamble': '',
 
-# Latex figure (float) alignment
-#'figure_align': 'htbp',
+    # Latex figure (float) alignment
+    #'figure_align': 'htbp',
 }
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-  ('index', 'LetsEncrypt.tex', u'Let\'s Encrypt Documentation',
-   u'Let\'s Encrypt Project', 'manual'),
+    ('index', 'LetsEncrypt.tex', u'Let\'s Encrypt Documentation',
+     u'Let\'s Encrypt Project', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -295,9 +295,9 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  ('index', 'LetsEncrypt', u'Let\'s Encrypt Documentation',
-   u'Let\'s Encrypt Project', 'LetsEncrypt', 'One line description of project.',
-   'Miscellaneous'),
+    ('index', 'LetsEncrypt', u'Let\'s Encrypt Documentation',
+     u'Let\'s Encrypt Project', 'LetsEncrypt', 'One line description of project.',
+     'Miscellaneous'),
 ]
 
 # Documents to append as an appendix to all manuals.

letsencrypt-apache/docs/conf.py

@@ -232,25 +232,25 @@ htmlhelp_basename = 'letsencrypt-apachedoc'
 # -- Options for LaTeX output ---------------------------------------------
 
 latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
+    # The paper size ('letterpaper' or 'a4paper').
+    #'papersize': 'letterpaper',
 
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
+    # The font size ('10pt', '11pt' or '12pt').
+    #'pointsize': '10pt',
 
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
+    # Additional stuff for the LaTeX preamble.
+    #'preamble': '',
 
-# Latex figure (float) alignment
-#'figure_align': 'htbp',
+    # Latex figure (float) alignment
+    #'figure_align': 'htbp',
 }
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-  (master_doc, 'letsencrypt-apache.tex', u'letsencrypt-apache Documentation',
-   u'Let\'s Encrypt Project', 'manual'),
+    (master_doc, 'letsencrypt-apache.tex', u'letsencrypt-apache Documentation',
+     u'Let\'s Encrypt Project', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -293,9 +293,9 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  (master_doc, 'letsencrypt-apache', u'letsencrypt-apache Documentation',
-   author, 'letsencrypt-apache', 'One line description of project.',
-   'Miscellaneous'),
+    (master_doc, 'letsencrypt-apache', u'letsencrypt-apache Documentation',
+     author, 'letsencrypt-apache', 'One line description of project.',
+     'Miscellaneous'),
 ]
 
 # Documents to append as an appendix to all manuals.

letsencrypt-auto

@@ -110,6 +110,9 @@ then
   elif [ -f /etc/redhat-release ] ; then
     echo "Bootstrapping dependencies for RedHat-based OSes..."
     $SUDO $BOOTSTRAP/_rpm_common.sh
+  elif `grep -q openSUSE /etc/os-release` ; then
+    echo "Bootstrapping dependencies for openSUSE-based OSes..."
+    $SUDO $BOOTSTRAP/_suse_common.sh
   elif [ -f /etc/arch-release ] ; then
     echo "Bootstrapping dependencies for Archlinux..."
     $SUDO $BOOTSTRAP/archlinux.sh

letsencrypt-compatibility-test/docs/conf.py

@@ -226,25 +226,26 @@ htmlhelp_basename = 'letsencrypt-compatibility-testdoc'
 # -- Options for LaTeX output ---------------------------------------------
 
 latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
+    # The paper size ('letterpaper' or 'a4paper').
+    #'papersize': 'letterpaper',
 
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
+    # The font size ('10pt', '11pt' or '12pt').
+    #'pointsize': '10pt',
 
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
+    # Additional stuff for the LaTeX preamble.
+    #'preamble': '',
 
-# Latex figure (float) alignment
-#'figure_align': 'htbp',
+    # Latex figure (float) alignment
+    #'figure_align': 'htbp',
 }
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-  (master_doc, 'letsencrypt-compatibility-test.tex', u'letsencrypt-compatibility-test Documentation',
-   u'Let\'s Encrypt Project', 'manual'),
+    (master_doc, 'letsencrypt-compatibility-test.tex',
+     u'letsencrypt-compatibility-test Documentation',
+     u'Let\'s Encrypt Project', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -273,7 +274,8 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    (master_doc, 'letsencrypt-compatibility-test', u'letsencrypt-compatibility-test Documentation',
+    (master_doc, 'letsencrypt-compatibility-test',
+     u'letsencrypt-compatibility-test Documentation',
      [author], 1)
 ]
 
@@ -287,9 +289,10 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  (master_doc, 'letsencrypt-compatibility-test', u'letsencrypt-compatibility-test Documentation',
-   author, 'letsencrypt-compatibility-test', 'One line description of project.',
-   'Miscellaneous'),
+    (master_doc, 'letsencrypt-compatibility-test',
+     u'letsencrypt-compatibility-test Documentation',
+     author, 'letsencrypt-compatibility-test',
+     'One line description of project.', 'Miscellaneous'),
 ]
 
 # Documents to append as an appendix to all manuals.
@@ -309,6 +312,8 @@ intersphinx_mapping = {
     'python': ('https://docs.python.org/', None),
     'acme': ('https://acme-python.readthedocs.org/en/latest/', None),
     'letsencrypt': ('https://letsencrypt.readthedocs.org/en/latest/', None),
-    'letsencrypt-apache': ('https://letsencrypt-apache.readthedocs.org/en/latest/', None),
-    'letsencrypt-nginx': ('https://letsencrypt-nginx.readthedocs.org/en/latest/', None),
+    'letsencrypt-apache': (
+        'https://letsencrypt-apache.readthedocs.org/en/latest/', None),
+    'letsencrypt-nginx': (
+        'https://letsencrypt-nginx.readthedocs.org/en/latest/', None),
 }

letsencrypt-nginx/docs/conf.py

@@ -225,25 +225,25 @@ htmlhelp_basename = 'letsencrypt-nginxdoc'
 # -- Options for LaTeX output ---------------------------------------------
 
 latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
+    # The paper size ('letterpaper' or 'a4paper').
+    #'papersize': 'letterpaper',
 
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
+    # The font size ('10pt', '11pt' or '12pt').
+    #'pointsize': '10pt',
 
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
+    # Additional stuff for the LaTeX preamble.
+    #'preamble': '',
 
-# Latex figure (float) alignment
-#'figure_align': 'htbp',
+    # Latex figure (float) alignment
+    #'figure_align': 'htbp',
 }
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-  (master_doc, 'letsencrypt-nginx.tex', u'letsencrypt-nginx Documentation',
-   u'Let\'s Encrypt Project', 'manual'),
+    (master_doc, 'letsencrypt-nginx.tex', u'letsencrypt-nginx Documentation',
+     u'Let\'s Encrypt Project', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -286,9 +286,9 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  (master_doc, 'letsencrypt-nginx', u'letsencrypt-nginx Documentation',
-   author, 'letsencrypt-nginx', 'One line description of project.',
-   'Miscellaneous'),
+    (master_doc, 'letsencrypt-nginx', u'letsencrypt-nginx Documentation',
+     author, 'letsencrypt-nginx', 'One line description of project.',
+     'Miscellaneous'),
 ]
 
 # Documents to append as an appendix to all manuals.

letsencrypt-nginx/letsencrypt_nginx/configurator.py

@@ -107,6 +107,10 @@ class NginxConfigurator(common.Plugin):
     # This is called in determine_authenticator and determine_installer
     def prepare(self):
         """Prepare the authenticator/installer."""
+        # Verify Nginx is installed
+        if not le_util.exe_exists(self.conf('ctl')):
+            raise errors.NoInstallationError
+
         self.parser = parser.NginxParser(
             self.conf('server-root'), self.mod_ssl_conf)
 

letsencrypt-nginx/letsencrypt_nginx/dvsni.py

@@ -99,8 +99,8 @@ class NginxDvsni(common.TLSSNI01):
         for key, body in main:
             if key == ['http']:
                 found_bucket = False
-                for key, _ in body:
-                    if key == bucket_directive[0]:
+                for k, _ in body:
+                    if k == bucket_directive[0]:
                         found_bucket = True
                 if not found_bucket:
                     body.insert(0, bucket_directive)

letsencrypt-nginx/letsencrypt_nginx/tests/configurator_test.py

@@ -1,3 +1,4 @@
+# pylint: disable=too-many-public-methods
 """Test for letsencrypt_nginx.configurator."""
 import os
 import shutil
@@ -29,6 +30,12 @@ class NginxConfiguratorTest(util.NginxTest):
         shutil.rmtree(self.config_dir)
         shutil.rmtree(self.work_dir)
 
+    @mock.patch("letsencrypt_nginx.configurator.le_util.exe_exists")
+    def test_prepare_no_install(self, mock_exe_exists):
+        mock_exe_exists.return_value = False
+        self.assertRaises(
+            errors.NoInstallationError, self.config.prepare)
+
     def test_prepare(self):
         self.assertEquals((1, 6, 2), self.config.version)
         self.assertEquals(5, len(self.config.parser.parsed))

letsencrypt-nginx/letsencrypt_nginx/tests/util.py

@@ -49,21 +49,25 @@ def get_nginx_configurator(
 
     backups = os.path.join(work_dir, "backups")
 
-    config = configurator.NginxConfigurator(
-        config=mock.MagicMock(
-            nginx_server_root=config_path,
-            le_vhost_ext="-le-ssl.conf",
-            config_dir=config_dir,
-            work_dir=work_dir,
-            backup_dir=backups,
-            temp_checkpoint_dir=os.path.join(work_dir, "temp_checkpoints"),
-            in_progress_dir=os.path.join(backups, "IN_PROGRESS"),
-            server="https://acme-server.org:443/new",
-            tls_sni_01_port=5001,
-        ),
-        name="nginx",
-        version=version)
-    config.prepare()
+    with mock.patch("letsencrypt_nginx.configurator.le_util."
+            "exe_exists") as mock_exe_exists:
+        mock_exe_exists.return_value = True
+
+        config = configurator.NginxConfigurator(
+            config=mock.MagicMock(
+                nginx_server_root=config_path,
+                le_vhost_ext="-le-ssl.conf",
+                config_dir=config_dir,
+                work_dir=work_dir,
+                backup_dir=backups,
+                temp_checkpoint_dir=os.path.join(work_dir, "temp_checkpoints"),
+                in_progress_dir=os.path.join(backups, "IN_PROGRESS"),
+                server="https://acme-server.org:443/new",
+                tls_sni_01_port=5001,
+            ),
+            name="nginx",
+            version=version)
+        config.prepare()
 
     # Provide general config utility.
     nsconfig = configuration.NamespaceConfig(config.config)

letsencrypt/cli.py

@@ -883,7 +883,6 @@ def prepare_and_parse_args(plugins, args):
     # parser (--help should display plugin-specific options last)
     _plugins_parsing(helpful, plugins)
 
-
     return helpful.parse_args()
 
 

letsencrypt/plugins/disco_test.py

@@ -51,8 +51,8 @@ class PluginEntryPointTest(unittest.TestCase):
 
     def test_description(self):
         self.assertEqual(
-                "Automatically use a temporary webserver",
-                self.plugin_ep.description)
+            "Automatically use a temporary webserver",
+            self.plugin_ep.description)
 
     def test_description_with_name(self):
         self.plugin_ep.plugin_cls = mock.MagicMock(description="Desc")

letshelp-letsencrypt/docs/conf.py

@@ -225,25 +225,25 @@ htmlhelp_basename = 'letshelp-letsencryptdoc'
 # -- Options for LaTeX output ---------------------------------------------
 
 latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
+    # The paper size ('letterpaper' or 'a4paper').
+    #'papersize': 'letterpaper',
 
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
+    # The font size ('10pt', '11pt' or '12pt').
+    #'pointsize': '10pt',
 
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
+    # Additional stuff for the LaTeX preamble.
+    #'preamble': '',
 
-# Latex figure (float) alignment
-#'figure_align': 'htbp',
+    # Latex figure (float) alignment
+    #'figure_align': 'htbp',
 }
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-  (master_doc, 'letshelp-letsencrypt.tex', u'letshelp-letsencrypt Documentation',
-   u'Let\'s Encrypt Project', 'manual'),
+    (master_doc, 'letshelp-letsencrypt.tex', u'letshelp-letsencrypt Documentation',
+     u'Let\'s Encrypt Project', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -286,9 +286,9 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  (master_doc, 'letshelp-letsencrypt', u'letshelp-letsencrypt Documentation',
-   author, 'letshelp-letsencrypt', 'One line description of project.',
-   'Miscellaneous'),
+    (master_doc, 'letshelp-letsencrypt', u'letshelp-letsencrypt Documentation',
+     author, 'letshelp-letsencrypt', 'One line description of project.',
+     'Miscellaneous'),
 ]
 
 # Documents to append as an appendix to all manuals.