Commit graph

8163 commits

Author SHA1 Message Date
Brad Warren
21cebbb520 filter by port in http01 2018-01-16 22:28:58 -08:00
Brad Warren
886ff583b3 fix bytes 2018-01-16 22:22:01 -08:00
Brad Warren
8568cc391b add find_best_http_vhost port test 2018-01-16 22:16:57 -08:00
Brad Warren
d95eed3b5d respect port in find_best_http_vhost 2018-01-16 22:10:22 -08:00
Brad Warren
c429a15edf filter defaults 2018-01-16 21:45:20 -08:00
Brad Warren
cb59903a40 fix typo 2018-01-16 21:40:06 -08:00
Brad Warren
60d825c56a fix typo 2018-01-16 21:39:00 -08:00
Brad Warren
e4b3bda05d include default vhosts 2018-01-16 21:37:58 -08:00
Brad Warren
9bb48778dc fix typo 2018-01-16 21:13:13 -08:00
Brad Warren
90ca31f15c Don't add includes twice 2018-01-16 21:12:40 -08:00
Brad Warren
ac06b0d759 fix test-same-vhost 2018-01-16 21:11:17 -08:00
Brad Warren
cdf4d4b0ce fix typo 2018-01-16 21:06:54 -08:00
Brad Warren
485b534557 add test_same_vhost 2018-01-16 21:06:10 -08:00
Brad Warren
5f6a350a56 fix tests 2018-01-16 21:01:00 -08:00
Brad Warren
f91f6d418e add alias 2018-01-16 20:59:22 -08:00
Brad Warren
0aa6898218 play coverage games 2018-01-16 20:50:55 -08:00
Brad Warren
abc0287cde make lint happy 2018-01-16 20:44:41 -08:00
Brad Warren
72144f6cb7 fix typo 2018-01-16 20:39:56 -08:00
Brad Warren
4c001ad466 check for Include in vhost 2018-01-16 20:39:17 -08:00
Brad Warren
94f521553e test for rewrite 2018-01-16 20:32:09 -08:00
Brad Warren
3e348332a9 fix http-01 tests? pt2 2018-01-16 20:29:26 -08:00
Brad Warren
8d09c4c6cd fix http-01 tests? 2018-01-16 20:19:30 -08:00
Brad Warren
aa0678a14e fix enmod test 2018-01-16 20:06:59 -08:00
Brad Warren
daeda80bb0 does double backslash make pylint happy? 2018-01-16 20:03:11 -08:00
Brad Warren
dbef9b64ef remove S which doesn't seem to work across contexts 2018-01-16 19:00:54 -08:00
Brad Warren
6c14d88068 fix order args 2018-01-16 18:46:44 -08:00
Brad Warren
0e95baf8a4 uncomment tests 2018-01-16 18:23:34 -08:00
Brad Warren
00da23cbf2 use stricter rewriterule 2018-01-16 18:22:48 -08:00
Brad Warren
75a9ec8796 remove ifmod rewrite 2018-01-16 18:19:34 -08:00
Brad Warren
de1d5c1abb enable mod_rewrite 2018-01-16 18:18:16 -08:00
Brad Warren
d7989650f3 remove unneeded directives 2018-01-16 18:17:35 -08:00
Brad Warren
8b03dc33bd fix quote spacing 2018-01-16 18:16:33 -08:00
Joona Hoikkala
1df91d749f
Include overrides to every VirtualHost 2018-01-17 02:04:11 +02:00
Joona Hoikkala
3819e36fe7
Finalized HTTP vhost discovery and added overrides 2018-01-16 20:33:25 +02:00
Brad Warren
368ca0c109 Small cleanup for Apache HTTP-01
* Remove http_doer from self

* Refactor _find_best_vhost
2018-01-15 22:08:37 -08:00
Joona Hoikkala
60dd67a60e Use static directory under workdir for HTTP challenges (#5428)
* Use static directory under workdir for HTTP challenges

* Handle the reverter file registration before opening file handle
2018-01-14 15:22:22 -08:00
ohemorange
2cb9d9e2aa Implement HTTP-01 challenge for Nginx (#5414)
* get http01 challenge working

* support multiple challenge types in configurator.py

* update existing nginx tests

* lint

* refactor NginxHttp01 and NginxTlsSni01 to both now  inherit from NginxChallengePerformer

* remove TODO

* challenges_test tests with both tlssni01 and http01

* Make challenges.py more abstract to make lint happier

* add pylint disables to the tests to make pylint happier about the inheritance and abstraction situation

* no need to cover raise NotImplementedError() lines

* python3 compatibility

* test that http01 perform is called

* only remove ssl from addresses during http01

* Initialize addrs_to_add

* Change Nginx http01 to modify server block so the site doesn't stop serving while getting a cert

* pass existing unit tests

* rename sni --> http01 in unit tests

* lint

* fix configurator test

* select an http block instead of https

* properly test for port number

* use domains that have matching addresses

* remove debugger

* remove access_log and error_log cruft that wasn't being executed

* continue to return None from choose_redirect_vhost when create_if_no_match is False

* add nginx integration test
2018-01-11 17:06:23 -08:00
Brad Warren
5d58a3d847
Merge pull request #5417 from certbot/apache-http
HTTP01 support in Apache
2018-01-11 11:18:07 -08:00
Joona Hoikkala
28dad825af
Do not try to remove temp dir if it wasn't created 2018-01-11 20:44:40 +02:00
Brad Warren
f0f5defb6f Address minor concerns with Apache HTTP-01
* enable other modules

* change port type

* remove maxDiff from test class

* update port comment

* add -f to a2dismod
2018-01-11 09:59:25 -08:00
Joona Hoikkala
fa97877cfb Make sure that Apache is listening on port 80 and has mod_alias
* Ensure that mod_alias is enabled

* Make sure we listen to port http01_port
2018-01-11 14:48:32 +02:00
Brad Warren
2ba334a182 Add basic HTTP01 support to Apache
* Add a simple version of HTTP01

* remove cert from chall name

* make directory work on 2.2

* cleanup challenges when finished

* import shutil

* fixup perform and cleanup tests

* Add tests for http_01.py
2018-01-10 23:35:09 -08:00
Brad Warren
9e95208101
Factor out common challengeperformer logic (#5413) 2018-01-10 18:34:45 -08:00
Brad Warren
39472f88de
reduce ipdb version (#5408) 2018-01-10 13:26:31 -08:00
Brad Warren
3acf5d1ef9
Fix rebootstraping with old venvs (#5392)
* Fix rebootstrapping before venv move

* add regression test

* dedupe test

* Cleanup case when two venvs exist.

* Add clarifying comment

* Add double venv test to leauto_upgrades

* Fix logic with the help of coffee

* redirect stderr

* pass VENV_PATH through sudo

* redirect stderr
2018-01-10 12:10:21 -08:00
Brad Warren
00634394f2
Only respect LE_PYTHON inside USE_PYTHON_3 if we know a user must have set it version 2 (#5402)
* stop exporting LE_PYTHON

* unset LE_PYTHON sometimes
2018-01-09 21:16:44 -08:00
ohemorange
6eb459354f Address erikrose's comments on #5329 (#5400) 2018-01-09 16:48:16 -08:00
ohemorange
f5a02714cd Add deprecation warning for Python 2.6 (#5391)
* Add deprecation warning for Python 2.6

* Allow disabling Python 2.6 warning
2018-01-09 16:11:04 -08:00
Brad Warren
887a6bcfce Handle need to rebootstrap before fetch.py (#5389)
* Fix #5387

* Add test for #5387

* remove LE_PYTHON

* Use environment variable to reduce line length
2018-01-09 15:40:26 -08:00
Joona Hoikkala
288c4d956c Automatically install updates in test script (#5394) 2018-01-09 08:28:52 -08:00