1
0
mirror of https://github.com/certbot/certbot.git synced 2026-01-21 19:01:07 +03:00
Commit Graph

1912 Commits

Author SHA1 Message Date
Jacob Hoffman-Andrews
1ca6016bb0 Merge branch 'test-mode' of https://github.com/kuba/lets-encrypt-preview into kuba-test-mode
Conflicts:
	letsencrypt/network2.py
2015-05-21 12:28:39 -07:00
schoen
1681fbea3a Merge pull request #435 from kuba/boulder-compat
Spec and Boulder compatibility fixes
2015-05-19 17:04:07 -07:00
James Kasten
36bb03df63 Merge pull request #427 from diracdeltas/fix/nginxparser-issues
fix some nginxparser issues
2015-05-19 15:12:55 -07:00
Jakub Warmuz
ac0868b6de acme.messages2.Error title is omitempty 2015-05-19 20:13:55 +00:00
Jakub Warmuz
cd6b9bc9c7 Fix coverage for acme.messages2.Error 2015-05-19 20:09:11 +00:00
Jakub Warmuz
0018bc0500 Error: typ/title no omitempty 2015-05-19 19:50:00 +00:00
Jakub Warmuz
41115bfc77 Spec and Boulder compatibility fixes.
Relevant acme-spec:
- https://github.com/letsencrypt/acme-spec/issues/127
- https://github.com/letsencrypt/acme-spec/pull/119
- https://github.com/letsencrypt/acme-spec/issues/98
- https://github.com/letsencrypt/acme-spec/issues/92

Relevant boulder:
- https://github.com/letsencrypt/boulder/pull/170
- https://github.com/letsencrypt/boulder/issues/128
2015-05-19 19:42:53 +00:00
Jakub Warmuz
2cadfdaae1 response might carry binary data, use repr() in network2 logging 2015-05-19 19:21:04 +00:00
Jakub Warmuz
c0acf8239d network2: Log GET/POST uri 2015-05-19 19:19:29 +00:00
yan
24f9da5275 Add support and tests for some Nginx config edge cases
1. Match "if" statements
2. Allow special characters in nginx directives when enclosed in single or
   double quotes.
2015-05-18 17:58:28 -04:00
James Kasten
1ada2cab15 Merge pull request #417 from kuba/plugins
Plugins fixes (unhashable PluginEntryPoint, typo in examples)
2015-05-18 11:22:04 -07:00
James Kasten
064ec73903 Merge pull request #425 from kuba/tests
Do not depend on letsencrypt_apache in core
2015-05-18 11:15:45 -07:00
James Kasten
8b8ce85c59 Merge pull request #426 from jmdcal/patch-1
typeo
2015-05-18 10:42:42 -07:00
James Kasten
7c1248dba1 Merge pull request #399 from kuba/get_sans
get_sans_from_csr using pyOpenSSL
2015-05-18 10:28:55 -07:00
James Kasten
7416f3fbbc Merge pull request #419 from letsencrypt/fix_standalone_signal_race
Attempt to fix #378
2015-05-18 10:18:12 -07:00
James Kasten
77d4b5a28a Merge pull request #382 from kuba/test-dirs-chmods
Fix test dirs chmods errors.
2015-05-18 10:17:11 -07:00
confidential
b0d98edcfe typeo
fixing spelling
2015-05-18 09:58:14 -05:00
Jakub Warmuz
3fd4f2a94a Do not depend on letsencrypt_apache in core tests 2015-05-17 07:52:25 +00:00
Seth Schoen
6f4212dcf1 Fix trivial documentation typo 2015-05-16 23:52:33 -07:00
Jakub Warmuz
74d6d4e0b3 Fix typo in examples 2015-05-15 19:53:41 +00:00
Jakub Warmuz
a941cf61b7 Merge remote-tracking branch 'github/letsencrypt/master' into test-dirs-chmods
Conflicts:
	letsencrypt_nginx/dvsni.py
2015-05-15 19:44:07 +00:00
Jakub Warmuz
834691278e Fix repr for PluginsRegistry (unhashable PluginEntryPoint).
(venv)root@le:~/lets-encrypt-preview# letsencrypt -vv auth
DEBUG:root:Logging level set at 10
Traceback (most recent call last):
File "/usr/lib/python2.7/logging/__init__.py", line 859, in emit
msg = self.format(record)
File "/usr/lib/python2.7/logging/__init__.py", line 732, in format
return fmt.format(record)
File "/usr/lib/python2.7/logging/__init__.py", line 471, in format
record.message = record.getMessage()
File "/usr/lib/python2.7/logging/__init__.py", line 335, in getMessage
msg = msg % self.args
File "/root/lets-encrypt-preview/letsencrypt/plugins/disco.py", line 219, in __repr__
self.__class__.__name__, set(self._plugins.itervalues()))
TypeError: unhashable type: 'PluginEntryPoint'
Logged from file cli.py, line 356
Traceback (most recent call last):
File "/root/lets-encrypt-preview/venv/bin/letsencrypt", line 9, in <module>
load_entry_point('letsencrypt==0.1', 'console_scripts', 'letsencrypt')()
File "/root/lets-encrypt-preview/letsencrypt/cli.py", line 356, in main
logging.debug("Discovered plugins: %r", plugins)
File "/usr/lib/python2.7/logging/__init__.py", line 1630, in debug
root.debug(msg, *args, **kwargs)
File "/usr/lib/python2.7/logging/__init__.py", line 1148, in debug
self._log(DEBUG, msg, args, **kwargs)
File "/usr/lib/python2.7/logging/__init__.py", line 1279, in _log
self.handle(record)
File "/usr/lib/python2.7/logging/__init__.py", line 1289, in handle
self.callHandlers(record)
File "/usr/lib/python2.7/logging/__init__.py", line 1329, in callHandlers
hdlr.handle(record)
File "/usr/lib/python2.7/logging/__init__.py", line 757, in handle
self.emit(record)
File "/root/lets-encrypt-preview/letsencrypt/log.py", line 40, in emit
for line in record.getMessage().splitlines():
File "/usr/lib/python2.7/logging/__init__.py", line 335, in getMessage
msg = msg % self.args
File "/root/lets-encrypt-preview/letsencrypt/plugins/disco.py", line 219, in __repr__
self.__class__.__name__, set(self._plugins.itervalues()))
TypeError: unhashable type: 'PluginEntryPoint'
2015-05-15 15:00:53 +00:00
James Kasten
e166c4159e Merge pull request #416 from kuba/tests
Small tests improvements
2015-05-14 22:26:10 -07:00
Seth Schoen
ca4bece393 Attempt to fix #378 2015-05-14 15:36:51 -07:00
Jakub Warmuz
0bc5791a55 More tests for cli.py 2015-05-14 21:44:36 +00:00
Jakub Warmuz
82bd808ab3 100% coverage for network2_test 2015-05-14 21:16:38 +00:00
Jakub Warmuz
484fd8fe9e Fix randomly created mock_dir 2015-05-14 21:13:12 +00:00
Jakub Warmuz
a2767d30a1 Remove dead code 2015-05-14 21:12:58 +00:00
James Kasten
c57443812b Merge pull request #409 from kuba/pkgs_sep_prep
Fix references to letsencrypt.client
2015-05-13 11:59:50 -07:00
Jakub Warmuz
e06c0cbbf7 Revert "Bump coverage"
This reverts commit da53813770.
2015-05-12 22:09:45 +00:00
Jakub Warmuz
787c64c546 Fix references to letsencrypt.client 2015-05-12 22:08:00 +00:00
Jakub Warmuz
aeef964fb6 Merge remote-tracking branch 'github/letsencrypt/master' into get_sans 2015-05-12 21:27:10 +00:00
Jakub Warmuz
da53813770 Bump coverage 2015-05-12 21:18:45 +00:00
Jakub Warmuz
ac9f97100c Merge remote-tracking branch 'github/letsencrypt/master' into test-mode
Conflicts:
	letsencrypt/tests/configuration_test.py
	letsencrypt/tests/network2_test.py
2015-05-12 21:16:56 +00:00
Jakub Warmuz
bb94952830 Merge remote-tracking branch 'github/letsencrypt/master' into test-dirs-chmods
Conflicts:
	letsencrypt/client/plugins/nginx/tests/testdata/etc_nginx/foo.conf
	letsencrypt/client/plugins/nginx/tests/testdata/etc_nginx/nginx.conf
	letsencrypt/client/plugins/nginx/tests/testdata/etc_nginx/nginx.new.conf
	letsencrypt/client/plugins/nginx/tests/testdata/etc_nginx/server.conf
	letsencrypt/client/plugins/nginx/tests/testdata/etc_nginx/sites-enabled/default
	letsencrypt/client/plugins/nginx/tests/testdata/etc_nginx/sites-enabled/example.com
	letsencrypt/client/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/fastcgi_params
	letsencrypt/client/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-utf
	letsencrypt/client/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-win
	letsencrypt/client/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/mime.types
	letsencrypt/client/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi-ui.conf.1.4.1
	letsencrypt/client/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi.rules
	letsencrypt/client/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi_core.rules
	letsencrypt/client/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/nginx.conf
	letsencrypt/client/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/proxy_params
	letsencrypt/client/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/scgi_params
	letsencrypt/client/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/sites-available/default
	letsencrypt/client/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/sites-enabled/default
	letsencrypt/client/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/uwsgi_params
	letsencrypt/client/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/win-utf
	letsencrypt/client/plugins/nginx/tests/testdata/foo.conf
	letsencrypt/client/plugins/nginx/tests/testdata/nginx.conf
	letsencrypt/client/plugins/nginx/tests/testdata/nginx.new.conf
	letsencrypt/client/plugins/nginx/tests/testdata/server.conf
	letsencrypt/client/plugins/nginx/tests/testdata/sites-enabled/default
	letsencrypt/client/plugins/nginx/tests/testdata/sites-enabled/example.com
	letsencrypt/client/plugins/nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/fastcgi_params
	letsencrypt/client/plugins/nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-utf
	letsencrypt/client/plugins/nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-win
	letsencrypt/client/plugins/nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/mime.types
	letsencrypt/client/plugins/nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi-ui.conf.1.4.1
	letsencrypt/client/plugins/nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi.rules
	letsencrypt/client/plugins/nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi_core.rules
	letsencrypt/client/plugins/nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/nginx.conf
	letsencrypt/client/plugins/nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/proxy_params
	letsencrypt/client/plugins/nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/scgi_params
	letsencrypt/client/plugins/nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/sites-available/default
	letsencrypt/client/plugins/nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/sites-enabled/default
	letsencrypt/client/plugins/nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/uwsgi_params
	letsencrypt/client/plugins/nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/win-utf
	letsencrypt_apache/tests/util.py
	letsencrypt_nginx/tests/testdata/foo.conf
	letsencrypt_nginx/tests/testdata/nginx.conf
	letsencrypt_nginx/tests/testdata/nginx.new.conf
	letsencrypt_nginx/tests/testdata/server.conf
	letsencrypt_nginx/tests/testdata/sites-enabled/default
	letsencrypt_nginx/tests/testdata/sites-enabled/example.com
	letsencrypt_nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/fastcgi_params
	letsencrypt_nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-utf
	letsencrypt_nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-win
	letsencrypt_nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/mime.types
	letsencrypt_nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi-ui.conf.1.4.1
	letsencrypt_nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi.rules
	letsencrypt_nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi_core.rules
	letsencrypt_nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/nginx.conf
	letsencrypt_nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/proxy_params
	letsencrypt_nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/scgi_params
	letsencrypt_nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/sites-available/default
	letsencrypt_nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/sites-enabled/default
	letsencrypt_nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/uwsgi_params
	letsencrypt_nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/win-utf
	letsencrypt_nginx/tests/util.py
2015-05-12 21:06:17 +00:00
James Kasten
d6e554b1fd Merge pull request #401 from kuba/pkgs_sep_prep
Repo reorganisation
2015-05-12 13:41:27 -07:00
Jakub Warmuz
cf9a4b6012 Remove unused import 2015-05-12 20:15:10 +00:00
Jakub Warmuz
55b619853b Merge remote-tracking branch 'github/letsencrypt/master' into pkgs_sep_prep
Conflicts:
	letsencrypt/continuity_auth.py
	letsencrypt_nginx/configurator.py
	letsencrypt_nginx/dvsni.py
	letsencrypt_nginx/tests/configurator_test.py
	letsencrypt_nginx/tests/dvsni_test.py
2015-05-12 20:13:50 +00:00
James Kasten
eb2f019144 Merge pull request #405 from diracdeltas/doc/nginx-dvsni
Update docs to reflect nginx support
2015-05-12 12:27:28 -07:00
yan
f4144f0017 Update docs to reflect nginx support 2015-05-12 12:05:17 -07:00
James Kasten
aed3c7f877 Merge pull request #396 from bradmw/master
Minimal Proof of Possession Challenge
2015-05-12 10:44:17 -07:00
Brad Warren
27511d4822 Added no cover line to unittest.main() 2015-05-12 12:42:59 -04:00
Brad Warren
de974ca51b Merge remote-tracking branch 'upstream/master' 2015-05-12 11:57:17 -04:00
Brad Warren
a496179f74 Incorporated feedback and added extra error checking to POP 2015-05-12 11:56:26 -04:00
James Kasten
8229c72b9c Merge pull request #387 from diracdeltas/feature/nginx-dvsni
dvsni support for nginx
2015-05-11 20:21:20 -07:00
James Kasten
65cda7efbd Merge pull request #403 from kuba/bugs/402
Cover tests (fixes #402).
2015-05-10 13:25:59 -07:00
Jakub Warmuz
c7aff67132 Merge branch 'bugs/402' into pkgs_sep_prep 2015-05-10 19:18:27 +00:00
Jakub Warmuz
53fbedda53 100% acme coverage 2015-05-10 19:16:31 +00:00
Jakub Warmuz
b4c747a283 Merge branch 'bugs/402' into pkgs_sep_prep
Conflicts:
	letsencrypt/tests/client_test.py
	tox.ini
2015-05-10 17:56:41 +00:00
Jakub Warmuz
99b2003e61 Cover tests (fixes #402).
1. --cover-tests, to make sure every test is run, helped to find
   broken determine_account tests
2. fix determine_account test
3. unittest.main()  # pragma: no cover
4. bump coverage

coveralls.io always reported higher coverage, because it also looked
at test files.
2015-05-10 17:38:26 +00:00