Merge branch 'master' into drop-pyjwt

AUTHORS.md

@@ -289,3 +289,4 @@ Authors
 * [Yuseong Cho](https://github.com/g6123)
 * [Zach Shepherd](https://github.com/zjs)
 * [陈三](https://github.com/chenxsan)
+* [Shahar Naveh](https://github.com/ShaharNaveh)

acme/setup.py

@@ -3,7 +3,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '1.29.0.dev0'
+version = '1.30.0.dev0'
 
 install_requires = [
     'cryptography>=2.5.0',

certbot-apache/setup.py

@@ -1,7 +1,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '1.29.0.dev0'
+version = '1.30.0.dev0'
 
 install_requires = [
     # We specify the minimum acme and certbot version as the current plugin

certbot-compatibility-test/setup.py

@@ -1,7 +1,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '1.29.0.dev0'
+version = '1.30.0.dev0'
 
 install_requires = [
     'certbot',

certbot-dns-cloudflare/setup.py

@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '1.29.0.dev0'
+version = '1.30.0.dev0'
 
 install_requires = [
     'cloudflare>=1.5.1',

certbot-dns-cloudxns/setup.py

@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '1.29.0.dev0'
+version = '1.30.0.dev0'
 
 install_requires = [
     'dns-lexicon>=3.2.1',

certbot-dns-digitalocean/setup.py

@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '1.29.0.dev0'
+version = '1.30.0.dev0'
 
 install_requires = [
     'python-digitalocean>=1.11', # 1.15.0 or newer is recommended for TTL support

certbot-dns-dnsimple/setup.py

@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '1.29.0.dev0'
+version = '1.30.0.dev0'
 
 install_requires = [
     # This version of lexicon is required to address the problem described in

certbot-dns-dnsmadeeasy/setup.py

@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '1.29.0.dev0'
+version = '1.30.0.dev0'
 
 install_requires = [
     'dns-lexicon>=3.2.1',

certbot-dns-gehirn/setup.py

@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '1.29.0.dev0'
+version = '1.30.0.dev0'
 
 install_requires = [
     'dns-lexicon>=3.2.1',

certbot-dns-google/setup.py

@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '1.29.0.dev0'
+version = '1.30.0.dev0'
 
 install_requires = [
     'google-api-python-client>=1.5.5',

certbot-dns-linode/setup.py

@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '1.29.0.dev0'
+version = '1.30.0.dev0'
 
 install_requires = [
     'dns-lexicon>=3.2.1',

certbot-dns-luadns/setup.py

@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '1.29.0.dev0'
+version = '1.30.0.dev0'
 
 install_requires = [
     'dns-lexicon>=3.2.1',

certbot-dns-nsone/setup.py

@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '1.29.0.dev0'
+version = '1.30.0.dev0'
 
 install_requires = [
     'dns-lexicon>=3.2.1',

certbot-dns-ovh/setup.py

@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '1.29.0.dev0'
+version = '1.30.0.dev0'
 
 install_requires = [
     'dns-lexicon>=3.2.1',

certbot-dns-rfc2136/setup.py

@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '1.29.0.dev0'
+version = '1.30.0.dev0'
 
 install_requires = [
     'dnspython>=1.15.0',

certbot-dns-route53/setup.py

@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '1.29.0.dev0'
+version = '1.30.0.dev0'
 
 install_requires = [
     'boto3>=1.15.15',

certbot-dns-sakuracloud/setup.py

@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '1.29.0.dev0'
+version = '1.30.0.dev0'
 
 install_requires = [
     'dns-lexicon>=3.2.1',

certbot-nginx/setup.py

@@ -1,7 +1,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '1.29.0.dev0'
+version = '1.30.0.dev0'
 
 install_requires = [
     # We specify the minimum acme and certbot version as the current plugin

certbot/CHANGELOG.md

@@ -2,7 +2,23 @@
 
 Certbot adheres to [Semantic Versioning](https://semver.org/).
 
-## 1.29.0 - master
+## 1.30.0 - master
+
+### Added
+
+*
+
+### Changed
+
+*
+
+### Fixed
+
+*
+
+More details about these changes can be found on our GitHub repo.
+
+## 1.29.0 - 2022-07-05
 
 ### Added
 

certbot/certbot/__init__.py

@@ -1,3 +1,3 @@
 """Certbot client."""
 # version number like 1.2.3a0, must have at least 2 parts, like 1.2
-__version__ = '1.29.0.dev0'
+__version__ = '1.30.0.dev0'

certbot/docs/cli-help.txt

@@ -126,7 +126,7 @@ optional arguments:
                         case, and to know when to deprecate support for past
                         Python versions and flags. If you wish to hide this
                         information from the Let's Encrypt server, set this to
-                        "". (default: CertbotACMEClient/1.28.0 (certbot;
+                        "". (default: CertbotACMEClient/1.29.0 (certbot;
                         OS_NAME OS_VERSION) Authenticator/XXX Installer/YYY
                         (SUBCOMMAND; flags: FLAGS) Py/major.minor.patchlevel).
                         The flags encoded in the user agent are: --duplicate,

tools/finish_release.py

@@ -83,7 +83,7 @@ def publish_windows(css):
     :param str css: CSS host name
 
     """
-    username = getpass.getuser()
+    username = input("CSS username (usually EFF username): ")
     host = css
     command = "ssh -t {}@{} bash /opt/certbot-misc/css/venv.sh".format(username,host)
     
@@ -130,9 +130,9 @@ def get_snap_revisions(snap, version):
     print('Getting revision numbers for', snap, version)
     cmd = ['snapcraft', 'status', snap]
     process = subprocess.run(cmd, check=True, stdout=subprocess.PIPE, universal_newlines=True)
-    pattern = f'^\s+beta\s+{version}\s+(\d+)\s*$'
+    pattern = f'^\s+beta\s+{version}\s+(\d+)\s*'
     revisions = re.findall(pattern, process.stdout, re.MULTILINE)
-    assert len(revisions) == SNAP_ARCH_COUNT, f'Unexpected number of snaps found for {snap} {version}'
+    assert len(revisions) == SNAP_ARCH_COUNT, f'Unexpected number of snaps found for {snap} {version} (expected {SNAP_ARCH_COUNT}, found {len(revisions)})'
     return revisions
 
 

tools/pinning/current/pyproject.toml

@@ -75,6 +75,11 @@ setuptools-rust = "*"
 # https://github.com/python-poetry/poetry-core/commit/4e1f2ab582d1fef0033c0d3f35a3f2f2365a4bc9
 pylint = ">2.6.2"
 
+# Bug in poetry, where still installes yanked versions from pypi (source: https://github.com/python-poetry/poetry/issues/2453)
+# this version of cryptography introduced a security vulnrability.
+# Making sure that it would not get installed (Fixing https://github.com/certbot/certbot/issues/9336)
+cryptography = "!= 37.0.3"
+
 [tool.poetry.dev-dependencies]
 
 [build-system]

tools/snap/build_remote.py

@@ -253,6 +253,12 @@ def main():
             process.join(args.timeout)
 
             if process.is_alive():
+                for target in targets:
+                    if target == 'certbot':
+                        workspace = CERTBOT_DIR
+                    else:
+                        workspace = join(CERTBOT_DIR, target)
+                    _dump_failed_build_logs(target, archs, status, workspace)
                 raise ValueError(f"Timeout out reached ({args.timeout} seconds) during the build!")
 
             build_success = True